From patchwork Wed Feb 24 10:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443797 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; 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=XQ2a78/W; 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=P7xmGGYv; 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=NRfEjpRP; 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 4Dlsgm0zPKz9sVS for ; Wed, 24 Feb 2021 21:32:52 +1100 (AEDT) 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=Id8K4wGTVnL9Vx+CeTxjHtDn9+Nhf1h9zh5bpBdNSNg=; b=XQ2a78/WwdV9JF9kNo9YBPmhg 3KCdMwjTr6MIswCsHWIaFt3B+IfiL3bqSbcaRvyGgmJgkTyt0nPkwmwDd+THUh3xIxOrO2xijkh84 3ORIfnAFNbp3zXEXI3NYrx0jXpGoD08wpxOLu/ABzoWxjAz6AERtTQRf1OoPdT4eFXMa0bx/DuoJ5 L9kyVmsfRCUwhNcMSpzeVG1OUerkyKdA5HYM+PFZwMuz1e95w0Tcq/WNunoFmp/5NcCcX7lCvnPcM 89f6+3vD+XeEnWo4l+4A8eqJdMBkc9s2mdnmGNHENrIe74n03x9gGCXLXXdxuZrD2uMCTB3cH+Ss+ zYOwGweRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTJ-0008Px-Ig; Wed, 24 Feb 2021 10:32:45 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTF-0008OD-4y for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:43 +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=1614162760; x=1645698760; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=1rfvT00kG3AZIMe3pcuLkAsV6i9sYgS6P+IMN8qy1TI=; b=P7xmGGYvlkKDFn+USryoWvM9zg8rj7WHVcJd0/7J6hJRC+Z9RRuvP770 qmmzwuKxy5xfIZ0Daoi6kwjZDF4g1VfLY5NFqR6qrGqzE9bYu5QKlrWI7 uNOu8+sK+p9kzceP7EhNpfZ2ypfKdH1I85t32T6/Knb2ADImbBlFW+LcP wYzf66oRlioEmxb92iLzWRzVvBCHBu/Bx89B/XgXZgu55x5SLPlss39oB M1hhR9II0ulu1IFnkqRTi2DySh7XpNNypiMcC+IUm1iLUqweyqKiU8j0L dyeqv7gM3IG+H2Q09k4byPUgUHgrrGNF8hq+xXKSKocsUQo3RxTUj6YHR Q==; IronPort-SDR: xkAKOnlLoDJxkZtZzIgFWdeWRQj5loKbvqwZ7fHtquXw/NlP7Yc8ViOYqzLfo2UGdeoHvtnQPs F1vpFQvRwFrlKPNQsEKzGmFI3WVEsod+NVtQLBfRfe267dcYvA9I8ZcWI1uUi2UNme8fOh7j5G L3zgdOeFzOYfPmhkCLTfHHVHhZ+FfG5EDvcRR1kDZ07GANMkUQUmv32uZr7NwzWjz+S572JZIK nyO0vWB7sVqlGdlSVQwwBpaKvWAFCh84LGCP7wCRHF200YlA0PnIYLA9fL5fbFje+ttxSlHpeW 4EY= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="160697278" Received: from mail-bn8nam12lp2170.outbound.protection.outlook.com (HELO NAM12-BN8-obe.outbound.protection.outlook.com) ([104.47.55.170]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:35 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ATHXu12ZMTqxqppSHXJVuD0tj6KELQlZXMV90G5M2/ZbQDCDIjmmKcWmLjV9l2Fmt3Rpio1Er8yjYiwNOfdzWtGW+R6nkhxvor/U66siUJNt0TIatCcKWy0xreN2PunsrYSeOX1XrxMOH90/bnkkqclgGRoYaa9G1fcb8/I6aPg17qFDD/r/jjNFDhfDSq+OnUuy9UbHVVL/uDlvUDTHsC3xIsx/7gbQQs6vjTmCt/qEhZCBEhzhiGCniYQuEz7XJcanyofmvfxRPEdPlbHjMZPOS4BXo6RDtNBNyi56UDMsbXjoGv9EJCQosaOSnQf/niz7FkwDMgD4/Kid9QK/tg== 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=oEN4WveOeKLxFUrnHw8bdI82rK9e7ZnX6mrUTjLP8F4=; b=VuNviMHi31NezIVQ3DiaKBatTIRpMISiqgkge6ktQqodXXaM1aPCdHOD9UfCfWjtUsCd0ahtEDDRhFdlRplKbjlX1PDf3JLBUg+7idn+wLkvjdgVYOjhWKcPVRhdhpKvPBfZpLDB2CWWoSs7Hq1e8LLdnOKEI3TiZGQd2xnSXpV8pWZ1BcRBdZm2pH/WB9FjpWA9LZU0M+OmhFXJFpcPu7+sxYWMFcPO1syPGH+fPhzlNNLlQrv1ZIktqFukgeq2eB1Bf2V9+grpEbf8pnhiG1UTZCChR6vJRqjPyXHULi9kGptloOJ4oOq5iP9deL8g1/NjF4aKT7vU9ie4A7imfQ== 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=oEN4WveOeKLxFUrnHw8bdI82rK9e7ZnX6mrUTjLP8F4=; b=NRfEjpRPfTy1w6MiGme1FvLKRoc5zVULR0vmUWYbqGPmHotnA7uNuhxixswHarCKDc5XiqdlgtDIOak1kzYV71XrBDR18gZo4GPm60pK6fp1b9o/uPQxdoCbcQE0+RdIdRlfjX93pTmlp9zjQMWte4a2y6l4GTPcQ9LuclMx/P0= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:35 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:35 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 01/11] include: sbi: Simplify HSM state define names Date: Wed, 24 Feb 2021 16:01:53 +0530 Message-Id: <20210224103203.246229-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5c128d49-c416-4558-63c3-08d8d8af7fdf X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:466; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xESfB8DGLq9jd8wvAg0lGzDiiPi+55V6fUlvLiORk+mXpsHzo4xjN0ztBwohY7Nj/Dx3/N7wzgulXIpAGTaGRm0nMcDVQzAs/LpulwtPlSt5OaXjCGemBzX2b/8zwypNM4cEeJWWvjFioVC1Hx7jakHJjUVjxvketUV28OQLGyCHr2P1JfnmVuK1FkgUuq3ATNHmfyAE2nmWKgxsh/hmNoJh/UgcF78RfAeGkOCAUS56T7ZYsgLncaoEF77omJT3J1ucgZAaIGh+cwOu6g5mBtWDlGU6PjHHys3I3r3HAtMS1iJQfWTQe6u196xCWPi4Kr3R8LqQzKokbw8rdh4cUxpzm6jv4nRklXwsLYYbGoZZkBPJ6An4DqDEMF2ZoeHAfv3NE+57TTmG1/i94ouSZZB4Iw0R0XeKVW3f0Dwpkf73TnBP3JL3zQ5S1nOUShpq9EufTc3knYBU6MW2Vs9KNZyeNYsPbBKXScNRPl0U6UwdRieT5Wh/EUA/RJQv8Et79nG/RXjBOx3mcoGO7EXCkg== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: guta4dIMLCpxOvsXT3RfSpUF3snonp3WPLC+huswQYRaH8Z9Nj+HwQWEvMaHjWvLBinOJcxypHYr/WUQSl5dfYattLonCqocp06SNPHC29Gk2uHMUkvNgj+gxoi5mSA/SvO6VEC7iqpt5Kbopwm8nvjVfaAuk6/uxaKM8MASdKsbDLQ7q4urQCtts3ruZxPXQ10j0SJvfVh9PMBN59+cgVthBKrhv3GCKQF4zF9OzXHtISo4Gw1UzEyWq+G+i8piw7+RokJ5iWsd0j3IPy0c6ZIGKxFquDMwHbnc0YMTdjhefp9zmS3g8MNP1TZ0tWbOO+nlFOmDX47gUUIKvazbEFy3moNUNDPWUPG8aNdvL+RJ0K4u5vfklumj8GM+ImwfLuzgcCwg5CnQZyQe9JJrN9vHXinwbt4ccps6sW3wZm37xptGvc5YymfcqfzKx4QXsPJlRfvXxVpw9iwxQ/+XEYNuRs+s0wYaIxc6iq5b9xFogrEUfQNbNPDEf4rWH9T/IastkLEF84sEEJKJhH6KvnPX92BggSG/Is+1FcVyw5riRfy8SdYAQfkdmLTnz9QapwxgHOCn2/uuKKUtrssDx3mIscuOe9FKc1bOXApXYCZSmAwpqIsc6OFwO7l3bV0/WBov0XmZDLuDLzWByCjq6jrBF+mjMo7cT8zooSiOGjaG7TswwiGkAD8ezEYVXWOuxdPfMvqhpOln9nvDdeni4oc2fMtkffwrcExT4eXWhdcP1emfGHT+S2E2rj7/XoJ29rPi1vfdFatNkC7pkkD9G+Ig8fa1cci+ekrHl5RueBCFwREQlmpYoUPPJ5p/hCWN7pFE4iDQjhcfRaEWNUt1pttE/xEr0H6qUZgVMH5oLp3gBjPmCp8OVwee7jcWQSIRNkc3HIUdKL1xdVulFHlNQBXJskWrAdZJoAnN6HF5Z8yBJxWw5pNW5vkIaxRT0e2ndOIBXFRm3hrxLH3/U9CbkZfbLRpMcZgGD5dYQ1IdwVdZkKf89FLdYjPxzApGIZ4zvAjKBh6S/o0cA8jPOiEg7DzuAzwG1FcgtjpZoY970D7oB/pdwHEiigSEkkz/Zpg6w3qWVGqINAkYZMWHggiGxpSnDEUS02I1Kz1GahNkkDCk4QRML1y+9NqQB5N79M/ky1ePnMdl2IjhCG90nhTnu1sIfe4lUiUBWQ/9td8or+BLPeX3Da/FJPHL3OJ/nOpSHpMgokX+ro5lAmWYYcd5sP+zJpLA51uwd4hM/HZf5rIE8a8sRzL5foA0C5nNHvdn8ufJPvukL0GUaz74eP9x4Uubaqk1oCtQICh6JDK3vJPomHB5XlZF6GAHlR64tGSO X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c128d49-c416-4558-63c3-08d8d8af7fdf X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:35.2675 (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: oVlDA7ka3y8PgPGIOwJlMM1hCjkww1b+fj7hskOT7yuAkyUOEArOEGC4VhCWI+rdUx3VXc7WqU8q6YCqwwtK4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053241_399071_CEA7DE91 X-CRM114-Status: GOOD ( 14.15 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.144 listed in list.dnswl.org] 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 We simplify HSM state define names so that these defines can directly replace SBI_HART_xyz defines used by SBI HSM implementation. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_ecall_interface.h | 8 ++++---- lib/sbi/sbi_hsm.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/sbi/sbi_ecall_interface.h b/include/sbi/sbi_ecall_interface.h index 002c6f9..b272213 100644 --- a/include/sbi/sbi_ecall_interface.h +++ b/include/sbi/sbi_ecall_interface.h @@ -58,10 +58,10 @@ #define SBI_EXT_HSM_HART_STOP 0x1 #define SBI_EXT_HSM_HART_GET_STATUS 0x2 -#define SBI_HSM_HART_STATUS_STARTED 0x0 -#define SBI_HSM_HART_STATUS_STOPPED 0x1 -#define SBI_HSM_HART_STATUS_START_PENDING 0x2 -#define SBI_HSM_HART_STATUS_STOP_PENDING 0x3 +#define SBI_HSM_STATE_STARTED 0x0 +#define SBI_HSM_STATE_STOPPED 0x1 +#define SBI_HSM_STATE_START_PENDING 0x2 +#define SBI_HSM_STATE_STOP_PENDING 0x3 /* SBI function IDs for SRST extension */ #define SBI_EXT_SRST_RESET 0x0 diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index e1b2b2c..1722280 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -39,16 +39,16 @@ int sbi_hsm_hart_state_to_status(int state) switch (state) { case SBI_HART_STOPPED: - ret = SBI_HSM_HART_STATUS_STOPPED; + ret = SBI_HSM_STATE_STOPPED; break; case SBI_HART_STOPPING: - ret = SBI_HSM_HART_STATUS_STOP_PENDING; + ret = SBI_HSM_STATE_STOP_PENDING; break; case SBI_HART_STARTING: - ret = SBI_HSM_HART_STATUS_START_PENDING; + ret = SBI_HSM_STATE_START_PENDING; break; case SBI_HART_STARTED: - ret = SBI_HSM_HART_STATUS_STARTED; + ret = SBI_HSM_STATE_STARTED; break; default: ret = SBI_EINVAL; From patchwork Wed Feb 24 10:31:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443796 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; 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=Yu5qX0Az; 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=S4LSHyGp; 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=mHknmjkM; 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 4Dlsgk5YVzz9sVV for ; Wed, 24 Feb 2021 21:32:50 +1100 (AEDT) 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=uC+ccIy9SIdVfwz+hQMQdMDHnaOevhrK85J9suv4rkM=; b=Yu5qX0AzcfEZcHIG0KC2YnOqG NS01CoT6DFoBFIsWen+2pdsxp2CAakho3tFpIbsBR5UmVxvASht+VhYLVgIx9gkuicZrMlHGdmSGW TdLkCLAS92S99LtkF60nsdbWDWX7XM8EdsOxPxpo8XeZFrrHABabuyFrHhoQ7X3+UfTV0/L4YpOhY nFE0Kg21ESZPNHFdgI9hNo3zJFlrovpynVlb5ZsQ04XW7G3zv44xaA4QIUtb2gwIrar6hvAn/J5DU tIpzXNL9DcNeV4hVtoT36WprdylsNcOfTwKHBPcSByJ0DZymaLz1wwHZrOQyM4JvyzE942NHzmlrF fs/xCW17A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTK-0008QM-8z; Wed, 24 Feb 2021 10:32:46 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTG-0008Oo-OK for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:44 +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=1614162762; x=1645698762; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=UZHBGgLRjlIEoKajYR4IBTR0BBUe/rmAw3i5AortW/0=; b=S4LSHyGpjR2v9y49gtgS4R8mgqFVDN8kQGoCoIj8zE5FkY5apivtB7VW gmNDx7iIhLkvvDyLpavjWhw13e8JeGjouDaZk7ruo8E4+Cr71ZtuyeGfO JGCqTqR7LRXhHBzcTDLnKmbEIuUPDoW96/CGFS6+VQyXtQdY6EzgZvUqK aWwRO+y2ONFNutltJlmEqcu3gb65GAnKWil7BPAbO0myPPN7778Cemsjw 76q0aMheqtaO/XjI9sJ9+tP5jFzlpMtsO0jhzthTpH3sDpNoVYP+dXjaD YEg1URk2gycjDeWfWCjK26GY6y2eBXs6oeMj6aoD9i885PTXN3EFzhVzc A==; IronPort-SDR: iizxDkTIVYEEEUp31QXaPDgMNlRT/2CymXXOjQ+kmh8wxr0kJlrBRoLIVVYcKbD8qcvp0ee+ZM i+PmjR0g9PPTPpTFupQpfmmISL+eSX6IB8RuVU5CYCn24XjAiVJgSFwFQ3SDmVAISbnC2t+jYt 98CuHpb65GMe0bgCllYi3qLrdjYeOxS1bmDQ2X6DmnigUjhrLPaP2qVQBft5R1QyXLdkHRW0Xd P95uUVmU2WC1OpTpjln8lWUiiNwSWGsCwqbrIh4zImUzB9RXCo6YjEBF01sVqVxhGJcZSm0j4D ZWI= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="160697282" Received: from mail-bn8nam12lp2174.outbound.protection.outlook.com (HELO NAM12-BN8-obe.outbound.protection.outlook.com) ([104.47.55.174]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:38 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m968LharCdzeammJY+lid7Y06+FXoe3cfagdWF5MRaHpqvxiRYAyd1LYvxw8cXczaoEPgkL2y+7+u89+XioqjJxia/H5tiTQFRFDa6p/RKnnfWegfy7FXNEd5UOf8v4wOlZ/P8WhhWf9zNf8RhdVUvTZQ7hDfYxXAZMpRR/6B16+RYvO203hC2FX22nMTHUY274JH1KoyPa271ZtTXtyhI2RBYT/LBzoB6pPpsY9s2mTPN3TrAWy9K6L130nzHtjXGDayEeS7FWvMd1E6MphuJutnMKTpHv1xSucq1ecyazQvJhij00rxI4tO5rPtA4QYL0YdrlBq+raRDVXr48hdQ== 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=rhby+6xpV8d4uqmZRXOQ4rfJQhpMroWJrnWuXr79R/o=; b=WduXpCL3Fx/jHLAxvbJpPyooBw1Q3+Wx1Aj30QDAQ0mdiUD23eLP5RQiIMypMHZyD7MEMh1PhoBp8lSi9WT12ftzk6pvz5a2xTt8seh0cQrL/iE+BYvR/+oaRrg1wiOjKw5BBiL5vqd5VMIVOlueAYrg4QYnBBGeaKlsGJJ3a9hzKCCcDnvxedos3L6H5IcAs1Y7BL7zUYeObrFH19mgcq0Mctrz+RqDRggrLxl/+EEC/GDosSWYafaY9UGPoirOJQ9t2wOS1twyFjw5Ob89wjK7/I7EaQumIIsqFgbRwK4qj+76s89QEfZ32njca/WaISW3YVuTXzd/qSot20XsWA== 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=rhby+6xpV8d4uqmZRXOQ4rfJQhpMroWJrnWuXr79R/o=; b=mHknmjkMQUTsPNOhcnE2jiCU3bt1b16kgMnzdKzOjlZn6bMqHzrmbwI7uPNypfxCbw+FhmA0bmEThyzjjHuRc4s18/xzbQLdnHU7zVg774QyDmuRkAElzsxo3Mgyv0TMZ1AKdU2/u2BPLh3swmUwNxS/r56Zn8ouZHOXz7G61Uc= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:38 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:38 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 02/11] lib: sbi: Use SBI_HSM_STATE_xyz defines instead of SBI_STATE_xyz defines Date: Wed, 24 Feb 2021 16:01:54 +0530 Message-Id: <20210224103203.246229-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2bb37cb6-8822-415b-bb19-08d8d8af8194 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hGq6HoyEMJHXl/bCXGnn5nMkB4aPFM6U7XpCg6TH66t3hWvaBNBTJmqGMIBv7QSYwhfKDSV5BL7PjJjcNo5bGNnmMaNvT3n9ARYiwBQFxVsbOupgj6Ho6qeHoq9wYX17kdGt1MPEjcS/OFS5c4N0nSWrRt5lM0+gIG7VWnUFsdLP5bpOiBgbfjYjKys9dEKP1OwUkmPrZtEnTwluLCCY9wP8AwMJatZrc4joXVP/EY0xFM6N+uGRa/14y8JtdBppNsVON/XOgk6JYQ2BVXaiNjLjfcoZgvNTDN35qtZ43fnpJ6u9laWBxdATMG+qXcmmTmdEUxCALyfjE8X61AO0wG19LcjLRN7hbcbcVZZ28vJR/22q9P17mngsaBLLPlE7il3B2TKTEB9L/dh0rzrsOBIsfqnBTFBdOQOGrtzRDGOzkm4/fmPfLsXpdc85bM99MwTpUe22YJt/N+G9apB6BftK7QaBjdp62Q9kvKzMgEcyFXfuUAfTzS6xU03DEii1JA8ZQTUqqCba35z79WZFBw== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: diIoVAES+lnCs8TAQwE3YHVDalvtHoayQFgTQ+dh4eTiQn/oAvyvGXNoT0YImByxGjQ6WYvaL0/OlS4a18bhoH/GB9a5r2lM/Nx3HOGqPChB2APF144nxTlYzhRG0l/toUcenhYzlUqc7qZx3meM2DKEklC1G4bpqIILa1ybWlmATuemZrX4yqKc6jSlj+nAqvdxGToW446ctpBydzs4Nciv87G3ZAXKM76KiKCfh0ZEAZHDuD2TuVy/HbsT4HhBgL8BFxAiSaBYhsJyLvoYKVikvpY5G1n9bEdJNLrKAvmayUC/5hgI/ykZhE8lPI/eC9sXxB3qIRUq+4EZ1UcSd33ZW0bEWnl080T56UexMXnzsaxCBSN8qetrRCzCq/E3Pc682ndp8QU+X1iiXCCnYETwYtB8QLVJY3wNQc8yIfCtgqdsh2UrHUCEhFyVleXH0/ium8qbpfc4W2u7dZt9eyWq5QU+Vg/oI0ZggYUD+9rQrKcAeTX25EURcrxgwYqvsbyxVTzhLyz6+XOV72Bd42pTJ2IBanuj8M9m5yULCalrM8/CWjJOCotcXSNr0rWgeSkb28ip9bIvCruB1CGvdKRAkmyp4GK8pj9KCUma9tyNfmbZgNUVwI+7xAUQOdaQPawvehePNeL3+nY+hFCqlUtPnk92SdcMQGOuwb6TkvK1qHtt8AKWfw63XNklh3OLJb2mn2mEVsWIiPmFz+MjnATBBYiR/lpihHCbJb9R6lgzJoN/R0BCTSS8euIA62gFFruTJkbU3PSJJapHancqrJLSMtIviNOTtpzvz4xPSLc14/rFdj1E8S3+8m35/E3FSYdE+eHF1DnKny1lWw0ZXbAkL5GHdR6GtYydf6akk117GtT4HsKSrN87bJOwzlLzd/8Bx55ccz+YvzEQnu+Ly6pMjtaJBZYBd1njS0e6k9w0a2Qr5RXn0GWx3UO76vsszFC3WGcY0saFoPvHzbIjG1mYWBLEheUOGnugjmyCsb9WYsyZUHk8iFENeAQImOE5NWvZ6VqidL1ILswAT+1nN23yh18j4FMKUJWZQXVAEN57KVN+feIyZr0DSeWk8BBWbuGX/QZsWZETkX5wKWzacSlcuFmAUy2/qwhAkDfzW7YpxkBJFgCldYpnaSff3VHZ/xknvioLAWmW/rJT5S9fJFcO2uKWjO0Ttls4fjm90t7u3mey4J+d36JcF8rAxz+fZsKFO5uyJ5rvRzSp3ZjBAgiMXRWQJcZYffysWEl1orfouBg8cPvQ2MkoJDCBEqA9i6UpDjugGFleMxsB4TvC80OQnHdvsxrLlOZKGHI3/39xgl0RxNIWQCn5sLjn/Lrj X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb37cb6-8822-415b-bb19-08d8d8af8194 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:38.1177 (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: LpnAZ7oAlRdMXwOM7Z74QuiSOPhRXw8py8Tf/jaI3N2nTTJ5li0T1538XP0HEkuwrV8TdJitHzlqZkVIkK1ptg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053243_052370_6A59C6A8 X-CRM114-Status: GOOD ( 21.22 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.144 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 We replace the use of SBI_STATE_xyz defines with SBI_HSM_STATE_xyz defines because the HSM state defines are complete enough to implement HSM state machine in OpenSBI. As a result of this, we can now remove sbi_hsm_hart_state_to_status() function because it is now redundant and sbi_hsm_hart_get_state() can directly return HSM state or error. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_hsm.h | 8 ------ lib/sbi/sbi_ecall_hsm.c | 7 ++--- lib/sbi/sbi_hsm.c | 64 ++++++++++++++--------------------------- 3 files changed, 24 insertions(+), 55 deletions(-) diff --git a/include/sbi/sbi_hsm.h b/include/sbi/sbi_hsm.h index 4823383..69ddee7 100644 --- a/include/sbi/sbi_hsm.h +++ b/include/sbi/sbi_hsm.h @@ -12,13 +12,6 @@ #include -/** Hart state values **/ -#define SBI_HART_STOPPED 0 -#define SBI_HART_STOPPING 1 -#define SBI_HART_STARTING 2 -#define SBI_HART_STARTED 3 -#define SBI_HART_UNKNOWN 4 - struct sbi_domain; struct sbi_scratch; @@ -30,7 +23,6 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, ulong saddr, ulong smode, ulong priv); int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow); int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid); -int sbi_hsm_hart_state_to_status(int state); int sbi_hsm_hart_started_mask(const struct sbi_domain *dom, ulong hbase, ulong *out_hmask); void sbi_hsm_prepare_next_jump(struct sbi_scratch *scratch, u32 hartid); diff --git a/lib/sbi/sbi_ecall_hsm.c b/lib/sbi/sbi_ecall_hsm.c index df29d51..79a9f21 100644 --- a/lib/sbi/sbi_ecall_hsm.c +++ b/lib/sbi/sbi_ecall_hsm.c @@ -23,7 +23,7 @@ static int sbi_ecall_hsm_handler(unsigned long extid, unsigned long funcid, struct sbi_trap_info *out_trap) { ulong smode; - int ret = 0, hstate; + int ret = 0; struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); switch (funcid) { @@ -37,9 +37,8 @@ static int sbi_ecall_hsm_handler(unsigned long extid, unsigned long funcid, ret = sbi_hsm_hart_stop(scratch, TRUE); break; case SBI_EXT_HSM_HART_GET_STATUS: - hstate = sbi_hsm_hart_get_state(sbi_domain_thishart_ptr(), - regs->a0); - ret = sbi_hsm_hart_state_to_status(hstate); + ret = sbi_hsm_hart_get_state(sbi_domain_thishart_ptr(), + regs->a0); break; default: ret = SBI_ENOTSUPP; diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 1722280..1f54c9d 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -33,30 +33,6 @@ struct sbi_hsm_data { atomic_t state; }; -int sbi_hsm_hart_state_to_status(int state) -{ - int ret; - - switch (state) { - case SBI_HART_STOPPED: - ret = SBI_HSM_STATE_STOPPED; - break; - case SBI_HART_STOPPING: - ret = SBI_HSM_STATE_STOP_PENDING; - break; - case SBI_HART_STARTING: - ret = SBI_HSM_STATE_START_PENDING; - break; - case SBI_HART_STARTED: - ret = SBI_HSM_STATE_STARTED; - break; - default: - ret = SBI_EINVAL; - } - - return ret; -} - static inline int __sbi_hsm_hart_get_state(u32 hartid) { struct sbi_hsm_data *hdata; @@ -64,7 +40,7 @@ static inline int __sbi_hsm_hart_get_state(u32 hartid) scratch = sbi_hartid_to_scratch(hartid); if (!scratch) - return SBI_HART_UNKNOWN; + return SBI_EINVAL; hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); return atomic_read(&hdata->state); @@ -73,14 +49,14 @@ static inline int __sbi_hsm_hart_get_state(u32 hartid) int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid) { if (!sbi_domain_is_assigned_hart(dom, hartid)) - return SBI_HART_UNKNOWN; + return SBI_EINVAL; return __sbi_hsm_hart_get_state(hartid); } static bool sbi_hsm_hart_started(const struct sbi_domain *dom, u32 hartid) { - if (sbi_hsm_hart_get_state(dom, hartid) == SBI_HART_STARTED) + if (sbi_hsm_hart_get_state(dom, hartid) == SBI_HSM_STATE_STARTED) return TRUE; else return FALSE; @@ -110,7 +86,7 @@ int sbi_hsm_hart_started_mask(const struct sbi_domain *dom, for (i = hbase; i < hend; i++) { hmask = 1UL << (i - hbase); if ((dmask & hmask) && - (__sbi_hsm_hart_get_state(i) == SBI_HART_STARTED)) + (__sbi_hsm_hart_get_state(i) == SBI_HSM_STATE_STARTED)) *out_hmask |= hmask; } @@ -123,9 +99,9 @@ void sbi_hsm_prepare_next_jump(struct sbi_scratch *scratch, u32 hartid) struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); - oldstate = atomic_cmpxchg(&hdata->state, SBI_HART_STARTING, - SBI_HART_STARTED); - if (oldstate != SBI_HART_STARTING) + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_START_PENDING, + SBI_HSM_STATE_STARTED); + if (oldstate != SBI_HSM_STATE_START_PENDING) sbi_hart_hang(); } @@ -142,7 +118,7 @@ static void sbi_hsm_hart_wait(struct sbi_scratch *scratch, u32 hartid) csr_set(CSR_MIE, MIP_MSIP); /* Wait for hart_add call*/ - while (atomic_read(&hdata->state) != SBI_HART_STARTING) { + while (atomic_read(&hdata->state) != SBI_HSM_STATE_START_PENDING) { wfi(); }; @@ -174,7 +150,9 @@ int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot) hdata = sbi_scratch_offset_ptr(rscratch, hart_data_offset); ATOMIC_INIT(&hdata->state, - (i == hartid) ? SBI_HART_STARTING : SBI_HART_STOPPED); + (i == hartid) ? + SBI_HSM_STATE_START_PENDING : + SBI_HSM_STATE_STOPPED); } } else { sbi_hsm_hart_wait(scratch, hartid); @@ -191,9 +169,9 @@ void __noreturn sbi_hsm_exit(struct sbi_scratch *scratch) hart_data_offset); void (*jump_warmboot)(void) = (void (*)(void))scratch->warmboot_addr; - hstate = atomic_cmpxchg(&hdata->state, SBI_HART_STOPPING, - SBI_HART_STOPPED); - if (hstate != SBI_HART_STOPPING) + hstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_STOP_PENDING, + SBI_HSM_STATE_STOPPED); + if (hstate != SBI_HSM_STATE_STOP_PENDING) goto fail_exit; if (sbi_platform_has_hart_hotplug(plat)) { @@ -238,16 +216,16 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, if (!rscratch) return SBI_EINVAL; hdata = sbi_scratch_offset_ptr(rscratch, hart_data_offset); - hstate = atomic_cmpxchg(&hdata->state, SBI_HART_STOPPED, - SBI_HART_STARTING); - if (hstate == SBI_HART_STARTED) + hstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_STOPPED, + SBI_HSM_STATE_START_PENDING); + if (hstate == SBI_HSM_STATE_STARTED) return SBI_EALREADY; /** * if a hart is already transition to start or stop, another start call * is considered as invalid request. */ - if (hstate != SBI_HART_STOPPED) + if (hstate != SBI_HSM_STATE_STOPPED) return SBI_EINVAL; init_count = sbi_init_count(hartid); @@ -276,9 +254,9 @@ int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) if (!sbi_hsm_hart_started(sbi_domain_thishart_ptr(), hartid)) return SBI_EINVAL; - oldstate = atomic_cmpxchg(&hdata->state, SBI_HART_STARTED, - SBI_HART_STOPPING); - if (oldstate != SBI_HART_STARTED) { + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_STARTED, + SBI_HSM_STATE_STOP_PENDING); + if (oldstate != SBI_HSM_STATE_STARTED) { sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", __func__, oldstate); return SBI_EDENIED; From patchwork Wed Feb 24 10:31:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443799 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; 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=WXn8/Cu8; 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=lsRGPb6a; 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=h+LId5gg; 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 4Dlsgn1rkYz9sVX for ; Wed, 24 Feb 2021 21:32:53 +1100 (AEDT) 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=tcJYh4b68vvafcDcPECml1/f7IGZEJ2a+Cc8/PzMUtE=; b=WXn8/Cu8+u82J7S2XAttaeYQQ pIpKZdCkh1S6IgWbGE7S4FPqICMPbfCYI0IPFk2/ujlinkr934r5RwK+v6qPg9w/D2gCwBpILntJr XyK+hY6cOeFwASOqBFs1prJaP9187qdtZ+xVOeZF62fqicx59Jq+o9TtwA88LXHXRBGy1xdO4gBlF 1CYneG8Eg3earwyXBxVqhFW0c+JAfAZy1lgTKhn4t/gvwJDj6t3Ws7FYPRGllyDKOjUXabKxVRc00 jKt4tKDx0R0Wlu5ANJFWZQrV3K6A/BFYHYvSAgOUgZHmsKbl9IhVINuQhhRM+IkzNO5w2OiuSZ/Jb dOe3k4++Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTK-0008Qc-Sx; Wed, 24 Feb 2021 10:32:46 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTH-0008OD-Tr for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:45 +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=1614162763; x=1645698763; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=u2H5jVwBqcdlt9+vc/G0CdxuhXna4zj1/gOXb/Yj7mE=; b=lsRGPb6aho10MwTNzUx8JkmuXaQcjjqgJV7ckeWZNz2LG/uI66Yuzgj7 CTjYqUErkp3+xyz9xe0RcX5ZbBkOqAuuqzWORDSOMcETg0DcIfMYixIJk ojl4/lalKOEqC4aHxC9F1RFw6tqW5UpLw58K2vk34bt5ay3OvSZ1KIshm oNc1EsdxPNYgbvO/Jyxor6qE+DGMHvZkZGcDF4MsuvcDds4hwvic4j4hm uuhKjAMRSnIYg0anpeonsjgpdzpxZRGkzfUHH1uhKWm0ZD5r57rDHO4sv 6pQf2LviBF/pAHTYMhdAOXRfSBDMWfqHhGZ4lUj7jW1A+LtEPuzRrSnTz Q==; IronPort-SDR: BJWNTlLsjv9pIR1F15x08VHKlTit4KhCgzthZufinbcvWR5kBgrRosNeIO2fWsAeEtM9HBgue4 nDhuLvlE4FztAd0EQkZvmaE4JHw5ahlwYXLcnMYiBotxJ7wYBx5qmB+Q9kSxJWyB78GtNsskHJ OljClaqDljJRgQUwkdZJk6BwzKXzfmNlhTA2PgtbhIPS+ooWmzLZ4SR/eofNmX0vrPhTOjReba wzHgxdBIF70+CijeUkc+3pEjC3zsd15V+fznAHi7WJUDJlSM9uep6RJJAUrn6kAuzrfs6H4fMe JpI= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="160697288" Received: from mail-bn8nam12lp2169.outbound.protection.outlook.com (HELO NAM12-BN8-obe.outbound.protection.outlook.com) ([104.47.55.169]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:41 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m553Ix4lUMrxme8tHrnghv0VhjDFcIoYsG8TEAorjTyX8DQxlPy15jhixOv9BiGGCTl/ixnemukTDfNh4m8qkaLifh1+o/mGFpCQJS7iDi4Cz1tpvr1FtrDHSvN9vZT9Yk48TYNJlew8B9676bGhuAfi2Yvfhh8Y/0w4G69zDwKp4Pi4jZE5MsY59fdL6LZ3MEOUq13bmcBXhTnYb0uUItciqTYWF2xnVZxYYK+oJRBTZj/eDYys0abhYH3Nr6lQm9DRxvAq5VvtfPVFpP/wxcEDwVsPP5KovECl1tgBYk6TGnhWUdY2fEaABFF1bL1kjrSLaHk4VL9or0JbE9CXhQ== 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=XHZbHDHKsy7ketsnF4G158AqJ6KeVj0vZOOV8eSCESI=; b=YhTlKrQzsH/duvO8wOtET9NOS2J5Zz7ysnq4/pmDzaLtpoy3ONg5gNG4DAsDIYFfoH3GnG2afGyrHr6UIaeg34M0OOH+k1FGJ8O6ytZugKfAP+PdBy+E6QC3jGOBPbEYqH2S00gwukBh5Cd7EFNm303o9TEX/0BEpuW1lLsO00X5BOTP6CzxUbrcYXdany/v/qBySpeoprzl/8/IOa01GYUCXFEFey06apRXWomcoS6+P95/U6RFbx8mWRUyM+rZBV5IVHjyc8MmTSjHbOZvZwr+x7j5iTbOHljlFPtfsZbi/LlZJ4T13IPQb990FpOBuC5juIx0Eg0OhRmbN5ZNsg== 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=XHZbHDHKsy7ketsnF4G158AqJ6KeVj0vZOOV8eSCESI=; b=h+LId5gghWbFq4aCn3Q9gCCv+RtFxr571pecoSfom1RgnfQ9X8SbBw9zrXkfBslLoEdaw/i8kx9+DHQNkAqFtZt+eJ6hjzNmnUdUEae+19Z1n2/0X8VwrlfuYdlDXM/ZaNd9XdY4dWds+2/flz2YlL678r4RI2QHBWfIkQWzSJM= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:40 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:40 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 03/11] lib: sbi: Rename sbi_hsm_hart_started_mask() function Date: Wed, 24 Feb 2021 16:01:55 +0530 Message-Id: <20210224103203.246229-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cc5bb804-ca38-412d-397b-08d8d8af834a X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LHtqyWn9NkoxUtu8gd866wtIaHPQ3/d4kRFM6TB7Ml9tuCiaN3UDmeTEpNtb6ILN7SHnUMHzQrn0AdmaU1uSxCwSKMyiEJgr1mLWKzPPSdTdC6G4UDcnQKhi+aTCrbAoYxYZIaGkZzm7jJopkAnjqO6FeOsi4QR0QFpxKeD3bTGCW2Ayk7sF8fskEBxJEdieCBIyFtRlPWolRi5SYi/OtNrIJ6/HWBALlkvMr/UWxvUdShlTQo67mXHtTXZE6GfwjI4ji6QrcyQ48eu8KIAJyEejJmBkkXONIGmVdu0jbiBCgZ+Ws+D+B1fZZFJEhR9HxBaQvoribs4E3aUwjy5SuJm+yt9PYmirFg7Cvr0TcGXz1tybtIQn/Dv9mOIHUnUth+jr6W2XSFMOZOAxI+b3GbJLQQlI9MFkc7gj7rsthMRXj9Jt7IKLeiu70se+ulAHr6olIBaY73l77Kx483d9pG5brEkGvvOuwD4bzmqBujlzKvkz4twTvNCOsFZ6ZFL8D6o8Tl0B2UmMQdquZnAGJw== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: kICM5+gWWmR8xnwYdEMtFxYbX5NhJbSaTxmVri5zYFt+WkUnsJDjcLq0AU61D+2UFjcjppR3RcgKn2k4p3WcTpWoGBMvOs0bMVlXQoiupEXr1P5lg65jGb65yOJFh7vS394rj9iwGrtRELmq4ADzDOzcMm0ZTQpdkSnAzFV+9T7ZYOmDvpYKErpvd/JNR4fbKqlXchN2ZInM4o6F6sCx3YzueZY76JNT3ur+hWX8GCQlvTTLeC8YV3lIHiwZiCZHJzAY88DkxsrFIABlapwfDqr/niUNSwBmL5w1U1s+HfBaVZXxDSxuL/lczi3iYL1oSEn5laxkp/SDxO4+md1BKvUbLzQBlCj7lgyEXb5oNw3FG27POrDuRc6pn8ZsMYhx4+VIOAxEhyoAWZS3xaJ+lp4+JXzyqiSpT16+mzMQ9Um+MaF1bEHvdJDNr+IjVwOGs94tBhqC1C84emt8qwHgIQErrPJEIumw1v4VGciJ2jkf/volFgMtEhaQA4Dq2wJAkZZeLKqGMNGTr4HzJHWbHkVpc1FHYWG0Sg92/57ryR/IWEtKjZhxJmaMNNFbUXbRJsbAU2mgitWPuRrUO2aoUvlf9IICOZXpVkMo1tf5KfwHK3SpBq9ROMHwV5V1E1OZMTioB4NjYJ2vU3Fo+EABaCpqCIJLMDdWqRkd8PTUAM3IxvD9Pf+eQMKM6jNlA8+6LjoLYfaZswqMDoMm+5YbwdG4ivtHJQmyN0HHdDuGSxpnN0o3WPHApOI2GIknmyFyA/89Ur5T0lzprwbPRKyhOO1lkITKritUWsSXUVPSRhoKRZjiwVkMAvlIwd7/sTbq74H9L26v+oc7tQRpbvpOB0GPbw81zDMljc9aXiwr8dfq++uqL57CL2wy3pD+Gw7KskThNwlrlKVXV4YAXojC9NYOXEjG0Rvg+BOimIzBXCY/u2fXKMD3EpqajSD4DhZXKG5GZ6ubsbfFqRk5rYhMpgS/4g/agE6i+AYWvD6TV+SuYvkrbVDTl5TOLY6HhrgZmViYkfEtJvxJSEEiSTEHzgqF2QNi4ZQSf4eGOcRXfoqF9+le+67SQCFhLYUV0esKJvtC8H3Rw7xUtS21RbqykWt8rdX0iUkYmLWGDDlh1dK+VPC9YitagyR0Kx27XfR2nXJ312Qi9ulLvuHh61ShKoYBtXdWIAMrPVtFBm+S2PcbhI0fROrHjP3jbDDabrmGHxTpZwapmZtoKMhNzI6urXt/gq1ZT4KUzTo67BowhMmRp/GnEsaf4+oOBeZhcPg62+SJQVCFCjFM9X7fkGoKWiZHqKrbd8qcdtLC5Lxq+dbydqfwCoiRS92fGMxjZxEZ X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc5bb804-ca38-412d-397b-08d8d8af834a X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:40.8040 (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: 8emk4d5VjxuKep4BLDEh3eOWNfJHUtJ5h/J+RzcWb1GXy/nJ+DbtyHSFs7S4389i6MdrM3T+eacWdgFwW8zPGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053244_267624_CE154E2A X-CRM114-Status: GOOD ( 16.77 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.144 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 A hart can take interrupt in the new HSM states introduced by the SBI HSM suspend function (such as SUSPENDED state) so we rename sbi_hsm_hart_started_mask() to something more generic such as sbi_hsm_hart_interruptible_mask(). Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_hsm.h | 4 ++-- lib/sbi/sbi_ecall_legacy.c | 4 ++-- lib/sbi/sbi_hsm.c | 4 ++-- lib/sbi/sbi_ipi.c | 4 ++-- lib/sbi/sbi_system.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/sbi/sbi_hsm.h b/include/sbi/sbi_hsm.h index 69ddee7..4250515 100644 --- a/include/sbi/sbi_hsm.h +++ b/include/sbi/sbi_hsm.h @@ -23,8 +23,8 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid, ulong saddr, ulong smode, ulong priv); int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow); int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid); -int sbi_hsm_hart_started_mask(const struct sbi_domain *dom, - ulong hbase, ulong *out_hmask); +int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom, + ulong hbase, ulong *out_hmask); void sbi_hsm_prepare_next_jump(struct sbi_scratch *scratch, u32 hartid); #endif diff --git a/lib/sbi/sbi_ecall_legacy.c b/lib/sbi/sbi_ecall_legacy.c index 1a7fe26..e20de76 100644 --- a/lib/sbi/sbi_ecall_legacy.c +++ b/lib/sbi/sbi_ecall_legacy.c @@ -34,8 +34,8 @@ static int sbi_load_hart_mask_unpriv(ulong *pmask, ulong *hmask, if (uptrap->cause) return SBI_ETRAP; } else { - sbi_hsm_hart_started_mask(sbi_domain_thishart_ptr(), - 0, &mask); + sbi_hsm_hart_interruptible_mask(sbi_domain_thishart_ptr(), + 0, &mask); } *hmask = mask; diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 1f54c9d..a81b821 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -70,8 +70,8 @@ static bool sbi_hsm_hart_started(const struct sbi_domain *dom, u32 hartid) * @return 0 on success and SBI_Exxx (< 0) on failure * Note: the output HART mask will be set to zero on failure as well. */ -int sbi_hsm_hart_started_mask(const struct sbi_domain *dom, - ulong hbase, ulong *out_hmask) +int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom, + ulong hbase, ulong *out_hmask) { ulong i, hmask, dmask; ulong hend = sbi_scratch_last_hartid() + 1; diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index 4347832..a3a6ce6 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -82,7 +82,7 @@ int sbi_ipi_send_many(ulong hmask, ulong hbase, u32 event, void *data) struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); if (hbase != -1UL) { - rc = sbi_hsm_hart_started_mask(dom, hbase, &m); + rc = sbi_hsm_hart_interruptible_mask(dom, hbase, &m); if (rc) return rc; m &= hmask; @@ -94,7 +94,7 @@ int sbi_ipi_send_many(ulong hmask, ulong hbase, u32 event, void *data) } } else { hbase = 0; - while (!sbi_hsm_hart_started_mask(dom, hbase, &m)) { + while (!sbi_hsm_hart_interruptible_mask(dom, hbase, &m)) { /* Send IPIs */ for (i = hbase; m; i++, m >>= 1) { if (m & 1UL) diff --git a/lib/sbi/sbi_system.c b/lib/sbi/sbi_system.c index 08a8b47..10915b4 100644 --- a/lib/sbi/sbi_system.c +++ b/lib/sbi/sbi_system.c @@ -35,7 +35,7 @@ void __noreturn sbi_system_reset(u32 reset_type, u32 reset_reason) struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); /* Send HALT IPI to every hart other than the current hart */ - while (!sbi_hsm_hart_started_mask(dom, hbase, &hmask)) { + while (!sbi_hsm_hart_interruptible_mask(dom, hbase, &hmask)) { if (hbase <= cur_hartid) hmask &= ~(1UL << (cur_hartid - hbase)); if (hmask) From patchwork Wed Feb 24 10:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443798 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; 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=ZXFdMwk5; 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=QbHrsZ9h; 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=KtFoH1np; 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 4Dlsgm745Mz9sVV for ; Wed, 24 Feb 2021 21:32:52 +1100 (AEDT) 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=Wvj0cgWHiopuZiKZ4j4DKKtvfSNoIwczVPYePRMrOLo=; b=ZXFdMwk5YEUcR0e6oLTV/xlu9 vTOjohIXnhlqMUS5ZcKLKLdtlLUqe+R63/8cx6vXY1K3QlbxZoDh55YCdEUVh8E8CYXTkZfJeISz+ ndV5U9yOCb6Jbn6Tdzo2ZUtwWGLHWZhpcaXutkuZ45SsTYghC7dDRFF7NWWoPO5XSWytouyIarF0T XUcdXP5YVrY3IsDgILyeTJOpo6kkwjtR8+ukt3aQJXxOAxbvI09EKMI49WAGL2YYfBSqB+3zKdnYX J2PHuIod3cVyV3RnOJL+p1U3+bGwohkO88x6qx9LetICa4yhq6J0HiXYbjmKC68i6TaKjE7cdU1cx V457f1FlA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTM-0008RG-Ip; Wed, 24 Feb 2021 10:32:48 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTJ-0008Ph-Mt for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:46 +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=1614162765; x=1645698765; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=BxIdjkni5doUoOKI27nj2ycy8wJmOcbBRmAKBmJ6A9k=; b=QbHrsZ9h84nSao9KXoXT7lpDacFmRWjcLlm0MolAOPwQcAalfmp2THnd BkY0Y06S+E1cW28JqpeaBjbyVA4zDKmZsYZAVbYcD+tHuZXBRI4E5K9xz bnclpmmzkCDzpKbZwEQwnPLmsxLh48AbJPF6FNbttpkLIAyCzbTTWmi4J DG36aOOCKvpuFVhUi5kAG+0ZVMfet2W87arwsYsD0wo+As/nur06/b5vr S7BGckiWAZrCBUc701OHZGxcLnKs7fS4NluM7rnVY3imUUwvmzMRl2KZI T9IT4JYGtDCSCD7QBwqmam9UQiA5ZTtOLotabShf0l05FeSZpZlh6MoqI w==; IronPort-SDR: Ss1kLp6U38+5DJK6zCbfsqyUloDEvfcMJ5Eqw2GeNB0S4Cgqba92hHYmeQtn3nfDLmE801sM1i wVZd5ql9mrU8SIPFXIOuZQgD32CxMEhtaQw8CbR4UZW9Jmr1vTrngIF/JRlrLS9wHWpBzu6C2R McI4IQ7MEvyHBOrU5OHmrq92wxzsgMI/vBuLXx4jh7sxJvNV+/4ilyznBgtWqVPWW2YssIBFc8 emGbkOcJLmVqZDUzXRnpiXbUNmXOCj3LhgOZ2FEGz/7mgBM2T40usWui60q1HTv1/zrFej4tcH FGo= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="160697292" Received: from mail-bn8nam12lp2173.outbound.protection.outlook.com (HELO NAM12-BN8-obe.outbound.protection.outlook.com) ([104.47.55.173]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:43 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=le5Cm4r8suJXQETaaIH0Xjc/NFqrf6f14bw3gc/aN6PWOEGjZhfC92bHRSrjRVfbPspcOf6SIFVpaR8NogUiazGRO3R+7WMl9Xo1woBordptUjM9Ki1BhCyb4KbbayovQAxsj1kH2b1d+hoteftN8Eq0RJ0i3Tv052KEQ/tD/nYQACmBQfGes03IAoU+s5iQ0blFyCO9cmmItBE4udfvQYQ66z/vuXPDxStnMH6csEnITZsXoz7CnmSBgMKHeFNjQmL0N74pUW+3cZtSqkXo34OTEwwib04qh5d3jeBG2sY7T1I73TLhoX3F93IMgdxb3Ax57PIHt8FIqEkTgqKmZA== 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=z8T3Y5XXMCJ7m1V65vI16/DCYMxSELJs3zuRrie32Gs=; b=dMfHI1sv22AG8Op3NCVT6cX+LdIDq2Ov+WwkYJY2jM8LCrCq02pOmSzpue9tfPXHvj0LilCC49WGeU4vGP1BhCnYLgA5Q54jUxU7Ps0PX7G83FVbmHsWh5jPRp7tt+U3FDNykqv6nl7IyXeo6E9Tufx5jiSNPBYV8dt1VVwfKz1xLkEKkIF1yL0EeZXN42UGbTASXcq5Q3szY2WBNoiKx1dO6Jg6+7da9BuYf2otM+7anVpnNhLYO/qWhjBFvzTSZqv0fzThOSxEG02MpqBNxmbP6xpa63QlKtnVfAU7aoj5+Fcqnes1NxFmIcySFoYkSHR/t1ct+feoQ8th0YyQzQ== 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=z8T3Y5XXMCJ7m1V65vI16/DCYMxSELJs3zuRrie32Gs=; b=KtFoH1np53wg4tF64uPwRbn7QIQFpQ7LGbWE6xpOk/zm5VU1cMj0LrUSPrSRsGam2D4Kx8iyWHOtEOfNE+sD1RDvv90qASZNWzSrzh0i/Is/PIzCFDhAthDOrLYbG0iZiKPGrzOcKvlMuyhUtL3Uu5LWkVjt89nUaFUJti7wStM= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:43 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:43 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 04/11] lib: sbi: Remove redundant sbi_hsm_hart_started() function Date: Wed, 24 Feb 2021 16:01:56 +0530 Message-Id: <20210224103203.246229-5-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fb87aaf2-8ba5-4cde-e471-08d8d8af84c0 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:747; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kmCZgWzHOq6DyqGbBBl8Lj6OnpqRrtae/tfCkGV/QgsTZ29zhayw+ChPF0KbTT/qb+HMS73jjP6iISwkCubHv2HQtG6BZXk6QXdslseQhhVhxNb9M56dN6qTFj/MLZVIAJeAUT6qeBt3RVwGn8agr2XxK98i38k+MA9DGyIxEwdSlSDTQiHRWI3hXoCEsfeSjEsUVtIB4TgnwFqf/xC6iN8g+vTkCNB1A3P14X2p9eLxTG4QztdRGoNZyUaF+msvthjpgn+Oo4h//uXho6dHtgda7LrO1PJH4ZEYTz+G1Xhw0uRNyC072AD6fIeGsUa4YTe3jpxzDdfiNrG6nIR7aH12B71IhRDNHdv5LWzx8X2LpRKzegYTeBdHsrbN+pVQkwFshWXUw9YNN/RDjMLwemvRvJm125dFDUl9/NH7+ve9XqvKfxCZO+XQK5BMQ9e7Z/bWV7UeGjgN2GtBWHGtV8tycNJAsgD0hHY6FtQHn+XKe2ITeSydq3ywJk6zJqrq3GDv+xfMvH/09LVb8l2pqA== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: dhm1x7eW+lCx53Wm93d5ppgDyV8UvmwPVjJWAiDHM3Y1SLOy03Oyp5gHg06MEurt3M1erxRgTN5aB/ag0UHKOUGCh7wrvhNeMOnJ/ueiau+o0/IsbpigRxRw18Brn7A/HkuF7WDcpFFYfzirx6Kg9P/C5kZCRVk7kxaqt+X6OvkKg+TAXTFO26sipVbrDwljmVp4yxbSL8jRXSFXIDv/ftCrUYk8Yh8+UYohQSHUeRBQeJh3zTkMWaU7iIqf1HsbdhNaTPMIePUDlLFs1J/jgGSoIan3EhkI/472Ur+WLQjECzUwpIPSpZ9ZuvMLLJY0fdVHlyRqmJoYhep2LUTk5RTnVrChqq4iaZfcp9nOQYg7Z9ieBxNmcRx8sKzMwwi3eUL5ho5YcQfieMTaQM10bSh3n/ZkxjxeoLOFxniPdis7zZ3NnD52b59GCDSZQh5TEQERrwCewrpZ5nym13SNGPYWAbLkVe7YAMHebO3E3txmZ+8eScRB8X37ajHqNwT+RxbAIMQDob7PRE8BXHDPQncErE0NDHrLxlNCsYXaUrApxwpfaCweDMDa2GT/1VKi/kq4gI7E392yBGJQv1m2WkpEdxwwKgezUQ7FrEGk/HhiGnrkJGE8hNR265qCmy2U+2lX0sATfYzKqeewKVzUR57KXpepUb2vZeic6DDNNPLFGtEbqz8x6r2OG3gpr38RKuRuWFSaphbo0j6p6i19qYvjFMGS1GwtW0QwxbXXrR74WVfXe6SWfuF4ErFqhjl/bFSGf1we/eokVGsdqM1uOtYQ2m04WE8RXSZgWOaIczjzBxGRK0yN/r7XcF9K0TB1QQ8IXhd0h5mb7LCMS0ovv4jy3SMTs9PWE8LJdGt3T166C9fe+fSKjsaN0iHj4D4weP/yqqMRy5s1Ji9RKa+msH6a/hMzVLf7kapzwRHetT3RNg5w1mnOykL8nysipwCiHvxS8wi4IqvMt9u7uEcZuWF0MFYNRXuOtwSYcgUxkoq8XXQXEQrdOol8z4u16QX726oln4exck6zq2t1MTQR3H7muhozgTUbkTm9CiTCNqWSHoSNvQqY7EPykg0Oqg9ShLb9NRfqfyixB77XKwx0ivrLyuQuA51vrhxfM6fBooXxNvsel72dPf9BFJzi3H1QHr/7ei2ljmdhM9PNvryd7y20NDcil3W81ANs2MMAwgHEUChEKtKPUvVOSjH3W08c9inZtgRA9NUsg6SehE+ZuWgb7CmnlqdB423z/v8ofrZRdX65K8yRS50b4u5yUr3GL7XqnAAJNRRV2ap7j1kURAd7HDA38jjX1YaVGn+Nemu/jWVzaqLntuqeRKuHgPt/ X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb87aaf2-8ba5-4cde-e471-08d8d8af84c0 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:43.2684 (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: U/EWkCz0fEXTDydLJ2B843IAbR4EhW/+RqmPX0sqOKuB5lXGyN2fns9Qo+V/nOv37TepGQR1SwJdvCg7etwVOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053246_021074_B230516A X-CRM114-Status: GOOD ( 15.55 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.144 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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_hsm_hart_started() function is only used by sbi_hsm_hart_stop() for checking state of calling HART and current domain assignment. The atomic_cmpxchg() called by sbi_hsm_hart_stop() will check state of calling hart anyway and domain assignment can be checked by other domain function such as sbi_domain_is_assigned_hart(). This means sbi_hsm_hart_started() is redundant and can be removed. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hsm.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index a81b821..10099c2 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -54,14 +54,6 @@ int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid) return __sbi_hsm_hart_get_state(hartid); } -static bool sbi_hsm_hart_started(const struct sbi_domain *dom, u32 hartid) -{ - if (sbi_hsm_hart_get_state(dom, hartid) == SBI_HSM_STATE_STARTED) - return TRUE; - else - return FALSE; -} - /** * Get ulong HART mask for given HART base ID * @param dom the domain to be used for output HART mask @@ -247,12 +239,12 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) { int oldstate; - u32 hartid = current_hartid(); + const struct sbi_domain *dom = sbi_domain_thishart_ptr(); struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); - if (!sbi_hsm_hart_started(sbi_domain_thishart_ptr(), hartid)) - return SBI_EINVAL; + if (!dom) + return SBI_EFAIL; oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_STARTED, SBI_HSM_STATE_STOP_PENDING); From patchwork Wed Feb 24 10:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443800 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; 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=MwfTJ5Ik; 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=B3nFXR5i; 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=Y8VrFW9f; 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 4Dlsgp5NGsz9sVS for ; Wed, 24 Feb 2021 21:32:54 +1100 (AEDT) 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=KUd4wKLtVVlXaeOS77JUlzqLRwgj1X+EIkgXWuXxP5E=; b=MwfTJ5IkfgDFSKh2Pb8m/4tae ZizlOwbtBfmW2Qr72qW6W1ab0T5B9iYla5HDdCQqU2KrI7Zlsum/t9cIMuhSOQTstmy52hTf+jrW+ 3qDskTmCPgKxGE0RditpaW/cIlcPsAF/rjm1LCdW8Eh0hroDp8cn4HXdIqp3nQO5d2t1E8FOiGomc mpgnD4BevELtuDtjcsr/VAm+BXbBsm6XyxB+lLOeI0YF9I4o4sI+mqTqebObXDJiWKp3lVTGwtOtC dt9nvYzmRcqxSiqFL+GIR5gj21BkDBb917TYO42zjBXqLFAaQk8YVEsInKg6zRaGof5//c+D3QzeB YzQlewKiA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTO-0008SE-JC; Wed, 24 Feb 2021 10:32:50 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTM-0008RD-Lf for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:49 +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=1614162768; x=1645698768; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Q9oxshxTKKxsqoYs+BbtZfoedyAJjCN6uYWzADm2dbo=; b=B3nFXR5iTkdJNmi+rJijOxpzX6KGUncsYIz0j8+eq5ZApEMiIY4XeCOj 65eZFU0jNib3Tm4FluiBo1gOb8f4pgnTd68EVTbhkFmYXiJNJnXSF49R+ U43yFunehsL0Dor5DRK1Etlhfex6MOWiY2cj/GWPt2dnsCQIi0gFi1n1q P6jkgFSLTRPieqIAm9Mh6bNXatRTMeCvSl5d2AgyWmoiiXmzyRaOwZUvi ExVfcG1a56vz1INyIMjy+IQow1quUYjiHSdpq6puWTMegdwJZ4LXoYMV1 oiS2Rm0RpONHU5/Yvdstvm4cAudnMyOIoZHT3YmucvYlSUZOssU4hblq2 w==; IronPort-SDR: GUcvNAEmeeru5nkKJwRzz1GdfHlGHf5napPk0i8Q0+Rm2mBAfmoZbYqh6nU2e187JYdWQ2lGvJ d9FgOSqIUxVU1WIhUbwNX2lvA6RNG5cKskkpXofYqKk2vvIpx7uKxoRVihu8Ehgz6KBEm2FttD gi/nh6AorWCH8Wa7+aaXUV74yzofwXBOW0OcRO2cXsYq7F/FCh1WFpQTVzsEque2k+Up/LVagt UwkGzydfZRN6XrNEzeScVn8NPtboWMm0Vj8tCboAJYtQX6hcJQ2MoYz8LKZYKLahTVZgRNn2Mc XpA= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="160697300" Received: from mail-bn8nam11lp2173.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.173]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:47 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X+k35+3JexbrP0H+4K5MAJrpxgZhG6E0rPA/NMcelVM2GTiCytmRdn974OgF9gSH6z37MwxJSOnnACiY1TmvbVsB0NBTaPKzfVdv/kGD8R4fTR+0LD5/9ihrVpo2c+BVb+W8TuZxyXtQsM0LLJkkcNEJZ2ae60r+JE1fYkNpOvzMWXSOrjtc9quGe8wSA5VSOUXvzoZqHH3HRqoKJlxQWVY042YuN8MVVpLKnndiMI06pSldT4FZeKukL0FYcSoNd6XCDSc7W94omq6lLGxa3g7iV1J0WnwRAg8xucrkmPiz12bfdnIxGThcF4UTROjuOJ1/2MTGDR95olfL3D9FAw== 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=WRZXaMocM8ZAD6/ZF/rlzmTtmVnucoet4BeC/jm/jXA=; b=iBi8Z45Tho8194kT0Wv2WNu39MuXfErGf1/KsQc8vOTG60GGHlbBflj1FyuSQPHdjHjcJ07nJznTDsdEH+4XoWigqfLw9CpmWN+8aH0liaRUfDGVjgJ1CRJnCxv+DFvurr0Ck7DuNJVHGddFgPx/dihynaUIlU/aVrDZ83j0zXQ64gFta9Axvyt6TLeo0GlkgPt/hKMhpPLkYaB3cOLGGcg91QkOsIsMg2DIPWtGYv4ZtMGswsBcsPo/FEHiz520TaJJjrI7ojvYwTGYW8FUX3ykJKQfbTU3717/pZOhGUOrVK/Gig40Uesr7EfJw4gDgGdJSAKTU3PhFvw8A0CHhA== 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=WRZXaMocM8ZAD6/ZF/rlzmTtmVnucoet4BeC/jm/jXA=; b=Y8VrFW9fINSySUSal3WThAoUTAa+8MS1FvRsJxs0F09UsRl2lmpsE/BhK5n3C5aTPNJK+cdWbzKWIvW0JY3RNJl4qzqWOptUJixMIbF22G+Nl0bvuNC3jB8A7Ts/5AhmC/9chLgUsozuMCQu2VR7Q33MaDPVtDWCtmgdlsT+DPw= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:46 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:46 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 05/11] lib: sbi: Fix error codes returned by HSM start() and stop() functions Date: Wed, 24 Feb 2021 16:01:57 +0530 Message-Id: <20210224103203.246229-6-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9fbea0fb-3cb7-4916-b95b-08d8d8af8647 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IDeuk7+kfQMvCRUnPaPBc1F26G8vq6Qbx+/AiH8TX5b3/aZMenu82oAHe4DV0UeE6/PERJ62EOsDD5z43noPbvFFStZtKE6+f1cQvSTTsiXTTC3PoWJaV82W6oZMaXiNErJVBKztwsJetmCB7Ecp02LgDxvRplCsVLzSv+onHY/sz2wtOu5N3wu5n93ofb5qc8FVZxn9tZLVtSt86XKDxiUuYt9vR1lFhNczeu8M6Ez8GzklHlDd7Tke7+bRAMCewctAVQWplbfsoLUOzoPCv38VDDCkaRK3EgBHBrtpLt/jSMpePPDd3GYUjCvHzsj9n50MzZ08D5cjN6dF9m3czFRURxyZF52kGPzRofDYTuu7GB2wjr2nlpsKlEPnDGkxisKy/GULEccXRTjmlRkjcDn/Tt4XSw2LhHZwU4EtRP+lX7tTWIin4oPXaeZ5sqX39rMyHIoaQJyRTXSSf1Ymk/VW0zFVSH+YHsKtCiolrLdugSR0h7ttH7UOBUNe6MqEhP9Z3fPj1Krd7giTX5YHuA== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(4744005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: oANK8FIAIddVcUYM3s8K97tnSqfwz+jqa2j0io9sb5MadevQQd5EW2G2bc8IThqObOfvD0qE8F9t2mFvlatjAN2GOaapaJLdcDHQsCZ5UL2csVBegU9foS2xNSJlm6AWKlw88gh59jVGVER6hCQ+/kNyCJ0N2hOK+FdJPRWmnbo32a0ZUt/SvZTT46PaJDosQt1Kg+HERL5rWtPGTOwti/cF8cVnVy22bY5Rw+NZAowF/sEjyJFp3+WdU0Gmb00qqI2pCWID1B6I5PHWEIYE9TgDevNyhaCQOcPT7st+mmCE4jBfXlFW6XgBiW7+pIlo/mWuEGYy3Sr+Gvz1zL03WeVhhm2yE+iOyYe9pQ7rkfdvP9fbvU3ONbq7pmI9F83r5Sxp93+w5vlf2qQUZ4LrFWgvDjMM6ZzU1X9su43kGJTtQ03WofsEgNN6OMCy7I4wh7KWRjh3CjZqmbuleegElu0LwuHLuzvbjm+mJgfbI2sNWdazP+YxAZzwgTqMspxvTg77CnDYUcBdOTXlMjD1T9kn7RhHKgAdkavwcWiM1CH0edbvQwYmcb/Q0FqM8Jm2u+3EqEB1SNa3TIPCZvq5EH2BPfoyxUuE9WGEVbdhKu/5DYIq3iqWXihVrcybqEPv2zwuEr5SwD3rst3r6DH0uCyNlmrT34png8X0Hz5mJQVKBUJ8aNXytELsUpGDndDpgw9rfSdzl2VyA0bTj0bXVeH155rm43vQQDrKGnh20rN5JAHQ08yIXN3D8/JC+QR5vAwYCqTQNZqag6C/hPX9W2WVMc0llCRgfC5ycsDXDdsrKtWwtzQxKXLbiBHdaDnTNvIqfVsSEyMEGl/5dW6sQAz8VZr4aQt9fO9LZI9JvGOIq1YudKeR9NElEUDxbRkG9XfgjG9sCj5h9lsxq72THKfZSvQdeUEQhEaxr1MnPUg4l9XJhPytib1WMZd5iY7kyc/voqGufIfJRsJCp5Gx+oKE1jlzgseqsjbe6ExDDmYTAUc6kIR5VLvJTPPnIoJnLGnWZk8aTDas81Sd78ArW/R7anI578DbyVbffNATefIo8dcu3/3vbPxkNXrPnDiscDAYjc+WlX1QEZwDSs8paKQM4M1g31yyZGtgfxaG621PvBSGjY9hhjjoaiWfs8eRpQnK0hjs9PIxddmMsCSlVF015ORIJ10z9a5WoqiR0S1mlltFccgS1YfakjCUks3PZxEYXRYvzTshruw16WulFy1qYM63OBmpiE8SBag5nsHsdKzmL0mpP22XN2fq94HDCm2E3ME+zD24I1X9+ablD1/7XAbzdTIbk5SSpjDD9E/DxZde50zy3iyJEhLZYArm X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fbea0fb-3cb7-4916-b95b-08d8d8af8647 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:46.0736 (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: u4JeMV2XSbz0l73JqS0lNMQUj2d6l4d+yRh4TIajop6DWgsT52oSWKZp65/C4+WF6RL5nNCUiib/fN4p9wN9Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053248_887870_3E7C3912 X-CRM114-Status: GOOD ( 15.63 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.144 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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_hsm_hart_start() and sbi_hsm_hart_stop() functions should only return error codes as defined by the SBI specification. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 10099c2..63fa8c2 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -202,7 +202,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, return SBI_EINVAL; if (dom && !sbi_domain_check_addr(dom, saddr, smode, SBI_DOMAIN_EXECUTE)) - return SBI_EINVAL; + return SBI_EINVALID_ADDR; rscratch = sbi_hartid_to_scratch(hartid); if (!rscratch) @@ -251,7 +251,7 @@ int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) if (oldstate != SBI_HSM_STATE_STARTED) { sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", __func__, oldstate); - return SBI_EDENIED; + return SBI_EFAIL; } if (exitnow) From patchwork Wed Feb 24 10:31:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443802 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; 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=IO+LXAOX; 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=chqLJE68; 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=soOFxB4m; 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 4Dlsgy35pBz9sVS for ; Wed, 24 Feb 2021 21:33:02 +1100 (AEDT) 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=hShwxL5mEREnMvUdw6Zlzx9BF6dpF0SHyqxuFQ2FGcY=; b=IO+LXAOXS/D5h3ufwd/DbBXYx M64Bp/jYnVR8psvOKmY/tRnx+CiwpJO6KdLen7kn09qly6T4PP0dEOBaP0212WyriWp+xcLYCyf6k rAlYNhxCKYtJzXmgEamnU30TJ+EZDCEL7gXv1ogLzs9LCuk7fSQ1SSf+U73Ai4kzS5v5qBaC2Q5wY uEAysAmMxvezFQtNoDKR+1mFXL0pjYkJp81uemGcRbZcJnsljBZpTr1zUa+u7EHfiBnfa80vfAlQk q+PdbfzTS2AUoRenf35tb4xz2nBsT2a0IJo+jKY3E+Yky7FetN6hbMjJNBn0T3Yi5n5CgJR6wtAw8 GWmloghDg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTW-0008UQ-6E; Wed, 24 Feb 2021 10:32:58 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTP-0008SG-IP for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:55 +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=1614162771; x=1645698771; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=kDIJyH4cXAIVtuYMux+AGj47CY1iSsWYpibPj3+GMoc=; b=chqLJE687IJkfqaHWUlVoKx/ZcrtRk/x/LHzteN1dxUYUM2/PZdqyOt0 vMEUX4BxjRnMbCsEb/bdMPYc0ue8+/bu02ZbsHolI4O+XiPquqHE9ZNOL 4OWLmX/7V1DB/sy1RXjOIvdHsfn7StuZYkc+gKmTdNlk2QpCFC/EA/lbe 3KQ9ymc+AbVVYuCW+fqwuqp+jOtL3k+QzbPyKY6ArLSEKAnP2r39sJtKe 51hzWODKH9tZZK9UsQxK+a27UC3Pi+oqr1Tn/VUuRvUkwVHbawYMc1N3w gudZcWjzHxOemZfaFW0IgbxwfTVz0adMbAJT8YHYyl7/AZkO5cT29j2wX w==; IronPort-SDR: WPogB9UYzE9uBfEUg4jV1vkCB3vh9CS9lcVLNWPjvC7N6oZe8eUWx+w3wI65vfOnkskVlzL75/ 3SsSvp5j9ivYotYXlvy95tvV62yt1QXCqzTci+Tg+/Gcd/uUy7D7lWLv1cdyTpO5bo+tO5X0iS sl69tlKyYwmnzG51i5VAupbXyToTLhH5317udxP7KHN1EJrKU8E2gddnpualydWdrRgPTikjQr L5gD0smY4a4gCCN/qJFOpzbv1isNGO7PBm16Z962vxnFfD1rMcT3uJ4kyNKcIRLcyS5cNfDDL6 /z4= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165448" Received: from mail-bn8nam11lp2175.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.175]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:49 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DaB/+ergDAQpzTO1Sat9x0VARItD2f7yQuHabFAmE760EkXJY7fsk3Fe/HAUprrqjFcX4XXFfes5MIoyc1TntG6RSnyIWWNKxOWiUpV1dBcHF+mq9gehxtpmQQI8vpUcr8UBdWvQr7IkKqnr+ubNpoYdr5uV+VzHj9VjgJX+rW2H2/YI9ixWqYbbiGgnbEdv52UWMN9I9i54aBy+bL+o1XVXW2AE4ImfLTVkGqcln7ozxVr+QYshqH0yq41NA8e2RbyB4T6AFkUCewYINIFZknOVJD7PGekoTXXs+SHEBBRj05psLMVrBnY26Ng7PliKL7ecTSVs/HSVX3UHpH526w== 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=Wyna8UMS6gOYxOExKKCsPAKsX9mklNojJYtLKmXMD/k=; b=mRHcGAwM7ADkESLv8lH8qLKmko91OzsrVu35WZq552g9xTemTkPDoGc0jDD9WVfk/GOoZUqfc+5mZrumHS5gvm7mxJ9M+UeCFLtG4tGsCpGqBoXFQn+WLz57bLEOs3DF+dqxsWotMO6C32rllhLGd8tvIK/+fX7STyfmEk6Tk4SBsnR9K+tNerW3c5u9ajoHj6Z7BnNraNTG9ltGrrvEEMVHy3vrym0dDBF9GGifHbZ7KZ4m9xwaltPkinhvgCAvPTtOBGAs1+PiyXG7P7lmwfjhMbfGZFV8p3MBAOOfKk4mt/WaVzIRy3y0CBXCgMuJB3QdhpTh6WxB50l/eEdLrA== 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=Wyna8UMS6gOYxOExKKCsPAKsX9mklNojJYtLKmXMD/k=; b=soOFxB4m7qEirLzToHzKDEAhLJYVwXSJwJvaTh5Tf0RR2bSr+q/RdxrrcRHZHSQJbopdDHxTUbEoGlMVgsUAClfBvIHstKv5lHdhpVbXafhcybsCvELvSZxt0tj6BcddDKMJkps/SXMyLwu1S40qstemrA1f+qyDYhfv5YP89cg= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:48 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:48 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 06/11] include: sbi: Add HSM suspend related defines Date: Wed, 24 Feb 2021 16:01:58 +0530 Message-Id: <20210224103203.246229-7-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0d3b21d0-1d8d-40a5-94ee-08d8d8af87e5 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:372; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D77o1N2s345Xd6twsGoC5FT7q+rGcJmXr59ozLfMuYoOwNikXFM500JnR5HigcL624ZRilY7ijd5N65oUZxEcVnFMWP0ySrKyq3XJIsiHLDsYhI7WDL/9eiCHEetGBl4Qe0p8DAODmdkB6PN4WPdQykE42ZI3MNi2Shv2zQYcDhT8u0JjJQJCtgn0dYSvm3mhBVx+m5PBgn/JrLBdQadX//z04Oa0MurKGZ4wZ7xS1A32tCiDEADjozs8Q+6+17Hd/K489IPrljP2QJdO/Uf6+BZUpFCMIyqAExvI1RnODYESUHWb1UF57urptMetzq8Mz0iJcLFncvOjwizosNtjiAeJbam6Rb/CkJxCktD1iyeuv8AmeTaOnQLhdPtUK1h9UI9MES/9cHTuV5zGYYcaE8zhlZ9ZLYgpYDBnH6AjEmIRQoomSjj8bM8HiHialtORz/sqtnm7ik8w/VeLwNHzHJr6/0qMFwWAYvjMs1818DlRx8RUGCLIfxN6WP+Qy5HbxhQEMV0Zwe1rOrCIh5g/A== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(15650500001)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Dixl/OTETHKKIxTP9vH8KqYsC1qJsHxoAOdzJN2F+tZlNZgu++XkrCUmQqLovP+ohmxxaK6KSIRLHY1kVny4OpcZBLJbvm/PZU8Ir4JvDwAc9TKcDtitBX0SlXCTuj+VHwhZkZBdDlXO9Dk35SuSX4gZKj8XZ8IwVEgC/vSI+3GJCqhTtiWukYYLWpCbFgwdlMk8AMN1Ul5u6ZZzHzpMQvB2sbXvzg53BdgKvlxEMXAcNpN2DQDAKY4XiJamXAuWMDbAlZ+sOvSuxbZn5IJ96QhBoU+xKf8c5TqLUVh0UdCYD8kdk0hCGmVJt5m088x+dW3t09kOQJ9dJ5ElznJtB2TQ0p5oeqvWSOXSfNFbVhtMOvE8udYfZ3zGb8CALlDp7kBwfF477cHUwAmuH4PkQc4tXmG/4u0e5nn0snn5gETEhwbtvcrW7Rc/QrEszd/l4T3bGmFOiLtBZZvCwlUXe1qCDuPKSg4pjrtXVCKSsEitC9eO5OxzgxiQ+S1izrqMtnZVYljiWkGVvJJeB4VK6GyXAZi8ezsLpcYvw5FNDDfTjhEB5JfUw5bVqe/X0oAzpGzSwGOfsY+PIcXsZJRt0DpkkKoYoLOEOG+HnP06b/agQ/M3nWq+uJJ/ON4rHEJaaESZimgkSHcp27KGCSqTfoASngOngkLzRzDrSMXNTg0FIYK7aSnaPxFXAskDFaeS4sKKeM29TxQxeaQvexDfix75+9G9tZ/u3aFmv8DjIRZRF1OUI8NgLPmX7yjYOt79VEwq4HeGJ13m/mCeTxVchEwdYwWRPMugcMaS8ABT8UOl/bEq6LGrNBp2B1nWh5nZ6P3b1YYqGsCL/Ux3+8kev67zxVTJ4wmw209cM3EpiTcIe306Hrbp/wG/jvihC6q4lXGBoFndgaaoO8EvABsxzGYFTwzSPy0jC1IaFjL/s/nKT4IRvpMhrZ4ClxjxJvU9nwlgAL46gR6k24t65EF1Rf1BI+g9OLuUneDUlpLn/EgqER7HV2fIRB9ba2gyIyv1Ibk7pSEM5cLVTixes31WJ+1srz7dtqns0oqwaOoCTDB+2ekrv/eRgNKG4MN8mtT3cwEzYnoJGoTRVONbxcw5e0jm00JsmZJnL5PYHgefi5Jm2sBg0zHsxREQI1APDj0EmuqWTpOlzAj05n+ZWA0+Hn98CHfVE8/DOWzNSwLu9miGkYkZ5jSuk7Lzx0L5LsF1UzcfDjw+CjSfZ2C5iWUCrAmPpq/a6kmaYwUHsWYo54lQJ0Sfe17V24eBSlZsth25N62uJ4OpOKyB8GyznmrAn0HmR7iBcCtcC7f1fmyMn8qKbOF9weF86WWhIynNEBnF X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d3b21d0-1d8d-40a5-94ee-08d8d8af87e5 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:48.7199 (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: 4L2BfJ7pdqZEt6lMWCbpTCiibsmshxTF/J0jdYWFrUYekIvICe3c/CXqY35oVhyt6/rBl+evDPtbCsPLuz/Eyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053251_772972_A20B4BE4 X-CRM114-Status: GOOD ( 13.16 ) X-Spam-Score: 2.1 (++) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 listed in list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay 0.8 UPPERCASE_50_75 message body is 50-75% uppercase 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 This patch adds SBI HSM suspend related defines to ecall interface header. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_ecall_interface.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/sbi/sbi_ecall_interface.h b/include/sbi/sbi_ecall_interface.h index b272213..7fcb373 100644 --- a/include/sbi/sbi_ecall_interface.h +++ b/include/sbi/sbi_ecall_interface.h @@ -57,11 +57,28 @@ #define SBI_EXT_HSM_HART_START 0x0 #define SBI_EXT_HSM_HART_STOP 0x1 #define SBI_EXT_HSM_HART_GET_STATUS 0x2 +#define SBI_EXT_HSM_HART_SUSPEND 0x3 #define SBI_HSM_STATE_STARTED 0x0 #define SBI_HSM_STATE_STOPPED 0x1 #define SBI_HSM_STATE_START_PENDING 0x2 #define SBI_HSM_STATE_STOP_PENDING 0x3 +#define SBI_HSM_STATE_SUSPENDED 0x4 +#define SBI_HSM_STATE_SUSPEND_PENDING 0x5 +#define SBI_HSM_STATE_RESUME_PENDING 0x6 + +#define SBI_HSM_SUSP_BASE_MASK 0x7fffffff +#define SBI_HSM_SUSP_NON_RET_BIT 0x80000000 +#define SBI_HSM_SUSP_PLAT_BASE 0x10000000 + +#define SBI_HSM_SUSPEND_RET_DEFAULT 0x00000000 +#define SBI_HSM_SUSPEND_RET_PLATFORM SBI_HSM_SUSP_PLAT_BASE +#define SBI_HSM_SUSPEND_RET_LAST SBI_HSM_SUSP_BASE_MASK +#define SBI_HSM_SUSPEND_NON_RET_DEFAULT SBI_HSM_SUSP_NON_RET_BIT +#define SBI_HSM_SUSPEND_NON_RET_PLATFORM (SBI_HSM_SUSP_NON_RET_BIT | \ + SBI_HSM_SUSP_PLAT_BASE) +#define SBI_HSM_SUSPEND_NON_RET_LAST (SBI_HSM_SUSP_NON_RET_BIT | \ + SBI_HSM_SUSP_BASE_MASK) /* SBI function IDs for SRST extension */ #define SBI_EXT_SRST_RESET 0x0 From patchwork Wed Feb 24 10:31:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443804 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; 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=fGl8n528; 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=oAEeG7Cx; 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=LMHMmAdv; 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 4Dlsh040xtz9sVS for ; Wed, 24 Feb 2021 21:33:04 +1100 (AEDT) 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=zQcf3L2zmEEsw9Q/wizXITOC3pzzIDl5lJRipfa8Ku4=; b=fGl8n528HTxo5ROitOoljO4FC bgcgR5MGKUq+mDcWHtR2KJqa3WePTaGR42GnrKfHZl6PWq3q2b9dMSESNoNm3yeCZAAonPWrE6aJP CXYpFci+lBFe0YRMQurPFmJOfaYcbathlUsqttqxuMYDzbeNHL88t4cjH4vH9cvV+xpwLb6gARXZ7 VRY48SPhWx3PJSgXJlnhQmhrTgA2G23YKnQfgQDAcEmqp7ekt5Vd2CB+zqgHmrmE9hGDZ/TxYWobj VCAhQZa1GlrQQw0f6gdPZhfXjYe9ccozKnBSYnnMD1AbIL5mZjz5TbiAM35So6s8McbDBN0pc1F1a pHU9GGtng==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTW-0008Uu-Pv; Wed, 24 Feb 2021 10:32:58 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTR-0008Sy-1u for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:56 +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=1614162772; x=1645698772; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=1wf6dPXty6Hxk2YLJQCVPKvJIjVh8bygVgYSalnH39Q=; b=oAEeG7Cxh59qFmG+3Ep7L54xWgRiyBijsubzEcx+3Rt4o8VWhSUhy1uu FSyqx/IxguAvFJiKYKuEqKkE5Nr2y97r1kKiMSVPXHQKXIJOcDAbWcSqJ MsysGKmBBlW3mxNsl2BiviD8CG0y/dkb40BElSYKo3hV+RryE1bFvAJKe 9qEAMEB0s+e/1P5CKjIotdlqDfrXQC1jp037g8exym/M+L2ysKErY/U3N TaM7W/V3PwDmKH5RksELiwsQHeaziFHXfiEBA3Oq9+B7T28CYd6AG0rSp rV71zJQ9nTiI1rqOeRg2Vuyhe4QE+fHvIpABBhZi258cELRzu5/xhdbUV g==; IronPort-SDR: EWTFec/4wBaOZj0HJ05pTiLpvAncPbV6Clucxtr64TPnZ9MupE5EhDLkUbdrQT91t5iq6zBwMm cEkyL7QJv7YEkd9CbShM5jD/XPUbN/LXbBLCE4n2MaqcjNHEnBSxcSpXH3A3gdia9+sA9dO2p5 AN4X75BJ4Q+KzZC5Pps5cCaricXk5Um8W0PsMw13ef5FyCIR3U1264nUPY7R9URPI0GnDrfNLK YXto9NCmf64zzDJEdcI+gkfLqM0U1xrgqLksmQTiYZ9QGNeqbmb8OZsCI6CLFIJWZxqKTsqa5m eHE= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165451" Received: from mail-bn8nam11lp2174.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.174]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:51 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LSCfOQQzYscgUWd/8kkuTxP2R5yzBH9VU60piScJ/wUroWtgU3VmoBHqMZdA3s9tB7Zte6KXhKnuUZ5XPTp9r3CbPYib8asgHVrEq4Tq+oisz3wyvOLlqsWgo0ui1vR4rBYrkNxrrNkLmEi5odSs02Hnq5IVa6V9DXEF3oUlDzBc4DgsAFuTjWBjVlhWeLYBuvMRqWP+DCYl82Lf4jayflhe29Ro1KyWD25Dr40xpjAeWIbam8RtQRcCCqMUOm9kqOpHrsGLhY1KnkObLjLjrOfZijUjzXETZfEVzKMjekqcgH7pe9f6nralACZTfHSIvgH3BR8rLhrGNUUUl1smhg== 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=2Bo9iEvdcJyRIqYGwp8RBTHrb5Fr2GYVPb3TIiWEBgU=; b=U/FKg17l/qA7AX9BAPgW1qxSG1o94bDAEawO8SWqrS+DlNA1Y1DiKL1ybo9rdrpqPtV7gX/fOzNAJcm/ibptLorM5PtNQ/OrgEqlQvxlhNLIAbwiiwKiIGN/HmmYhvEB6xd5Br1hYsgFBiOU/BT1F5+XjRslGT92SvJYgKTfOhnQF6/BJsfDjDQL0vntZt6XvG/ayVXg8WEer/CfWc8/c74S9YZHTuMtH0BRNEk2QIbr6+qX7Oc620MmGOz40bOOHchYGrmVKgobJt6uOmg+h4yQJ41NhyLLbjxJVK0Gr+mxD6mOmhU//pJQJQWdOU0e7moDqVbPEzzSRH6Qg3x/mw== 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=2Bo9iEvdcJyRIqYGwp8RBTHrb5Fr2GYVPb3TIiWEBgU=; b=LMHMmAdvVzszPbBVwoUMvbggKIffCwH7D6h5pp6SCg/dJf4uYYp7MjABnXWmAJxpHqTRQkONxu+CX4yh/MSHZcSbRado4ycYup2zI0HT9snE97wxZBnDj55F1ZWOuChlbAWkQcrONPYzTH/b6HYFkNuSQmg6Ip//jKTh4TZ6/ns= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:51 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:51 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 07/11] lib: sbi: Add sbi_hart_reinit() function Date: Wed, 24 Feb 2021 16:01:59 +0530 Message-Id: <20210224103203.246229-8-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 03151f46-7020-4de9-7ed9-08d8d8af8974 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ibQsC8JBon+UAIkFPjDhunwaw08mHOXnjE/iG16/ehINmUq/3N5/nFN3KeAvFAD6MmuQdvBkqZK2U1+roY+/F7xKVVd8W0lgVZnRCx98x0EYT0JAKAqH2qzN3+9J74N9QOk4SXou43W4J840fAPB5Cc1Yj1JWs/9+/GDrD672T0kNF3Z3nO9oN52Bat2rmUaOhu0n0+BU2iPva+g1iFg3mTukVTxjUiKf1N5AxV+PLEKz/rkLJHkicjbAcfqxP5T/gfzrRFgwp1Z0hKRM5xQqq9Ivvw0ngZx+SK19pdFWpRwpdn65h2pucqCh9iBeiRY4fx9k0Gc6BLMn79yA6W8VUmupbvsGcB9leSXnwZSNVBYegk5S0ues/Yp3jGe2Qr7ZuVZ6sMhN+2P8Bul1PD5efLa+Vf1hkhvkbDsNCEydAol6ym59JsB1X006HCANsLgDQeFGDKGqP4YThHotmxMHQoapFv9AphUjawPHE5a94jRDiBTp5l9lERp5pnvjp5gVajVmpDX3sIIEw9xyimtw== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: I9KgofoyR7hofVk8NRTgk54nD+/WEbYjOUfHUM00a9cuflUR7ZCC7UFkp4Rx16O7v4mQP3E5MnOy/kgHJqu2lQ3uBrkDTaX515cbDBJBkziRCRSFd3/WpD1o1g8x0DoyWlUtt/bI/b5DWhuLAWTCBbBgY4wSeD8e2vmaFm/JK1DoOQcpvhxacdJuFzq1g7ZzqQkEvGLQT3yD/xbSlBAtxnwZQGOaxYtzFEN7H742o8c+LVljiVWrRr2+awjpQNkVCMUV0MpQeOuAjHsfEQaRZdv/pAVyKs3T+dE4DPrE7xuYv+RJZNktt7+Hqc6KJcfaiUKF/Ut6dWXl3e5bd/wMWIt+xUQBCDGbrdDl4dzTlVcdpOXON8o6W8B1aQR5sY4PsVFzT/Z7y8XpU1d7jSkZhoM+UJUOupUiOaEHw+bX5NJMRMYHy6WYmRDn37ZaAQEehptOySodtAitctP5QDS0WFh0+08LrfFC2VHZk7TWgGC36K3ZkRqbYydKm08iFecugT8x89xqa/U76RCQW9AvtehgPQZbxxNVjVuxpcKrGpi+0Ar+AFRfPuaiVHUp5FEO9a8j0f2kilPA+0z2iVWvRYvR+age1/LbxngNejXd12pXRU9OVJ24WuDmwOIEXV1OJ+gqWpDFajJyjTrAatZ6ZmkQSj2bSredGICVhObuJibXCkIPZdWsjGZrzpZphEoWRAb1ct5mHtN8Aq1/G1PW3EuRe4ahkN+owXM6fMZYuztOAeuPoxsruQ2xRdNVVI6pG0lAoXpYWEdT+QDBv0QRCRPcOegtBGPr9IEyi86IkkzWrm3HKNX2vu3ZdfHLxnmkPqbSHjZglE3ya3piBKH6GQBz4Dll0g3FMjaPkBQtVKamzYnvhLGJ1kVT64MvQEN+IuRQdznEJkIqG+7t/zLFMH6J05O8+8Z87MvhqgNa7KLUy/Mri9amYecor3xJyY1R39w1CL9Up8j82U9sQ6w4X2gFfXNT+yjzJEELh99kCdHY+YCiaucXtFxqcTmveq3aukg7J2k6eFoOhPWqCgoaXaqUplymky5ThDC9DGcIRYY2iWKhrRN4tyDADvfhRA8tnoyesiYyEvyAJtszELTyueM+px/V7FGOGXaPiBTL6ABOmKPLOPA9aTsEKHlIiQpu79n2F3v+xoR2nCCRHvydluDncWJD9vgdpAy8yuIqTSsrDa1ezLl4lkd35DEzKNZnHgg5Y5CtSZkbZRqzTHAW5Mfzt6kWXo9Q6ws1npu3JRZvzRlw97vJM9ORV3U8n8sUWP4vYsJncbN9EYBL+tDThc4rxXRUCV/g/qdGOuNTVW+6RFcqgxOAumtMjCp3oF0/ X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03151f46-7020-4de9-7ed9-08d8d8af8974 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:51.1224 (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: KtLrEroTP/V0q7l3Il3eMNMTSQrzglrsqzVPsIgvVLddGBuuET7ul+DlECKFtXZurhiftRWTp9fYGGlLAVfxoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053254_041953_200852D6 X-CRM114-Status: GOOD ( 16.95 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 We add sbi_hart_reinit() function which will re-initialize HART CSRs assuming HART features are already detected. This new function will be useful in re-initializing HART after it resumes from HSM SUSPENDED state. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_hart.h | 1 + lib/sbi/sbi_hart.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h index ec9e30f..031c7b0 100644 --- a/include/sbi/sbi_hart.h +++ b/include/sbi/sbi_hart.h @@ -27,6 +27,7 @@ enum sbi_hart_features { struct sbi_scratch; +int sbi_hart_reinit(struct sbi_scratch *scratch); int sbi_hart_init(struct sbi_scratch *scratch, bool cold_boot); extern void (*sbi_hart_expected_trap)(void); diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index fc86e9f..d91b08c 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -430,10 +430,25 @@ __mhpm_skip: hfeatures->features |= SBI_HART_HAS_TIME; } -int sbi_hart_init(struct sbi_scratch *scratch, bool cold_boot) +int sbi_hart_reinit(struct sbi_scratch *scratch) { int rc; + mstatus_init(scratch); + + rc = fp_init(scratch); + if (rc) + return rc; + + rc = delegate_traps(scratch); + if (rc) + return rc; + + return 0; +} + +int sbi_hart_init(struct sbi_scratch *scratch, bool cold_boot) +{ if (cold_boot) { if (misa_extension('H')) sbi_hart_expected_trap = &__sbi_expected_trap_hext; @@ -447,17 +462,7 @@ int sbi_hart_init(struct sbi_scratch *scratch, bool cold_boot) hart_detect_features(scratch); - mstatus_init(scratch); - - rc = fp_init(scratch); - if (rc) - return rc; - - rc = delegate_traps(scratch); - if (rc) - return rc; - - return 0; + return sbi_hart_reinit(scratch); } void __attribute__((noreturn)) sbi_hart_hang(void) From patchwork Wed Feb 24 10:32:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443803 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; 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=CezhF2Er; 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=bYo1kg/U; 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=AwEkaJzf; 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 4Dlsgz32lQz9sVV for ; Wed, 24 Feb 2021 21:33:03 +1100 (AEDT) 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=I8VdyUG1gxOx6yjQkdl9t97Vjg7eQAuUBVgv0wpawMw=; b=CezhF2ErqV/NBDS15paLfQtCI qrWgaIE2pJXxFjgNxUBJAsxj9Qriefg9A/CrkReDDkePdaifLaks2ELBSs8bF9Be0PhS3Bknri0co VyvhGt1u7ZsHYKK8iLrxWYB+T5Jkv0dCYdkd7W7/bk38fC87jG9vDj2bcPlL1B6Rf8R8Zm8KPoQYP SiDuB0CPAlstRqNWLg3vpw3/rt5qHkYhs6oDxsLHncFPHvHrpySgvSG9rZPXi9YMQn6bpr28WkOh0 uXSsfIM+y0Jb0Y9HXg4oZ1BSHl2kvWBHex7nJD7EFi3cqsbOb+3k/xA6AEwvXZsibXGoEbgHsydX3 rIhu9ming==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTX-0008V8-Bb; Wed, 24 Feb 2021 10:32:59 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTT-0008TX-JH for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:56 +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=1614162775; x=1645698775; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=JY9hL7yxSv+lWQKmPRw2kEIZ635FUP1JauCp+dh8Iuc=; b=bYo1kg/U/w24Vy+6kXqLBOYblOn9TZZCa6W9j3m1d9ktcn6ABeyj/Z6L CK5RMuNTo45DykE40NNO2M6MITo7Y/+tfIhhOsB8ivgsUyTxKfd0CF4oQ EtTU4S/dUtSOoOCtQmDjx6t7q3GKzZ9gG0EGq5BSbXojwAMGKE9bGk7XX AoLe/HoToIC7OKDgsKS9L+obHeCvRSbcukYievfCqYgmE8rfdAu95DRBe caHly02N29n8TlvE7d2R/cQnknOnqRbZlnvZyu6099mwD1fNn1Tl19fHi uampfwk5ynbXnWAM94W9gBrATZelbRuT0Y1FK+cSl9XNFOZ+WHjBK393M A==; IronPort-SDR: BjRHTin3fyKoZvQj1We6FjlPLxM95oTL9Vp8YpFG/HgCHEqArGCznbDoXhJ6kJXun/yu6r219K 0KZadQ20pIcuDgayIZcgCIHZ3hSvc6EvWOUQv/Wqn6cw/VenT9o9vSSFDKGTKUfnHFmUIFgN3a d1njeq7STGi1eRGn5UyD3mUxR59m3XTz/wLHn49vYnuUJ+TX0z3L3+2vXb+YmBxsZVpKdTKDDa 9kvMSh50yNJnOe4KfWZBM9pWzVpI0NuVPOinLwSum9sb61wXJ98rF1UfwXLcj0IW2HdHeexH+S 0N0= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165458" Received: from mail-bn8nam11lp2168.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.168]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:54 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f65yQ8+T0K3qeC4+5nqhyr9FIWoVII6+eoYT1alosjlYXB4pd3d7hwlpGiANvzQ/WdRzYqq5aBJSWZOB9JPuZyE+b/nOLDGQaNzDyhzxdGbVyHFp62JPLcNkyiIAS2lMcDtxeSkOXwLQpXLHpodpuUbrSJfoDzT8LNblJ/ldaE4JoOovn/IvAwiiR/yzAQ+UKuFth60XhxEKaPhEYjCfRkV1hyFCFMfW+ubUJjBnkcOhD81h2AhItHMYL8NCexZUyqBMvLpwVXy4rJaOxGJq9wtow72cI8mPHH9oWMMPkt5bUpm3jCLnaiK90tNZUbojVDW9jOerxEgXEmDI40/NeA== 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=MV0KBd95TdvUFFXIa8qN9/v/+Zwhq7HZDQI99HKMecc=; b=FdWus8Tzrn+EH3587wl2uutipBuwbfNHOj2K4BLy2lgxn7U/nmQKIhljaDtkDCyhsqMkk0LicnImsiexicG0Es6jhbqCbOwmSpHmRAcxv37PglPD/j5fEkg4kqWt/d2rBR8PfbMw0GGTthp/n0D1Ugwqywam0U2k150sS629PjBOVxQnu9nrzc5cAA2z6e/a+ynIvauEK5NPF+EzlvuR0Q/qi781foKn1WPCqk//RHHkB5e+zgWl9+YSRtAfn8W1gg9nWEDZz02CnPbFmPw27zHfPsECTbvNZn1occFTKl0oEuAB+WrLBhHJa7XOyUIUGEqR5BQbMKhljyvCRNILDQ== 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=MV0KBd95TdvUFFXIa8qN9/v/+Zwhq7HZDQI99HKMecc=; b=AwEkaJzfrbRp/E7Oe8+CABUsX/WSSUdN0tpfyirn/j7QrbsJpwLtLgX3fDqh0pEKKoXRtbgtxctYx3ASwPDC0QG0kUlj0bn8F0qnUc/8RKHdfw+6CSRO096WhJ0dkTBxXcCnvoR1OUaG9Hzfvh/cZoUgkODMTmmjrsm9QkGNAX4= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:53 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:53 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 08/11] include: sbi: Add hart_suspend() platform callback Date: Wed, 24 Feb 2021 16:02:00 +0530 Message-Id: <20210224103203.246229-9-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6d088b11-ac50-4cfe-29c9-08d8d8af8aeb X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B07NYZOM5uqemQU12OB0kqDhNLyB8LlwyQXHu/BhcHyskLyuYHdDe5g8zdnDQ3AfzkfZHx5RrTB0QSiPn7dAQEY62DScMJFptV/i/gXhhpjPcLPXAp5m8fU2zVUJoss8ps/tDsYSbQv+d+jzKGgJYf6f1XOLZ2DQk+JE9ZdHRKZ8uY5ahZPgtmiJCpgFHf1HiETJtv+JOhX80jrTdv0BFL059u8jsjlPMWVKuhuw0ooEhXLOehic1RMv2kishlVXVdKybe6UOmsf7QQhCEOAIPuZNsuJOctqtqiOp972wJMukOLDm96DgJM2uUib4gL+mM3z5L18kcNtY/wDo9B/NqV5J6ZKIkwlWDsfunSH0D1qHkV383J0vT8a41kizBXeQxnFrE7mXsBjA+8sYc3KBB1xLYVuECyELdgcFvolqv/l54207V/faVjHHcGoxzjD15QMeU6TypvdME5dl7rhGXHnrnuSdwVtbe8u5Q2d+RtZbjSIjD7/soYODG1Gy1tVp89cvRZQpMa8ZtYhy7n+2ej4ptkDd2EWRWH2LKgg7BTdfq9ZclIgMCbyuDp8WM1SUeadfTarq/0lFt6eYVVAlQ== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007)(357404004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: y2C4fY9KQy9NYGUMFN4k9gZsU1L+yVrnRuYiHQVRYzAY62yoKjssKfDQGlw+47WtNj6zkdtbQqg1AXhT1WWzVuyjp4krJNmAqkstKZiG/RWzObsgRqxxL7EjSaDQeURVTEPafiqRCHVXSE4HkX6Xw2NN/6gnVpHr4D6yHq/0j4QfkXg55sQWVIwvInBLKGOkMa87pp1eVhb6LFBIJ5wzOuppl1Ct4pyAZ4padVSGcfQPpXuBg6BHKYAg7iL+A7+p9MytJKvHxxcWySOscOZLzFHYHDf+aa9920LP7fVFo5JWP8XEZI4D5IEN3PlYb5trffB68ZLbJN9GbQRa2EKb+G5+g5R9zbyahr1rkiPBtV+LOGuLRgloxbJgjccJaKy0lBgofgm1QJ/sqX6tySvWj28436MYnBlJbkdV5yhK0JrJC0WH3ImPp3hQRVZLibru0MwPh1zWz11cPx3LuplvHGfnEKdaobtaqUMgMeFPgEfs0UD1FYLST+bNtVw95vlrikCNKT/c+zTdNi/lHBMhp55rkKWF2CIpEpF1PjvFFIcKQqQtKD4rafxEeSCVfabDN01JdsFDLpMb30EGUO7YRA2HLhdYZfMkYPUI4f34zVPx37kiegqjA648/lMLwWzhFwKDzu82HCGg5QJ/DZNNG3R7cU4V4ecqWsRURmQnwAoBc1zMZkr4oVtiPtzm+ccClz82ucVwkSXzi/d9nl/dLWCbqtKU4ffQQM5M4lZaygW0MVobH65pSkivlhIqHVKbEwHDlO/pDljr+6Egn8uWGg98pcfU383azJKLpklfYWkAI7+OzLL8TDAde9l2M1qLMmQUY9DDEMiW+Pnie7iqtgUe7eUcKOrh5pU6mjgXOrDa06wKbqmzMeY+zpjSNNUvdHLY/LHwNPRaeqyIA1947k0eb1p1oK2lKPVBDRxuk6e7FP9yJ5cJhlnk/9wQgckmevADQ40dnrxla9peAjYC2y4JVugRuW9bSi/lY8PYyhBV6Hf6gNQI+NXo7Dxpr7WjgfOK4oAp3ihKP8TdU7I8N1U/P67f795ZLKCjH20y1N5WMsLa8BDBNrX40InL8nhYH0nfZ7Bsv64t9D99sJHSNM0R/4150+cgaNnTBftl04usR0VQwjwUhEvUmF3HzAatyNogkPztZO4Zdnwgrda9FB5grvwif0FQnhRFE3kSGBKrq1XZgC8xReYdsGJLlBMeIP8u99dVfWwBwVkh55qU4sb+kKZO0MMROrE2KtJgQDu/nOQJ1jcV2Bg+Kn18waukbJXVw/RFC+VOPF4pKtnWf6qj3SarIhQpdUCAR5BAA4pMOHHWC9UXOVOSYSRRIkpP X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d088b11-ac50-4cfe-29c9-08d8d8af8aeb X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:53.5738 (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: 2cRkCh6anpuI6kaQWGGxyhlzHUtmddkUP8ix6RnjLPO++0FqIYd6E6PhiLAFlOX6/+r1Mu69dTrsnFQb7fusug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053255_803573_A237AC16 X-CRM114-Status: GOOD ( 16.39 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 We add hart_suspend() callback in platform operations which will be used by HSM implementation to enter retentive or non-retentive suspend state. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_platform.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index cc7e3ff..dadbc1e 100644 --- a/include/sbi/sbi_platform.h +++ b/include/sbi/sbi_platform.h @@ -139,6 +139,11 @@ struct sbi_platform_operations { * return if success. */ int (*hart_stop)(void); + /** + * Put the current hart in platform specific suspend (or low-power) + * state. + */ + int (*hart_suspend)(u32 suspend_type, ulong raddr); /* Check whether reset type and reason supported by the platform */ int (*system_reset_check)(u32 reset_type, u32 reset_reason); @@ -370,6 +375,31 @@ static inline int sbi_platform_hart_stop(const struct sbi_platform *plat) return SBI_ENOTSUPP; } +/** + * Put the current hart in platform specific suspend (or low-power) state. + * + * For successful retentive suspend, the call will return 0 when the hart + * resumes normal execution. + * + * For successful non-retentive suspend, the hart will resume from specified + * resume address + * + * @param plat pointer to struct sbi_platform + * @param suspend_type the type of suspend + * @param raddr physical address where the hart can resume in M-mode after + * non-retantive suspend + * + * @return 0 if successful and negative error code on failure + */ +static inline int sbi_platform_hart_suspend(const struct sbi_platform *plat, + u32 suspend_type, ulong raddr) +{ + if (plat && sbi_platform_ops(plat)->hart_suspend) + return sbi_platform_ops(plat)->hart_suspend(suspend_type, + raddr); + return SBI_ENOTSUPP; +} + /** * Early initialization for current HART * From patchwork Wed Feb 24 10:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443805 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; 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=mfEzT6nl; 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=nwc4cq5L; 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=YSxKtB0r; 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 4Dlsh12K3cz9sVV for ; Wed, 24 Feb 2021 21:33:05 +1100 (AEDT) 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=0skDLcPVk4kTrmWRcA0C25fnNIORiEB+N9x4UWxkGiM=; b=mfEzT6nl7kjgdVnEtlch/yq5Q Q/T4/tFq3wVUvMV/EL3yktwvfijGbwGgQcp4Eu8f/8qb8WfOoRvzox+HtJ1WCfp++O9O6E8uQC8K4 jPevBzq3MeZ9a2bn/T1K3Whxcb/03ZIeri1p3wDiw1HxSHNwGFh7gZ81+P3z5FTMYeIqdiTsknnJj QIBhbAjH3OTfAYtxru4zbK2Yro1VJGB3Z+sBQHofEdvoTYOIrH+tsnBgnLX568ox0LeqI2J4KsssB lIDosAP1ldprx2EToiVH+OntWkZfuedk8K/n91nYgxkgxkqIGNuJ0SJj4h5M5tL9pBnkOKgXg4Ka0 5RHyt6dYQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTZ-0008WR-0C; Wed, 24 Feb 2021 10:33:01 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTV-0008TX-UV for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:32:59 +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=1614162777; x=1645698777; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=OJLyadUrBy/GUxVrs/PQC7q8CasxGd88GiprB5H83K0=; b=nwc4cq5LYs0Rd8zqbOMEM6M5qdY/HXVRJcShkEChw464j5ztOQWoz9OB BQxVdS4ZhHm3whypSWcrV4xx0/hKuY2qO5N/aUA7FY8M7nJHJef0q2QRT rWKGS0+m6LmQWyjk/jlG/Z7UF9dVV+YkBDE8JyONNkmTwVRlLJTyPlxq4 aRccF/aJCUAhgLFixS9bfzDkPobZbPO5EGKF3PF/uxqwCcmI5kbbDcMKm X0etDOeWMPkYnUENzqHdpTjVyB69q7ydPLRZ5mYZDGqgnmGbOszMAC+5u 5kFDC6+b4Lv7c5hJLYSPH0QfBJPjTzZaTKej96PgLqSvN87a94+kCf6BJ w==; IronPort-SDR: cCQLvgvWvxMuX0hwgIYGH5KuSC8e19P80vks9q5MbGWU9OWIYzzNCX0HakaPy0XT1cp+j7PBNr Ub3acfnjxrqgeivQFG2SUH1VUbCK3lrzCdTYZPlIeJ5vBJCsfgx/ckg07ZtBxG2D/EImBLOQoN KZBArspjs1TqR/dMjcxD0dP9WDtUXsrrT5EOBrYmekatEAS96YtNmavbEidbtoQ0orLwuun5AC t6eR8lS36ACymo2sN680OSXEuOLzqQ6Xp/yUagulToiUbSkHkxZYJX82Cnn1fIeNc3Io7opqVq Ydg= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165462" Received: from mail-bn8nam11lp2168.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.168]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:56 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MtMMx4udLfBP5OfUIjgNvhCHFxh50QCc+m1a4K/QzE+S0MvB/7lbqe/vsWYI3f3XhbbC8vMhZ4YlJc2TMqbetCLTGZMkjQUtf86fIbEaEeY4JQrlabZ9Ggf4oi3CQ3sxq+S7YXNWQzR02AKOnXIycMkrJR9/HI6bTUkipVYt/DEnXX9oZEk7KjFWQTn6b9gC/ncSD1iitQ9+qfNAgJv0AA5hZroNFrbZtDNvsT3jhcq+pObUaXqrmG4Aid67oWm2gSxSqMRqFmXvK59ZL/bti6Ii1YU5P43RUA4TJ0XGALQrpYEoooUnD2Q226jRe85EcdEDpwoHYAF+l9nT534RWQ== 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=qdkeIw1sWmPaFRYIUt54yXrsLN4Z56LR5waRgY8RnTM=; b=FBBTSRlDAKNdXsqrTMzg0Hus4G06x/OC/aOphL3nnqivP1QVF43J1xkFCdXcN0bFcjZcVJKGq7jWZyC45b+tfADfcJQTIt8woLE3qowi3IiGcoVNVDzDGJ3QHLl6X+Rza8fJ2+p1NubuJWZakWaDkIFZBOIVfRya8dDRDmzsyYyNMkrHf0ypQPrJNRhSVJtWkTw5r9wcLfZPewIwQg2FppX0xQ7aEO4ZpzCm5oO7+LUPMM9KVIK6BsAuCKCFabcXnVp6MwTK8dW8Mse0I3lnU2z+r6/mD4A8OVuJ4d0UMWzG54F5ZrDJdC7xUq6FoYc4eOSCWarJt8N5fQrdPXn5EA== 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=qdkeIw1sWmPaFRYIUt54yXrsLN4Z56LR5waRgY8RnTM=; b=YSxKtB0rj6ePmO0d+2zw8fc09NvCD2waibuKZq4xpluRqWJH2q6CNcJU4ag74J4JKBn/RiM+Mhnyxdy6JHIdnIK+5hZpjF8NMKZHiHfR58q9Btp4K4XE8iYrkK5I/fLYuQm5dyRhMCX4MhHeqT/0FCezYizLHMPpAfDgF86vouk= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:56 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:56 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 09/11] lib: sbi: Implement SBI HSM suspend function Date: Wed, 24 Feb 2021 16:02:01 +0530 Message-Id: <20210224103203.246229-10-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1266a0b9-dead-4269-914d-08d8d8af8c4b X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:669; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PSQZIA3vyjrgJaQ6vjpUO/WRV4GBwrGb45u1939/d1ArpgoZjtVeVemEcIKb5UyEJrJLTB6NPe/0xgzi4BvrVZo8HvwOQbm3eLe+I78+nYALyZZBTIUM1mp0BIE1qe2QXkJoTNwfu1+oy8akhpNaP2ZlSQnkaALya0rnNADbM2yNX4qXuLq7OtKi/NHHCzN+tQtAiE9zGx5zZeqd1S5Yzm3IXLER1ngZ0tsy9cHJNcZQUy0cdUX+jfw4JHDTtm+59nWibrYSSCHcl2/ChTRvcTAxTGDLOD3obVpZM8jXBCfVltSpzk8eMKUxzhUMuBfoMn3hT08lAbllo9BhmIJdEEa6dATjvco+7YcwM0Ya26WHH5ACUyjrDt7YjJ2CfzOpl+ia4g42WOBZYbp5x20BqR+FfOsl4qkx0w0U/ltf621GAbLDtcHLCb+Kqh5Ir21aMjTWtC5MMXm31CREi79dGhzRbW/t0N6fnK8mQNcVSDXz7xPTncLHq3Ezu2DJhWC+EK6/czaiODCuhAqvRcJUPw== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(15650500001)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: begj+0Wkwoa57r9eSPtB8oPTojicIRRsbzUOh00ubDNJaYjxzfwhzC/jigUXO+ulzW5ruzOuksiv+tVZD9lqkpgpbIbzv0Ax6/YbhbpkOicTnEbWpimz1yiZdANY0geTY1bMF+3NMxKpbcOWJ6RNBMSEwm8rOI/1frwbAGsOsVLu2y0/JRtd4A66lmBTmYmj1PojCuEYodto7DLJsu/fya4lGkbQXx1kMcSZwkzyGnG3/r7nn6SML281lHyFiknHDdcPeAGr00McZtUtpJSZ2nfWbxcXD0OlzfSyH6xQdj3hx1wrs7ig+n1myiSdyk2sWMTujLg6/emY5yFrI/c1Ph7ipMfWyfs/2Y9r3rGdzFhSUJDpk5DUbZ4/EhqSfS2vBWNYSK8qr+AqvO/kBWDxeno/Gxgc7w0hA8uQlnvSX1PCUQMP4LLmNA4gMJN3fi97lX33/RsGAMSlsCxo3BR3M0agQVyh3AOUPih0xtQ4v7tWMZgTQPA47eI5xFhjUg74N43XCxzkUSD5CaMA4FJmE7VfIaowIm9HrzJxPVoC0RINkFUjc3OIIwwT4W2Ab9ZF97Nua0S+3vPBXfk5pK1+1rE4v+ZvDQIvs7Mb+M4JEAEAF0RZIAh57/mcubg1I1UWQV0jB7EcTzERz8ZH+InZBKv6GcczoNdNUbsytyONnx7AjYc8pWMqqdHCg2D5GGVwU5Sg0getgPNyIn6EGG+FbF6J1J8fCmcY8ZRaG5nsKLH+YHoWcrCKRcM1fzu9tlr/NpEnPrvF8Uhgfq7Hig+V+g9e6f8sBROsXCFnXC879jhk1yNOAClEuN+c+LYOt6xpznE2jkQgM0xD3r/N9vc1zZGsUA2J58ExXYChhf+6nogSt42R+NIpt0lxiW4FRUTvYyWtNnJOA8Bt/LPz3XPAsLEkUEgLJwhrFIkAQosL95WCsGgv2dciGoujI7P2hksQ86eMRjo1MjECi3hUpRjrXA9LC2CL3Pk0+UHaQkQc6vHXE0nejX1ZisPF+MpIet4d1FVIHHSotz1DCBDDfQLoqy0rGQxxgfQjnn+KP30bs1/MZ+daeks1pS9/06mgvm4q6oei8jKNjTvFVz8HpVy+znNs/00pH9Kead3VlnBbArPHOHXRRAIQbhzuJhMr930wRswjqN0pNylWhobocdBWbcbPSOP3n6akIn1Z5mHyHA7TN/gS16tRJttw73CLrW9tOKSR7czvFmyQ2CWUje10HxJmaijPhSgnFjKUF/MaUXu8LRs3/JjqXK2NLhwlSVxuRzwTF2YXbMDwf3Tw3mF4NalQfvtpI1FvlXQ/I+7QBWMe0nrDMIv/TKKedlSLgDZY X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1266a0b9-dead-4269-914d-08d8d8af8c4b X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:55.9353 (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: p34avH+blx1Y4PUXRgSn21vQN/9ZhzGy31YkVwBqny2JYlkV6Hpzl7bg2Nz/zUQiaws1FNszn/BqLT19RudRyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053258_315083_DB65E619 X-CRM114-Status: GOOD ( 25.26 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 This patch implements the SBI HSM suspend function. Using this new SBI call, the S-mode software can put calling HART in platform specific suspend (i.e. low-power) state. For a successful retentive suspend, the SBI call will return without errors upon resuming whereas for a successful non-retentive suspend, the SBI call will resume from a user provided resume address. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_hsm.h | 4 + lib/sbi/sbi_ecall_hsm.c | 6 ++ lib/sbi/sbi_hsm.c | 187 +++++++++++++++++++++++++++++++++++++++- lib/sbi/sbi_init.c | 38 +++++++- 4 files changed, 229 insertions(+), 6 deletions(-) diff --git a/include/sbi/sbi_hsm.h b/include/sbi/sbi_hsm.h index 4250515..bf0c1a5 100644 --- a/include/sbi/sbi_hsm.h +++ b/include/sbi/sbi_hsm.h @@ -22,6 +22,10 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, const struct sbi_domain *dom, u32 hartid, ulong saddr, ulong smode, ulong priv); int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow); +void sbi_hsm_hart_resume_start(struct sbi_scratch *scratch); +void sbi_hsm_hart_resume_finish(struct sbi_scratch *scratch); +int sbi_hsm_hart_suspend(struct sbi_scratch *scratch, u32 suspend_type, + ulong raddr, ulong rmode, ulong priv); int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid); int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom, ulong hbase, ulong *out_hmask); diff --git a/lib/sbi/sbi_ecall_hsm.c b/lib/sbi/sbi_ecall_hsm.c index 79a9f21..a4a0e58 100644 --- a/lib/sbi/sbi_ecall_hsm.c +++ b/lib/sbi/sbi_ecall_hsm.c @@ -40,6 +40,12 @@ static int sbi_ecall_hsm_handler(unsigned long extid, unsigned long funcid, ret = sbi_hsm_hart_get_state(sbi_domain_thishart_ptr(), regs->a0); break; + case SBI_EXT_HSM_HART_SUSPEND: + smode = csr_read(CSR_MSTATUS); + smode = (smode & MSTATUS_MPP) >> MSTATUS_MPP_SHIFT; + ret = sbi_hsm_hart_suspend(scratch, regs->a0, regs->a1, + smode, regs->a2); + break; default: ret = SBI_ENOTSUPP; }; diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 63fa8c2..3be7f8a 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -31,6 +31,9 @@ static unsigned long hart_data_offset; /** Per hart specific data to manage state transition **/ struct sbi_hsm_data { atomic_t state; + unsigned long suspend_type; + unsigned long saved_mie; + unsigned long saved_mip; }; static inline int __sbi_hsm_hart_get_state(u32 hartid) @@ -65,6 +68,7 @@ int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid) int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom, ulong hbase, ulong *out_hmask) { + int hstate; ulong i, hmask, dmask; ulong hend = sbi_scratch_last_hartid() + 1; @@ -77,9 +81,12 @@ int sbi_hsm_hart_interruptible_mask(const struct sbi_domain *dom, dmask = sbi_domain_get_assigned_hartmask(dom, hbase); for (i = hbase; i < hend; i++) { hmask = 1UL << (i - hbase); - if ((dmask & hmask) && - (__sbi_hsm_hart_get_state(i) == SBI_HSM_STATE_STARTED)) - *out_hmask |= hmask; + if (dmask & hmask) { + hstate = __sbi_hsm_hart_get_state(i); + if (hstate == SBI_HSM_STATE_STARTED || + hstate == SBI_HSM_STATE_SUSPENDED) + *out_hmask |= hmask; + } } return 0; @@ -259,3 +266,177 @@ int sbi_hsm_hart_stop(struct sbi_scratch *scratch, bool exitnow) return 0; } + +static int __sbi_hsm_suspend_ret_default(struct sbi_scratch *scratch) +{ + /* Wait for interrupt */ + wfi(); + + return 0; +} + +static void __sbi_hsm_suspend_non_ret_save(struct sbi_scratch *scratch) +{ + struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, + hart_data_offset); + + /* + * We will be resuming in warm-boot path so the MIE and MIP CSRs + * will be back to initial state. It is possible that HART has + * configured timer event before going to suspend state so we + * should save MIE and MIP CSRs and restore it after resuming. + * + * Further, the M-mode bits in MIP CSR are read-only and set by + * external devices (such as interrupt controller) wherease all + * VS-mode bits in MIP are read-only alias of bits in HVIP CSR. + * + * This means we should only save/restore S-mode bits of MIP CSR + * such as MIP.SSIP and MIP.STIP. + */ + + hdata->saved_mie = csr_read(CSR_MIE); + hdata->saved_mip = csr_read(CSR_MIP) & (MIP_SSIP | MIP_STIP); +} + +static void __sbi_hsm_suspend_non_ret_restore(struct sbi_scratch *scratch) +{ + struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, + hart_data_offset); + + csr_write(CSR_MIE, hdata->saved_mie); + csr_write(CSR_MIP, (hdata->saved_mip & (MIP_SSIP | MIP_STIP))); +} + +static int __sbi_hsm_suspend_non_ret_default(struct sbi_scratch *scratch, + ulong raddr) +{ + void (*jump_warmboot)(void) = (void (*)(void))scratch->warmboot_addr; + + /* + * Save some of the M-mode CSRs which should be restored after + * resuming from suspend state + */ + __sbi_hsm_suspend_non_ret_save(scratch); + + /* Wait for interrupt */ + wfi(); + + /* + * Directly jump to warm reboot to simulate resume from a + * non-retentive suspend. + */ + jump_warmboot(); + + return 0; +} + +void sbi_hsm_hart_resume_start(struct sbi_scratch *scratch) +{ + int oldstate; + struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, + hart_data_offset); + + /* If current HART was SUSPENDED then set RESUME_PENDING state */ + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_SUSPENDED, + SBI_HSM_STATE_RESUME_PENDING); + if (oldstate != SBI_HSM_STATE_SUSPENDED) + sbi_hart_hang(); +} + +void sbi_hsm_hart_resume_finish(struct sbi_scratch *scratch) +{ + u32 oldstate; + struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, + hart_data_offset); + + /* If current HART was RESUME_PENDING then set STARTED state */ + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_RESUME_PENDING, + SBI_HSM_STATE_STARTED); + if (oldstate != SBI_HSM_STATE_RESUME_PENDING) + sbi_hart_hang(); + + /* + * Restore some of the M-mode CSRs which we are re-configured by + * the warm-boot sequence. + */ + __sbi_hsm_suspend_non_ret_restore(scratch); +} + +int sbi_hsm_hart_suspend(struct sbi_scratch *scratch, u32 suspend_type, + ulong raddr, ulong rmode, ulong priv) +{ + int oldstate, ret; + const struct sbi_domain *dom = sbi_domain_thishart_ptr(); + const struct sbi_platform *plat = sbi_platform_ptr(scratch); + struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, + hart_data_offset); + + /* For now, we only allow suspend from S-mode or U-mode. */ + + /* Sanity check on domain assigned to current HART */ + if (!dom) + return SBI_EINVAL; + + /* Sanity check on suspend type */ + if (SBI_HSM_SUSPEND_RET_DEFAULT < suspend_type && + suspend_type < SBI_HSM_SUSPEND_RET_PLATFORM) + return SBI_EINVAL; + if (SBI_HSM_SUSPEND_NON_RET_DEFAULT < suspend_type && + suspend_type < SBI_HSM_SUSPEND_NON_RET_PLATFORM) + return SBI_EINVAL; + + /* Additional sanity check for non-retentive suspend */ + if (suspend_type & SBI_HSM_SUSP_NON_RET_BIT) { + if (rmode != PRV_S && rmode != PRV_U) + return SBI_EINVAL; + if (dom && !sbi_domain_check_addr(dom, raddr, rmode, + SBI_DOMAIN_EXECUTE)) + return SBI_EINVALID_ADDR; + } + + /* Save the resume address and resume mode */ + scratch->next_arg1 = priv; + scratch->next_addr = raddr; + scratch->next_mode = rmode; + + /* Directly move from STARTED to SUSPENDED state */ + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_STARTED, + SBI_HSM_STATE_SUSPENDED); + if (oldstate != SBI_HSM_STATE_STARTED) { + sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", + __func__, oldstate); + ret = SBI_EDENIED; + goto fail_restore_state; + } + + /* Save the suspend type */ + hdata->suspend_type = suspend_type; + + /* Try platform specific suspend */ + ret = sbi_platform_hart_suspend(plat, suspend_type, + scratch->warmboot_addr); + if (ret == SBI_ENOTSUPP) { + /* Try generic implementation of default suspend types */ + if (suspend_type == SBI_HSM_SUSPEND_RET_DEFAULT) { + ret = __sbi_hsm_suspend_ret_default(scratch); + } else if (suspend_type == SBI_HSM_SUSPEND_NON_RET_DEFAULT) { + ret = __sbi_hsm_suspend_non_ret_default(scratch, + scratch->warmboot_addr); + } + } + +fail_restore_state: + /* + * We might have successfully resumed from retentive suspend + * or suspend failed. In both cases, we retore state of hart. + */ + oldstate = atomic_cmpxchg(&hdata->state, SBI_HSM_STATE_SUSPENDED, + SBI_HSM_STATE_STARTED); + if (oldstate != SBI_HSM_STATE_SUSPENDED) { + sbi_printf("%s: ERR: The hart is in invalid state [%u]\n", + __func__, oldstate); + sbi_hart_hang(); + } + + return ret; +} diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 0e82458..1d4a838 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -311,14 +311,12 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid) scratch->next_mode, FALSE); } -static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid) +static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid) { int rc; unsigned long *init_count; const struct sbi_platform *plat = sbi_platform_ptr(scratch); - wait_for_coldboot(scratch, hartid); - if (!init_count_offset) sbi_hart_hang(); @@ -362,6 +360,40 @@ static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid) (*init_count)++; sbi_hsm_prepare_next_jump(scratch, hartid); +} + +static void init_warm_resume(struct sbi_scratch *scratch) +{ + int rc; + + sbi_hsm_hart_resume_start(scratch); + + rc = sbi_hart_reinit(scratch); + if (rc) + sbi_hart_hang(); + + rc = sbi_hart_pmp_configure(scratch); + if (rc) + sbi_hart_hang(); + + sbi_hsm_hart_resume_finish(scratch); +} + +static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid) +{ + int hstate; + + wait_for_coldboot(scratch, hartid); + + hstate = sbi_hsm_hart_get_state(sbi_domain_thishart_ptr(), hartid); + if (hstate < 0) + sbi_hart_hang(); + + if (hstate == SBI_HSM_STATE_SUSPENDED) + init_warm_resume(scratch); + else + init_warm_startup(scratch, hartid); + sbi_hart_switch_mode(hartid, scratch->next_arg1, scratch->next_addr, scratch->next_mode, FALSE); From patchwork Wed Feb 24 10:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443806 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; 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=nT/0F6b1; 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=Ggc5je4d; 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=pKb/G4tT; 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 4Dlsh33btVz9sVS for ; Wed, 24 Feb 2021 21:33:07 +1100 (AEDT) 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=1mZCsJUluDy14VRzDn9Q6G9QNDMhXn8bRzhV5HSvxz0=; b=nT/0F6b16nFOvFJRpJGI83nzd uNzByhUjXLodc1xZvpWUT5e2gJ0GGtNgP5n4pPuf6L4WS7uCdPc5Upv/H9v4FOKJ4fr9YGQ+iIpW6 dtxovExtwbQOpnyf1GmIgeQLJtY7WNIJfnfK5mF4GpgSZdSyao397GY0uD6zCKBztzmC4bCjKh6M7 iK9OeeRzJl0LHx6JeFK1Vu3qECScobKqXBE3A44VZkSX8LyR3inf2ccm2XzLOnTwlovAmIZCjDb8h 3OdJ+NzzDPtD32dMoNxaMI6EFEtTtDh7ufs1GS1VwEsvnKKchz8XetGjMlwV581aXpc+iBy6ff2mr PkJyd2lPQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTa-00005e-Ux; Wed, 24 Feb 2021 10:33:02 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTY-0008TX-2C for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:33:00 +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=1614162779; x=1645698779; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=ilgT9/E2rEvMoOaiN2r8UZPKs3G0ZV9d77Wz5dBoKiw=; b=Ggc5je4dEFHkSq0s4Qw5JFnLkrgXPDL0tOWhyd4nPsntdyApodTgqjTd 3qPytToZ4odsK0GdskmxqxsaZJKztvis5dPZeLRcsnkWwCGxCu5lMJPsN iPPo++vog1O059z9D4U+VDxVmGPnlFtovaEPuAX5pOVK8Amd1tNGlZI/J wKHjliZa6rJEfwla29QIq3LX0HDxqDqYSXSUJwFp9CUDeuaRqQSZVX2bU B2bwFOgeoIB3w1mkRwtvfIap8zewlqCGTVnR6qRWSc0CLb+3qAEQq9cME RUxq4LBYFGvF6m8czAyusnjWkJ5bnn0khuqV5JjaRdZtQ4acW6MfgvkHH g==; IronPort-SDR: r1+t+USxybZ4dik4112PCa0XmKykbcnVfEitKMyK+E9PNZaPkCrxfGNRYrs79XgMB7Dr/sGfKL sRGoh4iAyZ3TRAeAKogby9ymL7v//w3l67oLuKTo6khgHhQ5/qoeUy+s8gaGACMtKs+iTLNNj2 Wpt1fz4mgBjGqbX/LMZpRs7Sa14rb9X/vQtNFJallxo23Kv0gyGHucwnH9MkUFurrkrHJ4xQcZ qJ1qYqi3Mbs+rhbak28myd0uoziFALsPYf7KisaNedYXhQ8DLBGSexpQzI2t+7iV9WgentABvY zK0= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165466" Received: from mail-bn8nam11lp2171.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.171]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:32:59 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aptcJT+cx8wPaWyjdyNLJwbg0EyDVeIZfQMlmM6kW4nKsEcVPl3s51jmq3CIRhbbJgMRcy4usjEd8dR+1M0733yEKMVz5XYus7DQFXH0Lvno/J8h0wbFpf9JVg14ePtaRtx8iclwY/B1RxDvj6sk7Z7DpKaMogszszfqv7QTl+vCBQt4uYNG4gePmwYVjqYFWfFEbZAsnnKtJXgjqBTomsiRULfk2moMqExT04RyY7H1omglLj3z62CybT/AMVyeXGCgMPYGYx5cWVdZQCrM9ygkcwhCXgsiZZofCuL14UT2oa06Yv9BpVir4+lQzTVQywnZH+x7mXTd9+4XpMQ+zA== 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=CRV7SE/WCcpYJEM9gitlQRUdVqcm4ozDRjMqwy7Z7RQ=; b=es2C3gcJg9/XTA1Yv2WhkHabFDARy/OBqUK5pu1Iv+PkoVOAd+h7jQkCqebxAYuYKgKVC0eTQzhUgFaeRgbL2LFIHLPz6bmCQ+B7V2hTGNzl5xWAxcn6M2Z3385x4TX90KqqB/FPpyWoflDXCTwh4nK1tOeID8sbL3Mm0EkFD9tLQ7PODldB5fXp7jDUed9YJHrKnhLIXEdgf8KmpU04GgtS61sr5iZXpynGCTQtzO6C4JI7sNZ5IcUxpaRzz8ZUg1yq51JVTktahmNj9yUoecfvjul/9SQ6Fr5PjNzucBbgSn0H/k6wKhq9JK9rL6W26ho+RVb+QM0wn4jZ3ZxNew== 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=CRV7SE/WCcpYJEM9gitlQRUdVqcm4ozDRjMqwy7Z7RQ=; b=pKb/G4tTFqBdlsFsKlxlFwDfYMIRz0VQOnA9rLdx4/D3IBXbekGsVroTkpIHzxWxPxufMMT55FgtoxjJ1rQV2ghuIMvNEjbsbVRQmYDNysgXkfleHTH1EE5GDK8zHwjZ8t0mJeiiLYrdAywyvXQd/53KfcWDhs1yh9eYh0dPK0s= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:32:58 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:32:58 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 10/11] include: sbi: Upgrade SBI implementation version to v0.3 Date: Wed, 24 Feb 2021 16:02:02 +0530 Message-Id: <20210224103203.246229-11-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b75d8007-cd64-4cc7-3048-08d8d8af8db6 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aPks1H3X7jZuhr1mrcpPP1qiLgp8UF8M6RIJCHd7UxvYWCI/cOMpMREMUe+bKg3uW0pZcU1Mix+RW4qILH7Lmzn1r1uHi3YdmnpV3w3v+as+z+myXRMx2z+w0ncqWa3m/Q5GzcaBbpKMgzoweSl4+LRcPi0grmx95XPQBA8/+Kx+rdBy3R0h9ZbIrBxrO4NN2MI318FYVCtdJ7VZDQv8jeSeaA+w5L7PeZ1SrFHzZWQHseFFs7YaTXiwxC3se88Y1ovd8mZlnkdSR+hQK/fVb9F2dsJri+Fbj8QFOfZv8tDAEwFtUuiudaicT5vQhR3AKnjdj3X/A4tDNm3D/CluLrMu2eABgYHTvkNMashcMxYKv8YqrhiZQXHUiqZHEZc3W+Ww7RjAxBvleFIWXg+9a7wTtTGB0dYbpItujHVOGb/CCFNBD3vvLnS/WJND9mloMPJgp2kMNuoatvb6O3nEttp3Fj9tKctlL5DzdYa1WQjnlMKNMHJl+KmfOOERSbuO02SAHTbyoVhVlAHOtRLYQw== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(4744005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: P8SYZT4b+2HEpPWny/Rh1i8f/uXQjy/kE0o5Tnz0vnTiB3LQKNvuz/CVwJa8qbl4Dh8MOwaGslYo/FvRyIy97NaOoTkmVoiMoLWZjxMmjCItbNERlYSyFJAjoubKcyVu41KNV/UIJPEjzSQuMZkQ5g9hmAl7h6DIeA5bJCVLWSwjVEm6Qz+GOhBoIBeunQCfz3fr4PMGmrOfxxPYsIJgnvC5TajO1wN1sa/R1x2CdLUQ3X9arVerV/NDFiIOjI6TyDAAaWaBGicYwpj8sDTMF+JjcAgPSgmG33RPiwVGwmvDMB7No4AvRhIrxN+B1mUzh7daPsK/wEUpXs8Ql4I0sYUs0nUk3K9NhryUS784zZTDDexil+aKkG1y2hiXn4BYIt6qrX7KCd5RcQ+bdGIo7zL0kO0deE4gfOT7NnPREEAIYQsxbTrKeFLl+AQyHOo1Tgcee7VBI3q+qQNjfHRfHe3a7PY/I6/6RC2QrrW9NSfEUhL6AtuRc8PvER0tyf6tV2DVeA0rxeFawMD282QFRStnYvUHO03QrA3Gd0g50OkPsxlci1LvmcbIoH+SygQpN8CfisWCeVFKoYh/Josii8NYFuSTHKC3StYm0A4hrdGKW3vo5p8K4wzOT1LH/9PxRnvta8FeoAr5TFLdMzgrrahvCA87oaprJuI4cFDTmiEimz9+542rBGgih22rmHUu5VRG1wmBZcDQ+gEMmRYyfZpxjgW4khMOFVAnAaKCJILPpyYp4KNFQ8kuRLwkPj7ttSU1FwFZO+3PZKwDC5kIOVYgHzhXDYNmKNdVEfNH38AmtOcI7AHm1VBjahxCL9OYGRL4XR2k1iq8WdJ8L5e/24FuOfZSjdyoMzvsKbc7PY/V+iID6X08tWxWqAxFUj/XdpDR+kYqJKbbcKbINkt0XfBBlO8hW+kUEoeA6JWRDqBYCA3DbBZkhaSQzbyX2zq7GKdn6Oa3Atw7QheIPmP66tJtCdXrH4H52ty8OpQI5x1XDB9Ar4n94k88Ur20JOTyOL6XNWmok4R9G0eWrLRNcrtODGw+df5oSyIvihKv0/eW7X1RhRMg9X5OlwzEff1rkY7qv7inl8QOKrVCcC9VXuL5wvKe61lY1+gCjKkew08JryrqALaQlRgLkmO7rB3bIbTWGMyD+aZrG/H4agt24n8GSCMDJxj7F4FUN0Bk6dP9bas8sdNlCPlE+/GUCNoFajsmYhJyrzX0sUmya3YHYqx7gXh+AwfB/QtlrLvfcjvZJiTrCm4PqgOafwAVqH3CS/HeAujJ23x8+mLIWqURwtxhJotkhpQ8AfNpBo+7cHzCDwvhdMOKIZE4GPE5mRrX X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: b75d8007-cd64-4cc7-3048-08d8d8af8db6 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:32:58.5366 (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: Wo81RlgZoA/9UKk4snB2fWTcCksiU3rtjA+ZKGvIfauie1CK+No25+TKgLgrwKaFiZ0e2YGfilvKO/e4xef4bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053300_265132_C0E7FCA9 X-CRM114-Status: GOOD ( 15.67 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 OpenSBI SBI implementation is now compliant with latest draft SBI v0.3 specification so let's upgrade SBI implementation version. This will also help HSM suspend function detection in S-mode because HSM suspend function is only present when HSM extension is present and SBI implementation version is 0.3 (or higher). Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_ecall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sbi/sbi_ecall.h b/include/sbi/sbi_ecall.h index d357085..63ef866 100644 --- a/include/sbi/sbi_ecall.h +++ b/include/sbi/sbi_ecall.h @@ -14,7 +14,7 @@ #include #define SBI_ECALL_VERSION_MAJOR 0 -#define SBI_ECALL_VERSION_MINOR 2 +#define SBI_ECALL_VERSION_MINOR 3 #define SBI_OPENSBI_IMPID 1 struct sbi_trap_regs; From patchwork Wed Feb 24 10:32:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1443807 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; 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=BVHubZuw; 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=fVum7uV1; 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=WWrBH0wG; 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 4Dlsh6553Nz9sVS for ; Wed, 24 Feb 2021 21:33:10 +1100 (AEDT) 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=5cRXLeIERmPhNZrzheiJL5TFrsz+mFYy6kGlEtHduW4=; b=BVHubZuwfCKw5RdGf8H3Yw8oo fNTpHdMIBl/EFCbvXfbwt5FFBQuTy2ChvJg5eBhtlPkdCc43vdGBDS3K8mViygHOFwtDSgqZ3l4fW RoKJQbb40v+8T21wfpaoWtI/AuyXEfvIN2Rxs4pWYoyNgDgEC1BWxI+2CIbtqtMwyllcr83nqZ5qP LRKxyHGGWON9fDvhpqukQMtuy/SbEZrO6Rn5OFQf51sRzngIL4M+tuYR01vbLdy8LKn9jgI72Gzsd vIYLV+AQzvLPRNZPHsWY3df7AinCfmg4bDMtVWB4+fBlT2HZW9vS6O75avJSMR7iSRPO3qnGbNPkS 5kIaJ7sXg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTd-00007D-4C; Wed, 24 Feb 2021 10:33:05 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lErTa-0008TX-As for opensbi@lists.infradead.org; Wed, 24 Feb 2021 10:33: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=1614162782; x=1645698782; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=KrYqgT6S0W9PP/qenp3De+EEPMxe/u4f01bCSIqS9bg=; b=fVum7uV1gdOyk7Jsi6B5GMViB5/eEmcIQCLUf0gytusEwZwaHU4hG6KH TlmDZ5GN+2OAzNOpWhTiJ4PbXjsYyaLlVOWZbvqnLyKyPpxesL390zIPN VJwcZWRjJ7kHv5KVAzjrd5Q1+4dBbsw/+UeByHdxSaq7RtDlptTYnObT5 VVT5e1+nS4C8gNjYtStqwZ07mqyJcDAjgUmmymmx/svKKzP8gJJq4jHTa zGHbVoRuzmLHJoFvzaX0nwddyrnz10RGxo4kN09Zp+uKJXe+YlVp1sdnX uimA3aqII6i1gbIDWxWfJKEzNYgTTxpHNs3cXuEx51rS2hdh50IYC13wh w==; IronPort-SDR: A7KXAMIGvY6sK6TSi9C3JRxfrHknGNCoPgm5xWZQMYLJWH/hpMb6O99FfwjUcP0B+biBQld+ij ywtxIofK5lVW/YgDIRtxCKYkH6SiJ7OfwXPTreplgp0pKEk/jp1VIvXCgnd74hOBaEuDgmGtv+ nj0Kk+7/7ME3sGBdssBqVUOYuCSe5/Rl4tnEO0ooeLvbDwC2P9LoYYogzIZQbZCsMUIG/ncGh5 MrL1I7zZxY9KMDobKlVjeE4owo0VKj36lQXU2RzgAX5AM2ivo2w5BOrYJUD75yua/aNBbEO9NH 0t4= X-IronPort-AV: E=Sophos;i="5.81,202,1610380800"; d="scan'208";a="165165473" Received: from mail-bn8nam11lp2170.outbound.protection.outlook.com (HELO NAM11-BN8-obe.outbound.protection.outlook.com) ([104.47.58.170]) by ob1.hgst.iphmx.com with ESMTP; 24 Feb 2021 18:33:01 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tm4GHPe91+h9azek+uh7b2FFOYX84X0MAmqm22ABs99Ik21rxfgWRPhTOVnEcKZGK9KoSPWSodB/45rlMUUjbJOp3z4ewLd8WXCi44H7WqmPqHFjumwLP4anZt+rIZC8/sksDgsAq+1vaZpjsGUcIQKyJw9ucgkvyTyggSTHkJv3bfFIXcMpLgM9alf9JshM81Mb9WfFjvDsCcUCvjv0/RBIlQEl951nTjeIv4yQNvZ1g5t2rHmtPZTgAZuPPfT9btbM4ytOZF0yFa4qKHA6Fk/s/OZ6TEJ8cDoTdfcL9c5SbeTCljTwHqpd2Y//kzEnnznPA9EOzqxEXccNGTYqgQ== 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=6xG/8FCGhbRojCVfj+rM17cHQ3xlPfR1OtpeSdO4vAI=; b=oNxMT+R24SibDS8zmeDrcbhPi3Pb0XIPxAfNBV6/UIm1cRctXGuKCl1twtB6Ca5Qge2e94NPSjdSTSCPDFAxSMxmLIZOQq/VapY82r+Ww71ENJAhDNAzmVrrRgNatX3iXRBCPIPocDGCmnwmspCYF+rUe/erArbH6z/3fT2xd3ivx4zxb0+5T6j8SNdEMhb9fL9ynSi/VOB5oqmeNVgZ52Eh+YPD4KEaNNnCh+6me6oJ32WZD5jWd5/yUjqBBdvtv8QziuR00P/QWS/8cpVslwJqTgs7mz1fsiVUBFYA0mWadPpZewYfPpbaoHyYsnwdCIKLPuLHLAj6H5NFiK0a1Q== 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=6xG/8FCGhbRojCVfj+rM17cHQ3xlPfR1OtpeSdO4vAI=; b=WWrBH0wGefKwA3JyR7Cyx9A/gz90M/VQ/l22/SXnVUtMnsDurIyNGl5i13b2knIst/tTZlnuD/hYl/GXiCEOmm+FOMA2hPocViUNBiZTSVkfcr7S4NlNFKmkCVTHI/lVYsoAuxUv9So/uhVagILkkgsNbuwc/3oqUduwAjXpbqo= 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 DM6PR04MB6329.namprd04.prod.outlook.com (2603:10b6:5:1e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Wed, 24 Feb 2021 10:33:00 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::38c0:cc46:192b:1868%7]) with mapi id 15.20.3868.033; Wed, 24 Feb 2021 10:33:00 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH v2 11/11] lib: Remove redundant sbi_platform_ipi_clear() calls Date: Wed, 24 Feb 2021 16:02:03 +0530 Message-Id: <20210224103203.246229-12-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224103203.246229-1-anup.patel@wdc.com> References: <20210224103203.246229-1-anup.patel@wdc.com> X-Originating-IP: [122.171.60.122] X-ClientProxiedBy: MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.171.60.122) by MA1PR01CA0142.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 24 Feb 2021 10:32:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6a4877ef-fdbc-4f01-d232-08d8d8af8f39 X-MS-TrafficTypeDiagnostic: DM6PR04MB6329: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bsjtoNcwmAjZKs7vu/pRWWut32kWlY+ftu2vjPqQDMFrVzMDao8vcGTy3O+aBEYA/pd7z5JkNvKidwVM2hYisftYYGhR+g+Uuu48zo3AvvlkbjftPd5kxovWwlbwiqf1B0Q58wMX9j/Sh6Ha7GZF///q9FqPv0WBijJwKkwznz5nr7kd5vkWO7S4uzfY2puGW0kj81ITEuz8fLqEkhqDpboM2ljEnHTHPUZL7iAdL1jZLjPi6liXkylu3N+tyUOX03XXRmauaKzXg2o8LmJ2n5n0I6APx1qbRx7OhR225bZO46uktBCBmqbhJxv7jnSJXWnypxsDFzP7FI+vZjB9nfMrwZ0c78eBmAe5lpRtlq37fsNkG1JO6oKvrsFJRPNRDdTCf6G5gRLlEAcZYs3meTxvjF17psrFQ+k76Jpue5iuLNN8qYSw6EXtVUzGxYspsAgwMCak3jEeZI303Z72Hj/YUqzuwdoLG4x78oyY6k1IRyOk6wrzjrjAWZA+3Vr7s4Ju5UDtxd+ky62hpU2wyQ== 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)(136003)(396003)(366004)(376002)(346002)(39860400002)(54906003)(316002)(26005)(66476007)(66556008)(110136005)(8936002)(6636002)(8676002)(1076003)(52116002)(7696005)(956004)(2616005)(55016002)(4326008)(86362001)(5660300002)(36756003)(186003)(16526019)(6666004)(83380400001)(2906002)(478600001)(66946007)(44832011)(8886007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: nGmuzpJTO7CdCHAD3g+GrjzYZmVIcxPuI9CIETrvH1d6F8njiSLH8YTxAsL37KllIm4u5TpJJNs4us6K8VKTjT6Kmof9rU9mh6e7XTPRKy1+PfMGdl522LTBS6WQuhnG8sfbbr42sTUURAmafy1SotS5mUmkbDd+1pOFQy3ouki+D2eep8y/WmsYZTvIhVMZwNVeXywqIJWayuv4YpM7GSdzUgYfa1syDD/E3JhWlgLuG0bstsKhkQ/aQq79ds/wv6zvkj82FjWaJRe0N2sGGdvOhaF4qSECBzthuTCPGtmQrlQLTEMUoauOIbsXF+aTmPDa366ZPKazk5M9K4OIwA+LKp647LpNReDSs46NzRECaARWreAtdh4tP3Jm3sm7olTRtcTqVV+fiaZzD8ZqP0TjCl4bXwfN2sFpZO2vUsg1iBgAuNI1UKQNGyPajZ3eM4IxCHXq3X89E4WKqt01hf3szJOkbKigBfHqmmAlaTvjQu5kBiqNTOc0lJhCA6PSvhNi2QfJ8e+i+3E2Eyf81bw/VJpzYqmPUOztKaA0YTD4CrgykXc9JH8v0GbQwenUrOTWw0LC8EuiQIEf0aPfnLhIqrvGR3w6wQGlKrpPavjC6tASYBiQtpDT341bpnEt/mAGMZTQsZatGzwCZT5LL75rW6OXRmh7uMWm5w5JmuYNWPEioI4Q6qmkUmAY7WNg67iVJPfY9YSvtiiF6gr+a9gv2v4gaoyo3LxfeLIKhhN5UO6rZU9nehjQRpSq5LFoCShuPJcutO2SyaBW3YEiVGOsJ7M3DRFibt7qmrnEH04mCyaK9lD5KFSiTY7laXRO+50JoVb5MU0JDKnlfpAQEvKqeaPUM9IvZ3MFJhE60NZ6OkzhWVvgRP48rlbAEnuH6/TgL4U4pvKaA35JHQJv9NlDCyKpdyArsMAXjOfzXhrFqWGWErBvd58Y62jvCbRMPNw/jy1y7bfntdXpVqRqIwJXIYtgu0WkDwjYymrIhHVNt/6aJv7BZqJnOA3SrWpeHOJiaGZ6i6V4lehNbmop/xd+itDrMIQgB/uB/UR3HCAhg5X2EKX8Jo27Yt8huEplH8VaI8F4jJcjaSpBKP/yKOIzynBmZhue8A124fp+3YwG2AlR4aJ7glI+E4cKZ72qU0NNtEb/o+cBUGqTw9QB9f/y+f34zToRuGIrovyA35iWr8zwcMwFl0JnZrelkc5DfBiBhnzCvPNiWyoAVdZAwLXa20JLhD4S6JrAtm+jrftha7RoA1Lne7Adx5CKP6ouep+jreA5hyjfyEinxmVZezcl9eOqAV0/mz01gNS5Inm8VlZsBkM4bRnPH2cwYsus X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a4877ef-fdbc-4f01-d232-08d8d8af8f39 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:33:00.8042 (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: ckFCF5XxgR+MEIyKeNDiTNvwwsnQ9eIBhgWDaUz9DuFJBz4eCxkwIw+KOQUKaRRz25S/99YfOKnMpmdgedG7OA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6329 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_053302_734999_78A267D5 X-CRM114-Status: GOOD ( 15.86 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [122.171.60.122 listed in dnsbl.sorbs.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.71.153.141 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 Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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_platform_ipi_clear() called from wait_for_coldboot() and sbi_hsm_hart_wait() is redundant because IPI will be automatically cleared by sbi_platform_ipi_init() called from sbi_ipi_init(). Further, wait_for_coldboot() is common for warm startup and warm resume path so the sbi_platform_ipi_clear() called in warm resume path cause resuming HART to miss an IPI injected other HART to wakeup the HART. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hsm.c | 7 ++++--- lib/sbi/sbi_init.c | 11 ++++++++--- lib/sbi/sbi_ipi.c | 5 ++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 3be7f8a..e011069 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -107,7 +107,6 @@ void sbi_hsm_prepare_next_jump(struct sbi_scratch *scratch, u32 hartid) static void sbi_hsm_hart_wait(struct sbi_scratch *scratch, u32 hartid) { unsigned long saved_mie; - const struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); /* Save MIE CSR */ @@ -124,8 +123,10 @@ static void sbi_hsm_hart_wait(struct sbi_scratch *scratch, u32 hartid) /* Restore MIE CSR */ csr_write(CSR_MIE, saved_mie); - /* Clear current HART IPI */ - sbi_platform_ipi_clear(plat, hartid); + /* + * No need to clear IPI here because the sbi_ipi_init() will + * clear it for current HART via sbi_platform_ipi_init(). + */ } int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot) diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 1d4a838..4de2dfa 100644 --- a/lib/sbi/sbi_init.c +++ b/lib/sbi/sbi_init.c @@ -130,7 +130,6 @@ static unsigned long coldboot_done; static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) { unsigned long saved_mie, cmip; - const struct sbi_platform *plat = sbi_platform_ptr(scratch); /* Save MIE CSR */ saved_mie = csr_read(CSR_MIE); @@ -167,8 +166,14 @@ static void wait_for_coldboot(struct sbi_scratch *scratch, u32 hartid) /* Restore MIE CSR */ csr_write(CSR_MIE, saved_mie); - /* Clear current HART IPI */ - sbi_platform_ipi_clear(plat, hartid); + /* + * The wait for coldboot is common for both warm startup and + * warm resume path so clearing IPI here would result in losing + * an IPI in warm resume path. + * + * Also, the sbi_platform_ipi_init() called from sbi_ipi_init() + * will automatically clear IPI for current HART. + */ } static void wake_coldboot_harts(struct sbi_scratch *scratch, u32 hartid) diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index a3a6ce6..b50735e 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -230,7 +230,10 @@ int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot) ipi_data = sbi_scratch_offset_ptr(scratch, ipi_data_off); ipi_data->ipi_type = 0x00; - /* Platform init */ + /* + * Initialize platform IPI support. This will also clear any + * pending IPIs for current/calling HART. + */ ret = sbi_platform_ipi_init(sbi_platform_ptr(scratch), cold_boot); if (ret) return ret;