From patchwork Mon Oct 19 12:54:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1384288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=v9ZLS/GC; 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=hJ+cacYa; 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=RMjB+yxB; 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 4CFGwD2jV3z9sTr for ; Mon, 19 Oct 2020 23:56:12 +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=6YJSNZKVxiO7thR/SlPbBbg8WoN7ffZvdbpKPuKP6gU=; b=v9ZLS/GCJwnUWv7S3dKyryDiz aGlfPk2kmufDLkQb1DTU3XcgGctRMHspG5c3FkIXFIQat2VrqQR4FpcPfTLXsiIUh6LeOBMBhtX3f pkGyXwb22/qn2L6WM1C/gHQzWA70P7CxA6IRNfwrtd1f/A8xq4XIaLTzwDRFy6nTAWEOcNd9IaTlD zeyZxRrb/51LjQT7iydtd8hLR7PNoKmm8Ra7ZleCzpOujuCB7fwu50E32zupcydZJw/U1VpseYBpy 3FlCUQIZCPoRwDsPYSougRSKI9aYZiEE3YISfWtr9rw5wsoGRG0xiF6jfrmE9W14l7NJmQm3eBXPM brYUgHYUQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUUhn-00055e-6C; Mon, 19 Oct 2020 12:56:03 +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 1kUUhZ-0004yp-58 for opensbi@lists.infradead.org; Mon, 19 Oct 2020 12:55:50 +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=1603112149; x=1634648149; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=UkJ62EqlAWIEP67454ZhfU6HEuBR40GxpdxEhQBnRTY=; b=hJ+cacYajO0HvTk73UP1W1lyYv++JEhxGVrqiP+dWYUtLOVycjixtffM Vk5OshFjXKsxfqqTUDCMUFVi3EOhkaGnJ0Dq3I8jHSJLxy5Hg9YbgJr7h /sLsxpNQQoISosBeAl0Ed7SpOA987YahJOhBH7I3s8ANPp+TbXl7EhbP0 gb6VVruNFhq7UxzFSsWRRE/gj316dlMd+ofu9uH6YKuutD/OD5AnbwDDh rrg1nTybyYRTgZf1Lzx4JQPYFKEu8zKUwxURQ7rMDqPPDeR7rsA9TVaqf gZhn0095Db3ZpE6l2Pnffc3YsZVrP6zXCECzlbsNOy62mZdrnDkAgvqt5 w==; IronPort-SDR: o7SzQW34DJyNZlP2kBojHHZ4uQg5Y7rSse0DBFh3Hj8gI37/eAAn0UOLuZFG6CvdT5W+Kp9sOi /zuCpKlbMySC5TY3a7XjqKSmJSrvAO8YzQdBclViT0Ek8p0HidJNDb3xoXHsd8ZGDCtwbklJhn T3UtI/ZUUPGLcFrnuTRid748z8XY71gPYlDmHiBaam0lwDLoDMpowLGWJoqtdVl5hANK1VUbft S5BON0RRLLoyItaQ0LuDmBvW7YYRNgwZ9OkL4Ooxj96xPY7KfdjHprofIlB5EaiGBw3J1lG6m2 JHA= X-IronPort-AV: E=Sophos;i="5.77,394,1596470400"; d="scan'208";a="154752555" Received: from mail-cys01nam02lp2059.outbound.protection.outlook.com (HELO NAM02-CY1-obe.outbound.protection.outlook.com) ([104.47.37.59]) by ob1.hgst.iphmx.com with ESMTP; 19 Oct 2020 20:55:49 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZ4INSVTReUTH9rrvgkz+atlvlu40OVysgtXrA5wXagJ2k3jUtyHfIghIOY8zcKdi3GdrRD0Lsvu5/H8Y9q4dGQ+SJlKNaJxamNlv+bnw5syalBCsn7rUBWSkVu1lFH3rlfkOlBKH/I3nT/VZdb0JU/7y6Rb9JVppLlMXJRYDIr+4ZzZLZE3Ve8QMDW3ISruOL+hA3UlP4N8jPMDKaa+dg4X7Ps4Ygs75iyUzi1PwHIVs2jD8P9Y5xU3b+Af8oiBdLq8U9eYRyrxPG+PkEEElCTghxIop3OCyuM5aF75oF8koo3lp3LSzbwdPEH9rGhlof81y+VjlsVtIRZq61nLLw== 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=NY2vXc31CsWOph0hnBrq+Kf4LTZU4aI6dzrI8eHD3UI=; b=FD1nNzQzfCxfDZgmqUawPrYHxIx/bRkIiGODXeiZkQBMFfL4JXMzgvPL7U68f5XXdSJt1RjizJqGanWg482L9D/rAHWU8h1BhFzKrPbaUwJnxnugg828KMLqoJf9LMulCN+bGlZbf0KLdnz4qzjYR/tMjFWLNvOMKhOmwOEVnJ93h8TFFnIgXOShZ8LH90jHh6d+lx5LgUVxbsOxWp1vCyl7l6bZJLX9GK3NOCw3VpU75K6lxTpb227693G+N7kh7OugsKiHBvN8igQBOqogpsHw761a7VLhi0Rl4s5PBGzCINGLvbP+muF4AsLz0Nna8T6ablPkJAmWcj4A3ne7Ww== 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=NY2vXc31CsWOph0hnBrq+Kf4LTZU4aI6dzrI8eHD3UI=; b=RMjB+yxBE7A3HJQI6O+BXYdXv/NkIrlYtAjDE2mD7h6bPWVc+XSCXmbNWoYyagqsajtj+wsQ3EszThxs/gNC8pvYiVw/BJ17dKAn5KyUKazTAOHYJ1TaSkH64n4kgJ4wIvJqr9NUeZFnKLrDSbHzU/WCHGiDWz5EDH7vnvBNZu8= 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 DM6PR04MB5548.namprd04.prod.outlook.com (2603:10b6:5:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.27; Mon, 19 Oct 2020 12:55:46 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.028; Mon, 19 Oct 2020 12:55:46 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v3 09/16] lib: sbi: Optimize sbi_hsm_hart_started_mask() implementation Date: Mon, 19 Oct 2020 18:24:46 +0530 Message-Id: <20201019125453.2460105-10-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201019125453.2460105-1-anup.patel@wdc.com> References: <20201019125453.2460105-1-anup.patel@wdc.com> X-Originating-IP: [122.172.253.92] X-ClientProxiedBy: MAXPR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::22) 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.172.253.92) by MAXPR0101CA0060.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Mon, 19 Oct 2020 12:55:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 16d725c1-93fe-458b-d9fc-08d8742e4bd0 X-MS-TrafficTypeDiagnostic: DM6PR04MB5548: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1850; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gLb3ziWS70uiXfT5YDGca1gAep/xJu+RNIT44hz50DJ4okMmu2reIyBG1pTrVJKwZ+HAzA4URBLHumfbao4Zu5zMfrc52X2lgsDajOmlLRn6SjxrBJGAdkDIAnC3ouVVG9ExIHVBBuAZhawGzVckxjBf5eJZnYIsmW2DtDlDVZ4iyk5FcfvQlFnX7DwH+33sJ/aUkdOMRBs3JtGTLG2kOAwP1hPxosiZe4uSBr0l8TsflX+PyZV+wfiP8U3zyDJKidFChFQ1vN873lNQGNB/puHz5MkRtH3unMdv6/NqmI/i+u7NY71MqGpfHrgPKv0H0v0rKeyjzrumwkRItD/4jw== 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)(366004)(136003)(396003)(376002)(346002)(39860400002)(6636002)(55016002)(8886007)(66946007)(66476007)(8936002)(8676002)(66556008)(2906002)(86362001)(44832011)(83380400001)(2616005)(956004)(16526019)(5660300002)(186003)(54906003)(110136005)(52116002)(7696005)(55236004)(1076003)(4326008)(478600001)(316002)(36756003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: IsmY5TCeP3/dThsYiZP2WY1899AuKHbhAtANLjq9LMmv7ZczathYE44q8IK/X8BbXTA6grqJW82Gddxmq3YUvvlM5qZj0e2uBVmitLidq0xumHrQIx1ER5/3HVLu+S2Bipuna7sIKZ2O164RhRo3ojbwyu/g8FbJ5mxeO2NRW83I7hdgl2TqA77xVOVhG0em82MSZL+hzjVMUgga7cUDXCcHFGDR7jRyxfSx9x3sHQz+sByk5P3tQW//Ce9pB+kNJruvYPw2KkNmWl06WDprrkaHNVmmIn8/Lv9R5gmYIG3XfF9hkV7RXsOrT1EZq9dI2BRw40ArbgsrSdEI54UKDLI7WZt5QX4UXMP0I4VhlfLzHZQzX+ywZjFvyRDNWRGWGZ9XDJ1wWcbxN5WazBX7nJJrGmEZSB+xML10IHQrVxEPuZI0HErNqVmtUZzqmZSS+vdWqQMfFcnu7asnOJDJp0PBLFsT98iENCazL1FYyoLgwgYyzFixtWO9DiDbBhT+Jhi4rLDYbjf1ytmqv04OBSS2H+AvCh8OvIlmOAWiC6y/i8PlBb9IebV2aEidbJNxMT5P0FrX18cHsBuK10gU5oaK0b2Tl98QQajQ/bEcrZGcpIRfI104ZVxApLW6n7JnlDo3sZYTOtNuXJzhm1Wh3Q== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16d725c1-93fe-458b-d9fc-08d8742e4bd0 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2020 12:55:46.8227 (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: jXHY3jVxQ2eQr3K75JMwWZu+1118RY6VmA3ZFeW7bVRG6cBomi5uqG/OcISH/J2Sp6poG/s3WCYvXbNZavFPqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5548 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201019_085549_395268_823D6F9E X-CRM114-Status: GOOD ( 15.83 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.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_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_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.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 Instead of calling sbi_hsm_hart_get_state() in a loop, we can simply call a new inline __sbi_hsm_hart_get_state() which only takes "hartid" and enforce domain checks using sbi_domain_assigned_hartmask(). This patch optimizes sbi_hsm_hart_started_mask() as-per above. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hsm.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c index 8ecf90f..3ff671f 100644 --- a/lib/sbi/sbi_hsm.c +++ b/lib/sbi/sbi_hsm.c @@ -57,20 +57,27 @@ int sbi_hsm_hart_state_to_status(int state) return ret; } -int sbi_hsm_hart_get_state(const struct sbi_domain *dom, u32 hartid) +static inline int __sbi_hsm_hart_get_state(u32 hartid) { struct sbi_hsm_data *hdata; struct sbi_scratch *scratch; scratch = sbi_hartid_to_scratch(hartid); - if (!scratch || !sbi_domain_is_assigned_hart(dom, hartid)) + if (!scratch) return SBI_HART_UNKNOWN; hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset); - return atomic_read(&hdata->state); } +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_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) @@ -90,18 +97,21 @@ static bool sbi_hsm_hart_started(const struct sbi_domain *dom, u32 hartid) int sbi_hsm_hart_started_mask(const struct sbi_domain *dom, ulong hbase, ulong *out_hmask) { - ulong i; - ulong hcount = sbi_scratch_last_hartid() + 1; + ulong i, hmask, dmask; + ulong hend = sbi_scratch_last_hartid() + 1; *out_hmask = 0; - if (hcount <= hbase) + if (hend <= hbase) return SBI_EINVAL; - if (BITS_PER_LONG < (hcount - hbase)) - hcount = BITS_PER_LONG; - - for (i = hbase; i < hcount; i++) { - if (sbi_hsm_hart_get_state(dom, i) == SBI_HART_STARTED) - *out_hmask |= 1UL << (i - hbase); + if (BITS_PER_LONG < (hend - hbase)) + hend = hbase + BITS_PER_LONG; + + 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_HART_STARTED)) + *out_hmask |= hmask; } return 0;