From nobody Fri Dec 19 06:34:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06E56C4332F for ; Mon, 21 Nov 2022 00:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbiKUAmg (ORCPT ); Sun, 20 Nov 2022 19:42:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiKUAme (ORCPT ); Sun, 20 Nov 2022 19:42:34 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C30D9264F; Sun, 20 Nov 2022 16:42:30 -0800 (PST) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NFpRh3525zFqRN; Mon, 21 Nov 2022 08:39:12 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 21 Nov 2022 08:42:25 +0800 Received: from huawei.com (10.67.174.169) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 21 Nov 2022 08:42:25 +0800 From: Chen Lifu To: , , , , , , , , CC: Subject: [PATCH -next] RISC-V: KVM: optimize kvm_arch_hardware_enable() Date: Mon, 21 Nov 2022 08:39:15 +0800 Message-ID: <20221121003915.2817102-1-chenlifu@huawei.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.174.169] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The values of CSR_HEDELEG and CSR_HIDELEG registers are constants, so change them from variables to macros. Signed-off-by: Chen Lifu --- arch/riscv/kvm/main.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c index df2d8716851f..70196b03b6f9 100644 --- a/arch/riscv/kvm/main.c +++ b/arch/riscv/kvm/main.c @@ -12,10 +12,21 @@ #include #include #include #include =20 +#define EXC_HEDELEG ((1UL << EXC_INST_MISALIGNED) | \ + (1UL << EXC_BREAKPOINT) | \ + (1UL << EXC_SYSCALL) | \ + (1UL << EXC_INST_PAGE_FAULT) | \ + (1UL << EXC_LOAD_PAGE_FAULT) | \ + (1UL << EXC_STORE_PAGE_FAULT)) + +#define IRQ_HIDELEG ((1UL << IRQ_VS_SOFT) | \ + (1UL << IRQ_VS_TIMER) | \ + (1UL << IRQ_VS_EXT)) + long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) { return -EINVAL; } @@ -30,29 +41,13 @@ int kvm_arch_hardware_setup(void *opaque) return 0; } =20 int kvm_arch_hardware_enable(void) { - unsigned long hideleg, hedeleg; - - hedeleg =3D 0; - hedeleg |=3D (1UL << EXC_INST_MISALIGNED); - hedeleg |=3D (1UL << EXC_BREAKPOINT); - hedeleg |=3D (1UL << EXC_SYSCALL); - hedeleg |=3D (1UL << EXC_INST_PAGE_FAULT); - hedeleg |=3D (1UL << EXC_LOAD_PAGE_FAULT); - hedeleg |=3D (1UL << EXC_STORE_PAGE_FAULT); - csr_write(CSR_HEDELEG, hedeleg); - - hideleg =3D 0; - hideleg |=3D (1UL << IRQ_VS_SOFT); - hideleg |=3D (1UL << IRQ_VS_TIMER); - hideleg |=3D (1UL << IRQ_VS_EXT); - csr_write(CSR_HIDELEG, hideleg); - + csr_write(CSR_HEDELEG, EXC_HEDELEG); + csr_write(CSR_HIDELEG, IRQ_HIDELEG); csr_write(CSR_HCOUNTEREN, -1UL); - csr_write(CSR_HVIP, 0); =20 return 0; } =20 --=20 2.37.1