* [PATCH 1/2] sizes.h: Add SZ_1T macro
@ 2021-12-08 14:32 Christophe Leroy
2021-12-08 21:19 ` Krzysztof Wilczyński
2021-12-15 20:42 ` Bjorn Helgaas
0 siblings, 2 replies; 4+ messages in thread
From: Christophe Leroy @ 2021-12-08 14:32 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman
Cc: Christophe Leroy, linux-kernel, linuxppc-dev, Toan Le, linux-pci
Today drivers/pci/controller/pci-xgene.c defines SZ_1T
Move it into linux/sizes.h so that it can be re-used elsewhere.
Cc: Toan Le <toan@os.amperecomputing.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
drivers/pci/controller/pci-xgene.c | 1 -
include/linux/sizes.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 56d0d50338c8..716dcab5ca47 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -49,7 +49,6 @@
#define EN_REG 0x00000001
#define OB_LO_IO 0x00000002
#define XGENE_PCIE_DEVICEID 0xE004
-#define SZ_1T (SZ_1G*1024ULL)
#define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe)
#define XGENE_V1_PCI_EXP_CAP 0x40
diff --git a/include/linux/sizes.h b/include/linux/sizes.h
index 1ac79bcee2bb..84aa448d8bb3 100644
--- a/include/linux/sizes.h
+++ b/include/linux/sizes.h
@@ -47,6 +47,8 @@
#define SZ_8G _AC(0x200000000, ULL)
#define SZ_16G _AC(0x400000000, ULL)
#define SZ_32G _AC(0x800000000, ULL)
+
+#define SZ_1T _AC(0x10000000000, ULL)
#define SZ_64T _AC(0x400000000000, ULL)
#endif /* __LINUX_SIZES_H__ */
--
2.33.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] sizes.h: Add SZ_1T macro
2021-12-08 14:32 [PATCH 1/2] sizes.h: Add SZ_1T macro Christophe Leroy
@ 2021-12-08 21:19 ` Krzysztof Wilczyński
2021-12-16 14:23 ` Christophe Leroy
2021-12-15 20:42 ` Bjorn Helgaas
1 sibling, 1 reply; 4+ messages in thread
From: Krzysztof Wilczyński @ 2021-12-08 21:19 UTC (permalink / raw)
To: Christophe Leroy
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
linux-kernel, linuxppc-dev, Toan Le, linux-pci
Hello Christophe,
> Today drivers/pci/controller/pci-xgene.c defines SZ_1T
>
> Move it into linux/sizes.h so that it can be re-used elsewhere.
Sounds like a good idea!
By the way, there was an earlier version of this patch, did something
happened? I think you simply extracted these changes from the other
series, correct?
> diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
> index 56d0d50338c8..716dcab5ca47 100644
> --- a/drivers/pci/controller/pci-xgene.c
> +++ b/drivers/pci/controller/pci-xgene.c
> @@ -49,7 +49,6 @@
> #define EN_REG 0x00000001
> #define OB_LO_IO 0x00000002
> #define XGENE_PCIE_DEVICEID 0xE004
> -#define SZ_1T (SZ_1G*1024ULL)
> #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe)
>
> #define XGENE_V1_PCI_EXP_CAP 0x40
> diff --git a/include/linux/sizes.h b/include/linux/sizes.h
> index 1ac79bcee2bb..84aa448d8bb3 100644
> --- a/include/linux/sizes.h
> +++ b/include/linux/sizes.h
> @@ -47,6 +47,8 @@
> #define SZ_8G _AC(0x200000000, ULL)
> #define SZ_16G _AC(0x400000000, ULL)
> #define SZ_32G _AC(0x800000000, ULL)
> +
> +#define SZ_1T _AC(0x10000000000, ULL)
> #define SZ_64T _AC(0x400000000000, ULL)
>
> #endif /* __LINUX_SIZES_H__ */
Thank you!
Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] sizes.h: Add SZ_1T macro
2021-12-08 14:32 [PATCH 1/2] sizes.h: Add SZ_1T macro Christophe Leroy
2021-12-08 21:19 ` Krzysztof Wilczyński
@ 2021-12-15 20:42 ` Bjorn Helgaas
1 sibling, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2021-12-15 20:42 UTC (permalink / raw)
To: Christophe Leroy
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
linux-kernel, linuxppc-dev, Toan Le, linux-pci
On Wed, Dec 08, 2021 at 02:32:42PM +0000, Christophe Leroy wrote:
> Today drivers/pci/controller/pci-xgene.c defines SZ_1T
>
> Move it into linux/sizes.h so that it can be re-used elsewhere.
>
> Cc: Toan Le <toan@os.amperecomputing.com>
> Cc: linux-pci@vger.kernel.org
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
I guess this needs to go with the [2/2] patch, since it also uses
SZ_1T.
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/controller/pci-xgene.c | 1 -
> include/linux/sizes.h | 2 ++
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
> index 56d0d50338c8..716dcab5ca47 100644
> --- a/drivers/pci/controller/pci-xgene.c
> +++ b/drivers/pci/controller/pci-xgene.c
> @@ -49,7 +49,6 @@
> #define EN_REG 0x00000001
> #define OB_LO_IO 0x00000002
> #define XGENE_PCIE_DEVICEID 0xE004
> -#define SZ_1T (SZ_1G*1024ULL)
> #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe)
>
> #define XGENE_V1_PCI_EXP_CAP 0x40
> diff --git a/include/linux/sizes.h b/include/linux/sizes.h
> index 1ac79bcee2bb..84aa448d8bb3 100644
> --- a/include/linux/sizes.h
> +++ b/include/linux/sizes.h
> @@ -47,6 +47,8 @@
> #define SZ_8G _AC(0x200000000, ULL)
> #define SZ_16G _AC(0x400000000, ULL)
> #define SZ_32G _AC(0x800000000, ULL)
> +
> +#define SZ_1T _AC(0x10000000000, ULL)
> #define SZ_64T _AC(0x400000000000, ULL)
>
> #endif /* __LINUX_SIZES_H__ */
> --
> 2.33.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] sizes.h: Add SZ_1T macro
2021-12-08 21:19 ` Krzysztof Wilczyński
@ 2021-12-16 14:23 ` Christophe Leroy
0 siblings, 0 replies; 4+ messages in thread
From: Christophe Leroy @ 2021-12-16 14:23 UTC (permalink / raw)
To: Krzysztof Wilczyński
Cc: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
linux-kernel, linuxppc-dev, Toan Le, linux-pci
Le 08/12/2021 à 22:19, Krzysztof Wilczyński a écrit :
> Hello Christophe,
>
>> Today drivers/pci/controller/pci-xgene.c defines SZ_1T
>>
>> Move it into linux/sizes.h so that it can be re-used elsewhere.
>
> Sounds like a good idea!
>
> By the way, there was an earlier version of this patch, did something
> happened? I think you simply extracted these changes from the other
> series, correct?
Yes it was previously in series
https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=274229&state=*
I decided to put it aside in a new separate series
https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=275829&state=*
because the change in patch 2 is independant.
>
>> diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
>> index 56d0d50338c8..716dcab5ca47 100644
>> --- a/drivers/pci/controller/pci-xgene.c
>> +++ b/drivers/pci/controller/pci-xgene.c
>> @@ -49,7 +49,6 @@
>> #define EN_REG 0x00000001
>> #define OB_LO_IO 0x00000002
>> #define XGENE_PCIE_DEVICEID 0xE004
>> -#define SZ_1T (SZ_1G*1024ULL)
>> #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe)
>>
>> #define XGENE_V1_PCI_EXP_CAP 0x40
>> diff --git a/include/linux/sizes.h b/include/linux/sizes.h
>> index 1ac79bcee2bb..84aa448d8bb3 100644
>> --- a/include/linux/sizes.h
>> +++ b/include/linux/sizes.h
>> @@ -47,6 +47,8 @@
>> #define SZ_8G _AC(0x200000000, ULL)
>> #define SZ_16G _AC(0x400000000, ULL)
>> #define SZ_32G _AC(0x800000000, ULL)
>> +
>> +#define SZ_1T _AC(0x10000000000, ULL)
>> #define SZ_64T _AC(0x400000000000, ULL)
>>
>> #endif /* __LINUX_SIZES_H__ */
>
> Thank you!
>
> Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Thanks
Christophe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-16 14:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-08 14:32 [PATCH 1/2] sizes.h: Add SZ_1T macro Christophe Leroy
2021-12-08 21:19 ` Krzysztof Wilczyński
2021-12-16 14:23 ` Christophe Leroy
2021-12-15 20:42 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).