luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: ftpci100: Rename macro name collision

Browse Source 
[ Upstream commit 5be967d5016ac5ffb9c4d0df51b48441ee4d5ed1 ]

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

Suggested-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210517234117.3660-1-rdunlap@infradead.org
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-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
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Randy Dunlap 2021-05-17 16:41:17 -07:00 committed by Greg Kroah-Hartman
parent e133435232
commit 0df49cdc7c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/pci/controller/pci-ftpci100.c
View File

@ -34,12 +34,12 @@
* Special configuration registers directly in the first few words * Special configuration registers directly in the first few words
* in I/O space. * in I/O space.
*/ */
#define PCI_IOSIZE 0x00 #define FTPCI_IOSIZE 0x00
#define PCI_PROT 0x04 /* AHB protection */ #define FTPCI_PROT 0x04 /* AHB protection */
#define PCI_CTRL 0x08 /* PCI control signal */ #define FTPCI_CTRL 0x08 /* PCI control signal */
#define PCI_SOFTRST 0x10 /* Soft reset counter and response error enable */ #define FTPCI_SOFTRST 0x10 /* Soft reset counter and response error enable */
#define PCI_CONFIG 0x28 /* PCI configuration command register */ #define FTPCI_CONFIG 0x28 /* PCI configuration command register */
#define PCI_DATA 0x2C #define FTPCI_DATA 0x2C
#define FARADAY_PCI_STATUS_CMD 0x04 /* Status and command */ #define FARADAY_PCI_STATUS_CMD 0x04 /* Status and command */
#define FARADAY_PCI_PMC 0x40 /* Power management control */ #define FARADAY_PCI_PMC 0x40 /* Power management control */
@ -195,9 +195,9 @@ static int faraday_raw_pci_read_config(struct faraday_pci *p, int bus_number,
PCI_CONF_FUNCTION(PCI_FUNC(fn)) | PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
PCI_CONF_WHERE(config) | PCI_CONF_WHERE(config) |
PCI_CONF_ENABLE, 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) if (size == 1)
*value = (*value >> (8 * (config & 3))) & 0xFF; *value = (*value >> (8 * (config & 3))) & 0xFF;
@ -230,17 +230,17 @@ static int faraday_raw_pci_write_config(struct faraday_pci *p, int bus_number,
PCI_CONF_FUNCTION(PCI_FUNC(fn)) | PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
PCI_CONF_WHERE(config) | PCI_CONF_WHERE(config) |
PCI_CONF_ENABLE, PCI_CONF_ENABLE,
p->base + PCI_CONFIG); p->base + FTPCI_CONFIG);
switch (size) { switch (size) {
case 4: case 4:
writel(value, p->base + PCI_DATA); writel(value, p->base + FTPCI_DATA);
break; break;
case 2: case 2:
writew(value, p->base + PCI_DATA + (config & 3)); writew(value, p->base + FTPCI_DATA + (config & 3));
break; break;
case 1: case 1:
writeb(value, p->base + PCI_DATA + (config & 3)); writeb(value, p->base + FTPCI_DATA + (config & 3));
break; break;
default: default:
ret = PCIBIOS_BAD_REGISTER_NUMBER; ret = PCIBIOS_BAD_REGISTER_NUMBER;
@ -469,7 +469,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
if (!faraday_res_to_memcfg(io->start - win->offset, if (!faraday_res_to_memcfg(io->start - win->offset,
resource_size(io), &val)) { resource_size(io), &val)) {
/* setup I/O space size */ /* setup I/O space size */
writel(val, p->base + PCI_IOSIZE); writel(val, p->base + FTPCI_IOSIZE);
} else { } else {
dev_err(dev, "illegal IO mem size\n"); dev_err(dev, "illegal IO mem size\n");
return -EINVAL; return -EINVAL;
@ -477,11 +477,11 @@ static int faraday_pci_probe(struct platform_device *pdev)
} }
/* Setup hostbridge */ /* Setup hostbridge */
val = readl(p->base + PCI_CTRL); val = readl(p->base + FTPCI_CTRL);
val |= PCI_COMMAND_IO; val |= PCI_COMMAND_IO;
val |= PCI_COMMAND_MEMORY; val |= PCI_COMMAND_MEMORY;
val |= PCI_COMMAND_MASTER; val |= PCI_COMMAND_MASTER;
writel(val, p->base + PCI_CTRL); writel(val, p->base + FTPCI_CTRL);
/* Mask and clear all interrupts */ /* Mask and clear all interrupts */
faraday_raw_pci_write_config(p, 0, 0, FARADAY_PCI_CTRL2 + 2, 2, 0xF000); faraday_raw_pci_write_config(p, 0, 0, FARADAY_PCI_CTRL2 + 2, 2, 0xF000);
if (variant->cascaded_irq) { if (variant->cascaded_irq) {