From patchwork Wed Dec 23 14:19:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksey Makarov X-Patchwork-Id: 58980 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp3889638lbb; Wed, 23 Dec 2015 06:22:19 -0800 (PST) X-Received: by 10.98.18.136 with SMTP id 8mr26468820pfs.62.1450880539598; Wed, 23 Dec 2015 06:22:19 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p88si35478166pfi.246.2015.12.23.06.22.19; Wed, 23 Dec 2015 06:22:19 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755393AbbLWOWP (ORCPT + 29 others); Wed, 23 Dec 2015 09:22:15 -0500 Received: from mail-lb0-f170.google.com ([209.85.217.170]:35894 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755071AbbLWOWM (ORCPT ); Wed, 23 Dec 2015 09:22:12 -0500 Received: by mail-lb0-f170.google.com with SMTP id oh2so47298059lbb.3 for ; Wed, 23 Dec 2015 06:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=p6Ko1c00FGP8EjyMk8C5U9Ji5Q23nZEZgi/yO0VWmj0=; b=aPQDYAEdMo6P0fECmLBS7Bdjp98S+Qxo3cjuptBEXEtr9+Gq0vcWRxuoq66VQ0YuWH aPHzyFhjLsdNOvDeuy8ooE6oCMZJDqJEPQBhuMYH9Ml8KG/eugRypfudwRyOujxW5Uf3 l4fBBzksiP+3rKJSGieCjO3KC0CaI9+PTgFK8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p6Ko1c00FGP8EjyMk8C5U9Ji5Q23nZEZgi/yO0VWmj0=; b=ilAhooXjqE0IFxSSIyF9bgn69Ev0wgI1Ad2hV5CSpOFEdgbPS+dfoeUMbXKXcb6Hsg zghhjuf98YhD+EVF1JnIwDg59R0/RqPpWR8amGYyOwrE4QUM8LpIVwUB734YZZnTxcIe b5n8c02U2Uu4MK5KGnkLy2VxBjEzlgi19k6VEQ4p3jyK5zA8IHcun/tfK2L6b9TwLY8U yTxvMVXDF6XRCIauLEb486ij8M8VlUjpulcewQUXbrl5arFbq9X3DWnuc9StmVlP5YDV 8kYxNeL84En2yn/nZlkcfRVEzkmhyVyb5aexP1+p2+O+/y1R8eZME05Oii5L7+e5VxP8 ++Yw== X-Gm-Message-State: ALoCoQlznoATVYl+uu8KcPruiS2Gv3ntFTj4cLv8gyX3v1QyM843PZSsOyD2tFlOO1nXnPT0hbCS4F4jJ7lERCjIQkTYXf19Pw== X-Received: by 10.112.200.229 with SMTP id jv5mr10696626lbc.23.1450880529573; Wed, 23 Dec 2015 06:22:09 -0800 (PST) Received: from turnip.localdomain (nivc-213.auriga.ru. [80.240.102.213]) by smtp.gmail.com with ESMTPSA id a75sm6693381lfe.34.2015.12.23.06.22.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Dec 2015 06:22:08 -0800 (PST) From: Aleksey Makarov To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Aleksey Makarov , Graeme Gregory , Russell King , Greg Kroah-Hartman , "Rafael J . Wysocki" , Shannon Zhao , Andy Shevchenko , Vladimir Zapolskiy , Len Brown Subject: [PATCH v4 1/3] ACPI: amba bus probing support Date: Wed, 23 Dec 2015 17:19:40 +0300 Message-Id: <1450880383-29560-2-git-send-email-aleksey.makarov@linaro.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450880383-29560-1-git-send-email-aleksey.makarov@linaro.org> References: <1450880383-29560-1-git-send-email-aleksey.makarov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Graeme Gregory On ARM64 some devices use the AMBA device and not the platform bus for probing so add support for this. Uses a dummy clock for apb_pclk as ACPI does not have a suitable clock representation and to keep the core AMBA bus code unchanged between probing methods. Signed-off-by: Graeme Gregory Signed-off-by: Aleksey Makarov --- drivers/acpi/Makefile | 1 + drivers/acpi/acpi_amba.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/internal.h | 5 ++ 3 files changed, 146 insertions(+) create mode 100644 drivers/acpi/acpi_amba.c -- 2.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 675eaf3..3cf732f 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -43,6 +43,7 @@ acpi-y += pci_root.o pci_link.o pci_irq.o acpi-y += acpi_lpss.o acpi_apd.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o +acpi-$(CONFIG_ARM_AMBA) += acpi_amba.o acpi-y += int340x_thermal.o acpi-y += power.o acpi-y += event.o diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c new file mode 100644 index 0000000..4b77d47 --- /dev/null +++ b/drivers/acpi/acpi_amba.c @@ -0,0 +1,140 @@ + +/* + * ACPI support for platform bus type. + * + * Copyright (C) 2015, Linaro Ltd + * Authors: Graeme Gregory + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "internal.h" + +static const struct acpi_device_id amba_id_list[] = { + {"ARMH0011", 0}, /* PL011 SBSA Uart */ + {"ARMH0061", 0}, /* PL061 GPIO Device */ + {"", 0}, +}; + +static struct clk *amba_dummy_clk; + +static void amba_register_dummy_clk(void) +{ + struct clk *clk; + + /* If clock already registered */ + if (amba_dummy_clk) + return; + + clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, 0); + clk_register_clkdev(clk, "apb_pclk", NULL); + + amba_dummy_clk = clk; +} + +static int amba_handler_attach(struct acpi_device *adev, + const struct acpi_device_id *id) +{ + struct amba_device *dev = NULL; + struct acpi_device *acpi_parent; + struct resource_entry *rentry; + struct list_head resource_list; + bool address_found = false; + int ret, irq_no = 0; + + /* If the ACPI node already has a physical device attached, skip it. */ + if (adev->physical_node_count) + return 0; + + dev = amba_device_alloc(NULL, 0, 0); + if (!dev) { + dev_err(&adev->dev, "%s(): amba_device_alloc() failed\n", + __func__); + return -ENOMEM; + } + + INIT_LIST_HEAD(&resource_list); + ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL); + if (ret < 0) + goto err_free; + + list_for_each_entry(rentry, &resource_list, node) { + switch (resource_type(rentry->res)) { + case IORESOURCE_MEM: + if (!address_found) { + dev->res = *rentry->res; + address_found = true; + } + break; + case IORESOURCE_IRQ: + if (irq_no < AMBA_NR_IRQS) + dev->irq[irq_no++] = rentry->res->start; + break; + default: + dev_warn(&adev->dev, "Invalid resource\n"); + } + } + + acpi_dev_free_resource_list(&resource_list); + + /* + * If the ACPI node has a parent and that parent has a physical device + * attached to it, that physical device should be the parent of the + * platform device we are about to create. + */ + dev->dev.parent = NULL; + acpi_parent = adev->parent; + if (acpi_parent) { + struct acpi_device_physical_node *entry; + struct list_head *list; + + mutex_lock(&acpi_parent->physical_node_lock); + list = &acpi_parent->physical_node_list; + if (!list_empty(list)) { + entry = list_first_entry(list, + struct acpi_device_physical_node, + node); + dev->dev.parent = entry->dev; + } + mutex_unlock(&acpi_parent->physical_node_lock); + } + + dev_set_name(&dev->dev, "%s", dev_name(&adev->dev)); + ACPI_COMPANION_SET(&dev->dev, adev); + + ret = amba_device_add(dev, &iomem_resource); + if (ret) { + dev_err(&adev->dev, "%s(): amba_device_add() failed (%d)\n", + __func__, ret); + goto err_free; + } + + return 1; + +err_free: + amba_device_put(dev); + return ret; +} + +static struct acpi_scan_handler amba_handler = { + .ids = amba_id_list, + .attach = amba_handler_attach, +}; + +void __init acpi_amba_init(void) +{ + amba_register_dummy_clk(); + acpi_scan_add_handler(&amba_handler); +} diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 11d87bf..9d58f0c 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -29,6 +29,11 @@ void acpi_processor_init(void); void acpi_platform_init(void); void acpi_pnp_init(void); void acpi_int340x_thermal_init(void); +#ifdef CONFIG_ARM_AMBA +void acpi_amba_init(void); +#else +static inline void acpi_amba_init(void) {} +#endif int acpi_sysfs_init(void); void acpi_container_init(void); void acpi_memory_hotplug_init(void);