Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: PCI: Use pci_enable_resources()

pci-legacy.c under MIPS has a copy of pci_enable_resources() named as
pcibios_enable_resources(). Having own copy of same functionality could
lead to inconsistencies in behavior, especially now as
pci_enable_resources() and the bridge window resource flags behavior are
going to be altered by upcoming changes.

The check for !r->start && r->end is already covered by the more generic
checks done in pci_enable_resources().

Call pci_enable_resources() from MIPS's pcibios_enable_device() and remove
pcibios_enable_resources().

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Link: https://patch.msgid.link/20250829131113.36754-4-ilpo.jarvinen@linux.intel.com

authored by

Ilpo Järvinen and committed by
Bjorn Helgaas
ae81aad5 754babaa

+2 -36
+2 -36
arch/mips/pci/pci-legacy.c
··· 249 249 250 250 subsys_initcall(pcibios_init); 251 251 252 - static int pcibios_enable_resources(struct pci_dev *dev, int mask) 253 - { 254 - u16 cmd, old_cmd; 255 - int idx; 256 - struct resource *r; 257 - 258 - pci_read_config_word(dev, PCI_COMMAND, &cmd); 259 - old_cmd = cmd; 260 - pci_dev_for_each_resource(dev, r, idx) { 261 - /* Only set up the requested stuff */ 262 - if (!(mask & (1<<idx))) 263 - continue; 264 - 265 - if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM))) 266 - continue; 267 - if ((idx == PCI_ROM_RESOURCE) && 268 - (!(r->flags & IORESOURCE_ROM_ENABLE))) 269 - continue; 270 - if (!r->start && r->end) { 271 - pci_err(dev, 272 - "can't enable device: resource collisions\n"); 273 - return -EINVAL; 274 - } 275 - if (r->flags & IORESOURCE_IO) 276 - cmd |= PCI_COMMAND_IO; 277 - if (r->flags & IORESOURCE_MEM) 278 - cmd |= PCI_COMMAND_MEMORY; 279 - } 280 - if (cmd != old_cmd) { 281 - pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd); 282 - pci_write_config_word(dev, PCI_COMMAND, cmd); 283 - } 284 - return 0; 285 - } 286 - 287 252 int pcibios_enable_device(struct pci_dev *dev, int mask) 288 253 { 289 - int err = pcibios_enable_resources(dev, mask); 254 + int err; 290 255 256 + err = pci_enable_resources(dev, mask); 291 257 if (err < 0) 292 258 return err; 293 259