Commit 754babaa authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

sparc/PCI: Remove pcibios_enable_device() as they do nothing extra 



Under arch/sparc/ there are multiple copies of pcibios_enable_device() but
none of those seem to do anything extra beyond what pci_enable_resources()
is supposed to do. These functions 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.

Remove all pcibios_enable_device() from arch/sparc/ so that PCI core can
simply call into pci_enable_resources() instead using its __weak version
of pcibios_enable_device().

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250829131113.36754-3-ilpo.jarvinen@linux.intel.com
parent 2657a0c9

arch/sparc/kernel/leon_pci.c

+0 −27
Original line number Diff line number Diff line
@@ -60,30 +60,3 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) 
	pci_assign_unassigned_resources();

	pci_bus_add_devices(root_bus);

}
 


int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	struct resource *res;

	u16 cmd, oldcmd;

	int i;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	oldcmd = cmd;



	pci_dev_for_each_resource(dev, res, i) {

		/* Only set up the requested stuff */

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

			continue;



		if (res->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (res->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}



	if (cmd != oldcmd) {

		pci_info(dev, "enabling device (%04x -> %04x)\n", oldcmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}

arch/sparc/kernel/pci.c

+0 −27
Original line number Diff line number Diff line
@@ -722,33 +722,6 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, 
	return bus;

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	struct resource *res;

	u16 cmd, oldcmd;

	int i;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	oldcmd = cmd;



	pci_dev_for_each_resource(dev, res, i) {

		/* Only set up the requested stuff */

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

			continue;



		if (res->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (res->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}



	if (cmd != oldcmd) {

		pci_info(dev, "enabling device (%04x -> %04x)\n", oldcmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}



/* Platform support for /proc/bus/pci/X/Y mmap()s. */

int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma)

{

arch/sparc/kernel/pcic.c

+0 −27
Original line number Diff line number Diff line
@@ -641,33 +641,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	struct resource *res;

	u16 cmd, oldcmd;

	int i;



	pci_read_config_word(dev, PCI_COMMAND, &cmd);

	oldcmd = cmd;



	pci_dev_for_each_resource(dev, res, i) {

		/* Only set up the requested stuff */

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

			continue;



		if (res->flags & IORESOURCE_IO)

			cmd |= PCI_COMMAND_IO;

		if (res->flags & IORESOURCE_MEM)

			cmd |= PCI_COMMAND_MEMORY;

	}



	if (cmd != oldcmd) {

		pci_info(dev, "enabling device (%04x -> %04x)\n", oldcmd, cmd);

		pci_write_config_word(dev, PCI_COMMAND, cmd);

	}

	return 0;

}



/* Makes compiler happy */

static volatile int pcic_timer_dummy;