2022-01-22 00:41:44

by Christophe Leroy

Subject: [PATCH v7 05/14] sizes.h: Add SZ_1T macro

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 <[email protected]>
Cc: [email protected]
Signed-off-by: Christophe Leroy <[email protected]>
Reviewed-by: Krzysztof Wilczyński <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
---
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

2022-02-24 16:33:02

by Lorenzo Pieralisi

Subject: Re: [PATCH v7 05/14] sizes.h: Add SZ_1T macro

On Fri, 21 Jan 2022 08:42:21 +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.
>
>

Applied to pci/misc, thanks!

[05/14] sizes.h: Add SZ_1T macro
https://git.kernel.org/lpieralisi/pci/c/0cc62aed37

Thanks,
Lorenzo