From patchwork Sun Jan 21 12:27: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: 125281 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp655552ljf; Sun, 21 Jan 2018 03:38:29 -0800 (PST) X-Google-Smtp-Source: AH8x2247Sd9I1/LUQ+Du/gOiGBcjILkWGghz8xv0zLqk3FkfnKDsu6gf8yX/2ARkG55rdfFu18wi X-Received: by 10.101.90.71 with SMTP id z7mr4364504pgs.15.1516534709050; Sun, 21 Jan 2018 03:38:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516534709; cv=none; d=google.com; s=arc-20160816; b=DEhWTyTiw4suAitnr/9pIkkkjGttfqcXmn/kda9sYtS55fkp52lyCd4FPsWrwYSzyc ZAgoAy3G4+CsbIwdif8xiVuSDubnj+39VBPyXSF7to2kOiPKE8u+yvD+26VsZ1w4rt0F zgVSxjD7JN1+JliI82BFGH7tcSC6U92+Am3s6mRpjHG7HMnXji6ZvTb9AIYNpyd1pjLG FKADAhlrMW0ahYeocaXsK7TXDMBy8h8M6nK5SaQ87X0rh1fLskd/Uph30GhjYNNV7HKH XwDPnUZq0tK3x1/fXRPSDCCJbYhfk46S46+JIYWeY1qzStiylKkVcpCRNqryj5tTTlum 1LIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=KuTAGfObcqtkMJHzLRiNrw9dRhAwc13BRg6cDl3zgWg=; b=z8DLgA1x8ZBF2FiOMdV6mXeAQj3Tt+PmiezCpgpxFQITM3MMiJzVX7POUd/Sv+FaMP ckDAV6eaolbRG7KefaXlBdeeK8olr3xY+/IE5vGOQPNV5cc5sZLQuzpCF6tefNgt3Eqd J3K0JucdReMj+ter1xbwCCInztfx0msRA6QQSoJHsFsW3cOPkjRL8Jrzwu1m98Rh66RC Uw/4qdtfk2XakUDjTGrnZHu5qOWWL7bGYg0lyl+0M+2lIKIXAOoZkptlg74Q2eB5w30s jsLQyafIM77huYvi3A+foxCOwlhw0rM6azKaP3HdljE3evCbQor/THnTc4+b3xg/eFSq u5tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10si11906948pgv.473.2018.01.21.03.38.28; Sun, 21 Jan 2018 03:38:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751415AbeAULh5 (ORCPT + 28 others); Sun, 21 Jan 2018 06:37:57 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:50635 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751178AbeAULgV (ORCPT ); Sun, 21 Jan 2018 06:36:21 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 26F7AEE451622; Sun, 21 Jan 2018 19:36:16 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.361.1; Sun, 21 Jan 2018 19:36:07 +0800 From: John Garry To: , , , , , , , , , , CC: , , , , , , , , John Garry , "Zhichang Yuan" , Gabriele Paoloni Subject: [PATCH v11 8/9] LPC, ACPI: Add the HISI LPC ACPI support Date: Sun, 21 Jan 2018 20:27:26 +0800 Message-ID: <1516537647-50553-9-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516537647-50553-1-git-send-email-john.garry@huawei.com> References: <1516537647-50553-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Based on the previous patches, this patch supports the LPC host on Hip06/Hip07 for ACPI FW. Signed-off-by: John Garry Signed-off-by: Zhichang Yuan Signed-off-by: Gabriele Paoloni Tested-by: dann frazier --- drivers/acpi/arm64/acpi_indirectio.c | 11 ++++++++++- drivers/bus/hisi_lpc.c | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/acpi/arm64/acpi_indirectio.c b/drivers/acpi/arm64/acpi_indirectio.c index 2649f57..6403f84 100644 --- a/drivers/acpi/arm64/acpi_indirectio.c +++ b/drivers/acpi/arm64/acpi_indirectio.c @@ -142,7 +142,7 @@ int acpi_indirectio_set_logicio_res(struct device *child, return ret; } -int +static int acpi_indirectio_pre_setup(struct acpi_device *adev, struct acpi_indirectio_host_data *pdata) { @@ -239,8 +239,17 @@ int acpi_indirectio_set_logicio_res(struct device *child, return ret; } +const struct acpi_indirectio_device_desc hisi_lpc_host_desc = { + .pdata = { + .io_size = PIO_INDIRECT_SIZE, + .io_start = 0, + }, + .pre_setup = acpi_indirectio_pre_setup, +}; + /* All the host devices which apply indirect-IO can be listed here. */ static const struct acpi_device_id acpi_indirect_host_id[] = { + {"HISI0191", INDIRECT_IO_INFO(hisi_lpc_host_desc)}, {""}, }; diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c index 4ce089a..9cabb84 100644 --- a/drivers/bus/hisi_lpc.c +++ b/drivers/bus/hisi_lpc.c @@ -457,7 +457,13 @@ static int hisilpc_probe(struct platform_device *pdev) } /* register the LPC host PIO resources */ - { + if (has_acpi_companion(dev)) { + lpcdev->io_host = find_io_range_by_fwnode(dev->fwnode); + if (!lpcdev->io_host) { + dev_err(dev, "range not registered!\n"); + return -EFAULT; + } + } else { struct logic_pio_hwaddr *range; range = devm_kzalloc(dev, sizeof(*range), GFP_KERNEL); @@ -515,10 +521,19 @@ static int hisilpc_probe(struct platform_device *pdev) {}, }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id hisilpc_acpi_match[] = { + {"HISI0191", }, + {}, +}; + +#endif + static struct platform_driver hisilpc_driver = { .driver = { .name = "hisi_lpc", .of_match_table = hisilpc_of_match, + .acpi_match_table = ACPI_PTR(hisilpc_acpi_match), }, .probe = hisilpc_probe, };