[PATCH] pcie AER: don't check _OSC when acpi is disabled

[PATCH] pcie AER: don't check _OSC when acpi is disabled

[Yinghai Lu]

[PATCH] pcie AER: don't check _OSC when acpi is disabled

when acpi=off and pci=nomsi, don't check _OSC in aer_osc_setup

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>

diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 1a1eb45..dd38777 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -34,6 +34,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
 	acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev);
 	struct pci_bus *parent;
 
+	if (acpi_pci_disabled)
+		return -1;
+
 	while (!handle) {
 		if (!pdev || !pdev->bus->parent)
 			break;

Re: [PATCH] pcie AER: don't check _OSC when acpi is disabled

[Subrata Modak]

Would you like to submit the Driver Test Cases to LTP ? Or, if you have
your Driver test cases written in C, we can port to LTP and have it
inside the LTP package.
You can also check out the following links for more info, and can always
ping me for anything:
http://ltp.cvs.sourceforge.net/ltp/ltp/testcases/kernel/device-drivers/,
http://ltp.sourceforge.net/documentation/how-to/ltp.php?

Regards--
Subrata
(LTP Maintainer)

On Tue, 2007-12-11 at 20:13 -0800, Yinghai Lu wrote:
> [PATCH] pcie AER: don't check _OSC when acpi is disabled
> 
> when acpi=off and pci=nomsi, don't check _OSC in aer_osc_setup
> 
> Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
> 
> diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
> index 1a1eb45..dd38777 100644
> --- a/drivers/pci/pcie/aer/aerdrv_acpi.c
> +++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
> @@ -34,6 +34,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
>  	acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev);
>  	struct pci_bus *parent;
> 
> +	if (acpi_pci_disabled)
> +		return -1;
> +
>  	while (!handle) {
>  		if (!pdev || !pdev->bus->parent)
>  			break;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@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] pcie AER: don't check _OSC when acpi is disabled

[Yinghai Lu]

[PATCH] pcie AER: don't check _OSC when acpi is disabled

when acpi=off or pci=noacpi, get warning

AER service couldn't init device 0000:00:0a.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:00:0f.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0b.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0e.0:pcie01 - no _OSC support
AER service couldn't init device 0000:80:0f.0:pcie01 - no _OSC support

so don't check _OSC in aer_osc_setup

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>

diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 8c199ae..7e53fa5 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -33,6 +33,9 @@ int aer_osc_setup(struct pcie_device *pciedev)
 	struct pci_dev *pdev = pciedev->port;
 	acpi_handle handle = 0;
 
+	if (acpi_pci_disabled)
+		return -1;
+
 	/* Find root host bridge */
 	while (pdev->bus && pdev->bus->self)
 		pdev = pdev->bus->self;