PCI: pull pcibios_setup() up into core (2b6f2c35) · Commits · 戴 / test

Currently, all of the architectures implement their own pcibios_setup() routine. Most of the implementations do nothing so this patch introduces a generic (__weak) routine in the core that can be used by all architectures as a default. If necessary, it can be overridden by architecture-specific code. Signed-off-by:

Myron Stowe <myron.stowe@redhat.com> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/pci.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -2665,6 +2665,18 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)
		dev->is_busmaster = enable;
		}

		/**
		* pcibios_setup - process "pci=" kernel boot arguments
		* @str: string used to pass in "pci=" kernel boot arguments
		*
		* Process kernel boot arguments. This is the default implementation.
		* Architecture specific implementations can override this as necessary.
		*/
		char * __weak __init pcibios_setup(char *str)
		{
		return str;
		}

		/**
		* pcibios_set_master - enable PCI bus-mastering for device dev
		* @dev: the PCI device to enable

include/linux/pci.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -642,6 +642,7 @@ extern int no_pci_devices(void);

		void pcibios_fixup_bus(struct pci_bus *);
		int __must_check pcibios_enable_device(struct pci_dev *, int mask);
		/* Architecture specific versions may override this (weak) */
		char pcibios_setup(char str);

		/* Used only when drivers/pci/setup.c is used */

Admin message