From patchwork Wed Oct 31 09:30:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 10662315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD10215E9 for ; Wed, 31 Oct 2018 09:30:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC2F82A33E for ; Wed, 31 Oct 2018 09:30:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A02172A344; Wed, 31 Oct 2018 09:30:55 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEFA92A33E for ; Wed, 31 Oct 2018 09:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728099AbeJaS2L (ORCPT ); Wed, 31 Oct 2018 14:28:11 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42145 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728086AbeJaS2L (ORCPT ); Wed, 31 Oct 2018 14:28:11 -0400 Received: by mail-wr1-f68.google.com with SMTP id y15-v6so15638878wru.9 for ; Wed, 31 Oct 2018 02:30:50 -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; bh=ZKXzc/9xi2oqrkPABloEIrBfH+ajRu+w1WHKhdOM4Rk=; b=aan0EMnXfDfOU3ca4R0bzQftvlM4ux2NUaP9DsCSp15jp64rmSsQvkALE+o9L+aXNj NTBE2ziWR+VhvyST0Upny13wP0AL3yUYufEUy+qscRzayHjwqqJCrFx+2ZI7w+XZik8h OQKLeLjjRSWHFGdJSu8tczyhIjt85xRHN5Dsk= 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=ZKXzc/9xi2oqrkPABloEIrBfH+ajRu+w1WHKhdOM4Rk=; b=JyebTwq6WvCdwHsrycv/cSAUuLU3zeDiZNIW2t9gxLNkmLzBmhBVVzqqLrr242hX/9 k14uL7eLAJ/kggKetpCapKhqmaxFk9fZeOI9bpq/aGhnicFeaerheyplhNhA45AxTCOc haVaYZenrAn2/FSl6ff0ZbPftqhjuWRV6QamKuHgJoBLLRZaak4+R/Mptamq3Zc48Rjp akCH/STwy+X6BIuSZ093dyX69cEPgUJPOStfCNY0uhQLTQwz0mBORZv968UEkL9obnfl ZCmIimkLPOq1YBJSVm37rtyhKbn0mbS+HSLBRBWs8o7WQamMQ+R5VGUATFXv9e31/qav qG3w== X-Gm-Message-State: AGRZ1gLwz2L6LHS3hNfpbEBfE8XWziQNQmzT2hy2KxHu44z7inv1TzZm cokd1jLzoPK7MJr0N89f6d8qug== X-Google-Smtp-Source: AJdET5cjhOAsBRDqNKR9ofuUFrrUZAH72t0ymGqkOxje1ysdvRhXFohd0iet1pmQ4nYBn5Upa2vqlA== X-Received: by 2002:adf:e485:: with SMTP id i5-v6mr1953416wrm.101.1540978250250; Wed, 31 Oct 2018 02:30:50 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1086:999:fd1b:8629:a7fc:68b]) by smtp.gmail.com with ESMTPSA id w14-v6sm10737377wrt.73.2018.10.31.02.30.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Oct 2018 02:30:49 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Benjamin Gaignard Subject: [PATCH 1/5] dt-bindings: hwlock: Document STM32 hwspinlock bindings Date: Wed, 31 Oct 2018 10:30:28 +0100 Message-Id: <20181031093032.20386-2-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181031093032.20386-1-benjamin.gaignard@st.com> References: <20181031093032.20386-1-benjamin.gaignard@st.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add bindings for STM32 hardware spinlock device Signed-off-by: Benjamin Gaignard --- .../bindings/hwlock/st,stm32-hwspinlock.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt diff --git a/Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt b/Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt new file mode 100644 index 000000000000..7a999479d802 --- /dev/null +++ b/Documentation/devicetree/bindings/hwlock/st,stm32-hwspinlock.txt @@ -0,0 +1,23 @@ +STM32 Hardware Spinlock Device Binding +------------------------------------- + +Required properties : +- compatible : should be "st,stm32-hwspinlock". +- reg : the register address of hwspinlock. +- #hwlock-cells : hwlock users only use the hwlock id to represent a specific + hwlock, so the number of cells should be <1> here. +- clock-names : Must contain "hwspinlock". +- clocks : Must contain a phandle entry for the clock in clock-names, see the + common clock bindings. + +Please look at the generic hwlock binding for usage information for consumers, +"Documentation/devicetree/bindings/hwlock/hwlock.txt" + +Example of hwlock provider: + hwspinlock@4c000000 { + compatible = "st,stm32-hwspinlock"; + #hwlock-cells = <1>; + reg = <0x4c000000 0x400>; + clocks = <&rcc HSEM>; + clock-names = "hwspinlock"; + }; From patchwork Wed Oct 31 09:30:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 10662317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5055D13BF for ; Wed, 31 Oct 2018 09:30:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40B622A33E for ; Wed, 31 Oct 2018 09:30:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 349DA2A344; Wed, 31 Oct 2018 09:30:57 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A26A72A33E for ; Wed, 31 Oct 2018 09:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728174AbeJaS2O (ORCPT ); Wed, 31 Oct 2018 14:28:14 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54053 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728132AbeJaS2N (ORCPT ); Wed, 31 Oct 2018 14:28:13 -0400 Received: by mail-wm1-f68.google.com with SMTP id v24-v6so4542538wmh.3 for ; Wed, 31 Oct 2018 02:30:53 -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; bh=OCewN85BXjXK6qI/FZdB9QY1FkUVogdwEIt0smFxfhs=; b=ebiZIiAcOFS+c+u43A22LaTq48add9ZKsgKdQoX+XEj2Oqdne0CRjNM9vSl+y46ZJI Kz6prWMdHKZXBlX9qOWVcKlAX7k8xrB4j92tM4L0aYf6sT2W/t8//1ermdRcyI35JplU osGpoR0wsai40PeQ6+yjlMVXWSRlWWz+IEgWI= 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=OCewN85BXjXK6qI/FZdB9QY1FkUVogdwEIt0smFxfhs=; b=JnKX4GJivS99Zg5/1zHdqeiNMNdSwwXmKrkPLyD07Okn7TuCvqb5HM5ceoA8FvBM7d 7dOlV7EaTKwQkkhLMTEE9UuTWZo3m8n3jUhrZVaPDeZGEVZO7id2UipKjlsR27++QF/W lE07IBoTH3oK4i2xAmHXcoiupxnTpCZiJxznCMmCg4SsF60tiv6bAhTIdENLs6Lm6HsO 3zY7ZUPSkLYOVoLqDFDD75J7S6peFPuq4r/l8HMK1+cdO+PxRcz0wgxtfPjY4mffy+B5 tllLDW0iRPYcnIY112UlyDwkZOTyoWCCh5yaTTXP9herbEH+LuNlbqTNfyiPXSDkUgRE GGBQ== X-Gm-Message-State: AGRZ1gKLLiLMTNHONN4ynZBpmj/Zcb5Sv0FX40bETz5uImn2432fshQa ucWzqr+kEXI5Y3JJqNlhYNvlTA== X-Google-Smtp-Source: AJdET5c3uYVY9Lo0ileEfE2sU8QuE8viihMcrLdNsmesrKHwypEh8qHlvonv2Zdp3c2w2dggUT6MoQ== X-Received: by 2002:a1c:84cd:: with SMTP id g196-v6mr1723453wmd.38.1540978252699; Wed, 31 Oct 2018 02:30:52 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1086:999:fd1b:8629:a7fc:68b]) by smtp.gmail.com with ESMTPSA id w14-v6sm10737377wrt.73.2018.10.31.02.30.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Oct 2018 02:30:51 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Benjamin Gaignard Subject: [PATCH 2/5] hwspinlock: add STM32 hwspinlock device Date: Wed, 31 Oct 2018 10:30:29 +0100 Message-Id: <20181031093032.20386-3-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181031093032.20386-1-benjamin.gaignard@st.com> References: <20181031093032.20386-1-benjamin.gaignard@st.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support of hardware semaphores for stm32mp1 SoC. The hardware block provides 32 semaphores. Signed-off-by: Benjamin Gaignard --- drivers/hwspinlock/Kconfig | 9 +++ drivers/hwspinlock/Makefile | 1 + drivers/hwspinlock/stm32_hwspinlock.c | 147 ++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 drivers/hwspinlock/stm32_hwspinlock.c diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig index e895d29500ee..e1a20b460590 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -59,3 +59,12 @@ config HSEM_U8500 SoC. If unsure, say N. + +config HWSPINLOCK_STM32 + tristate "STM32 Hardware Spinlock device" + depends on MACH_STM32MP157 + depends on HWSPINLOCK + help + Say y here to support the STM32 Hardware Spinlock device. + + If unsure, say N. diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile index b87c01a506a4..c0a9505b4dcf 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_HWSPINLOCK_QCOM) += qcom_hwspinlock.o obj-$(CONFIG_HWSPINLOCK_SIRF) += sirf_hwspinlock.o obj-$(CONFIG_HWSPINLOCK_SPRD) += sprd_hwspinlock.o obj-$(CONFIG_HSEM_U8500) += u8500_hsem.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 000000000000..6a0fafac7389 --- /dev/null +++ b/drivers/hwspinlock/stm32_hwspinlock.c @@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) STMicroelectronics SA 2018 + * Author: Benjamin Gaignard for STMicroelectronics. + * License terms: GNU General Public License (GPL), version 2 + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hwspinlock_internal.h" + +#define STM32_MUTEX_COREID BIT(8) +#define STM32_MUTEX_LOCK_BIT BIT(31) +#define STM32_MUTEX_NUM_LOCKS 32 + +struct stm32_hwspinlock { + struct clk *clk; + struct hwspinlock_device bank; +}; + +static int stm32_hwspinlock_trylock(struct hwspinlock *lock) +{ + void __iomem *lock_addr = lock->priv; + u32 status; + + writel(STM32_MUTEX_LOCK_BIT | STM32_MUTEX_COREID, lock_addr); + status = readl(lock_addr); + + return status == (STM32_MUTEX_LOCK_BIT | STM32_MUTEX_COREID); +} + +static void stm32_hwspinlock_unlock(struct hwspinlock *lock) +{ + void __iomem *lock_addr = lock->priv; + + writel(STM32_MUTEX_COREID, lock_addr); +} + +static const struct hwspinlock_ops stm32_hwspinlock_ops = { + .trylock = stm32_hwspinlock_trylock, + .unlock = stm32_hwspinlock_unlock, +}; + +static int stm32_hwspinlock_probe(struct platform_device *pdev) +{ + struct stm32_hwspinlock *hw; + void __iomem *io_base; + struct resource *res; + size_t array_size; + int i, ret; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + io_base = devm_ioremap_resource(&pdev->dev, res); + if (!io_base) + return -ENOMEM; + + array_size = STM32_MUTEX_NUM_LOCKS * sizeof(struct hwspinlock); + hw = devm_kzalloc(&pdev->dev, sizeof(*hw) + array_size, GFP_KERNEL); + if (!hw) + return -ENOMEM; + + hw->clk = devm_clk_get(&pdev->dev, "hwspinlock"); + if (IS_ERR(hw->clk)) + return PTR_ERR(hw->clk); + + for (i = 0; i < STM32_MUTEX_NUM_LOCKS; i++) + hw->bank.lock[i].priv = io_base + i * sizeof(u32); + + platform_set_drvdata(pdev, hw); + pm_runtime_enable(&pdev->dev); + + ret = hwspin_lock_register(&hw->bank, &pdev->dev, &stm32_hwspinlock_ops, + 0, STM32_MUTEX_NUM_LOCKS); + + if (ret) + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static int stm32_hwspinlock_remove(struct platform_device *pdev) +{ + struct stm32_hwspinlock *hw = platform_get_drvdata(pdev); + int ret; + + ret = hwspin_lock_unregister(&hw->bank); + if (ret) { + dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret); + return ret; + } + + pm_runtime_disable(&pdev->dev); + + return 0; +} + +static int __maybe_unused stm32_hwspinlock_runtime_suspend(struct device *dev) +{ + struct stm32_hwspinlock *hw = dev_get_drvdata(dev); + + clk_disable_unprepare(hw->clk); + + return 0; +} + +static int __maybe_unused stm32_hwspinlock_runtime_resume(struct device *dev) +{ + struct stm32_hwspinlock *hw = dev_get_drvdata(dev); + + clk_prepare_enable(hw->clk); + + return 0; +} + +static const struct dev_pm_ops stm32_hwspinlock_pm_ops = { + SET_RUNTIME_PM_OPS(stm32_hwspinlock_runtime_suspend, + stm32_hwspinlock_runtime_resume, + NULL) +}; + +static const struct of_device_id stm32_hwpinlock_ids[] = { + { .compatible = "st,stm32-hwspinlock", }, + {}, +}; +MODULE_DEVICE_TABLE(of, stm32_hwpinlock_ids); + +static struct platform_driver stm32_hwspinlock_driver = { + .probe = stm32_hwspinlock_probe, + .remove = stm32_hwspinlock_remove, + .driver = { + .name = "stm32_hwspinlock", + .of_match_table = stm32_hwpinlock_ids, + .pm = &stm32_hwspinlock_pm_ops, + }, +}; +module_platform_driver(stm32_hwspinlock_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Hardware spinlock driver for STM32 SoCs"); +MODULE_AUTHOR("Benjamin Gaignard "); From patchwork Wed Oct 31 09:30:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 10662325 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB09A15E9 for ; Wed, 31 Oct 2018 09:31:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB6532A33E for ; Wed, 31 Oct 2018 09:31:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFC322A344; Wed, 31 Oct 2018 09:31:17 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 799122A33E for ; Wed, 31 Oct 2018 09:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728215AbeJaS2Q (ORCPT ); Wed, 31 Oct 2018 14:28:16 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:32973 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727597AbeJaS2P (ORCPT ); Wed, 31 Oct 2018 14:28:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id u1-v6so15678802wrn.0 for ; Wed, 31 Oct 2018 02:30:55 -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; bh=YT2BGL73pI00O7JsdMy6/bfTMju1hXp1TWklR4ycj/Y=; b=BZum8nXLTQ4NN966TU5Ngk/Fw9BfsYRg3AezKMn0W/0NnzF4JHYdoxnWX2otpQY7nq aJ5rNEnIqV4EdmjoG8rYDO3DqRMVPJdLTlk4yAtAHizGIHHsAqNyybbtYK1sU1fYHpzT 16ITGm0vTNp4UO2j1RqijxyBtY1o+dutoj2sc= 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=YT2BGL73pI00O7JsdMy6/bfTMju1hXp1TWklR4ycj/Y=; b=bk6wNaLhLhKcpkrCyRs40Sb09tcNDBwkRBqS6k2lHLHzjC8YTkD2rJSs0k36KAJCf4 tKgKq0yBErFxUGCH0GaOLbMGdp3t88+oStZc3L+q92LYhgy5n9mGMxGlTCjyrO5t7Cf5 U90gODERfa9aWyXzlpGMKUC+AxhQ9LjN3yXbcrLwgIkpwpQT5/OyZlwnUDFHEjgPi2Mc pMyMprRAZJsPz6cZByH429x5VkbuGoBFmRHibPvFqWelXOZfx2Sv7JQKOCGef49Li4Cu g/jkdHQqMg739hftogYNbIv84tlRu8AUD9fa87AHPg5i4ViK/zZmlq8JCH2sLa841soD V52g== X-Gm-Message-State: AGRZ1gKSTFbZb8VIe5T2U+xu5cb6QlZBexi3CeVckBqcIh8mF21vtKdu 5RTBGya4DieqcO0yxLVdRgRjEg== X-Google-Smtp-Source: AJdET5eKYC/7D+pc1y5wcN4lTTcmB32J+l72dNO2mYye69Sc9Fue++6Bntxs0gBclQDyvVxGsKmq2Q== X-Received: by 2002:a5d:560c:: with SMTP id l12-v6mr2038566wrv.281.1540978254624; Wed, 31 Oct 2018 02:30:54 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1086:999:fd1b:8629:a7fc:68b]) by smtp.gmail.com with ESMTPSA id w14-v6sm10737377wrt.73.2018.10.31.02.30.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Oct 2018 02:30:54 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Benjamin Gaignard Subject: [PATCH 3/5] ARM: dts: stm32: Add hwspinlock node for stm32mp157 SoC Date: Wed, 31 Oct 2018 10:30:30 +0100 Message-Id: <20181031093032.20386-4-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181031093032.20386-1-benjamin.gaignard@st.com> References: <20181031093032.20386-1-benjamin.gaignard@st.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Declare hwspinlock device for stm32mp157 SoC Signed-off-by: Benjamin Gaignard Acked-by: Bjorn Andersson --- arch/arm/boot/dts/stm32mp157c.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/stm32mp157c.dtsi b/arch/arm/boot/dts/stm32mp157c.dtsi index 185541a5b69f..9b16c28f8ac3 100644 --- a/arch/arm/boot/dts/stm32mp157c.dtsi +++ b/arch/arm/boot/dts/stm32mp157c.dtsi @@ -803,6 +803,15 @@ status = "disabled"; }; + hsem: 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>; From patchwork Wed Oct 31 09:30:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 10662319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E1B6F15E9 for ; Wed, 31 Oct 2018 09:31:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D14C82A33E for ; Wed, 31 Oct 2018 09:31:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C26B22A344; Wed, 31 Oct 2018 09:31:01 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BA9A2A33E for ; Wed, 31 Oct 2018 09:31:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728223AbeJaS2T (ORCPT ); Wed, 31 Oct 2018 14:28:19 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43507 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728203AbeJaS2R (ORCPT ); Wed, 31 Oct 2018 14:28:17 -0400 Received: by mail-wr1-f66.google.com with SMTP id t10-v6so15627386wrn.10 for ; Wed, 31 Oct 2018 02:30:57 -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; bh=yyRbW79BND4C408UyY/nhuusJ4qXhHx099cfs+zi2aw=; b=U5IymNAlVU/1CSK7CG52MQsYlUiiiPA8uI8HRUj1dHQqWRGsOqUumdMI7ftoYNr+19 XGs6zEbQ6BZ+BTmXu9ptiuNM6ckgaPw/t4ST5bi9g2TmcOONZRI1rg21WfpkP5K/yvQw SUrFhlNtrZFY9lTCBCxk6fNaTpP+oaPStEOfU= 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=yyRbW79BND4C408UyY/nhuusJ4qXhHx099cfs+zi2aw=; b=P92vYhFn9W3nJEglBZ2oXxUNb+Ii/jecM0h/EpK3QFFJF8TYnRO8dWHf2ML6uNe2g0 t3EHSm/lQadFRSAs9r3ow1Cg3CIds0J+gJQuF+unb9UrC1dcLhIMDHEHnkjb/fAFmBpk FItmlpO3r/x9T/76IAdRnzB79j1QsZOLfUlf4VzycNH84gCawmdnPGgYHgscncKg+2B/ AZk1F/LmGZ5ZnCVD5Dufsk7sEM1job8pgBKyHSKGLvEz0wdS3bf4wjp3l8Ep3/3Moewi p0SUO9nD0nbg//mIMxnTunKiOnKr8EaFspNtXcH03yd6RFcbXERkaZRtkesjdM9WxUx+ qDsA== X-Gm-Message-State: AGRZ1gJ2WsKqvHwAad8YtRh/9GSwe00ND+NE3HipHluH8H1cZ+DYXEiE SU+YJkFol0Q3KVXDNrYjduiEZg== X-Google-Smtp-Source: AJdET5erSSSmVSXvhBZi7XFgOEfgHcibX1jxkevUGUm9LD9cQ0Bm5dtW9d2Zy1dR8e94tQx1DeTJZA== X-Received: by 2002:adf:ff05:: with SMTP id k5-v6mr1959110wrr.73.1540978256559; Wed, 31 Oct 2018 02:30:56 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1086:999:fd1b:8629:a7fc:68b]) by smtp.gmail.com with ESMTPSA id w14-v6sm10737377wrt.73.2018.10.31.02.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Oct 2018 02:30:56 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Benjamin Gaignard Subject: [PATCH 4/5] ARM: dts: stm32: enable hwspinlock on stm32mp157c-ed1 Date: Wed, 31 Oct 2018 10:30:31 +0100 Message-Id: <20181031093032.20386-5-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181031093032.20386-1-benjamin.gaignard@st.com> References: <20181031093032.20386-1-benjamin.gaignard@st.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable hwspinlock on stm32mp157c-ed1 Signed-off-by: Benjamin Gaignard --- arch/arm/boot/dts/stm32mp157c-ed1.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/stm32mp157c-ed1.dts b/arch/arm/boot/dts/stm32mp157c-ed1.dts index f77bea49c079..158a337b3129 100644 --- a/arch/arm/boot/dts/stm32mp157c-ed1.dts +++ b/arch/arm/boot/dts/stm32mp157c-ed1.dts @@ -94,3 +94,7 @@ vdda1v1-supply = <®11>; vdda1v8-supply = <®18>; }; + +&hsem { + status = "okay"; +}; From patchwork Wed Oct 31 09:30:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 10662321 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D5E2C15E9 for ; Wed, 31 Oct 2018 09:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C59362A33E for ; Wed, 31 Oct 2018 09:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9A542A344; Wed, 31 Oct 2018 09:31:07 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 384952A33E for ; Wed, 31 Oct 2018 09:31:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728035AbeJaS2U (ORCPT ); Wed, 31 Oct 2018 14:28:20 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40043 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727826AbeJaS2U (ORCPT ); Wed, 31 Oct 2018 14:28:20 -0400 Received: by mail-wr1-f65.google.com with SMTP id i17-v6so15593557wre.7 for ; Wed, 31 Oct 2018 02:30:59 -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; bh=2uKBBGkCNMoGjJfIY95Fh+s9tnlSDO4scNahnS2PGqY=; b=JT+fIGxzFE1oZ0o9/cuu8TmJdAOZGpwaGOYW4FfGgFbycJnB1k5HfvnFTwtwS5k+8H F/KY7au1njJwObf7X8BEGeBgVjct/1s1BsJZSodgBbAPqSuJCA1qTIdKLqLGIqGv12ej cs3mFxt3OZlg2x7Q4W2IZpIH32S7rvkSEfol4= 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=2uKBBGkCNMoGjJfIY95Fh+s9tnlSDO4scNahnS2PGqY=; b=U+DiiXwKdLLG9ZN8G70IhahkCNANqVaARGwTfQfT20HJulGoYMTvaCJuXwMix2modC uN93szxiTNxh+qjMUFkHK6kBu3yElv/PEuW4UjVYfkPvMDB8tookaIJgtspFXwuwv6gF MG7lR2oiNwOtXN2r/8Oq47H3XA+fG9hbZk4IROZC8HyWUg9TszCVIVJvvsbZTmnjI9Od 21sJor3PEhuYEfiNDn5TgY3TTD4y2BSKQk1q3Qea4xLwhd3LYAGXhwUf/9v+MiIGkdZI bkRlGDjIEMJmv5n9jcTFG3HkMeACekmhHrdOP/UQ0x8RwpFldUdlv8jRMK/fEdCx3H/E ZDkQ== X-Gm-Message-State: AGRZ1gKss6rTA5H+6hDO9+JD2ob+LDOpm0TGOUSKbjlN4kpHUi6BiHmD E5QHbfAt3kW3bLiEVDv75S9iPw== X-Google-Smtp-Source: AJdET5d4OGLv6czcLPclqwS8Icqyl9uCHrMTILaKN30Dysw+gywqquyKp4fU3qvqryMiz7y4qrgfWA== X-Received: by 2002:a5d:4e01:: with SMTP id p1-v6mr2116103wrt.320.1540978258587; Wed, 31 Oct 2018 02:30:58 -0700 (PDT) Received: from lmecxl0911.lme.st.com ([2a04:cec0:1086:999:fd1b:8629:a7fc:68b]) by smtp.gmail.com with ESMTPSA id w14-v6sm10737377wrt.73.2018.10.31.02.30.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Oct 2018 02:30:58 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: ohad@wizery.com, bjorn.andersson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, alexandre.torgue@st.com Cc: linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Benjamin Gaignard Subject: [PATCH 5/5] hwspinlock: Add test module Date: Wed, 31 Oct 2018 10:30:32 +0100 Message-Id: <20181031093032.20386-6-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20181031093032.20386-1-benjamin.gaignard@st.com> References: <20181031093032.20386-1-benjamin.gaignard@st.com> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Create a test module to perform simple unitary tests on hwspinlock. It doesn't cover all the possibles cases but at least allow to test that very basic features are working. Signed-off-by: Benjamin Gaignard --- drivers/hwspinlock/Kconfig | 9 +++ drivers/hwspinlock/Makefile | 1 + drivers/hwspinlock/hwspinlock_test.c | 132 +++++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 drivers/hwspinlock/hwspinlock_test.c diff --git a/drivers/hwspinlock/Kconfig b/drivers/hwspinlock/Kconfig index e1a20b460590..f340ebb4d1f7 100644 --- a/drivers/hwspinlock/Kconfig +++ b/drivers/hwspinlock/Kconfig @@ -68,3 +68,12 @@ config HWSPINLOCK_STM32 Say y here to support the STM32 Hardware Spinlock device. If unsure, say N. + +config HWSPINLOCK_TEST + tristate "hwspinlock test module" + depends on HWSPINLOCK && m + default n + help + Select M here if you want to build hwspinlock test module + + If unsure, say N. diff --git a/drivers/hwspinlock/Makefile b/drivers/hwspinlock/Makefile index c0a9505b4dcf..e6b3d0212fe0 100644 --- a/drivers/hwspinlock/Makefile +++ b/drivers/hwspinlock/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_HWSPINLOCK_SIRF) += sirf_hwspinlock.o obj-$(CONFIG_HWSPINLOCK_SPRD) += sprd_hwspinlock.o obj-$(CONFIG_HSEM_U8500) += u8500_hsem.o obj-$(CONFIG_HWSPINLOCK_STM32) += stm32_hwspinlock.o +obj-$(CONFIG_HWSPINLOCK_TEST) += hwspinlock_test.o diff --git a/drivers/hwspinlock/hwspinlock_test.c b/drivers/hwspinlock/hwspinlock_test.c new file mode 100644 index 000000000000..75819337e45a --- /dev/null +++ b/drivers/hwspinlock/hwspinlock_test.c @@ -0,0 +1,132 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) STMicroelectronics SA 2018 + * Author: Benjamin Gaignard for STMicroelectronics. + * License terms: GNU General Public License (GPL), version 2 + */ + +#include +#include +#include + +#define TIMEOUT 50 /* ms */ + +static void hwspin_lock_test_twice_request_specific(void) +{ + struct hwspinlock *lock0 = hwspin_lock_request_specific(0); + struct hwspinlock *lock1 = hwspin_lock_request_specific(1); + + int ret; + + if (!lock0 || !lock1) { + pr_warn("Can't request twice hwspin_lock\n"); + return; + } + + ret = hwspin_trylock(lock0); + if (ret) + pr_warn("Can't trylock requested hwspin_lock 0 (%d)\n", ret); + + ret = hwspin_trylock(lock1); + if (ret) + pr_warn("Can't trylock requested hwspin_lock 1 (%d)\n", ret); + + hwspin_unlock(lock0); + hwspin_unlock(lock1); + + ret = hwspin_lock_free(lock0); + if (ret) + pr_warn("Can't free requested hwspin_lock 0\n"); + + ret = hwspin_lock_free(lock1); + if (ret) + pr_warn("Can't free requested hwspin_lock 0\n"); +} + +static void hwspin_lock_test_trylock(void) +{ + struct hwspinlock *lock = hwspin_lock_request(); + int ret; + + if (!lock) { + pr_warn("Can't request hwspin_lock\n"); + return; + } + + ret = hwspin_trylock(lock); + if (ret) + pr_warn("Can't trylock requested hwspin_lock (%d)\n", ret); + + /* Try to lock a second time, this should failed */ + ret = hwspin_trylock(lock); + if (ret != -EBUSY) + pr_warn("Getting twice the same lock ! (%d)\n", ret); + + hwspin_unlock(lock); + ret = hwspin_lock_free(lock); + if (ret) + pr_warn("Can't free requested hwspin_lock 0\n"); +} + +static void hwspin_lock_test_request_specific(void) +{ + /* + * Let's assume that any hwspin_lock driver would at least have one + * lock at index 0 + */ + struct hwspinlock *lock = hwspin_lock_request_specific(0); + int ret; + + if (!lock) { + pr_warn("Can't request hwspin_lock 0\n"); + return; + } + + ret = hwspin_lock_timeout(lock, TIMEOUT); + if (ret) + pr_warn("Can't lock requested hwspin_lock 0 (%d)\n", ret); + + hwspin_unlock(lock); + ret = hwspin_lock_free(lock); + if (ret) + pr_warn("Can't free requested hwspin_lock 0\n"); +} + +static void hwspin_lock_test_request(void) +{ + struct hwspinlock *lock = hwspin_lock_request(); + int ret; + + if (!lock) { + pr_warn("Can't request hwspin_lock\n"); + return; + } + + ret = hwspin_lock_timeout(lock, TIMEOUT); + if (ret) + pr_warn("Can't lock requested hwspin_lock (%d)\n", ret); + + hwspin_unlock(lock); + ret = hwspin_lock_free(lock); + if (ret) + pr_warn("Can't free requested hwspin_lock\n"); +} + +/* + * Test hwspinlock user API when module is loaded + */ +static int __init hwspin_lock_test_init(void) +{ + pr_warn("Loading hwspinlock test module\n"); + hwspin_lock_test_request(); + hwspin_lock_test_request_specific(); + hwspin_lock_test_trylock(); + hwspin_lock_test_twice_request_specific(); + + return 0; +} + +module_init(hwspin_lock_test_init); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Hardware spinlock test driver");