Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6A51C433F5 for ; Fri, 18 Feb 2022 14:16:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78FEF83BC8; Fri, 18 Feb 2022 15:16:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1645193771; bh=d15G2YPMrr/6WA8R5QwgsrkB9iQVyAZDRS1U6JbEsyE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=xG2DdnPrp4e7DnLXo8B8DSTF43zQ1+NEucAzQwxNmg8b/wtYX8qQyt+OIacbiWO/4 SHUadTL9dmnePIBtvR0ewlUMZfH4+C+eow97hxd3FlMHfaCIzZ8kVGMXr8CnH/pcOo T5kwHMHaI9CvzBU/IVjJlXmR+sZuvPiC7RPmk8xQD4XtaxESRLIG6ShszQnbq+chZs 24sTSnJDDZxPIZFik2CyRROq9xeN1I9HyGt8QllCN8EY0jqwY6WKHDN7airObQ8fOV viQHEeDtQfN4zxPNZB1agbmaFON4UZ3y6a6VsvXF+pWEohe1ZTWN1hGXRkpOJmWTB9 FHuGxJ5vYiYSQ== Received: by phobos.denx.de (Postfix, from userid 109) id 0E7AB83BBE; Fri, 18 Feb 2022 15:16:10 +0100 (CET) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [91.198.250.252]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0626183BEF for ; Fri, 18 Feb 2022 15:16:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4K0YdY3HMJz9sQF; Fri, 18 Feb 2022 15:16:01 +0100 (CET) Message-ID: Date: Fri, 18 Feb 2022 15:15:56 +0100 MIME-Version: 1.0 Subject: Re: [PATCH u-boot-mvebu v2 3/5] arm: mvebu: a37xx: Move generic mbox code to arch/arm/mach-mvebu Content-Language: en-US To: =?UTF-8?Q?Pali_Roh=c3=a1r?= , =?UTF-8?Q?Marek_Beh=c3=ban?= , Konstantin Porotchkin , Vladimir Vid Cc: u-boot@lists.denx.de References: <20220217092619.1445-1-pali@kernel.org> <20220217185046.2349-1-pali@kernel.org> <20220217185046.2349-4-pali@kernel.org> From: Stefan Roese In-Reply-To: <20220217185046.2349-4-pali@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On 2/17/22 19:50, Pali Rohár wrote: > Generic A3720 mbox code is currently in Turris Mox specific board file > board/CZ.NIC/turris_mox/mox_sp.c. Move it to board independent arch file > arch/arm/mach-mvebu/armada3700/mbox.c. > > Signed-off-by: Pali Rohár > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese Thanks, Stefan > --- > arch/arm/mach-mvebu/armada3700/Makefile | 2 +- > arch/arm/mach-mvebu/armada3700/mbox.c | 67 ++++++++++++++++++++++++ > arch/arm/mach-mvebu/include/mach/mbox.h | 23 +++++++++ > board/CZ.NIC/turris_mox/mox_sp.c | 69 +------------------------ > 4 files changed, 92 insertions(+), 69 deletions(-) > create mode 100644 arch/arm/mach-mvebu/armada3700/mbox.c > create mode 100644 arch/arm/mach-mvebu/include/mach/mbox.h > > diff --git a/arch/arm/mach-mvebu/armada3700/Makefile b/arch/arm/mach-mvebu/armada3700/Makefile > index cd74726cc778..98350a41e04b 100644 > --- a/arch/arm/mach-mvebu/armada3700/Makefile > +++ b/arch/arm/mach-mvebu/armada3700/Makefile > @@ -2,5 +2,5 @@ > # > # Copyright (C) 2016 Stefan Roese > > -obj-y = cpu.o > +obj-y = cpu.o mbox.o > obj-$(CONFIG_MVEBU_EFUSE) += efuse.o > diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c > new file mode 100644 > index 000000000000..cb86b967c2eb > --- /dev/null > +++ b/arch/arm/mach-mvebu/armada3700/mbox.c > @@ -0,0 +1,67 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2018 Marek Behun > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define RWTM_BASE (MVEBU_REGISTER(0xb0000)) > +#define RWTM_CMD_PARAM(i) (size_t)(RWTM_BASE + (i) * 4) > +#define RWTM_CMD (RWTM_BASE + 0x40) > +#define RWTM_CMD_RETSTATUS (RWTM_BASE + 0x80) > +#define RWTM_CMD_STATUS(i) (size_t)(RWTM_BASE + 0x84 + (i) * 4) > + > +#define RWTM_HOST_INT_RESET (RWTM_BASE + 0xc8) > +#define RWTM_HOST_INT_MASK (RWTM_BASE + 0xcc) > +#define SP_CMD_COMPLETE BIT(0) > + > +#define MBOX_STS_SUCCESS (0x0 << 30) > +#define MBOX_STS_FAIL (0x1 << 30) > +#define MBOX_STS_BADCMD (0x2 << 30) > +#define MBOX_STS_LATER (0x3 << 30) > +#define MBOX_STS_ERROR(s) ((s) & (3 << 30)) > +#define MBOX_STS_VALUE(s) (((s) >> 10) & 0xfffff) > +#define MBOX_STS_CMD(s) ((s) & 0x3ff) > + > +int mbox_do_cmd(enum mbox_cmd cmd, u32 *out, int nout) > +{ > + const int tries = 50; > + int i; > + u32 status; > + > + clrbits_le32(RWTM_HOST_INT_MASK, SP_CMD_COMPLETE); > + > + writel(cmd, RWTM_CMD); > + > + for (i = 0; i < tries; ++i) { > + mdelay(10); > + if (readl(RWTM_HOST_INT_RESET) & SP_CMD_COMPLETE) > + break; > + } > + > + if (i == tries) { > + /* if timed out, don't read status */ > + setbits_le32(RWTM_HOST_INT_RESET, SP_CMD_COMPLETE); > + return -ETIMEDOUT; > + } > + > + for (i = 0; i < nout; ++i) > + out[i] = readl(RWTM_CMD_STATUS(i)); > + status = readl(RWTM_CMD_RETSTATUS); > + > + setbits_le32(RWTM_HOST_INT_RESET, SP_CMD_COMPLETE); > + > + if (MBOX_STS_CMD(status) != cmd) > + return -EIO; > + else if (MBOX_STS_ERROR(status) == MBOX_STS_FAIL) > + return -(int)MBOX_STS_VALUE(status); > + else if (MBOX_STS_ERROR(status) != MBOX_STS_SUCCESS) > + return -EIO; > + else > + return MBOX_STS_VALUE(status); > +} > diff --git a/arch/arm/mach-mvebu/include/mach/mbox.h b/arch/arm/mach-mvebu/include/mach/mbox.h > new file mode 100644 > index 000000000000..981204935832 > --- /dev/null > +++ b/arch/arm/mach-mvebu/include/mach/mbox.h > @@ -0,0 +1,23 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2018 Marek Behun > + */ > + > +#ifndef _MVEBU_MBOX_H > +#define _MVEBU_MBOX_H > + > +enum mbox_cmd { > + MBOX_CMD_GET_RANDOM = 1, > + MBOX_CMD_BOARD_INFO, > + MBOX_CMD_ECDSA_PUB_KEY, > + MBOX_CMD_HASH, > + MBOX_CMD_SIGN, > + MBOX_CMD_VERIFY, > + > + MBOX_CMD_OTP_READ, > + MBOX_CMD_OTP_WRITE, > +}; > + > +int mbox_do_cmd(enum mbox_cmd cmd, u32 *in, int nout); > + > +#endif > diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c > index cc57b9f095f7..4de067bbebbb 100644 > --- a/board/CZ.NIC/turris_mox/mox_sp.c > +++ b/board/CZ.NIC/turris_mox/mox_sp.c > @@ -8,74 +8,7 @@ > #include > #include > #include > - > -#define RWTM_BASE (MVEBU_REGISTER(0xb0000)) > -#define RWTM_CMD_PARAM(i) (size_t)(RWTM_BASE + (i) * 4) > -#define RWTM_CMD (RWTM_BASE + 0x40) > -#define RWTM_CMD_RETSTATUS (RWTM_BASE + 0x80) > -#define RWTM_CMD_STATUS(i) (size_t)(RWTM_BASE + 0x84 + (i) * 4) > - > -#define RWTM_HOST_INT_RESET (RWTM_BASE + 0xc8) > -#define RWTM_HOST_INT_MASK (RWTM_BASE + 0xcc) > -#define SP_CMD_COMPLETE BIT(0) > - > -#define MBOX_STS_SUCCESS (0x0 << 30) > -#define MBOX_STS_FAIL (0x1 << 30) > -#define MBOX_STS_BADCMD (0x2 << 30) > -#define MBOX_STS_LATER (0x3 << 30) > -#define MBOX_STS_ERROR(s) ((s) & (3 << 30)) > -#define MBOX_STS_VALUE(s) (((s) >> 10) & 0xfffff) > -#define MBOX_STS_CMD(s) ((s) & 0x3ff) > - > -enum mbox_cmd { > - MBOX_CMD_GET_RANDOM = 1, > - MBOX_CMD_BOARD_INFO, > - MBOX_CMD_ECDSA_PUB_KEY, > - MBOX_CMD_HASH, > - MBOX_CMD_SIGN, > - MBOX_CMD_VERIFY, > - > - MBOX_CMD_OTP_READ, > - MBOX_CMD_OTP_WRITE > -}; > - > -static int mbox_do_cmd(enum mbox_cmd cmd, u32 *out, int nout) > -{ > - const int tries = 50; > - int i; > - u32 status; > - > - clrbits_le32(RWTM_HOST_INT_MASK, SP_CMD_COMPLETE); > - > - writel(cmd, RWTM_CMD); > - > - for (i = 0; i < tries; ++i) { > - mdelay(10); > - if (readl(RWTM_HOST_INT_RESET) & SP_CMD_COMPLETE) > - break; > - } > - > - if (i == tries) { > - /* if timed out, don't read status */ > - setbits_le32(RWTM_HOST_INT_RESET, SP_CMD_COMPLETE); > - return -ETIMEDOUT; > - } > - > - for (i = 0; i < nout; ++i) > - out[i] = readl(RWTM_CMD_STATUS(i)); > - status = readl(RWTM_CMD_RETSTATUS); > - > - setbits_le32(RWTM_HOST_INT_RESET, SP_CMD_COMPLETE); > - > - if (MBOX_STS_CMD(status) != cmd) > - return -EIO; > - else if (MBOX_STS_ERROR(status) == MBOX_STS_FAIL) > - return -(int)MBOX_STS_VALUE(status); > - else if (MBOX_STS_ERROR(status) != MBOX_STS_SUCCESS) > - return -EIO; > - else > - return MBOX_STS_VALUE(status); > -} > +#include > > const char *mox_sp_get_ecdsa_public_key(void) > { Viele Grüße, Stefan Roese -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de