From patchwork Wed Nov 14 09:01:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 151048 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5436148ljp; Wed, 14 Nov 2018 01:02:10 -0800 (PST) X-Google-Smtp-Source: AJdET5ftUOtpoyYI9LmnuoFG7+jFxWSmjvUtylcI5Xv9Mm8Dhln3QxTMYBIQL0TeOf+ozYhW0z/i X-Received: by 2002:a17:906:5053:: with SMTP id e19-v6mr1214690ejk.223.1542186130384; Wed, 14 Nov 2018 01:02:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542186130; cv=none; d=google.com; s=arc-20160816; b=WYaiw8ZT3UZXHACxyAhU06r3a8+GApyOYNf/1TineK/XBlmZcpMhwvLtoagV+m8Ob7 y9CW06A4B7D6IoHUphMRvI+9M0YcWCaGYF4n/C8KTw1f58Qm65iNgDcwxa6gDMKHrCiM b30s+XnNxms63C3Xa0UOWgX0Sr77nxLFCHZgxpjm1I56cIBIVqXrHPkV7gpnHm0j697/ fpLa6qsfpFkQrQznjko2rYeJcZSqXNeNkZe+nic6c+F9RynE3AKqNqrvj4dxuBNy91ZX Ku/QXSGZDP7eKH21c+9ajYtXNJaPTQIbuHjXMOnbhyuXimkynhHPoTWcOrWUxosfc1dM vKhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature; bh=dk3a5ZMLVo7f1FggWXNrCxYhZ3LVF3ctNnlZAxDHfz0=; b=vQCXm06dvR+agaETfO+b6kX2+BVBpq/YcSmQatawARg+xe4zVQAVTpEdY232ANob+H N3UUwhjruf38IAFAH6E8M0uPnGA0TjTQt+lr6JEWE5P+a1kuLUABmo55jdkbytvTeVh6 E0+E/2diH/Q9UvrdplboCxsBIbr+e0iM0CHGT5u4OSAb9ywQn/NKGz8p1cDZe1acxp5d sX4hpv3DQ5U25/ReWlzUJCorDjytzhppsvX5i6EH1ODYmLMZSXFcjBYFsDa8Se9mUOUq wIwaBqJoZRNT2RojPB2jhM1Bq4g5ETIGfASRvHIAeOcJQSCcBQu3/EfFLwoczIr4uXhh vdaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YRsZIdPb; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q24si755059edc.335.2018.11.14.01.02.09; Wed, 14 Nov 2018 01:02:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YRsZIdPb; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id BD5B2C224B6; Wed, 14 Nov 2018 09:01:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A582CC2206C; Wed, 14 Nov 2018 09:01:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2B6C0C224B5; Wed, 14 Nov 2018 09:01:39 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 58A3BC2207D for ; Wed, 14 Nov 2018 09:01:36 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id q26so3919735wmf.5 for ; Wed, 14 Nov 2018 01:01:36 -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=7G1T/qn3Ds1FMKan4FxdEZTvvsyHqR+Fcp5F18FSOL0=; b=YRsZIdPbERK8lQiT2++ZoHvCV1NAsijQyEkuc/E/f1sXOpnnuj1zVKwRuX5MVleB+O 8A7nGlaBRrIhb/bUoOODDV/FZBCc5Z8TAXgmLvm179eDldcT755QyL2w59JhgGPnqUS8 TlnsxCFeF+MhDB4xbcK+AwkG/SIUjCflzGirE= 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; bh=7G1T/qn3Ds1FMKan4FxdEZTvvsyHqR+Fcp5F18FSOL0=; b=nnAmQ2SuATdgj2lDJgUry7xscR0SMaP1l5noeBt4aGPxGxKQp6DZigpKShlBY+g2ar 7ZwOdD+0rFrkThs8CLRNNPSe3btylWvmXr9aeUu07m3Efv2JmNkqLJhl1PzAe9CM9of3 Zkj/+GojSiIUd8sP/U7q1dDCBDhO+f1iuZdt0g7qdGWpl/V12POt89Z7LHIVuJya3XAo S3Kofj5WMZt3u5vwZ4T+jQp7oXh9ZJLTKaqwso5tBnuzTIEJxt1mXQ1P3ziKJw+U9o/P qUu9J4vfqPIZkkgAjQ0KZ0dIVgClTcbpqtt5IujI94Uaqrk+cFZyCbGRVZCfhekenBwf sgSg== X-Gm-Message-State: AGRZ1gJeZxEoV4jQsWjDeECP7PvjIO8qrL3EAprLn5dxfYnCB+8IJBTu AmNyreF4QXX/Uhcy9j8O92yhOQ== X-Received: by 2002:a1c:8604:: with SMTP id i4-v6mr1129463wmd.23.1542186095922; Wed, 14 Nov 2018 01:01:35 -0800 (PST) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1088:2b4c:4d39:8b22:d570:822a]) by smtp.gmail.com with ESMTPSA id j125-v6sm14474871wmb.12.2018.11.14.01.01.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Nov 2018 01:01:35 -0800 (PST) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: patrick.delaunay@st.com, albert.u.boot@aribaud.net, sjg@chromium.org, christophe.kerello@st.com, patrice.chotard@st.com Date: Wed, 14 Nov 2018 10:01:13 +0100 Message-Id: <20181114090114.7727-4-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181114090114.7727-1-benjamin.gaignard@st.com> References: <20181114090114.7727-1-benjamin.gaignard@st.com> Cc: uboot-stm32@st-md-mailman.stormreply.com, u-boot@lists.denx.de, Benjamin Gaignard Subject: [U-Boot] [PATCH v2 3/4] hwspinlock: add stm32 hardware spinlock support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Implement hardware spinlock support for STM32MP1. Signed-off-by: Benjamin Gaignard Reviewed-by: Simon Glass Reviewed-by: Patrice Chotard --- version 2: - remove useless include - add a private structure to store base address - be more verbose in configuration flag description arch/arm/dts/stm32mp157c-ed1.dts | 4 ++ arch/arm/dts/stm32mp157c.dtsi | 9 ++++ configs/stm32mp15_basic_defconfig | 2 + drivers/hwspinlock/Kconfig | 8 +++ drivers/hwspinlock/Makefile | 1 + drivers/hwspinlock/stm32_hwspinlock.c | 92 +++++++++++++++++++++++++++++++++++ 6 files changed, 116 insertions(+) create mode 100644 drivers/hwspinlock/stm32_hwspinlock.c diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts index f8b7701167..fc277dd7d2 100644 --- a/arch/arm/dts/stm32mp157c-ed1.dts +++ b/arch/arm/dts/stm32mp157c-ed1.dts @@ -365,6 +365,10 @@ usb33d-supply = <&usb33>; }; +&hwspinlock { + status = "okay"; +}; + &usbphyc_port0 { phy-supply = <&vdd_usb>; vdda1v1-supply = <®11>; diff --git a/arch/arm/dts/stm32mp157c.dtsi b/arch/arm/dts/stm32mp157c.dtsi index 33c5981869..37cadfa30c 100644 --- a/arch/arm/dts/stm32mp157c.dtsi +++ b/arch/arm/dts/stm32mp157c.dtsi @@ -690,6 +690,15 @@ status = "disabled"; }; + hwspinlock: hwspinlock@4c000000 { + compatible = "st,stm32-hwspinlock"; + #hwlock-cells = <1>; + reg = <0x4c000000 0x400>; + clocks = <&rcc HSEM>; + clock-names = "hwspinlock"; + status = "disabled"; + }; + rcc: rcc@50000000 { compatible = "st,stm32mp1-rcc", "syscon"; reg = <0x50000000 0x1000>; diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index 3bf7538089..c8409fd04e 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_EXT4_WRITE=y # CONFIG_SPL_DOS_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" CONFIG_STM32_ADC=y +CONFIG_DM_HWSPINLOCK=y +CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_STM32F7=y CONFIG_LED=y diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig index de367fd2a9..96d4f5d6ca 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -13,4 +13,12 @@ config HWSPINLOCK_SANDBOX can be probed and support all the methods of HWSPINLOCK, but does not really do anything. +config HWSPINLOCK_STM32 + bool "Enable Hardware Spinlock support for STM32" + depends on ARCH_STM32MP && DM_HWSPINLOCK + help + Enable hardware spinlock support in STM32MP. Hardware spinlocks are + hardware mutex which provide a synchronisation mechanism for the + various processors on the SoC. + endmenu diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile index 2704d6814f..289b12a256 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_DM_HWSPINLOCK) += hwspinlock-uclass.o obj-$(CONFIG_HWSPINLOCK_SANDBOX) += sandbox_hwspinlock.o +obj-$(CONFIG_HWSPINLOCK_STM32) += stm32_hwspinlock.o diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c new file mode 100644 index 0000000000..a32bde4906 --- /dev/null +++ b/drivers/hwspinlock/stm32_hwspinlock.c @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause +/* + * Copyright (C) 2018, STMicroelectronics - All Rights Reserved + */ + +#include +#include +#include +#include +#include + +#define STM32_MUTEX_COREID BIT(8) +#define STM32_MUTEX_LOCK_BIT BIT(31) +#define STM32_MUTEX_NUM_LOCKS 32 + +struct stm32mp1_hws_priv { + fdt_addr_t base; +}; + +static int stm32mp1_lock(struct udevice *dev, int index) +{ + struct stm32mp1_hws_priv *priv = dev_get_priv(dev); + u32 status; + + if (index >= STM32_MUTEX_NUM_LOCKS) + return -EINVAL; + + status = readl(priv->base + index * sizeof(u32)); + if (status == (STM32_MUTEX_LOCK_BIT | STM32_MUTEX_COREID)) + return -EBUSY; + + writel(STM32_MUTEX_LOCK_BIT | STM32_MUTEX_COREID, + priv->base + index * sizeof(u32)); + + status = readl(priv->base + index * sizeof(u32)); + if (status != (STM32_MUTEX_LOCK_BIT | STM32_MUTEX_COREID)) + return -EINVAL; + + return 0; +} + +static int stm32mp1_unlock(struct udevice *dev, int index) +{ + struct stm32mp1_hws_priv *priv = dev_get_priv(dev); + + if (index >= STM32_MUTEX_NUM_LOCKS) + return -EINVAL; + + writel(STM32_MUTEX_COREID, priv->base + index * sizeof(u32)); + + return 0; +} + +static int stm32mp1_hwspinlock_probe(struct udevice *dev) +{ + struct stm32mp1_hws_priv *priv = dev_get_priv(dev); + struct clk clk; + int ret; + + priv->base = dev_read_addr(dev); + if (priv->base == FDT_ADDR_T_NONE) + return -EINVAL; + + ret = clk_get_by_index(dev, 0, &clk); + if (ret) + return ret; + + ret = clk_enable(&clk); + if (ret) + clk_free(&clk); + + return ret; +} + +static const struct hwspinlock_ops stm32mp1_hwspinlock_ops = { + .lock = stm32mp1_lock, + .unlock = stm32mp1_unlock, +}; + +static const struct udevice_id stm32mp1_hwspinlock_ids[] = { + { .compatible = "st,stm32-hwspinlock" }, + {} +}; + +U_BOOT_DRIVER(hwspinlock_stm32mp1) = { + .name = "hwspinlock_stm32mp1", + .id = UCLASS_HWSPINLOCK, + .of_match = stm32mp1_hwspinlock_ids, + .ops = &stm32mp1_hwspinlock_ops, + .probe = stm32mp1_hwspinlock_probe, + .priv_auto_alloc_size = sizeof(struct stm32mp1_hws_priv), +};