From patchwork Thu Mar 31 09:37:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Octavian Purdila X-Patchwork-Id: 8710501 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17910C0553 for ; Thu, 31 Mar 2016 09:42:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBBAC2026F for ; Thu, 31 Mar 2016 09:42:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E41492025B for ; Thu, 31 Mar 2016 09:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756831AbcCaJh5 (ORCPT ); Thu, 31 Mar 2016 05:37:57 -0400 Received: from mga09.intel.com ([134.134.136.24]:8177 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756781AbcCaJhy (ORCPT ); Thu, 31 Mar 2016 05:37:54 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 31 Mar 2016 02:37:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,421,1455004800"; d="scan'208";a="945123492" Received: from opurdila-mobl.rb.intel.com ([10.237.104.166]) by orsmga002.jf.intel.com with ESMTP; 31 Mar 2016 02:37:48 -0700 From: Octavian Purdila To: "Rafael J. Wysocki" , Len Brown , Matt Fleming , Mark Brown , Wolfram Sang Cc: Joel Becker , Christoph Hellwig , linux-acpi@vger.kernel.org, linux-efi@vger.kernel.org, linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, irina.tirdea@intel.com, Octavian Purdila Subject: [RFC PATCH 04/10] acpi: fix enumeration (visited) flags for bus rescans Date: Thu, 31 Mar 2016 12:37:00 +0300 Message-Id: <1459417026-6697-5-git-send-email-octavian.purdila@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459417026-6697-1-git-send-email-octavian.purdila@intel.com> References: <1459417026-6697-1-git-send-email-octavian.purdila@intel.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the ACPI tables changes as a result of a dinamically loaded table and a bus rescan is required the enumeration/visited flag are not consistent. I2C/SPI are not directly enumerated in acpi_bus_attach(), however the visited flag is set. This makes it impossible to check if an ACPI device has already been enumerated by the I2C and SPI subsystems. To fix this issue we only set the visited flags if the device is not I2C or SPI. With this change we also need to remove setting visited to false from acpi_bus_attach(), otherwise if we rescan already enumerated I2C/SPI devices we try to re-enumerate them. Signed-off-by: Octavian Purdila --- drivers/acpi/scan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index a7e476c..8f3fd37 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1670,7 +1670,7 @@ static int acpi_check_spi_i2c_slave(struct acpi_resource *ares, void *data) return -1; } -static void acpi_default_enumeration(struct acpi_device *device) +static bool acpi_default_enumeration(struct acpi_device *device) { struct list_head resource_list; bool is_spi_i2c_slave = false; @@ -1685,6 +1685,7 @@ static void acpi_default_enumeration(struct acpi_device *device) acpi_dev_free_resource_list(&resource_list); if (!is_spi_i2c_slave) acpi_create_platform_device(device); + return !is_spi_i2c_slave; } static const struct acpi_device_id generic_device_ids[] = { @@ -1744,6 +1745,7 @@ static void acpi_bus_attach(struct acpi_device *device) struct acpi_device *child; acpi_handle ejd; int ret; + bool enumerated = true; if (ACPI_SUCCESS(acpi_bus_get_ejd(device->handle, &ejd))) register_dock_dependent_device(device, ejd); @@ -1766,7 +1768,7 @@ static void acpi_bus_attach(struct acpi_device *device) device->flags.initialized = true; } - device->flags.visited = false; + ret = acpi_scan_attach_handler(device); if (ret < 0) return; @@ -1778,9 +1780,10 @@ static void acpi_bus_attach(struct acpi_device *device) return; if (!ret && device->pnp.type.platform_id) - acpi_default_enumeration(device); + enumerated = acpi_default_enumeration(device); } - device->flags.visited = true; + if (enumerated) + device->flags.visited = true; ok: list_for_each_entry(child, &device->children, node)