From patchwork Fri Sep 25 11:29:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1371184 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=a+E3Usrc; 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=NOiAMg+z; 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=qSBIiFvo; 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 4ByV7m6qxwz9sSJ for ; Fri, 25 Sep 2020 21:29:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GSaX+HlIQF+QNSzlCnFwdjnKSSKvzsLqhOfj2RqBNTY=; b=a+E3Usrc0y2h6foPHpYLKEWO6 51cPqDtRnJrfLQRK+9FG92hbVCEMZNkPoMocnhx2lLT3NM1SM9cQ/IeO97A+7Ti5TXJxouc5cFKuQ HzQSUUkRdrSIsrQ9v3KZozIyhNsLbd5wUkaUCl5nAEyMWQSeNHex4f+1FA/N1S244Przd2yHS4d4k CjUXg2J5Mq7Bmu2mmJJRXGNX+/LRHO/Lxjd0RnV9EexUr3HCn7dY/h2uqFJtr4v0BC9WXdkBVt6tK 8CyxespnVCBIvqL0OL0yJwAQKEu9OzAzmbCgbz3hK8fiKiTs2JITMJd+k1d9XmFUJ5BonoS6iTSIY /8gybx7FQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLlvD-00049Q-8D; Fri, 25 Sep 2020 11:29:51 +0000 Received: from esa4.hgst.iphmx.com ([216.71.154.42]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLlv9-00046H-Rg for opensbi@lists.infradead.org; Fri, 25 Sep 2020 11:29:48 +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=1601033387; x=1632569387; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=dd4YRZajknSvMeYUCOMDUCKNu1WYxppMYm9wJgrljfs=; b=NOiAMg+z7mu3CZzRQ72P6qLTpy6ziItABTltMP4aNoR1UrDcPAgBBJga /j7IHrEVwlYgv944g8J7H7hlPnJ0/J7IQAsOKMZfDJVmMSuABdKbSWq5s YKS+e6EbN7S5nLUbAy5xOT/k/wVG/b31Xf/gqFDzB40T24NrtJG70csK0 nd2pCJwMyrHk0y3nmyjdI5r8OKz7ILDLT2D54H4saIyQpawBFsxVt7+0V HCAIIu0HDDgyMr57uc/4oUdMr2HwazDZGcKM/cm+j3W+oG4RZsU9pQUcY PEiFc4UTvRnz9aTeIdWhZf3tc89gPNIws2O2Q4M6AXwDgpn5qp8ZQc+6D g==; IronPort-SDR: pkOe85WiFPpDh6is82950GJqWtr9CGKJD4cVO8WqWB5zJapFf9vXqGJWgGp+9tXXrHwxXTkl8v BhKWaPWHFokNCMGFWCzeAzD/XJ1TUdvLNTfRwkhd/7gYzlzwu9Uv0YDKzpSzbo22tXRECN6XT/ UK5VFDunN9Jqtf2ngpNtx/thiWvNFh+UIz47qxybz+cfn+IZR5j/ogQuYT9hmHgDweBk6GeOeO rzqSLPxRAED+7CvLxlZ/YOx7b6KNcXn+qIBSVZX18XrRU4lD+202xHdpDgGSXPaz0T27u0+yXg AAc= X-IronPort-AV: E=Sophos;i="5.77,301,1596470400"; d="scan'208";a="148192080" Received: from mail-co1nam04lp2055.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([104.47.45.55]) by ob1.hgst.iphmx.com with ESMTP; 25 Sep 2020 19:29:47 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xut2XRhbgGHUTmQycta03UM7hG07iTxH/z/PUfTVCknJlvMZp+PP2w/tqP58n2CZiaQajcJGGqt3uQGMZjDT0WDbLIYjrsqttg6W17KkkYU0wS9KMzcNIpqpPu2bC5cna7o2mjI90YBsrTBOZLhgyvqMyrs+u4sJQiFtNMGqjGRE2+4i1SW+CApZP+5eHs9l6FdnTuAk74/7PHf4ryR3ww3M+lD9pn+DuavqoCuovk/ayBOdx4icySVYwSDsbpMXqHIJXkLIzP5SCALbN7fzGfxnZ+2if5CPVMc9HmUGgyGWOjC79uubAQjnyTE/2VYO6kH0hrdN0XFesUnHtDhT2A== 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=FMwCk0DvpyZkJZeGDN1nGtxaOKTxS30NCITJTrf4a/U=; b=B8sH1utbZ6998IwmFy9qNTW+LCqhj7EJHB/ZsWM5+aUFd+BWNpi00ZuMUuT7aOe+8xi+ghKLwCz/q09q9TrLXm8zUFxOZYV5DG8l+kYLCUJosZGnUrLkviPyPLONZkx5QHIL5oQP8G86HjAgQOfo1zVDkfWmvgXrd4y67cxd0FhO03YOm8HX/nEIxwmlh51meVeYbAh5l44fj+v7nzLykG1P+hEuK3tUcYirTmDL2tu9QDx0vRvMoMPocyl8fOUaCS3gEeNNl0E10JpnLCzjKbJgm4r5w+y6nU6PP6fSDXBlJonmf39i/eIkIzYXSZY9oU6igSalPEhzxqR4Spm+6w== 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=FMwCk0DvpyZkJZeGDN1nGtxaOKTxS30NCITJTrf4a/U=; b=qSBIiFvogtHR0z77sYDxEesNbpkfuhODbR9+rc0PinWIaXPAAJ72DYKmEAdWJHfuHQWfW402lljTZihXu9ySUjBRYh3Q667zzWA9eKh9mllo0HoYPcVQ3WcmRyvVmXHOrBQgb93CigzPVNW5CwNfK+DPC4Qc1M/6U/k5tz709j0= 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 DM6PR04MB6778.namprd04.prod.outlook.com (2603:10b6:5:24c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20; Fri, 25 Sep 2020 11:29:46 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e%7]) with mapi id 15.20.3391.020; Fri, 25 Sep 2020 11:29:46 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH 02/16] include: sbi: Remove pmp_region callbacks from sbi_platform_operations Date: Fri, 25 Sep 2020 16:59:00 +0530 Message-Id: <20200925112914.725846-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200925112914.725846-1-anup.patel@wdc.com> References: <20200925112914.725846-1-anup.patel@wdc.com> X-ClientProxiedBy: MA1PR01CA0152.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::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.179.69.106) by MA1PR01CA0152.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20 via Frontend Transport; Fri, 25 Sep 2020 11:29:44 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [122.179.69.106] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 542a1108-1840-41b5-0ca6-08d861464e5a X-MS-TrafficTypeDiagnostic: DM6PR04MB6778: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1060; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UZTcDYG8xHe97QoanlUcfQNu+QXtkWAIsY5RPZw2Za3SCV2FbF9upOkTiOgXhoEXq1GsZ62mDAhS+mzJ2bI/0QAaGZ8+rPcptt2GQzLnMVQPcmmkEPO0VJQYIfgPmHsc3uoWHxNr54OJiNzG/JV0P42NNQZH1UvQItkhZEaoHmS0cZLpsZFQiQJjdaP8fzrE34Sks4iVvEyTnk5Tl++eHiheXK/8BKSJ+e49dQbrBgk6dUl5ke7Y5pcxEmMvZyZCiMpdqB3w/WhTW8w4lu054jHSZTJtuvkMw0CarCUMR4NmpuuavQBfALZhO1iHRFO13ehp3O5sXa+Hk5bG5qbBClS8ck8IQNeyE9m/zprdP0TShwuXbC6arFotHi5Y5TSW X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(39860400002)(396003)(376002)(6636002)(6666004)(55016002)(66946007)(86362001)(26005)(1076003)(316002)(4326008)(2616005)(110136005)(44832011)(83380400001)(186003)(956004)(478600001)(52116002)(7696005)(66476007)(66556008)(16526019)(8886007)(2906002)(5660300002)(8676002)(36756003)(8936002)(54906003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: S/meBjbaZE9ul1pb6fQ3eDhAtkslwkhcZZFGguA6kqJ9VHBxBEjuoKr3XPLHkSZbfK0vFwI3VMnH54LWyVRn9/fMhwWay6eJ0t1Dylts5Cp43ofMCbUa1dNKHMORt5/1GPW7cSY+KQ/DH1GYJXRYK/3110C2mMABxhH1QCM75BrAvxEtyF1qUeaMKuCIdDkGdrHkb4PLWmKQ9z2GPJSP8slejDEc2JyozXT9gqKk6ng6p7XzJ/g2GPqisDSgB1qYijgE/D5blZnSjNL1RW5g+DRSzLEJOqzrxCt9/49O3ZIdqf3Fw0fo93P+JtCui+P/U/3EE44MTCjHi+0M0B/cIJTc9zoABWXQGCTD3j3OhWprQwV2WdVVXqOvR+ThVFsxxq8w9Mwmzrk+tgbpMcoSXA+Ey/gCHYhJWa3xKn+b+KtA37HSu274gIVL6/JkCyL5+abim4g9566NnJWqZaxEY7JcCa3grb0bNqGIzqxnoegzsiOe23OyBzt2gDJSURQmBn7qbUnXb1gF/ocv9cgwJRc+xkhaptDKo2Virqc9zLfZpRWnrrvAE+E/9QslS3WX+Syb9eUQRbnZt1t7uLFNon0OQqh2ugh77JHEbzjuGLE8+2W/cfegKX2Y8+GZUqpY7/aemeUJ7AxzHcJR88q6hQ== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 542a1108-1840-41b5-0ca6-08d861464e5a X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2020 11:29:46.5173 (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: Yb8aNH07AcRkJWkh5zJ9bIo+X/7kkppxX9PP2p+P3t9k5qAkan92WqGzrtv+MyUMIFXkzd8vtoyz59cThjUfxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6778 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200925_072948_099370_E156F53E X-CRM114-Status: GOOD ( 17.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.154.42 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_VALID_AU Message has a valid DKIM or DK signature from author's 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_EF Message has a valid DKIM or DK signature from envelope-from 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_region_xyz() callbacks are not required in sbi_platform_operations because we will be using OpenSBI domain memory regions to program the PMP CSRs. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- include/sbi/sbi_platform.h | 50 -------------------------------------- lib/sbi/sbi_hart.c | 14 +---------- 2 files changed, 1 insertion(+), 63 deletions(-) diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h index f51e36a..f2c3237 100644 --- a/include/sbi/sbi_platform.h +++ b/include/sbi/sbi_platform.h @@ -89,15 +89,6 @@ struct sbi_platform_operations { */ int (*misa_get_xlen)(void); - /** Get number of PMP regions for given HART */ - u32 (*pmp_region_count)(u32 hartid); - /** - * Get PMP regions details (namely: protection, base address, - * and size) for given HART - */ - int (*pmp_region_info)(u32 hartid, u32 index, ulong *prot, ulong *addr, - ulong *log2size); - /** Write a character to the platform console output */ void (*console_putc)(char ch); /** Read a character from the platform console input */ @@ -456,47 +447,6 @@ static inline int sbi_platform_misa_xlen(const struct sbi_platform *plat) return -1; } -/** - * Get the number of PMP regions of a HART - * - * @param plat pointer to struct sbi_platform - * @param hartid HART ID - * - * @return number of PMP regions - */ -static inline u32 sbi_platform_pmp_region_count(const struct sbi_platform *plat, - u32 hartid) -{ - if (plat && sbi_platform_ops(plat)->pmp_region_count) - return sbi_platform_ops(plat)->pmp_region_count(hartid); - return 0; -} - -/** - * Get PMP regions details (namely: protection, base address, - * and size) of a HART - * - * @param plat pointer to struct sbi_platform - * @param hartid HART ID - * @param index index of PMP region for which we want details - * @param prot output pointer for PMP region protection - * @param addr output pointer for PMP region base address - * @param log2size output pointer for log-of-2 PMP region size - * - * @return 0 on success and negative error code on failure - */ -static inline int sbi_platform_pmp_region_info(const struct sbi_platform *plat, - u32 hartid, u32 index, - ulong *prot, ulong *addr, - ulong *log2size) -{ - if (plat && sbi_platform_ops(plat)->pmp_region_info) - return sbi_platform_ops(plat)->pmp_region_info(hartid, index, - prot, addr, - log2size); - return 0; -} - /** * Write a character to the platform console output * diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index 55a04da..edf79b7 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -226,10 +226,8 @@ int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch, static int pmp_init(struct sbi_scratch *scratch, u32 hartid) { - u32 i, pmp_idx = 0, pmp_count, count; + u32 pmp_idx = 0; unsigned long fw_start, fw_size_log2; - ulong prot, addr, log2size; - const struct sbi_platform *plat = sbi_platform_ptr(scratch); if (!sbi_hart_pmp_count(scratch)) return 0; @@ -239,16 +237,6 @@ static int pmp_init(struct sbi_scratch *scratch, u32 hartid) fw_start = scratch->fw_start & ~((1UL << fw_size_log2) - 1UL); pmp_set(pmp_idx++, 0, fw_start, fw_size_log2); - /* Platform specific PMP regions */ - count = sbi_platform_pmp_region_count(plat, hartid); - pmp_count = sbi_hart_pmp_count(scratch); - for (i = 0; i < count && pmp_idx < (pmp_count - 1); i++) { - if (sbi_platform_pmp_region_info(plat, hartid, i, &prot, &addr, - &log2size)) - continue; - pmp_set(pmp_idx++, prot, addr, log2size); - } - /* * Default PMP region for allowing S-mode and U-mode access to * memory not covered by: