From patchwork Tue Oct 20 09:39:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1384765 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=Q63OXCKM; 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=luv9/zqy; 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=QUsMH+s2; 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 4CFpfm2119z9sRk for ; Tue, 20 Oct 2020 20:46:24 +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=gu2Qg+NarC2Tl2DUkhFEK4vzQ5wYyXSSfR5Fnhisa4w=; b=Q63OXCKMJiSHm00yLmaBXDd4f TljQCrcWaFJAzKH5QeV45IEZ3c/W3TuOjvYZolJ0w4sgTs9LPqNg+TK7fssgF5qo8re0bbbeWion9 F2nuarvhG50oEq1V+QWl1RZmesmMrSEBVleWcZntfczGGsyZwLQoKaHGLldK16w5lVTka2qHhO7d9 j50IUuvndgTJRfK4QjkDFuDWOhKyEmUfz7pi05Yp1NX+/czULPSUnaQemVCa0v/wmeiK2YWdNEqx4 7WQOyZ3lC7S0rVFzau8nhjtjIgHFUvY4md9hBPxohxVfE2GGdnIZBFBcEoUDbRZTvY2/IBgqaVqYS i7FkYpciw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUoDg-00031y-3d; Tue, 20 Oct 2020 09:46:16 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUoDc-0002we-6E for opensbi@lists.infradead.org; Tue, 20 Oct 2020 09:46:13 +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=1603187173; x=1634723173; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=AsCrBYUvWk5xnI0a+tJbdkEY9VXOFNWUX+zr7wumeGI=; b=luv9/zqyMSamhNwq53+DZ6v1KiVbFW+uCkImueia5EMmxmgP05racxhS 6XD4NL7iIM3WCSKI9M3iXXPpxb/euC430q+z5/wLNUHIqK9CfMf0lzNdS 9SLHPKojLdC4b3yar8hVcH65rVQgDKAIXztzkV0cUU4zBDqxEmE/NdXla qzwmR3OBoHtlSEw84Yiw2Y1SX0uGp4UpPRVNzTk20uw8bNp0XMPAscuUZ AsbEDgwTcr5lZZrXVVYV7ICjmkQtzsIpnLWnj3fVaiVX0AF2Ih3XrQMM6 qwesgzVldpbup2zaNnSsKqKDTFXTJw+pgAnpdbJMylY7yhQPJST/M1h+K w==; IronPort-SDR: rknvodggkI9Wy5A4CXx8M7YjEH8EzukCAOl7uEufUI3lLx+DrklWMLQoQDSIp7xxm320iiyDvk Puiyh0PjqZ466GabJp29+wIUcfNnmCC0HGKrDbBTLyvY6btrUpAI9WORgzILqR8PZXXKlOY0h9 WYQ2vG7Tl5AMw0BQSQnNQhbAWaLS51aPdmoxtDPiZn3iiToXXOVrWWZ8jAMekhGFf4ZSNEKvpX Avx9xU3dCO7ZC1XAKd7duSwnDOo6mQgc8bJhDm6wWUStCqItbW8J5gYDMb1y3r0o4oWYmvUCvs 660= X-IronPort-AV: E=Sophos;i="5.77,396,1596470400"; d="scan'208";a="151634531" Received: from mail-mw2nam10lp2108.outbound.protection.outlook.com (HELO NAM10-MW2-obe.outbound.protection.outlook.com) ([104.47.55.108]) by ob1.hgst.iphmx.com with ESMTP; 20 Oct 2020 17:46:12 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJpBvjAEklGqWblDaC0Im4dyORWJlB77UCGYlDNXbMkmsQ2Gt572/zFLGxZGfO4BHWLKJqrYSsGwTdJUB0fIwwj9/bKLKM/ViltELVno38NwBRvWMaguvNuoLuce8/4bpHLZD830ExkuPZ/Vx0PO4vIfH18KoPHIP2EU4Vn3+n0SED/zccsyMsQHWH/lxiVrwFurllhX9x2n8DrpcTRH+ffgTsUXHLo32/eS8StTSMLShnAyqLow3T+T11bJ/ImqBAL/CCKIkldgEvj6kyy4ClpDA2QnTi29ixy92aIDYnPuYKPLQ7NnsmxlQIN8Ws9ZXueBWrXOhyN3xXYKerX9mA== 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=ZIc7v2ltchc09mBGHUh4sJnDD5dT+buckj8dExTdZoo=; b=WSETWSGTZoStDJv6xgrMKo0HB9j1K4E4ri2LNzqFZjjeBcpBdcesRTc7eX7/0j4kzgYO1jDtrC73at39UuMSipN/L7voSwwdbROQ85umoWAjj+AIkrPu8ng/Vi4tVz6tINA9XNyw2zvtrpQlfWI/lKJYw+7P71trWASRYK6Pk7jPHwDDBzYLsuylJCV1wWJSuTjRJmmAyocISEUq7XRJP4+8X+Sm8ZaLmp2/ps28NSOC6w/8y0qzOD01SrJXv1IPuuHqhA2wLaTZvJ6SmEDClUrf2z7UrsZ63BzAVrzkyjd30Ciqvy62LjEORw6fQDLfUa2vh2VQ1utef7VD/qzvzA== 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=ZIc7v2ltchc09mBGHUh4sJnDD5dT+buckj8dExTdZoo=; b=QUsMH+s2+vSyGHqx9Ik5+6EosfnvnT7YPzU3MmJ8gCIbYIea01xs27ZIcWJZ6J9e9jEaWCJilCMjCXsKwnpWsB+oVzz6Szt/Qo1dQnL9vN1/cjOeyUGjUDPQbOLHZpv47XMcTkBi1w9vFJWoJojtRirmBHlwJOvbAuPbRzyxqbU= 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 DM6PR04MB5833.namprd04.prod.outlook.com (2603:10b6:5:16d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Tue, 20 Oct 2020 09:46:10 +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; Tue, 20 Oct 2020 09:46:10 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v4 14/16] lib: sbi: Configure PMP based on domain memory regions Date: Tue, 20 Oct 2020 15:09:28 +0530 Message-Id: <20201020093930.2551352-15-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201020093930.2551352-1-anup.patel@wdc.com> References: <20201020093930.2551352-1-anup.patel@wdc.com> X-Originating-IP: [122.172.254.103] X-ClientProxiedBy: MAXPR0101CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::17) 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.254.103) by MAXPR0101CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Tue, 20 Oct 2020 09:46:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 81cce63e-e3b3-403a-8318-08d874dcf994 X-MS-TrafficTypeDiagnostic: DM6PR04MB5833: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xv7g+ZQBq8omlDowbDMXo14nDjZv7rouhBnal53Jd4ug0JZYOQN9f+G6MksUiuk+ZuTH2h3113gABxVIKditLL8R14dIpv5j5drg6BJefuh2pMDw7PQ3qQJg0CazTK7WmRHlPzuRo1DUNsgbjJXGt+bkwwFT+0PoWjrJUd+miPQERlvASozWE2T9DQJQBcyKux6ivcOC9a2ZNNT1fvaAfkc5ETwFCyUNmde6jJ/RAZC4SLYCW5ANCgI1yFkKyJSqo2HdsDORYCGlNGFVbPtZa3z7LXIorFOZtcsck6M0sgd4535uxi84QfuT4HMBBHqiby98WoXEbhE7Gf5kuHzk0Q== 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)(376002)(396003)(346002)(39860400002)(136003)(366004)(6666004)(2616005)(2906002)(956004)(1076003)(55016002)(8886007)(478600001)(44832011)(66476007)(66556008)(5660300002)(66946007)(8676002)(54906003)(316002)(83380400001)(16526019)(186003)(110136005)(26005)(6636002)(55236004)(8936002)(52116002)(4326008)(7696005)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 2KT5RcN5ckFryvGGl58ljezDXF6KZq9GkC/K4Id99pXa1JvLYTRH6vOIU5gg6b4T+5AdIDdBTX5+MT6KPwnZ8W/mFxf5H04ma3BaWSMDW7AFHqkNwj/oPmp7bQVWIcbG/EJD31k82YKbFKMsLP1JVbDqm03b0pBcY5BEiSYeJLByjyftHdMHPpnol4tMQ66yvjR5jVD66B/hB57xrYqWdFLhp/kueTmzLAIKdjJY9IT+LCqaTxyj2JDsu3gZmfwixKRlUbZjgyddVt8XRmJflCC0HU8V82b4ixTsEJypA6iE0mHOHnJwuMtX5DYUobQENXfK51Xo3KrEuOja4vnJOExHVMlEGPQRvYYQfy3UvwXBb+55BfLQZ+81v+wontga2TV6T25LBu0lX878ha4ryeRguKhVjgS+1L02lqkWfFiflVx5pvmE8bpPva9Pv4PaYQhCkhd0Af6jpjj8qda9n4AvC4F4K/lMfeeeIZh/3uslolMa1qEecJG/G4Uh3G2QCw3lmKbICFTPCE55EM7M3XojiNBZLVZWU0Ymtj5Wp4ODm4Ly5VgPsZo3YsxX166UpdIfXpHEZMnUUWK2qGRF0lhtQG90oUDLSt9nhNRy2aLyRbf+EAGjmFzGsWY+8/hzhOdKL5JFYcEBhZ9InAGMfA== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81cce63e-e3b3-403a-8318-08d874dcf994 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2020 09:46:10.6398 (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: NAnrb6b3/t7kOxbJ+ar5AwvVrDSGcPcpe7/CroCioz/tFdHwzMairZ4WHtocwDvFxiE7P+nzmaTAyirbjKPhGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5833 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_054612_445061_C3DAF250 X-CRM114-Status: GOOD ( 18.54 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.154.45 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 The PMP configuration on each HART should be only based on the memory regions of the assigned domain because each domain includes a memory region to protect the underlying firmware. This patch updates the sbi_hart_pmp_configure() function accordingly. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/sbi/sbi_hart.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index ea5d479..1871a1e 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -184,24 +185,30 @@ void sbi_hart_pmp_dump(struct sbi_scratch *scratch) int sbi_hart_pmp_configure(struct sbi_scratch *scratch) { - u32 pmp_idx = 0; - unsigned long fw_start, fw_size_log2; + struct sbi_domain_memregion *reg; + struct sbi_domain *dom = sbi_domain_thishart_ptr(); + unsigned int pmp_idx = 0, pmp_flags; + unsigned int pmp_count = sbi_hart_pmp_count(scratch); - if (!sbi_hart_pmp_count(scratch)) + if (!pmp_count) return 0; - /* Firmware PMP region to protect OpenSBI firmware */ - fw_size_log2 = log2roundup(scratch->fw_size); - fw_start = scratch->fw_start & ~((1UL << fw_size_log2) - 1UL); - pmp_set(pmp_idx++, 0, fw_start, fw_size_log2); - - /* - * Default PMP region for allowing S-mode and U-mode access to - * memory not covered by: - * 1) Firmware PMP region - * 2) Platform specific PMP regions - */ - pmp_set(pmp_idx++, PMP_R | PMP_W | PMP_X, 0, __riscv_xlen); + sbi_domain_for_each_memregion(dom, reg) { + if (pmp_count <= pmp_idx) + break; + + pmp_flags = 0; + if (reg->flags & SBI_DOMAIN_MEMREGION_READABLE) + pmp_flags |= PMP_R; + if (reg->flags & SBI_DOMAIN_MEMREGION_WRITEABLE) + pmp_flags |= PMP_W; + if (reg->flags & SBI_DOMAIN_MEMREGION_EXECUTABLE) + pmp_flags |= PMP_X; + if (reg->flags & SBI_DOMAIN_MEMREGION_MMODE) + pmp_flags |= PMP_L; + + pmp_set(pmp_idx++, pmp_flags, reg->base, reg->order); + } return 0; }