ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
diff mbox series

Message ID 20170914145014.2834-1-vkuznets@redhat.com
State Accepted
Headers show
Series
  • ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
Related show

Commit Message

Vitaly Kuznetsov Sept. 14, 2017, 2:50 p.m. UTC
Hyper-V instances support PCI pass-through which is implemented through
PV pci-hyperv driver. When a device is passed through a new root PCI bus
is created in the guest. The bus sits on top of VMBus and has no
associated information in ACPI. acpi_pci_add_bus() in this case proceeds
all the way to acpi_evaluate_dsm() with reports

    ACPI: \: failed to evaluate _DSM (0x1001)

While acpi_pci_slot_enumerate() and acpiphp_enumerate_slots() are protected
against ACPI_HANDLE() being NULL and do nothing acpi_evaluate_dsm() is not
and gives us the error. It seems the correct fix is to not do anything in
acpi_pci_add_bus() in such cases.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 drivers/pci/pci-acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rafael J. Wysocki Sept. 26, 2017, 8:21 p.m. UTC | #1
On Tuesday, September 26, 2017 10:25:08 PM CEST Bjorn Helgaas wrote:
> On Thu, Sep 14, 2017 at 04:50:14PM +0200, Vitaly Kuznetsov wrote:
> > Hyper-V instances support PCI pass-through which is implemented through
> > PV pci-hyperv driver. When a device is passed through a new root PCI bus
> > is created in the guest. The bus sits on top of VMBus and has no
> > associated information in ACPI. acpi_pci_add_bus() in this case proceeds
> > all the way to acpi_evaluate_dsm() with reports
> > 
> >     ACPI: \: failed to evaluate _DSM (0x1001)
> > 
> > While acpi_pci_slot_enumerate() and acpiphp_enumerate_slots() are protected
> > against ACPI_HANDLE() being NULL and do nothing acpi_evaluate_dsm() is not
> > and gives us the error. It seems the correct fix is to not do anything in
> > acpi_pci_add_bus() in such cases.
> > 
> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> 
> Applied to pci/acpi for v4.15, thanks!
> 
> Rafael, let me know if you have any objections or if you'd rather take
> it yourself.

No objections, all is fine.

Thanks,
Rafael
Bjorn Helgaas Sept. 26, 2017, 8:25 p.m. UTC | #2
On Thu, Sep 14, 2017 at 04:50:14PM +0200, Vitaly Kuznetsov wrote:
> Hyper-V instances support PCI pass-through which is implemented through
> PV pci-hyperv driver. When a device is passed through a new root PCI bus
> is created in the guest. The bus sits on top of VMBus and has no
> associated information in ACPI. acpi_pci_add_bus() in this case proceeds
> all the way to acpi_evaluate_dsm() with reports
> 
>     ACPI: \: failed to evaluate _DSM (0x1001)
> 
> While acpi_pci_slot_enumerate() and acpiphp_enumerate_slots() are protected
> against ACPI_HANDLE() being NULL and do nothing acpi_evaluate_dsm() is not
> and gives us the error. It seems the correct fix is to not do anything in
> acpi_pci_add_bus() in such cases.
> 
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>

Applied to pci/acpi for v4.15, thanks!

Rafael, let me know if you have any objections or if you'd rather take
it yourself.

> ---
>  drivers/pci/pci-acpi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
> index a8da543b3814..4708eb9df71b 100644
> --- a/drivers/pci/pci-acpi.c
> +++ b/drivers/pci/pci-acpi.c
> @@ -624,7 +624,7 @@ void acpi_pci_add_bus(struct pci_bus *bus)
>  	union acpi_object *obj;
>  	struct pci_host_bridge *bridge;
>  
> -	if (acpi_pci_disabled || !bus->bridge)
> +	if (acpi_pci_disabled || !bus->bridge || !ACPI_HANDLE(bus->bridge))
>  		return;
>  
>  	acpi_pci_slot_enumerate(bus);
> -- 
> 2.13.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox series

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index a8da543b3814..4708eb9df71b 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -624,7 +624,7 @@  void acpi_pci_add_bus(struct pci_bus *bus)
 	union acpi_object *obj;
 	struct pci_host_bridge *bridge;
 
-	if (acpi_pci_disabled || !bus->bridge)
+	if (acpi_pci_disabled || !bus->bridge || !ACPI_HANDLE(bus->bridge))
 		return;
 
 	acpi_pci_slot_enumerate(bus);