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

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

PCI: x86: 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 for resource collisions with "!r->parent"

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 842de40d

arch/x86/pci/common.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
{

	int err;



	if ((err = pcibios_enable_resources(dev, mask)) < 0)

	if ((err = pci_enable_resources(dev, mask)) < 0)

		return err;



	if (!dev->msi_enabled)

arch/x86/pci/i386.c

+0 −38
Original line number Diff line number Diff line
@@ -241,44 +241,6 @@ void __init pcibios_resource_survey(void) 
 */

fs_initcall(pcibios_assign_resources);



int pcibios_enable_resources(struct pci_dev *dev, int mask)

{

	u16 cmd, old_cmd;

	int idx;

	struct resource *r;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	old_cmd = cmd;

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

		/* Only set up the requested stuff */

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

			continue;



		r = &dev->resource[idx];

		if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))

			continue;

		if ((idx == PCI_ROM_RESOURCE) &&

				(!(r->flags & IORESOURCE_ROM_ENABLE)))

			continue;

		if (!r->start && r->end) {

			printk(KERN_ERR "PCI: Device %s not available "

				"because of resource %d collisions\n",

				pci_name(dev), idx);

			return -EINVAL;

		}

		if (r->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (r->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		printk("PCI: Enabling device %s (%04x -> %04x)\n",

			pci_name(dev), old_cmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain crappy BIOSes forget to set it properly.

arch/x86/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ enum pci_bf_sort_state { 
extern unsigned int pcibios_max_latency;



void pcibios_resource_survey(void);

int pcibios_enable_resources(struct pci_dev *, int);



/* pci-pc.c */