| Message ID | b03f5cf556f1a89ccb4d7ae2f56414520cfd9209.1638973836.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] sizes.h: Add SZ_1T macro | expand |
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
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
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
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__ */
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(-)