Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e9e0bf authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

PCI: parisc: use generic pci_enable_resources() 



Use the generic pci_enable_resources() instead of the arch-specific code.

Unlike this arch-specific code, the generic version:
    - checks PCI_NUM_RESOURCES (11), not DEVICE_COUNT_RESOURCE (12), resources
    - skips resources that have neither IORESOURCE_IO nor IORESOURCE_MEM set
    - skips ROM resources unless IORESOURCE_ROM_ENABLE is set
    - checks for resource collisions with "!r->parent"

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarKyle McMartin <kyle@mcmartin.ca>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e789920d

arch/parisc/kernel/pci.c

+13 −17
Original line number Diff line number Diff line
@@ -287,23 +287,15 @@ void pcibios_align_resource(void *data, struct resource *res, 
 */

int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	u16 cmd;

	int idx;

	int err;

	u16 cmd, old_cmd;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);



	for (idx = 0; idx < DEVICE_COUNT_RESOURCE; idx++) {

		struct resource *r = &dev->resource[idx];

	err = pci_enable_resources(dev, mask);

	if (err < 0)

		return err;



		/* only setup requested resources */

		if (!(mask & (1<<idx)))

			continue;



		if (r->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (r->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}

	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	old_cmd = cmd;



	cmd |= (PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
@@ -312,8 +304,12 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
	if (dev->bus->bridge_ctl & PCI_BRIDGE_CTL_FAST_BACK)

		cmd |= PCI_COMMAND_FAST_BACK;

#endif

	DBGC("PCIBIOS: Enabling device %s cmd 0x%04x\n", pci_name(dev), cmd);



	if (cmd != old_cmd) {

		dev_info(&dev->dev, "enabling SERR and PARITY (%04x -> %04x)\n",

			old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}