Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Mon, Apr 1, 2013 at 12:25 PM, Yinghai Lu wrote: > On Mon, Apr 1, 2013 at 11:15 AM, Bjorn Helgaas wrote: >>> >> Is this a regression? This must have worked at one time, but it seems >> >> like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI >> >> drivers for quite a while. >> > >> > Yes. >> >> Do you know when the regression occurred? If you do, I'll add that >> info to the "stable" tag. > > No, I don't. > > Looking at the current code, it should be quite before kernel was using git. > as first drivers/Makefile in git already has pnp before eisa. > > Do we need to dig before 2.6.12 and 2.4? No, I don't think we need to worry about fixing kernels that old. But I do wonder whether we fully understand the cause. I know EISA is old and obsolete, but it's a little hard to believe that it's been broken since 2.6.12 and nobody noticed. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Mon, Apr 1, 2013 at 11:15 AM, Bjorn Helgaas wrote: >> >> Is this a regression? This must have worked at one time, but it seems > >> like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI > >> drivers for quite a while. > > > > Yes. > > Do you know when the regression occurred? If you do, I'll add that > info to the "stable" tag. No, I don't. Looking at the current code, it should be quite before kernel was using git. as first drivers/Makefile in git already has pnp before eisa. Do we need to dig before 2.6.12 and 2.4? Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Fri, Mar 29, 2013 at 6:18 PM, Yinghai Lu wrote: > On Fri, Mar 29, 2013 at 3:22 PM, Bjorn Helgaas wrote: >> [+cc Rafael, just FYI since it involves PNP resources] >> >> On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu wrote: >>> Mathhew 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 early than pci_eisa_init get 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 >> >> Is this a regression? This must have worked at one time, but it seems >> like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI >> drivers for quite a while. > > Yes. Do you know when the regression occurred? If you do, I'll add that info to the "stable" tag. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Fri, Mar 29, 2013 at 6:18 PM, Yinghai Lu ying...@kernel.org wrote: On Fri, Mar 29, 2013 at 3:22 PM, Bjorn Helgaas bhelg...@google.com wrote: [+cc Rafael, just FYI since it involves PNP resources] On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu ying...@kernel.org wrote: Mathhew 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 early than pci_eisa_init get 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 Is this a regression? This must have worked at one time, but it seems like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI drivers for quite a while. Yes. Do you know when the regression occurred? If you do, I'll add that info to the stable tag. Bjorn -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Mon, Apr 1, 2013 at 11:15 AM, Bjorn Helgaas bhelg...@google.com wrote: Is this a regression? This must have worked at one time, but it seems like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI drivers for quite a while. Yes. Do you know when the regression occurred? If you do, I'll add that info to the stable tag. No, I don't. Looking at the current code, it should be quite before kernel was using git. as first drivers/Makefile in git already has pnp before eisa. Do we need to dig before 2.6.12 and 2.4? Yinghai -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Mon, Apr 1, 2013 at 12:25 PM, Yinghai Lu ying...@kernel.org wrote: On Mon, Apr 1, 2013 at 11:15 AM, Bjorn Helgaas bhelg...@google.com wrote: Is this a regression? This must have worked at one time, but it seems like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI drivers for quite a while. Yes. Do you know when the regression occurred? If you do, I'll add that info to the stable tag. No, I don't. Looking at the current code, it should be quite before kernel was using git. as first drivers/Makefile in git already has pnp before eisa. Do we need to dig before 2.6.12 and 2.4? No, I don't think we need to worry about fixing kernels that old. But I do wonder whether we fully understand the cause. I know EISA is old and obsolete, but it's a little hard to believe that it's been broken since 2.6.12 and nobody noticed. Bjorn -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Fri, Mar 29, 2013 at 3:22 PM, Bjorn Helgaas wrote:
> [+cc Rafael, just FYI since it involves PNP resources]
>
> On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu wrote:
>> Mathhew 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 early than pci_eisa_init get 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
>
> Is this a regression? This must have worked at one time, but it seems
> like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI
> drivers for quite a while.
Yes.
>
>> 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
>
> I think we should add logging in eisa_request_resources() similar to
> what drivers/pnp/system.c does so it's more clear what resources EISA
> is using.
Those eisa resource does get registered into io port resource tree.
>
>> Reported-by: Matthew Whitehead
>> Tested-by: Matthew Whitehead
>> Signed-off-by: Yinghai Lu
>> Cc: sta...@kernel.org
>>
>> ---
>> drivers/eisa/pci_eisa.c | 41 ++---
>> 1 file changed, 22 insertions(+), 19 deletions(-)
>>
>> Index: linux-2.6/drivers/eisa/pci_eisa.c
>> ===
>> --- linux-2.6.orig/drivers/eisa/pci_eisa.c
>> +++ linux-2.6/drivers/eisa/pci_eisa.c
>> @@ -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, n = 0;
>> struct resource *bus_res;
>> @@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
>> 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, 0x00, 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 (_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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
[+cc Rafael, just FYI since it involves PNP resources]
On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu wrote:
> Mathhew 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 early than pci_eisa_init get 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
Is this a regression? This must have worked at one time, but it seems
like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI
drivers for quite a while.
> 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
I think we should add logging in eisa_request_resources() similar to
what drivers/pnp/system.c does so it's more clear what resources EISA
is using.
> Reported-by: Matthew Whitehead
> Tested-by: Matthew Whitehead
> Signed-off-by: Yinghai Lu
> Cc: sta...@kernel.org
>
> ---
> drivers/eisa/pci_eisa.c | 41 ++---
> 1 file changed, 22 insertions(+), 19 deletions(-)
>
> Index: linux-2.6/drivers/eisa/pci_eisa.c
> ===
> --- linux-2.6.orig/drivers/eisa/pci_eisa.c
> +++ linux-2.6/drivers/eisa/pci_eisa.c
> @@ -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, n = 0;
> struct resource *bus_res;
> @@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
> 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, 0x00, 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 (_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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
[+cc Rafael, just FYI since it involves PNP resources]
On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu ying...@kernel.org wrote:
Mathhew 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 early than pci_eisa_init get 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
Is this a regression? This must have worked at one time, but it seems
like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI
drivers for quite a while.
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
I think we should add logging in eisa_request_resources() similar to
what drivers/pnp/system.c does so it's more clear what resources EISA
is using.
Reported-by: Matthew Whitehead mwhit...@redhat.com
Tested-by: Matthew Whitehead mwhit...@redhat.com
Signed-off-by: Yinghai Lu ying...@kernel.org
Cc: sta...@kernel.org
---
drivers/eisa/pci_eisa.c | 41 ++---
1 file changed, 22 insertions(+), 19 deletions(-)
Index: linux-2.6/drivers/eisa/pci_eisa.c
===
--- linux-2.6.orig/drivers/eisa/pci_eisa.c
+++ linux-2.6/drivers/eisa/pci_eisa.c
@@ -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, n = 0;
struct resource *bus_res;
@@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
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, 0x00, 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);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 2/2] eisa, PCI: init eisa early before pnp step in
On Fri, Mar 29, 2013 at 3:22 PM, Bjorn Helgaas bhelg...@google.com wrote:
[+cc Rafael, just FYI since it involves PNP resources]
On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu ying...@kernel.org wrote:
Mathhew 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 early than pci_eisa_init get 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
Is this a regression? This must have worked at one time, but it seems
like we've had pnpacpi_init/isapnp_init/pnpbios_init before PCI
drivers for quite a while.
Yes.
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
I think we should add logging in eisa_request_resources() similar to
what drivers/pnp/system.c does so it's more clear what resources EISA
is using.
Those eisa resource does get registered into io port resource tree.
Reported-by: Matthew Whitehead mwhit...@redhat.com
Tested-by: Matthew Whitehead mwhit...@redhat.com
Signed-off-by: Yinghai Lu ying...@kernel.org
Cc: sta...@kernel.org
---
drivers/eisa/pci_eisa.c | 41 ++---
1 file changed, 22 insertions(+), 19 deletions(-)
Index: linux-2.6/drivers/eisa/pci_eisa.c
===
--- linux-2.6.orig/drivers/eisa/pci_eisa.c
+++ linux-2.6/drivers/eisa/pci_eisa.c
@@ -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, n = 0;
struct resource *bus_res;
@@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
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, 0x00, 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);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/2] eisa, PCI: init eisa early before pnp step in
Mathhew 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 early than pci_eisa_init get 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: Matthew Whitehead
Tested-by: Matthew Whitehead
Signed-off-by: Yinghai Lu
Cc: sta...@kernel.org
---
drivers/eisa/pci_eisa.c | 41 ++---
1 file changed, 22 insertions(+), 19 deletions(-)
Index: linux-2.6/drivers/eisa/pci_eisa.c
===
--- linux-2.6.orig/drivers/eisa/pci_eisa.c
+++ linux-2.6/drivers/eisa/pci_eisa.c
@@ -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, n = 0;
struct resource *bus_res;
@@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
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, 0x00, 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 (_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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/2] eisa, PCI: init eisa early before pnp step in
Mathhew 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 early than pci_eisa_init get 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: Matthew Whitehead mwhit...@redhat.com
Tested-by: Matthew Whitehead mwhit...@redhat.com
Signed-off-by: Yinghai Lu ying...@kernel.org
Cc: sta...@kernel.org
---
drivers/eisa/pci_eisa.c | 41 ++---
1 file changed, 22 insertions(+), 19 deletions(-)
Index: linux-2.6/drivers/eisa/pci_eisa.c
===
--- linux-2.6.orig/drivers/eisa/pci_eisa.c
+++ linux-2.6/drivers/eisa/pci_eisa.c
@@ -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, n = 0;
struct resource *bus_res;
@@ -49,22 +48,26 @@ static int __init pci_eisa_init(struct p
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, 0x00, 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);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
