From patchwork Sun Feb 21 08:53:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1442760 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=LwbqA5Ng; 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=NOfw3him; 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=mifxDg3N; 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 4DjzdC4tsGz9sVR for ; Sun, 21 Feb 2021 19:54: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=ZL+ma//regT72HYXVxThIM44JMhNTZvxFO3wgMWYkaE=; b=LwbqA5Ng7U1Ft8XYBNPoHvnRS d7p/mEhr51kYeRj8sghGSq25HEvbwX52yByABVKYqJtx/W3heiZEY5I2ViUgDXvHSk6m09xAVo3ZE mNlwzDB6iRpIyUpdBR0jj+Eb7//NTIi2D96ioQg/D+MjtPJTMpnYyf86At016E6/6JJO5LYcbxTAg DVGAoi2BbdBdjKzk8Wcx5OrCsbpuwvZy0eSdg/ijjcpFSBJ2MWIxV5J+c7CMMJo08THmQDbqDww1+ dtO80SrdNsgfYzf7uKaNJolyZg8UxahOg5QJcfZi3BUNtkO5i3vIxgFv1J9JHrpZ+19aLe9YwKLt1 +NCdcAuSg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lDkV0-0003W0-KX; Sun, 21 Feb 2021 08:53:54 +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 1lDkUx-0003UH-9t for opensbi@lists.infradead.org; Sun, 21 Feb 2021 08:53:52 +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=1613897631; x=1645433631; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Keraw41uxEi59K1et17/wi0RwVxWkEjdYqpGqWcDJ/A=; b=NOfw3him9pMs4PV2Jrk/gltm6ihI4AzQlf4pzzXlRNUxwVZaJKVy6oRu GgrEvj6y6PjcXQx+D2wbeOLZOFVkOnEv9icGgawVArhtt4h7buOAnxpgz U4ZQcx0XmKIds7+JyKxXm5GGRq1eoMoEDtVtj71rBm70d4VTrgw1nwH7L CU6RqtUKvRrYXHmeeBVQWF6qdkEmgXhNle/VCvZSZ0qzIkwecml73v/Ia EXhctpjd16DKLG1cGnBcQvbXm6ub/GX9Irs0nJjQjZbfYVgHjyfqG12Sj zxP0XB62Mj595GzwJyzsBOM+InhM/1pim4kSRiMy2zbd0RtuCi73pVZhT w==; IronPort-SDR: aGDQnZa5RTsEerKQmmAcA7JNsSOoDGPK9cOWL0kphxb2f4Oh/KKQWLc6my04nuhG4KIvn91Liu I56kch7QylsD1cRY4Gb9OJjATIlm5ysb8dpOMys40gOLi2qv0g/2adZmKIF8qT8YC3oM0Qi+pP hkaY4xUXHd25vRyDqmwE7eSu/xQwuYb4wtGcsGaA2HCp1K2cL3OfeMXFQQt2+SNi4YIodqnrcj s8TEu9shJkDeeepNwMHJuSDAkUFjqO1i5znFiqtoAYudjMxGdulgsycfRhQ5SyacCyN4Fy+Wmy /KI= X-IronPort-AV: E=Sophos;i="5.81,194,1610380800"; d="scan'208";a="160446553" Received: from mail-bn7nam10lp2104.outbound.protection.outlook.com (HELO NAM10-BN7-obe.outbound.protection.outlook.com) ([104.47.70.104]) by ob1.hgst.iphmx.com with ESMTP; 21 Feb 2021 16:53:50 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KtbwdVMGPcvyS0G3BBM7DcQTX1RJxrVmaArd3PKw5hZZyX5exyMwWCMJBI5siBw38LCExhthZJXsyW3eo9jT2ugqraDyDsx6yuaddXkse6DdWrmElY/Jyj/Dclz5rcNdrBnZY6pImTCuLCmK5b7iIi6szUn5rNWFDv4AzcCJejzk+9JTvTIKKSv+gNBwqwW+OgeslnG6ZO+elEhmkroNUMrLsSAd/3D/G1uWoubFXBBcDWV5feB11AxG/RhmJtYthie0WEpcdQSg0YypkEaO7PhJk/ai6lp0a09A+EuAgLDJthYlIXbdJVITNNgz4FJ8xD51pnNI+NNvbosm+BbwGw== 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=2d2PSsruY+1msGxgb8YnUd8yyG0paxjJ8qQ9hBl2s1I=; b=ZnVMh93++o+7TNkjUcsDK3FsqznSw61WlrJal50e+6IiX4fCEJjTbiYPaTcDfWxmmCF9c7k4RdAxhKBhszPse3SyjWyTl5mwN3e0lGsJcfPREfKzmo2BidGGXetnClleOmXPIelrzNdLizmAmOWaFoLJn4EIhk939q7f57Mc8yPBxF6EplJoKVbLL41ZPVXukfbtCyCon6j9Er50K/X1PD6D4V1VZ8RWJvOP1J2IZwsrFX2cUUA9HE/zT7mLPifvoSnlIFPk/+z/n96NewsJ3kZ6Rnp7AAdu+BemCki9QZ6YHY4gvQeXhw4w6df4S0SoaPeAg3lMoU/Bwr/iSbbT/Q== 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=2d2PSsruY+1msGxgb8YnUd8yyG0paxjJ8qQ9hBl2s1I=; b=mifxDg3N6AtwHji7P2a+DTtRrMkdGMXCE+NxvSv4bXlV+V6YamQ56OmKSbavbmLis9nOZBKiEe8NEm+nvhLYPhQzY9Sv/v2mftJoizCk7XFxWZLTksEuzvAPIQxFqHuMtX9QDMTxzQjaERLBePuPZWx4tzaHw1ed05IdbXQSoHI= 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 DM6PR04MB4123.namprd04.prod.outlook.com (2603:10b6:5:98::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.30; Sun, 21 Feb 2021 08:53:49 +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.029; Sun, 21 Feb 2021 08:53:49 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [RFC PATCH 03/10] lib: sbi: Rename sbi_hsm_hart_started_mask() function Date: Sun, 21 Feb 2021 14:23:14 +0530 Message-Id: <20210221085321.180602-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210221085321.180602-1-anup.patel@wdc.com> References: <20210221085321.180602-1-anup.patel@wdc.com> X-Originating-IP: [122.171.171.12] X-ClientProxiedBy: MA1PR01CA0104.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::20) 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.171.12) by MA1PR01CA0104.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Sun, 21 Feb 2021 08:53:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: dc15e976-2239-4b45-afea-08d8d64634da X-MS-TrafficTypeDiagnostic: DM6PR04MB4123: 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: GfJtE7DZN2PMBV5aDej6vQhNCK7lwhN+NfufgSkuxES8T9zrOchCiRYbqnGqxGl2nH8SAqNOt6cK9siGSJGPGBFTdfdJ8u9a0+KImq5sE7GHvQSc26judphhG06rDGLIhsGPnviruD4kEYHNpk9WERBzqh4Xq0Y1Pbea5praBFWAAGENh3Nmw/j0xdEgX9iHf09ZDPn1C1C7SR/eGbGnnlbcFeOq/3dVngbzObijRZ2Pq4lfw8Fo8Aiwgssye+9TPpot/wXKL4xg9gCr5hQoUYFMBQP/A3GTP4i5vdhsjl4M1hbYs2Nq06joZ88pYfLtAvC/uDhWQ/11+TprHdGS8B6b1JZxbFqK0gnbkKaoVPvyCQ10bjKVDVsOfoLzOEORCB4YjY3b+e0/MqPm0OM4Vr8OwtqRSkL7QfFa+Qh+neSJ+8/9mxV7efCDqkVzJmFoCEIIUwodSxkhVduHO+LTOwmcNh6MAYUO0wIM1jW29VanWFJ4ph+vc3dLvz7KDacKn5rhjvZ3AUtWzDc50SscMA== 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)(39860400002)(376002)(366004)(396003)(136003)(346002)(7696005)(2616005)(5660300002)(4326008)(16526019)(186003)(478600001)(36756003)(8936002)(52116002)(2906002)(26005)(54906003)(110136005)(86362001)(55016002)(66556008)(8886007)(44832011)(66946007)(6666004)(6636002)(956004)(1076003)(66476007)(8676002)(83380400001)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: +iYDSN5vmA6sJvySN+6xo47tUKkTYH+C/GlvvuvXca7qkooG1i1zUKH5mttsyU0qdMNP4oNjLoEvmG0XeYGi9lM/NaViVgH0QAxoJ9khCJVUHn+8F3Nhkr4PkxNYMhAD0moqEl5EUakDew8kecGqsNl8yavNqedO82lC1heS0wQ8h3HJdn0oLvlKZuqPHmWX/zO4jYiIBoTxpzcv3D5NrhVFGkYrx+7fVeJXvQPlVkybcuQFGdEA9vWg4uYv3BEJd4AsxK95lWplDDxVttrgjiLrVCS96/o2uaMk4CdCYsX6Pl/foNpFDDvFnIL9uGXTf3JXVTefu1cg7ACAOAH6HcqS1HDsSKr8SmT9OMdDn89ZXWMe7E+9fkPtYytzkKNnVbZk0dGHfMPnyk6u8tgvnL9TA3cY7F2f4su2P8X+Ch2Ie26wUudJBjRZmmmAms8e8lQe+iRUVBEGPGuv2HP9tRH5KA8SXJr2MYb8KbUWPOLQdAXIZCM3gzZRLtb7k9vP3DEh7rxFbORsDTHZDGau8WJ5EmzXaqrWrBLblG7uy6Ydkrq3ccG/kcyjoVw4ixBzQJzzROiwvAOu7DI0tT806AqHeEdAfKoN0sYdpgvFDY8/+RIv7xds5XPalJA2ERFEYV5NyEIDsyAoeXAu/zCEpXlwO8QK5FVRSpozp+eZ9ZzjwpvM4mJTCei4HHaNpd4fawPzsB4u+5MDdfaMM0TqMCvogeXNHg1xQpNUN95M2fqpnZtuemLN8MY8XCpLOMG8F04ZQCBX5c4KWuwZyRiLr5t6mu0HQdt0TJ6Dt9o3NHwc8rOv2H8djIzQ0x+lZNIF2Vrq5VC/3HVZ3QSxFEC3XfEG/aztq9hXqgZKkYz5VMh5G7uCLpzE/O3/39NrMdBrkb/yS5RKfwa5Pn7fEJBtXa9U5lr5k6vCoBe9NCL3vaKLQ/Ap27Wkf5nc432u6OsWHNgNy0K7LbkpsorhKFDk6oS6AR0MpMHGHOHl6xtOwCd5jkJwR8KjaLSEYzwxcslnZHaQiKPBfYdzwUEqNhs2xs2tWmwEDHWs0H97hPjlyICHTrHdYhSMeO6IyP2lFV3ryjMenB8qA/9c0HvGCu4AgNfEXL9fc7DWC+9WpobEagdR51TnXFImV7WIOidA4jO2sC/I+XnWJQSd5aNK3pj55wZUs34j/5TFHCS1hk3ThodkH2t6A3Puwhudey1S9DPpSw35JJn8wWV3i6lsPnGog+Dn9cXk+3Xot0xA2km3DqX0lvXkxvHI4Ddm3SH0957h6nZo+Xrz2Icd0N85fPCgzxakhQFENnKvbC/mTd05RDevK1hT2oPvACzREzQOdo+m X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc15e976-2239-4b45-afea-08d8d64634da X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2021 08:53:49.7485 (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: rhIjyqZzKU6kM68UN5atMKZPndDj7x8WJxDyVsTDT80YvwCLLAkNlaPLJPnthh+NhOhCj/6Yf7t8m3oGJHnpKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB4123 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210221_035351_555964_F86B1926 X-CRM114-Status: GOOD ( 15.30 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 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] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.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)