From patchwork Sun Oct 29 13:48:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 10031533 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 93013602D6 for ; Sun, 29 Oct 2017 14:00:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 826BF28582 for ; Sun, 29 Oct 2017 14:00:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 772CE286BF; Sun, 29 Oct 2017 14:00:20 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A6BB28582 for ; Sun, 29 Oct 2017 14:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=14oF2OdoIvnkEt3NQUoepfagituKAucAlxkaBl/I5Vc=; b=LQouhgmOxLp2Ij5qOjd4pLeYmM 3sw+z+XVsGelat4+9vKcHAIRs1gQFr2o8YNUuRY8NtiJ1UvhJUNR7NMpL93o9xRAIkRwh/6wwf410 1skfJ0FeeQUhdz/9HuxOO6qCDb126Z2Fp0DJufi8uUVLhpkLKX+hf+EZ1S0EzbrdpZrS5Y3dKSG33 4ePraAFZaPDqFfLaY2IIVsgMpsd72rXRQeMPOXRN3bx6K/B8hxwIEZr1tG0mBBiAIco4IKPluudOA IT2UBfgDZVYYW/uebwqSXuB5pv+hN9zyeyXFHS/p7HR2AMH4kYQbsFl6ULqPUNEoyoaR2LwE8l2zi iY5rTU8g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e8o8R-0003gP-He; Sun, 29 Oct 2017 14:00:19 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8nyP-0004G2-Iv for linux-arm-kernel@lists.infradead.org; Sun, 29 Oct 2017 13:50:09 +0000 Received: by mail-pf0-x241.google.com with SMTP id n89so8652324pfk.11 for ; Sun, 29 Oct 2017 06:49:37 -0700 (PDT) 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 :in-reply-to:references; bh=/PAFDc19whP8gE8TbCtljqrLmylPN1rotB4sfti0awU=; b=NMGZY8kl2QgEMGTSBJ4E/4vCWzQ/d8U5z01eLL1yGm49SJ4IcYr+Cav5pVS32T/8Yr 0DoIX1D7XEUEnSnTlUyf87DNbfgA43CiS2DWz7ydplNBMhvNgycocWlwSG1HMMAq0Uom VSfDzO3g/SyZO9C2mQvoQORY2gi1+e5rBXa9A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=/PAFDc19whP8gE8TbCtljqrLmylPN1rotB4sfti0awU=; b=de+N0FhF1Xn17eormkGQChXZxJahCe0UlTw5+a/vPt9VhnbsU/K4K0NR1w0BZRWG83 qUSdMA+s0YrTnn3obYv2NgR5DW0sQW/Dc4qZjwG92pVasGsYGIMlByqg4st9X4ZvMRlI mQbvrKmw2R08KkKLJmKqB2W1V3I5ut1q6TBOdfGgEb69wiRAhl2MWGQabKB8IF1OrWfO Yrii/YHLK6KALLBRVNh1SIh+0nIworV8IQ4rVI07ZHJMltr2yMSB9a+vuFqx0v8MhWm/ gip/Jr8Qo+MK/ybcbut45LHIKNi7QfUKzOTLjbtimpd7vv6Az0ChgKDXkxQB1U0iPWQF mXxg== X-Gm-Message-State: AMCzsaW/1NkRD2Eo52p4INwaz+1u+FjM+EACAEDrTFXn1v6k/Q3AeplP So9qtZPuHyMLhoWlILTNhNfo2A== X-Google-Smtp-Source: ABhQp+SqQdHL2MrB6y861djHwlu/xJXXPVYFWYCFyCI6MxV+H87O/MiqJFw4jMU3s4jagKpm4alGXg== X-Received: by 10.99.3.7 with SMTP id 7mr5161897pgd.295.1509284976800; Sun, 29 Oct 2017 06:49:36 -0700 (PDT) Received: from localhost ([122.167.161.211]) by smtp.gmail.com with ESMTPSA id l22sm24563957pfk.45.2017.10.29.06.49.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Oct 2017 06:49:36 -0700 (PDT) From: Viresh Kumar To: Greg Kroah-Hartman Subject: [PATCH V4 10/12] boot_constraint: Add support for Hisilicon platforms Date: Sun, 29 Oct 2017 19:18:58 +0530 Message-Id: X-Mailer: git-send-email 2.15.0.rc1.236.g92ea95045093 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171029_064958_524213_DDF90C39 X-CRM114-Status: GOOD ( 19.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nm@ti.com, Rajendra Nayak , Viresh Kumar , s.hauer@pengutronix.de, Stephen Boyd , linux-kernel@vger.kernel.org, xuwei5@hisilicon.com, robdclark@gmail.com, robh+dt@kernel.org, fabio.estevam@nxp.com, Vincent Guittot , shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds boot constraint support for Hisilicon platforms. Currently only one use case is supported: earlycon. One of the UART is enabled by the bootloader and is used for early console in the kernel. The boot constraint core handles it properly and removes constraints once the serial device is probed by its driver. This is tested on hi6220-hikey 96board. Signed-off-by: Viresh Kumar --- arch/arm64/Kconfig.platforms | 1 + drivers/boot_constraints/Makefile | 2 + drivers/boot_constraints/hikey.c | 145 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 drivers/boot_constraints/hikey.c diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6b54ee8c1262..265df4a088ab 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -87,6 +87,7 @@ config ARCH_HISI select ARM_TIMER_SP804 select HISILICON_IRQ_MBIGEN if PCI select PINCTRL + select DEV_BOOT_CONSTRAINTS help This enables support for Hisilicon ARMv8 SoC family diff --git a/drivers/boot_constraints/Makefile b/drivers/boot_constraints/Makefile index 0d4f88bb767c..43c89d2458e9 100644 --- a/drivers/boot_constraints/Makefile +++ b/drivers/boot_constraints/Makefile @@ -1,3 +1,5 @@ # Makefile for device boot constraints obj-y := clk.o deferrable_dev.o core.o pm.o serial.o supply.o + +obj-$(CONFIG_ARCH_HISI) += hikey.o diff --git a/drivers/boot_constraints/hikey.c b/drivers/boot_constraints/hikey.c new file mode 100644 index 000000000000..5f69f9451d93 --- /dev/null +++ b/drivers/boot_constraints/hikey.c @@ -0,0 +1,145 @@ +/* + * This takes care of Hisilicon boot time device constraints, normally set by + * the Bootloader. + * + * Copyright (C) 2017 Linaro. + * Viresh Kumar + * + * This file is released under the GPLv2. + */ + +#include +#include +#include +#include + +struct hikey_machine_constraints { + struct dev_boot_constraint_of *dev_constraints; + unsigned int count; +}; + +static struct dev_boot_constraint_clk_info uart_iclk_info = { + .name = "uartclk", +}; + +static struct dev_boot_constraint_clk_info uart_pclk_info = { + .name = "apb_pclk", +}; + +static struct dev_boot_constraint hikey3660_uart_constraints[] = { + { + .type = DEV_BOOT_CONSTRAINT_CLK, + .data = &uart_iclk_info, + }, { + .type = DEV_BOOT_CONSTRAINT_CLK, + .data = &uart_pclk_info, + }, +}; + +static const char * const uarts_hikey3660[] = { + "serial@fff32000", /* UART 6 */ +}; + +static struct dev_boot_constraint_of hikey3660_dev_constraints[] = { + { + .compat = "arm,pl011", + .constraints = hikey3660_uart_constraints, + .count = ARRAY_SIZE(hikey3660_uart_constraints), + + .dev_names = uarts_hikey3660, + .dev_names_count = ARRAY_SIZE(uarts_hikey3660), + }, +}; + +static struct hikey_machine_constraints hikey3660_constraints = { + .dev_constraints = hikey3660_dev_constraints, + .count = ARRAY_SIZE(hikey3660_dev_constraints), +}; + +static const char * const uarts_hikey6220[] = { + "uart@f7113000", /* UART 3 */ +}; + +static struct dev_boot_constraint_of hikey6220_dev_constraints[] = { + { + .compat = "arm,pl011", + .constraints = hikey3660_uart_constraints, + .count = ARRAY_SIZE(hikey3660_uart_constraints), + + .dev_names = uarts_hikey6220, + .dev_names_count = ARRAY_SIZE(uarts_hikey6220), + }, +}; + +static struct hikey_machine_constraints hikey6220_constraints = { + .dev_constraints = hikey6220_dev_constraints, + .count = ARRAY_SIZE(hikey6220_dev_constraints), +}; + +static struct dev_boot_constraint hikey3798cv200_uart_constraints[] = { + { + .type = DEV_BOOT_CONSTRAINT_CLK, + .data = &uart_pclk_info, + }, +}; + +static const char * const uarts_hikey3798cv200[] = { + "serial@8b00000", /* UART 0 */ +}; + +static struct dev_boot_constraint_of hikey3798cv200_dev_constraints[] = { + { + .compat = "arm,pl011", + .constraints = hikey3798cv200_uart_constraints, + .count = ARRAY_SIZE(hikey3798cv200_uart_constraints), + + .dev_names = uarts_hikey3798cv200, + .dev_names_count = ARRAY_SIZE(uarts_hikey3798cv200), + }, +}; + +static struct hikey_machine_constraints hikey3798cv200_constraints = { + .dev_constraints = hikey3798cv200_dev_constraints, + .count = ARRAY_SIZE(hikey3798cv200_dev_constraints), +}; + +static const struct of_device_id machines[] __initconst = { + { .compatible = "hisilicon,hi3660", .data = &hikey3660_constraints }, + { .compatible = "hisilicon,hi3798cv200", .data = &hikey3798cv200_constraints }, + { .compatible = "hisilicon,hi6220", .data = &hikey6220_constraints }, + { } +}; + +static int __init hikey_constraints_init(void) +{ + const struct hikey_machine_constraints *constraints; + const struct of_device_id *match; + struct device_node *np; + + if (!boot_constraint_earlycon_enabled()) + return 0; + + np = of_find_node_by_path("/"); + if (!np) + return -ENODEV; + + match = of_match_node(machines, np); + of_node_put(np); + + if (!match) + return 0; + + constraints = match->data; + BUG_ON(!constraints); + + dev_boot_constraint_add_deferrable_of(constraints->dev_constraints, + constraints->count); + + return 0; +} + +/* + * The amba-pl011 driver registers itself from arch_initcall level. Setup the + * serial boot constraints before that in order not to miss any boot messages. + */ +postcore_initcall_sync(hikey_constraints_init);