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

Commit c5fb301a authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

EISA/PCI: Init EISA early, before PNP 



Matthew reported kernels fail the pci_eisa probe and are later successful
with the virtual_eisa_root_init force probe without slot0.

The reason for that is: PNP probing is before pci_eisa_init gets called
as pci_eisa_init is called via pci_driver.

pnp 00:0f has 0xc80 - 0xc84 reserved.
[    9.700409] pnp 00:0f: [io  0x0c80-0x0c84]

so eisa_probe will fail from pci_eisa_init
				==>eisa_root_register
					==>eisa_probe path.
as force_probe is not set in pci_eisa_root, it will bail early when
slot0 is not probed and initialized.

Try to use subsys_initcall_sync instead, and will keep following sequence:
	pci_subsys_init
	pci_eisa_init_early
	pnpacpi_init/isapnp_init

After this patch EISA can be initialized properly, and PNP overlapping
resource will not be reserved.
[   10.104434] system 00:0f: [io  0x0c80-0x0c84] could not be reserved

Reported-by: default avatarMatthew Whitehead <mwhitehe@redhat.com>
Tested-by: default avatarMatthew Whitehead <mwhitehe@redhat.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
parent 2cfda637

drivers/eisa/pci_eisa.c

+21 −18
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
/* There is only *one* pci_eisa device per machine, right ? */

static struct eisa_root_device pci_eisa_root;



static int __init pci_eisa_init(struct pci_dev *pdev,

				const struct pci_device_id *ent)

static int __init pci_eisa_init(struct pci_dev *pdev)

{

	int rc, i;

	struct resource *res, *bus_res = NULL;
@@ -67,22 +66,26 @@ static int __init pci_eisa_init(struct pci_dev *pdev, 
	return 0;

}



static struct pci_device_id pci_eisa_pci_tbl[] = {

	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_BRIDGE_EISA << 8, 0xffff00, 0 },

	{ 0, }

};



static struct pci_driver __refdata pci_eisa_driver = {

	.name		= "pci_eisa",

	.id_table	= pci_eisa_pci_tbl,

	.probe		= pci_eisa_init,

};



static int __init pci_eisa_init_module (void)

/*

 * We have to call pci_eisa_init_early() before pnpacpi_init()/isapnp_init().

 *   Otherwise pnp resource will get enabled early and could prevent eisa

 *   to be initialized.

 * Also need to make sure pci_eisa_init_early() is called after

 * x86/pci_subsys_init().

 * So need to use subsys_initcall_sync with it.

 */

static int __init pci_eisa_init_early(void)

{

	return pci_register_driver (&pci_eisa_driver);

	struct pci_dev *dev = NULL;

	int ret;



	for_each_pci_dev(dev)

		if ((dev->class >> 8) == PCI_CLASS_BRIDGE_EISA) {

			ret = pci_eisa_init(dev);

			if (ret)

				return ret;

		}



device_initcall(pci_eisa_init_module);

MODULE_DEVICE_TABLE(pci, pci_eisa_pci_tbl);
 
	return 0;

}

subsys_initcall_sync(pci_eisa_init_early);