| Message ID | 20240429104633.11060-2-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | PCI: Add generic Conf Type 0/1 helpers | expand |
On Mon, Apr 29, 2024 at 01:46:24PM +0300, Ilpo Järvinen wrote: > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > because PCI core is going to introduce defines with the same names. > > Add ORION5X prefix to those defines to avoid name conflicts. > > Note: as this is part of series that replaces the code in question > anyway, only bare minimum renaming is done and other similarly named > macros are not touched. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
On Mon, Apr 29, 2024 at 01:46:24PM +0300, Ilpo Järvinen wrote: > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > because PCI core is going to introduce defines with the same names. > > Add ORION5X prefix to those defines to avoid name conflicts. > > Note: as this is part of series that replaces the code in question > anyway, only bare minimum renaming is done and other similarly named > macros are not touched. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Hi Ilpo What branch do these apply to? I wanted to test them, but i get hunks rejected: git am < 20240429104633.11060-1-ilpo.jarvinen@linux.intel.com.mbx Applying: ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way Applying: ARM: orion5x: Use generic PCI Conf Type 1 helper error: patch failed: arch/arm/mach-orion5x/pci.c:276 error: arch/arm/mach-orion5x/pci.c: patch does not apply Patch failed at 0002 ARM: orion5x: Use generic PCI Conf Type 1 helper I tried linux-next, v6.9-rc6, pci:next Thanks Andrew
On Mon, 29 Apr 2024, Andrew Lunn wrote: > On Mon, Apr 29, 2024 at 01:46:24PM +0300, Ilpo Järvinen wrote: > > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > > because PCI core is going to introduce defines with the same names. > > > > Add ORION5X prefix to those defines to avoid name conflicts. > > > > Note: as this is part of series that replaces the code in question > > anyway, only bare minimum renaming is done and other similarly named > > macros are not touched. > > > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > > Hi Ilpo > > What branch do these apply to? I wanted to test them, but i get hunks > rejected: > > git am < 20240429104633.11060-1-ilpo.jarvinen@linux.intel.com.mbx > Applying: ARM: orion5x: Rename PCI_CONF_{REG,FUNC}() out of the way > Applying: ARM: orion5x: Use generic PCI Conf Type 1 helper > error: patch failed: arch/arm/mach-orion5x/pci.c:276 > error: arch/arm/mach-orion5x/pci.c: patch does not apply > Patch failed at 0002 ARM: orion5x: Use generic PCI Conf Type 1 helper > > I tried linux-next, v6.9-rc6, pci:next Hi, On top of pci:main (so v6.9-rc1). "ARM: orion5x: Use generic PCI Conf Type 1 helper" should be only 4th patch but your command seems to apply it as 2nd patch (is the mbx file having them out-of-order?).
Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> writes: > orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic > because PCI core is going to introduce defines with the same names. > > Add ORION5X prefix to those defines to avoid name conflicts. > > Note: as this is part of series that replaces the code in question > anyway, only bare minimum renaming is done and other similarly named > macros are not touched. > > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> As some other patches of the series depend on patches in the PCIe subsystem, the best approach would be to let you apply the series through the PCIe subsystem. Thanks, Gregory > --- > arch/arm/mach-orion5x/pci.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c > index 3313bc5a63ea..77ddab90f448 100644 > --- a/arch/arm/mach-orion5x/pci.c > +++ b/arch/arm/mach-orion5x/pci.c > @@ -219,8 +219,8 @@ static int __init pcie_setup(struct pci_sys_data *sys) > /* > * PCI_CONF_ADDR bits > */ > -#define PCI_CONF_REG(reg) ((reg) & 0xfc) > -#define PCI_CONF_FUNC(func) (((func) & 0x3) << 8) > +#define ORION5X_PCI_CONF_REG(reg) ((reg) & 0xfc) > +#define ORION5X_PCI_CONF_FUNC(func) (((func) & 0x3) << 8) > #define PCI_CONF_DEV(dev) (((dev) & 0x1f) << 11) > #define PCI_CONF_BUS(bus) (((bus) & 0xff) << 16) > #define PCI_CONF_ADDR_EN (1 << 31) > @@ -277,8 +277,8 @@ static int orion5x_pci_hw_rd_conf(int bus, int dev, u32 func, > spin_lock_irqsave(&orion5x_pci_lock, flags); > > writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | > - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | > + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > > *val = readl(PCI_CONF_DATA); > > @@ -301,8 +301,8 @@ static int orion5x_pci_hw_wr_conf(int bus, int dev, u32 func, > spin_lock_irqsave(&orion5x_pci_lock, flags); > > writel(PCI_CONF_BUS(bus) | > - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | > - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | > + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); > > if (size == 4) { > __raw_writel(val, PCI_CONF_DATA); > -- > 2.39.2
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 3313bc5a63ea..77ddab90f448 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -219,8 +219,8 @@ static int __init pcie_setup(struct pci_sys_data *sys) /* * PCI_CONF_ADDR bits */ -#define PCI_CONF_REG(reg) ((reg) & 0xfc) -#define PCI_CONF_FUNC(func) (((func) & 0x3) << 8) +#define ORION5X_PCI_CONF_REG(reg) ((reg) & 0xfc) +#define ORION5X_PCI_CONF_FUNC(func) (((func) & 0x3) << 8) #define PCI_CONF_DEV(dev) (((dev) & 0x1f) << 11) #define PCI_CONF_BUS(bus) (((bus) & 0xff) << 16) #define PCI_CONF_ADDR_EN (1 << 31) @@ -277,8 +277,8 @@ static int orion5x_pci_hw_rd_conf(int bus, int dev, u32 func, spin_lock_irqsave(&orion5x_pci_lock, flags); writel(PCI_CONF_BUS(bus) | - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); *val = readl(PCI_CONF_DATA); @@ -301,8 +301,8 @@ static int orion5x_pci_hw_wr_conf(int bus, int dev, u32 func, spin_lock_irqsave(&orion5x_pci_lock, flags); writel(PCI_CONF_BUS(bus) | - PCI_CONF_DEV(dev) | PCI_CONF_REG(where) | - PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); + PCI_CONF_DEV(dev) | ORION5X_PCI_CONF_REG(where) | + ORION5X_PCI_CONF_FUNC(func) | PCI_CONF_ADDR_EN, PCI_CONF_ADDR); if (size == 4) { __raw_writel(val, PCI_CONF_DATA);
orion5x defines PCI_CONF_REG() and PCI_CONF_FUNC() that are problematic because PCI core is going to introduce defines with the same names. Add ORION5X prefix to those defines to avoid name conflicts. Note: as this is part of series that replaces the code in question anyway, only bare minimum renaming is done and other similarly named macros are not touched. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- arch/arm/mach-orion5x/pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)