From patchwork Sat Jul 10 16:18:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 1503541 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=2607:7c80:54:e::133; helo=bombadil.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=bombadil.20210309 header.b=zrElr86o; 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=foxEgcbK; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 4GMZwF6hQfz9sRR for ; Sun, 11 Jul 2021 02:18:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TbsDzcLUdLAHaYJh8+Cm7ieLEWtCCCLrzK8aeqVEqrs=; b=zrElr86onRLKGC 2Hjw8cpsaYDlLT+ICzbEd3fzol0XnXdqaBsBw/xmfLpBTMmTPOvVlp1behOjThWPvlFaNiG+er05w gE2vNUcwFir+GaYrnK733hQnMzJVssgtbyz/0qzRrRJCbFTTPpQmhcAYuhOkqH+cAY6mO1gems7fA 0blX0EWCdScyc+HG9ciKq/pBsjQHOD0J4oPkSlr4utA4HhcD/PVbq7PlI3gKt+ENNssaLhiHHDCSG 3Cm6EXYbhzWUPXJHsHHP5ZIIE9+foHHOEXSxAn59q6w2Yirp1refCB6qDCvl9Bekb50w76m/jAku0 3lzTBAhVVTnPYRQ+5sWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2Fgn-003rnI-6r; Sat, 10 Jul 2021 16:18:49 +0000 Received: from esa2.hgst.iphmx.com ([68.232.143.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m2Fgj-003rc8-Ks for opensbi@lists.infradead.org; Sat, 10 Jul 2021 16:18: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=1625933938; x=1657469938; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kv/Julf5Wn8pDtk5O1nnm3f/0+GEaDM0FndnNIGKgLQ=; b=foxEgcbKbUk3mJ3Mdmwd2Nolq2FoZABm4KxHwxYawIIHqwHwJ0HRkzik zHAljLe5D/cYj1HsOLpBTo1FlSPWj5DGGshZuRT7Aj79SlgdUeO33KR0L TfK4QODcuH90IF77g2oh2MKyKHdFxB+23PMx/eY1Uqb4BR6W4fmcYdOZ1 6ZKc52UulRCwJNOrsKPwnakbeBhi7iz1DyleYmWc9cgYF2eFNKv7boKL/ Psip4Bj+MbC7cjn0kl/GRyy9X1w6rz5BOMiaPB9Ny4NjTqd56uKtJ2JWF myPnTRvrG957uPJSsTf/zhurY9g1ipqEzxr4xwYDRjRDmEQV0BgiLpXL8 w==; IronPort-SDR: Q/A6dLc+GSngz9PjXhbh9f+vS8K0UlVRzq7StpxrqWI/ddPvQ/5hpct+lccTrADqfjDcvAlPDg 4fb36c2quh2OzygIlUlwI4aERY6FHNW+a6k8ErrL3TFoQOAX1UHewN2B/Rqus32B92pjYeOA/e x4xj2j7HfLy77VHCQGQDGj1dwt4LG1NWZxJvi5iczNDJaYxe5hVIVqwqrQbw7bx0oeQFoPIb8b 09CEZV5lycoJTCNYTJjXHq/LqeLAnMiwjmdB1byjow2QffBoadVQdP3EB+nGb+GNVr26tbunyt BX8= X-IronPort-AV: E=Sophos;i="5.84,229,1620662400"; d="scan'208";a="278060860" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 11 Jul 2021 00:18:58 +0800 IronPort-SDR: VRWe7GYwHEIYr8XTr5JPy+E6VGWDOXkE7zsLBfTbVVDRbkpgZQUAwWBhUdn+x8vTECyjR+jN19 kULHStN/m7tl2DZ+E0kpbY/F4v9yWkck0GFGYqt0sBc+Cp+RPRbMA27QY8SvS/V1WQnP5JTc/0 g0GN81b/bEc0BlWPOrdDABJnWeAwEMyMswZH+kAdu2q6J7B821UCKU/8BZf2l8HHmNSrldXFJR OA0YNaHK3rilDJoDaJuz5AAwALqjLm2VKg72Yqcs+V7HbKlbPS/m/+B/Od7ek342UQ0skK1lcr W9i+XW5h+bePGXYuLs4tYVoe Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2021 08:55:35 -0700 IronPort-SDR: iFQBEYLaongnv/L01yGAoDik/1HEkJKn7OzGUeaa0C+bq5ueSccbQpfN9gXE6VY2JhIfRc3MhD V5QZLBvF5RLvNkuC5/MBVs3uPfbb39dI6adEXfebJEg5rL+f+RXSUWQYM+27gfVk8DM1nMDO0m Mx9KdlSspMY1ubWzvMm0g7bZznoaAKxTaD7vjhrlJqZxHaqVp6RUlBfej6k8BSHEPOgLh8/42g TRoiaxamNvXCkGyFTsbZ3+J6WpYqXxOGSuW9r7hOpcAwWToakQNPgEP1FdjnVN2yj5XzD/mERe o2Q= WDCIronportException: Internal Received: from unknown (HELO fedora.wdc.com) ([10.225.163.38]) by uls-op-cesaip01.wdc.com with ESMTP; 10 Jul 2021 09:18:43 -0700 From: Atish Patra To: opensbi@lists.infradead.org Cc: Atish Patra , Anup Patel , Xiang W Subject: [PATCH v5 08/15] lib: sbi: Use csr_read/write_num to read/update PMU counters Date: Sat, 10 Jul 2021 09:18:09 -0700 Message-Id: <20210710161816.632364-9-atish.patra@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210710161816.632364-1-atish.patra@wdc.com> References: <20210710161816.632364-1-atish.patra@wdc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210710_091845_803163_F907E856 X-CRM114-Status: UNSURE ( 8.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Currently, csr_read/write_num functions are used to read/write PMP related CSRs where CSR value is decided at runtime. Expand this function to include PMU related CSRs as well. Reviewed-by: Anup Patel Reviewed-by: Xiang W Signed-off-by: Atish Patra --- lib/sbi/riscv_asm.c | 35 +++++++++++++++++++++++++++++++++++ 1 f [...] Content analysis details: (-2.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [68.232.143.124 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 SPF_HELO_PASS SPF: HELO 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 X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Currently, csr_read/write_num functions are used to read/write PMP related CSRs where CSR value is decided at runtime. Expand this function to include PMU related CSRs as well. Reviewed-by: Anup Patel Reviewed-by: Xiang W Signed-off-by: Atish Patra --- lib/sbi/riscv_asm.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/sbi/riscv_asm.c b/lib/sbi/riscv_asm.c index 8c54c11147e7..4c24a5132195 100644 --- a/lib/sbi/riscv_asm.c +++ b/lib/sbi/riscv_asm.c @@ -118,6 +118,21 @@ unsigned long csr_read_num(int csr_num) switch (csr_num) { switchcase_csr_read_16(CSR_PMPCFG0, ret) switchcase_csr_read_64(CSR_PMPADDR0, ret) + switchcase_csr_read(CSR_MCYCLE, ret) + switchcase_csr_read(CSR_MINSTRET, ret) + switchcase_csr_read(CSR_MHPMCOUNTER3, ret) + switchcase_csr_read_4(CSR_MHPMCOUNTER4, ret) + switchcase_csr_read_8(CSR_MHPMCOUNTER8, ret) + switchcase_csr_read_16(CSR_MHPMCOUNTER16, ret) +#if __riscv_xlen == 32 + switchcase_csr_read(CSR_MCYCLEH, ret) + switchcase_csr_read(CSR_MINSTRETH, ret) + switchcase_csr_read(CSR_MHPMCOUNTER3H, ret) + switchcase_csr_read_4(CSR_MHPMCOUNTER4H, ret) + switchcase_csr_read_8(CSR_MHPMCOUNTER8H, ret) + switchcase_csr_read_16(CSR_MHPMCOUNTER16H, ret) +#endif + default: break; }; @@ -161,6 +176,26 @@ void csr_write_num(int csr_num, unsigned long val) switch (csr_num) { switchcase_csr_write_16(CSR_PMPCFG0, val) switchcase_csr_write_64(CSR_PMPADDR0, val) + switchcase_csr_write(CSR_MCYCLE, val) + switchcase_csr_write(CSR_MINSTRET, val) + switchcase_csr_write(CSR_MHPMCOUNTER3, val) + switchcase_csr_write_4(CSR_MHPMCOUNTER4, val) + switchcase_csr_write_8(CSR_MHPMCOUNTER8, val) + switchcase_csr_write_16(CSR_MHPMCOUNTER16, val) +#if __riscv_xlen == 32 + switchcase_csr_write(CSR_MCYCLEH, val) + switchcase_csr_write(CSR_MINSTRETH, val) + switchcase_csr_write(CSR_MHPMCOUNTER3H, val) + switchcase_csr_write_4(CSR_MHPMCOUNTER4H, val) + switchcase_csr_write_8(CSR_MHPMCOUNTER8H, val) + switchcase_csr_write_16(CSR_MHPMCOUNTER16H, val) +#endif + switchcase_csr_write(CSR_MCOUNTINHIBIT, val) + switchcase_csr_write(CSR_MHPMEVENT3, val) + switchcase_csr_write_4(CSR_MHPMEVENT4, val) + switchcase_csr_write_8(CSR_MHPMEVENT8, val) + switchcase_csr_write_16(CSR_MHPMEVENT16, val) + default: break; };