From patchwork Fri Apr 20 10:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 10352359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 157AE60231 for ; Fri, 20 Apr 2018 10:08:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0735E28707 for ; Fri, 20 Apr 2018 10:08:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EFACC2870E; Fri, 20 Apr 2018 10:08:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6732628707 for ; Fri, 20 Apr 2018 10:08:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754511AbeDTKIU (ORCPT ); Fri, 20 Apr 2018 06:08:20 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6752 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754328AbeDTKIT (ORCPT ); Fri, 20 Apr 2018 06:08:19 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 30778FF4DF2DB; Fri, 20 Apr 2018 18:08:06 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.361.1; Fri, 20 Apr 2018 18:08:01 +0800 From: John Garry To: , , , , , CC: , , , , , , John Garry Subject: [RFC PATCH 2/2] HISI LPC: Add PNP device support Date: Fri, 20 Apr 2018 18:07:26 +0800 Message-ID: <1524218846-169934-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1524218846-169934-1-git-send-email-john.garry@huawei.com> References: <1524218846-169934-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the driver creates an per-ACPI device mfd_cell for child devices. This does not suit devices which are PNP-compatible, as we expect PNP-compatible devices to derive PNP devices. To add PNP device support, we continue to allow the PNP scan code to create the PNP device (which have the enumeration_by_parent flag set), but expect the PNP scan to defer adding the device to allow the host probe code to do this. In addition, no longer do we create an mfd_cell (platform_device) for PNP-compatible devices. We take this approach so that host probe code can translate the IO resources of the PNP device prior to adding the device. Signed-off-by: John Garry --- drivers/bus/hisi_lpc.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c index 2d4611e..d228bc5 100644 --- a/drivers/bus/hisi_lpc.c +++ b/drivers/bus/hisi_lpc.c @@ -17,8 +17,11 @@ #include #include #include +#include #include +#include "../pnp/base.h" + #define DRV_NAME "hisi-lpc" /* @@ -469,8 +472,11 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) struct acpi_device *child; int size, ret, count = 0, cell_num = 0; - list_for_each_entry(child, &adev->children, node) + list_for_each_entry(child, &adev->children, node) { + if (acpi_is_pnp_device(child)) + continue; cell_num++; + } /* allocate the mfd cell and companion ACPI info, one per child */ size = sizeof(*mfd_cells) + sizeof(*hisi_lpc_mfd_cells); @@ -492,6 +498,9 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) .pnpid = pnpid, }; + if (acpi_is_pnp_device(child)) + continue; + /* * For any instances of this host controller (Hip06 and Hip07 * are the only chipsets), we would not have multiple slaves @@ -523,6 +532,33 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) return ret; } + list_for_each_entry(child, &adev->children, node) { + struct pnp_resource *pnp_res; + struct pnp_dev *pnp_dev; + int rc; + + if (!acpi_is_pnp_device(child)) + continue; + + pnp_dev = child->driver_data; + + /* + * Prior to adding the device, we need to translate the + * resources to logical PIO addresses. + */ + list_for_each_entry(pnp_res, &pnp_dev->resources, list) { + struct resource *res = &pnp_res->res; + + if (res->flags | IORESOURCE_IO) + hisi_lpc_acpi_xlat_io_res(child, adev, res); + } + rc = pnp_add_device(pnp_dev); + if (rc) { + put_device(&pnp_dev->dev); + return rc; + } + } + return 0; }