From patchwork Wed Sep 9 14:50:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1360678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Zl0dzv2D; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=m7ye8QzT; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=xxtdHEXa; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmlMM440pz9sTN for ; Thu, 10 Sep 2020 00:51:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=zDB1t51oeNQjGdO5HT0cYM3SSRn//wE+11alD7Dx9aM=; b=Zl0dzv2DYqhFwPVgkxeASUdgS ynSPc8UAnsnyO0IiMNEvwN4LkrJ2HLIrZr8G5P6eEygVoBrHKwOaUnyUX8RUGs4/e3uj7uHDmbSl3 ZAydxGTJeNhe8AeA+Nb79BNEuqM7r//Q3GMis0gfeL5BI4+PbpMPmhAcNBXhaXt0mxiJbZk/YnF0a UiSBo2ZJsh5rwNj826hNzHTyY3s7meoPHg856TsJKB3ibUoWZ8EyOpSyB1HXBM3M2NStv4z4cIjIM 1lEMsl0Rk7XOPu/CbOBMbW5BbOonIT2kv/itA0qzCc9CGWwA6/9OY0w5Z2dW5WZA17i+o2k0DAGM6 Le7Qv3liw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG1RA-0005qT-Qc; Wed, 09 Sep 2020 14:51:04 +0000 Received: from esa4.hgst.iphmx.com ([216.71.154.42]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kG1R8-0005pT-AX for opensbi@lists.infradead.org; Wed, 09 Sep 2020 14:51:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1599663062; x=1631199062; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=sKSSjEfuzhRsNZoG2eJUFBumQd8MVYi7sjEe++FOHVU=; b=m7ye8QzTd4qU60s9tVrS6DiBXrMk1weEparUnhx8xUTCE3HP5FOC63rs 5r4s43uZonb7ZEr3i8oFaWSnNLF6+7o+eS2NsAHJxwZ//y+1mYi0uCD50 NgSBC1dxJp+tUbOgAzKeQVuWqYGWRtFvJvqDCFSNmIIYWnIWIcjteBya7 25DnGpzjpMf3QvrcnjTMC0ixBS2FesDuEDn+D4ecfMrKHfgB35X2Kg+fs E9sxuqEMK0TMypDz2Arx0nkN00vwIrjO1QaD6wjEsnpUV3vRBaYijS4OM vuNsyQBznCPI37XkDbUTMQdQYoZFY+kTlJ9lR7uyJDDC7aUhjvIY7HukD w==; IronPort-SDR: oxoUtzviNd2JwTsZBzkoSpV+7da5PSCpcRCVMvGjJ5j2ScMMJWJALAXIRfAq5+J7MXeik3nnjv flknT7pHoDJSledjfwtvYSYnYxr31AOxK7VrUrGDpMWaTPj3HpcYi5O8dTf1jU6vq7uVq0k8Ym TFTNKYSMRZtKtSC5vk3MOu2wQZartzmn0NpSSeOlNvuYxCU1jm0aLKhPciSVa6rTuJjQxHz6if 2huWola8QTzMJy9WiovqgNx8Ci3dlJc+8Bk3QaqgYAY6F7S3nEaeE/5VZnoMRdl4/13nHTQgut A2I= X-IronPort-AV: E=Sophos;i="5.76,409,1592841600"; d="scan'208";a="146857640" Received: from mail-co1nam04lp2051.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([104.47.45.51]) by ob1.hgst.iphmx.com with ESMTP; 09 Sep 2020 22:50:59 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CJ4FwcudGZ5AjP4LJdSByudsGf7KBTO5Y5B5UVd8ijv5kj+e1vAPmWT8ZJCfaEKCxd0rmXC/LvPI405bJM85L5GZC1NmVBYCiq1xZMNQMx75o8m8Hf/XQEcpS8JGo4yXkiMDvLJgDb6YXJQHVyq9kSjXc23qSISj2kcrUZLg2Ag05Avj7J+Sjv5aYeUJ7nhZbk3yb+f/HYuhRsf321ywEgIrbcuIydv8bir4j5G+CglZC+HzzWdtjL574eZGtxRZ393vhepWLr+c5WGSvWQ0AhryEAR+Ax+NVRLCxGBx92FNaHKdrujjCEzcdkahN1f2eofLs3OqP6Z7CYK21xUozw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bYqGzXAfwovBACNjzjqxA7d4F0gKiW7fS8iuUu0geTw=; b=hR4rmZ3bEVwLAMpQqDBxfg/nCcQfQixf/dAX3dKi4N/8IM+zZoXkVsNQsVEBoD3GgFst/k8PKFuLoEjPPd8YNeKK3b2D00827Ke/YuFVPr4XlSqa9ol5z5mvZzDlcd1Llh6Cp9eqUhPfNzj/whdP1cLtquPa2R9D6R61wuze2lVV9gFfCaxbtFefXQQNQZ7AMqApTwKTjLbeHf6MujHMtDKQvz8bjrPdO47ILHPopjsOaueai1Jk1n13Ha0F9AYu+tOk8EZ8G2/S+VeSzKrVIs0d08MCENEhSR8piPErB5DCfkVjh0zLgcBxRigpP4HylKJOhuwV/DvlDazewKlBRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bYqGzXAfwovBACNjzjqxA7d4F0gKiW7fS8iuUu0geTw=; b=xxtdHEXaP0q4GHbDRm96/Evi3fVcH36Z/GnO/sP1yeVxMXnaEyNas0TSFaC3pU518hrZwmfHNY27Obf8vrqyHb2Ev1WbxS1TWsoPqrpo84QFV4ZdPVAPoHfQ1x5qmZmGQStOXiFz2FwnzF6vZSa9qpu9g2FQO6nM7kjWR9rA8Ww= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5755.namprd04.prod.outlook.com (2603:10b6:5:162::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Wed, 9 Sep 2020 14:50:56 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e%7]) with mapi id 15.20.3370.016; Wed, 9 Sep 2020 14:50:56 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH 1/5] lib: sbi: Allow specifying start mode to sbi_hsm_hart_start() API Date: Wed, 9 Sep 2020 20:20:24 +0530 Message-Id: <20200909145028.446794-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200909145028.446794-1-anup.patel@wdc.com> References: <20200909145028.446794-1-anup.patel@wdc.com> X-ClientProxiedBy: BM1PR01CA0129.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:40::23) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (103.15.57.4) by BM1PR01CA0129.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:40::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16 via Frontend Transport; Wed, 9 Sep 2020 14:50:54 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [103.15.57.4] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a3b2c59b-fa64-4c00-a090-08d854cfc201 X-MS-TrafficTypeDiagnostic: DM6PR04MB5755: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:655; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ACxM5+KlrJ4Zyf0+XCHyxoLlrbx/J/KftH3BIdPOPZhYTjJIZT1gXmkBkIebU544cSFQits7swGGvMUC30RFSD6y2Q7V8MrAoz/byAnEHiWPl7WlsB1aZo0JbvNfMJPPcGB5N48Hu5kXrQ0DNTryNwB/+6CMjMBLBBWAIc9RpK5BnDbUNdXfQAMBtA9/9Dl47axmv7NRs4NxLXsgRby50N6FECtpdTLQO8RLTrrIRZ4yMq8ZspUXRLD6rUJoQQPmumnwYbftlA98PXVWolx/joghlWE8hdyxldtQ3TwX2Oqwcjj1I6q8Q0YQAdNAej3RHAOhMyBFY7kNsDGp6Kp+FA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(6666004)(66476007)(66556008)(52116002)(2906002)(7696005)(6636002)(86362001)(36756003)(55016002)(4326008)(8886007)(26005)(1076003)(186003)(66946007)(8936002)(16526019)(2616005)(956004)(316002)(110136005)(44832011)(83380400001)(8676002)(5660300002)(478600001)(54906003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 42hY4EvahhclzBYBtnjrHZhz2b2nZSNfIkVYl6ur/Tw6DldPY09i+yYNrYfizEVlCjhcw5OFN0preyKb1i9eT3gCmTB1PxlcdRnOj22zftBxqgYcbAbg4npR0rYS/Ctr6pizmRsyqW+SoIJnlXzJS0wmNIaVjxy02bNqxlSfFjvvsyMtjWiH1Xyao55Eh/LylpwlkIXaZ1d/cKAN6ZFfwhzOjNuyeRLLTv2u8ZzeaTd3qyUypNNqP9gqparWwWXfS4IaVo1SYOTa1CQuCgVIpuMm2u6IfNmU3PEWBMzF5Lu4wwrbSz2Zhjfp70sa5d/e7BfZp50ykhuCyRWjtKv5lAnhsaGx1A5VfVJjH7TMZVTvB0B4mPKohPNyIWFbf75D2MyS4jsWMwMThmaM28NoSm8X8AxezZoGuN2gXVfItSS573rwI4t2hVKP2crKn+8/UW4h7nesUgIBJheSIs2cSjZ/GIE4D/aDrX/vKEAQ3jsn4RUBVWyjABrjTLqmV1svIXW9V3fGaNPSNxm6ka1E3dg7WIPXvhXI6x8cHuH6rB8pJmy1alOlABhZWGwv++D2OKRxIIz5E75C+pbr/2jZSWZTFNL91RFJ5tU0aVujBVkkUsy2AokM+yhi/YGqMoH8AmvatJAZ9LX0WJirI2n69Q== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3b2c59b-fa64-4c00-a090-08d854cfc201 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2020 14:50:56.4753 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PcHXCXL3DvNr11HveCyrbNlVbqJsf8dMdN/Ww6g4g+OQMvr6BI1V4tOYRGgwX5trGxoP6OXGkTSzrM7I6e7TxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5755 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_105102_491273_3C6EF8B7 X-CRM114-Status: GOOD ( 15.73 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.154.42 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The sbi_scratch already has provision to specify the next stage mode so we can leverage this to specify start mode to sbi_hsm_hart_start(). In future, this will be useful in providing SBI calls to U-mode on embedded cores where we M-mode and U-mode but no S-mode. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_hsm.h | 2 +- lib/sbi/sbi_ecall_hsm.c | 6 +++++- lib/sbi/sbi_hsm.c | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/sbi/sbi_hsm.h b/include/sbi/sbi_hsm.h index 57d41ff..18d129b 100644 --- a/include/sbi/sbi_hsm.h +++ b/include/sbi/sbi_hsm.h @@ -25,7 +25,7 @@ int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot); void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch); int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, - ulong saddr, ulong priv); + ulong saddr, ulong smode, ulong priv); int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow); int sbi_hsm_hart_get_state(u32 hartid); int sbi_hsm_hart_state_to_status(int state); diff --git a/lib/sbi/sbi_ecall_hsm.c b/lib/sbi/sbi_ecall_hsm.c index 028bf68..992c93a 100644 --- a/lib/sbi/sbi_ecall_hsm.c +++ b/lib/sbi/sbi_ecall_hsm.c @@ -19,12 +19,16 @@ static int sbi_ecall_hsm_handler(unsigned long extid, unsigned long funcid, unsigned long *args, unsigned long *out_val, struct sbi_trap_info *out_trap) { + ulong smode; int ret = 0, hstate; struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); switch (funcid) { case SBI_EXT_HSM_HART_START: - ret = sbi_hsm_hart_start(scratch, args[0], args[1], args[2]); + smode = csr_read(CSR_MSTATUS); + smode = (smode & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; + ret = sbi_hsm_hart_start(scratch, args[0], args[1], + smode, args[2]); break; case SBI_EXT_HSM_HART_STOP: ret = sbi_hsm_hart_stop(scratch, TRUE); diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 013647a..b430793 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -203,7 +203,7 @@ fail_exit: } int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, - ulong saddr, ulong priv) + ulong saddr, ulong smode, ulong priv) { int rc; unsigned long init_count; @@ -212,6 +212,9 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, struct sbi_hsm_data *hdata; const struct sbi_platform *plat = sbi_platform_ptr(scratch); + if (smode != PRV_M && smode != PRV_S && smode != PRV_U) + return SBI_EINVAL; + rscratch = sbi_hartid_to_scratch(hartid); if (!rscratch) return SBI_EINVAL; @@ -236,6 +239,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, init_count = sbi_init_count(hartid); rscratch->next_arg1 = priv; rscratch->next_addr = saddr; + rscratch->next_mode = smode; if (sbi_platform_has_hart_hotplug(plat) || (sbi_platform_has_hart_secondary_boot(plat) && !init_count)) {