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

Commit 8d20e2cf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/myron-final-fixups-v2' into next 

* pci/myron-final-fixups-v2:
  PCI: fix undefined reference to 'pci_fixup_final_inited'
parents cfeeb34b 95df8b87

drivers/pci/bus.c

+1 −3
Original line number Diff line number Diff line
@@ -164,9 +164,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
int pci_bus_add_device(struct pci_dev *dev)

{

	int retval;

	extern bool pci_fixup_final_inited;



	if (pci_fixup_final_inited)

	pci_fixup_device(pci_fixup_final, dev);

	retval = device_add(&dev->dev);

	if (retval)

drivers/pci/quirks.c

+4 −16
Original line number Diff line number Diff line
@@ -2956,6 +2956,7 @@ extern struct pci_fixup __end_pci_fixups_resume_early[]; 
extern struct pci_fixup __start_pci_fixups_suspend[];

extern struct pci_fixup __end_pci_fixups_suspend[];



static bool pci_apply_fixup_final_quirks;



void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)

{
@@ -2973,6 +2974,8 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) 
		break;



	case pci_fixup_final:

		if (!pci_apply_fixup_final_quirks)

			return;

		start = __start_pci_fixups_final;

		end = __end_pci_fixups_final;

		break;
@@ -3006,21 +3009,6 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) 
EXPORT_SYMBOL(pci_fixup_device);





/*

 * The global variable 'pci_fixup_final_inited' is being used as a interim

 * solution for calling the final quirks only during hot-plug events (not

 * during boot processing).

 *

 * When the boot path's PCI device setup sequencing is addressed, we can

 * remove the instance, and usages of, 'pci_fixup_final_inited' along with

 * removing 'fs_initcall_sync(pci_apply_final_quirks);' and end up with a

 * single, uniform, solution that satisfies both the boot path and the

 * various hot-plug event paths.

 *

 * ToDo: Remove 'pci_fixup_final_inited'

 */

bool pci_fixup_final_inited;



static int __init pci_apply_final_quirks(void)

{

	struct pci_dev *dev = NULL;
@@ -3031,6 +3019,7 @@ static int __init pci_apply_final_quirks(void) 
		printk(KERN_DEBUG "PCI: CLS %u bytes\n",

		       pci_cache_line_size << 2);



	pci_apply_fixup_final_quirks = true;

	for_each_pci_dev(dev) {

		pci_fixup_device(pci_fixup_final, dev);

		/*
@@ -3051,7 +3040,6 @@ static int __init pci_apply_final_quirks(void) 
			pci_cache_line_size = pci_dfl_cache_line_size;

		}

	}

	pci_fixup_final_inited = 1;



	if (!pci_cache_line_size) {

		printk(KERN_DEBUG "PCI: CLS %u bytes, default %u\n",