* [PATCH v2] PCI: ftpci100: rename macro name collision
@ 2021-05-17 23:41 Randy Dunlap
2021-05-17 23:57 ` Linus Walleij
2021-06-03 16:26 ` Lorenzo Pieralisi
0 siblings, 2 replies; 3+ messages in thread
From: Randy Dunlap @ 2021-05-17 23:41 UTC (permalink / raw)
To: linux-pci
Cc: Randy Dunlap, kernel test robot, Linus Walleij, Jiaxun Yang,
Krzysztof Wilczyński, Thomas Bogendoerfer, linux-mips
PCI_IOSIZE is defined in mach-loongson64/spaces.h, so change the name
of the PCI_* macros in pci-ftpci100.c to use FTPCI_* so that they are
more localized and won't conflict with other drivers or arches.
../drivers/pci/controller/pci-ftpci100.c:37: warning: "PCI_IOSIZE" redefined
37 | #define PCI_IOSIZE 0x00
|
In file included from ../arch/mips/include/asm/addrspace.h:13,
... from ../drivers/pci/controller/pci-ftpci100.c:15:
arch/mips/include/asm/mach-loongson64/spaces.h:11: note: this is the location of the previous definition
11 | #define PCI_IOSIZE SZ_16M
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Suggested-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Krzysztof Wilczyński <kw@linux.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org
---
v2: prefix PCI_ macro names with "FT", thus use FTPCI_ for these macro names.
(suggested by Linus Walleij)
drivers/pci/controller/pci-ftpci100.c | 30 ++++++++++++------------
1 file changed, 15 insertions(+), 15 deletions(-)
--- linux-next-20210514.orig/drivers/pci/controller/pci-ftpci100.c
+++ linux-next-20210514/drivers/pci/controller/pci-ftpci100.c
@@ -34,12 +34,12 @@
* Special configuration registers directly in the first few words
* in I/O space.
*/
-#define PCI_IOSIZE 0x00
-#define PCI_PROT 0x04 /* AHB protection */
-#define PCI_CTRL 0x08 /* PCI control signal */
-#define PCI_SOFTRST 0x10 /* Soft reset counter and response error enable */
-#define PCI_CONFIG 0x28 /* PCI configuration command register */
-#define PCI_DATA 0x2C
+#define FTPCI_IOSIZE 0x00
+#define FTPCI_PROT 0x04 /* AHB protection */
+#define FTPCI_CTRL 0x08 /* PCI control signal */
+#define FTPCI_SOFTRST 0x10 /* Soft reset counter and response error enable */
+#define FTPCI_CONFIG 0x28 /* PCI configuration command register */
+#define FTPCI_DATA 0x2C
#define FARADAY_PCI_STATUS_CMD 0x04 /* Status and command */
#define FARADAY_PCI_PMC 0x40 /* Power management control */
@@ -195,9 +195,9 @@ static int faraday_raw_pci_read_config(s
PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
PCI_CONF_WHERE(config) |
PCI_CONF_ENABLE,
- p->base + PCI_CONFIG);
+ p->base + FTPCI_CONFIG);
- *value = readl(p->base + PCI_DATA);
+ *value = readl(p->base + FTPCI_DATA);
if (size == 1)
*value = (*value >> (8 * (config & 3))) & 0xFF;
@@ -230,17 +230,17 @@ static int faraday_raw_pci_write_config(
PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
PCI_CONF_WHERE(config) |
PCI_CONF_ENABLE,
- p->base + PCI_CONFIG);
+ p->base + FTPCI_CONFIG);
switch (size) {
case 4:
- writel(value, p->base + PCI_DATA);
+ writel(value, p->base + FTPCI_DATA);
break;
case 2:
- writew(value, p->base + PCI_DATA + (config & 3));
+ writew(value, p->base + FTPCI_DATA + (config & 3));
break;
case 1:
- writeb(value, p->base + PCI_DATA + (config & 3));
+ writeb(value, p->base + FTPCI_DATA + (config & 3));
break;
default:
ret = PCIBIOS_BAD_REGISTER_NUMBER;
@@ -469,7 +469,7 @@ static int faraday_pci_probe(struct plat
if (!faraday_res_to_memcfg(io->start - win->offset,
resource_size(io), &val)) {
/* setup I/O space size */
- writel(val, p->base + PCI_IOSIZE);
+ writel(val, p->base + FTPCI_IOSIZE);
} else {
dev_err(dev, "illegal IO mem size\n");
return -EINVAL;
@@ -477,11 +477,11 @@ static int faraday_pci_probe(struct plat
}
/* Setup hostbridge */
- val = readl(p->base + PCI_CTRL);
+ val = readl(p->base + FTPCI_CTRL);
val |= PCI_COMMAND_IO;
val |= PCI_COMMAND_MEMORY;
val |= PCI_COMMAND_MASTER;
- writel(val, p->base + PCI_CTRL);
+ writel(val, p->base + FTPCI_CTRL);
/* Mask and clear all interrupts */
faraday_raw_pci_write_config(p, 0, 0, FARADAY_PCI_CTRL2 + 2, 2, 0xF000);
if (variant->cascaded_irq) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] PCI: ftpci100: rename macro name collision
2021-05-17 23:41 [PATCH v2] PCI: ftpci100: rename macro name collision Randy Dunlap
@ 2021-05-17 23:57 ` Linus Walleij
2021-06-03 16:26 ` Lorenzo Pieralisi
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2021-05-17 23:57 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-pci, kernel test robot, Jiaxun Yang,
Krzysztof Wilczyński, Thomas Bogendoerfer, linux-mips
On Tue, May 18, 2021 at 1:41 AM Randy Dunlap <rdunlap@infradead.org> wrote:
> PCI_IOSIZE is defined in mach-loongson64/spaces.h, so change the name
> of the PCI_* macros in pci-ftpci100.c to use FTPCI_* so that they are
> more localized and won't conflict with other drivers or arches.
>
> ../drivers/pci/controller/pci-ftpci100.c:37: warning: "PCI_IOSIZE" redefined
> 37 | #define PCI_IOSIZE 0x00
> |
> In file included from ../arch/mips/include/asm/addrspace.h:13,
> ... from ../drivers/pci/controller/pci-ftpci100.c:15:
> arch/mips/include/asm/mach-loongson64/spaces.h:11: note: this is the location of the previous definition
> 11 | #define PCI_IOSIZE SZ_16M
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: kernel test robot <lkp@intel.com>
> Suggested-by: Linus Walleij <linus.walleij@linaro.org>
> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Krzysztof Wilczyński <kw@linux.com>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: linux-mips@vger.kernel.org
> ---
> v2: prefix PCI_ macro names with "FT", thus use FTPCI_ for these macro names.
> (suggested by Linus Walleij)
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] PCI: ftpci100: rename macro name collision
2021-05-17 23:41 [PATCH v2] PCI: ftpci100: rename macro name collision Randy Dunlap
2021-05-17 23:57 ` Linus Walleij
@ 2021-06-03 16:26 ` Lorenzo Pieralisi
1 sibling, 0 replies; 3+ messages in thread
From: Lorenzo Pieralisi @ 2021-06-03 16:26 UTC (permalink / raw)
To: linux-pci, Randy Dunlap
Cc: Lorenzo Pieralisi, Krzysztof Wilczyński, Linus Walleij,
Jiaxun Yang, kernel test robot, linux-mips, Thomas Bogendoerfer
On Mon, 17 May 2021 16:41:17 -0700, Randy Dunlap wrote:
> PCI_IOSIZE is defined in mach-loongson64/spaces.h, so change the name
> of the PCI_* macros in pci-ftpci100.c to use FTPCI_* so that they are
> more localized and won't conflict with other drivers or arches.
>
> ../drivers/pci/controller/pci-ftpci100.c:37: warning: "PCI_IOSIZE" redefined
> 37 | #define PCI_IOSIZE 0x00
> |
> In file included from ../arch/mips/include/asm/addrspace.h:13,
> ... from ../drivers/pci/controller/pci-ftpci100.c:15:
> arch/mips/include/asm/mach-loongson64/spaces.h:11: note: this is the location of the previous definition
> 11 | #define PCI_IOSIZE SZ_16M
Applied to pci/ftpci100, thanks!
[1/1] PCI: ftpci100: rename macro name collision
https://git.kernel.org/lpieralisi/pci/c/b1cb890637
Thanks,
Lorenzo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-03 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 23:41 [PATCH v2] PCI: ftpci100: rename macro name collision Randy Dunlap
2021-05-17 23:57 ` Linus Walleij
2021-06-03 16:26 ` Lorenzo Pieralisi
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).