From patchwork Fri Nov 16 10:39:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 151325 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp260772ljp; Fri, 16 Nov 2018 02:40:51 -0800 (PST) X-Google-Smtp-Source: AJdET5cQTOWSej8tojXSsdwD8njFYPGX/zAmPe78VcQjQd8rdlBWssdeP9o3mRCcvo3aRceg0ncH X-Received: by 2002:a50:e789:: with SMTP id b9-v6mr8832077edn.275.1542364851169; Fri, 16 Nov 2018 02:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542364851; cv=none; d=google.com; s=arc-20160816; b=khlxU4EAK4xA/UUHPOsSu9hEJJerkPLXmLLa6Kb0/cqycAdsOxAsGwA2t87faGtQkO WGLpLocc6bULPOFjwFdUsSz3Y+Ccv2I9g7EjDLuNvAAaYDzVd7z3eoOoCgKlvQDJK3E+ HT+rihVwMXU3375/c92ami/CIAKcr0O2J7f0LQD6Bka8wPwZrUQY2Gh2zyNTrP7Oxtnf JS92eGdggFDdXuibWiI08xqC86ofO2Wb9CPMEHYeIW/mo979nuNOKksVOIPOVMTXaX64 ihw4VuHlkUd7yyXGYE61Jk2/dqU6GYbkgs1j6Aj65cpvuMZ0IOtN24a6P153pK27MJx8 NeZg== 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=QYn7m6BH31WJSFZAwoZUpvWA2AEZlG7H20+urwS80W8=; b=d/k07ScVJlKpfvQtxQvdrJ5+8thP+rmSYcmavYLQ/mYQ9vCJkeKosWxtSgdrZasyXS RmbkWWZyq8WdtQgQP/fv+BXDLnGYZ/5SeE5MOrbtbKApR0fc4i0meJJHV+Yoi+0X3z9/ vpeCMqQkTYKcwMUdoQJcFj/Pq2JuZ2ihQoBX5pQTQxbOMfZBn4Q5kY0gVFvnYgccKkU1 D7Qjs1mU3cLDBJAUUddO9stPFUgzFzdCf4k0mf80nSOT8u/553EkdwetLf7mUvk9oLF+ 4fIFCYipT55mTGY3ID+9qpeCyjz1SrmjWUBoqn6Dh/1/Hdd4l6M3BVtqxO7T0Dab5kvz lAXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=OczTHqtM; 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 z4si2000682edz.205.2018.11.16.02.40.50; Fri, 16 Nov 2018 02:40:51 -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=OczTHqtM; 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 7F46FC224E7; Fri, 16 Nov 2018 10:40:23 +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 261E5C224F2; Fri, 16 Nov 2018 10:40:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C65FC224E4; Fri, 16 Nov 2018 10:40:08 +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 BE1BCC224E6 for ; Fri, 16 Nov 2018 10:40:04 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id y139so4226530wmc.5 for ; Fri, 16 Nov 2018 02:40:04 -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=sOPemw7CQBPO+68fqz/LsUMUZWB/gj4l8Fem4wYOt3s=; b=OczTHqtMDXn3U4ME/QooRsy2nni/AZZgGB6ZDYADE7uy6KkIR+DHmcT9G1Mw33XM5N blluOIxJP3eh1MW52rG2pPJ0SEFAX7lv+SJfTSu1vIH3dmx+1rz8c4Yq8BrAj/VNb0Zd cAcUacwube6ITMbrwAD1AfisLNGfdh20sXCgE= 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=sOPemw7CQBPO+68fqz/LsUMUZWB/gj4l8Fem4wYOt3s=; b=pzuzZNsj3RqdUEMAO6hQM9fGI2n1WTVDelNDV4VXKEDsGRnY3/sVSljDzlhSdx5dAH kPJ5dLuAVHzeSqsS6yD8GmCmL5AmCmCDoX8I+u65cP3bxb38RCeY6O0Npo6oIOjr6t9g 814nw87OJJNSifs2Rexa8+jl3UKnVLfIzX5y8KCbbUsPjXGSUPu2ITUkKKo6yac86Ubk Y8kaPZpGBnZQiRfnmQ+40M/PRKTBhpLwyzzOKQ2S4WNMS6VDcC5yRx46sOR9idcQOozn OzASJ8Tt+JxnIjvUzC3ei2Q/zMVyLzg1K1Ao1aKoR1OhAPJECT2QzNDL8s4VYErRWGQ2 IAuA== X-Gm-Message-State: AGRZ1gKaeF1Zyz2TwWwmQalCpp2Lafw7iOLOCKCcv6zKkRiFUHqeqhYO XSgRYuCBt2xsKe/dqB5M1KV67A== X-Received: by 2002:a7b:c853:: with SMTP id c19mr1988288wml.61.1542364804269; Fri, 16 Nov 2018 02:40:04 -0800 (PST) Received: from lmecxl0911.lme.st.com ([2a04:cec0:105d:3df6:606e:fa38:9819:9c69]) by smtp.gmail.com with ESMTPSA id f68sm13960857wmd.15.2018.11.16.02.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Nov 2018 02:40:03 -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: Fri, 16 Nov 2018 11:39:46 +0100 Message-Id: <20181116103947.11002-4-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181116103947.11002-1-benjamin.gaignard@st.com> References: <20181116103947.11002-1-benjamin.gaignard@st.com> Cc: uboot-stm32@st-md-mailman.stormreply.com, u-boot@lists.denx.de, Benjamin Gaignard Subject: [U-Boot] [PATCH v3 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 --- 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), +};