Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965150AbdCVReN (ORCPT ); Wed, 22 Mar 2017 13:34:13 -0400 Received: from 8bytes.org ([81.169.241.247]:40664 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964998AbdCVRdm (ORCPT ); Wed, 22 Mar 2017 13:33:42 -0400 From: Joerg Roedel To: "Rafael J. Wysocki" , Len Brown Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Joerg Roedel Subject: [PATCH 2/3] ACPI: Remove platform devices from a bus on removal Date: Wed, 22 Mar 2017 18:33:24 +0100 Message-Id: <1490204005-2733-3-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490204005-2733-1-git-send-email-joro@8bytes.org> References: <1490204005-2733-1-git-send-email-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2049 Lines: 71 From: Joerg Roedel The function acpi_bus_attach() creates platform_devices if this is specified by the firmware. But in acpi_bus_trim() these devices are not removed, leaving a dangling reference to the parent device. In the case of a PCI root-bus, this results in the host_bridge device not being released on hot-remove. Fix it by scanning the list of platform_devices for devices to be removed with the bus. Signed-off-by: Joerg Roedel --- drivers/acpi/scan.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 1926918..b07518b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -1928,6 +1929,25 @@ int acpi_bus_scan(acpi_handle handle) EXPORT_SYMBOL(acpi_bus_scan); /** + * acpi_bus_trim_platform_device - Check and remove a platform device + * from a bus + * @dev: Platform device to check + * @data: pointer to the acpi_device to check dev against + * + * Checks whether the platform_device dev belongs to the acpi_device + * data and unregisters dev if it matches. + */ +static int acpi_bus_trim_platform_device(struct device *dev, void *data) +{ + struct acpi_device *adev = data; + + if (dev->fwnode == acpi_fwnode_handle(adev)) + platform_device_unregister(to_platform_device(dev)); + + return 0; +} + +/** * acpi_bus_trim - Detach scan handlers and drivers from ACPI device objects. * @adev: Root of the ACPI namespace scope to walk. * @@ -1950,6 +1970,12 @@ void acpi_bus_trim(struct acpi_device *adev) } else { device_release_driver(&adev->dev); } + + /* Remove platform devices from the bus */ + if (adev->pnp.type.platform_id) + bus_for_each_dev(&platform_bus_type, NULL, adev, + acpi_bus_trim_platform_device); + /* * Most likely, the device is going away, so put it into D3cold before * that. -- 1.9.1