From patchwork Tue Feb 14 03:44:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13139343 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 8A0B1C6379F for ; Tue, 14 Feb 2023 03:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231504AbjBNDqF (ORCPT ); Mon, 13 Feb 2023 22:46:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbjBNDqD (ORCPT ); Mon, 13 Feb 2023 22:46:03 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A0C7E07F for ; Mon, 13 Feb 2023 19:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676346313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3AIpnqpvUD6jq2TBiR4c/9rNmsRY6g7mIfXM/n0+slQ=; b=dXgbcy0AHa1JyisZp6tXcxCFZRbz/xa0+a8qP+RxQw50zuEttNZAvsgGNSHqApMcqudUJd YPVhzZxbpZwNK0TKEyxti6NdwgpmzOjST8yk5yBG+Jv8e2O0xwy7OCKS+EZofpZy0YgcDe 6X4/EV0K0RttiqCcjdbWKTrKrDvd5/4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-567-W6oFm3vQNy2SJHawQnV8CQ-1; Mon, 13 Feb 2023 22:45:11 -0500 X-MC-Unique: W6oFm3vQNy2SJHawQnV8CQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 675303810789; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) Received: from virt-mtcollins-01.lab.eng.rdu2.redhat.com (virt-mtcollins-01.lab.eng.rdu2.redhat.com [10.8.1.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A1EEC16022; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) From: shahuang@redhat.com To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Shaoqin Huang , Andrew Jones , Eric Auger Subject: [kvm-unit-tests 1/3] arm: gic: Write one bit per time in gic_irq_set_clr_enable() Date: Mon, 13 Feb 2023 22:44:51 -0500 Message-Id: <20230214034453.148494-2-shahuang@redhat.com> In-Reply-To: <20230214034453.148494-1-shahuang@redhat.com> References: <20230214034453.148494-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Shaoqin Huang When use gic_irq_set_clr_enable() to disable an interrupt, it will disable all interrupt since it first read from Interrupt Clear-Enable Registers and then write this value with a mask back. So diretly write one bit per time to enable or disable interrupt. Fixes: cb573c2 ("arm: gic: Introduce gic_irq_set_clr_enable() helper") Signed-off-by: Shaoqin Huang --- lib/arm/gic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/arm/gic.c b/lib/arm/gic.c index 1bfcfcf..89a15fe 100644 --- a/lib/arm/gic.c +++ b/lib/arm/gic.c @@ -176,7 +176,6 @@ void gic_ipi_send_mask(int irq, const cpumask_t *dest) void gic_irq_set_clr_enable(int irq, bool enable) { u32 offset, split = 32, shift = (irq % 32); - u32 reg, mask = BIT(shift); void *base; assert(irq < 1020); @@ -199,8 +198,7 @@ void gic_irq_set_clr_enable(int irq, bool enable) assert(0); } base += offset + (irq / split) * 4; - reg = readl(base); - writel(reg | mask, base); + writel(BIT(shift), base); } enum gic_irq_state gic_irq_state(int irq) From patchwork Tue Feb 14 03:44:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13139344 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 95204C61DA4 for ; Tue, 14 Feb 2023 03:46:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbjBNDqE (ORCPT ); Mon, 13 Feb 2023 22:46:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjBNDqD (ORCPT ); Mon, 13 Feb 2023 22:46:03 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 232EBE397 for ; Mon, 13 Feb 2023 19:45:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676346313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zbfo96JRTocyXswA9WhCCrgwff+hUp+2pthDFDIBBTE=; b=X0EVOIv2yw2H95GCBfiTkfsf6jt+LJ4QIffzSIQk8CNIEBPvOqJBZHF9gEpaSEMv4qHZva ixNbgRomludjkwhDXvz51t0w8d7sSgKoSrEnxen6wGWD1jyUb4sgsALFyrNkp/Knf0Kzc1 qJFyKwZZIMMNOu/wAvPfZQ7dtY//EG4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-UA6rUb3-N4Kf1Zr6-ViHrg-1; Mon, 13 Feb 2023 22:45:11 -0500 X-MC-Unique: UA6rUb3-N4Kf1Zr6-ViHrg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E7F3381078B; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) Received: from virt-mtcollins-01.lab.eng.rdu2.redhat.com (virt-mtcollins-01.lab.eng.rdu2.redhat.com [10.8.1.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 793F2C16022; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) From: shahuang@redhat.com To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Shaoqin Huang , Andrew Jones Subject: [kvm-unit-tests 2/3] arm64: timer: Use gic_enable/disable_irq() macro in timer test Date: Mon, 13 Feb 2023 22:44:52 -0500 Message-Id: <20230214034453.148494-3-shahuang@redhat.com> In-Reply-To: <20230214034453.148494-1-shahuang@redhat.com> References: <20230214034453.148494-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Shaoqin Huang Use gic_enable/disable_irq() to clean up the code. Signed-off-by: Shaoqin Huang --- arm/timer.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/arm/timer.c b/arm/timer.c index c4e7b10..c0a8388 100644 --- a/arm/timer.c +++ b/arm/timer.c @@ -14,9 +14,6 @@ #include #include -static void *gic_isenabler; -static void *gic_icenabler; - static bool ptimer_unsupported; static void ptimer_unsupported_handler(struct pt_regs *regs, unsigned int esr) @@ -139,12 +136,12 @@ static struct timer_info ptimer_info = { static void set_timer_irq_enabled(struct timer_info *info, bool enabled) { - u32 val = 1 << PPI(info->irq); + u32 irq = PPI(info->irq); if (enabled) - writel(val, gic_isenabler); + gic_enable_irq(irq); else - writel(val, gic_icenabler); + gic_disable_irq(irq); } static void irq_handler(struct pt_regs *regs) @@ -366,17 +363,6 @@ static void test_init(void) gic_enable_defaults(); - switch (gic_version()) { - case 2: - gic_isenabler = gicv2_dist_base() + GICD_ISENABLER; - gic_icenabler = gicv2_dist_base() + GICD_ICENABLER; - break; - case 3: - gic_isenabler = gicv3_sgi_base() + GICR_ISENABLER0; - gic_icenabler = gicv3_sgi_base() + GICR_ICENABLER0; - break; - } - install_irq_handler(EL1H_IRQ, irq_handler); set_timer_irq_enabled(&ptimer_info, true); set_timer_irq_enabled(&vtimer_info, true); From patchwork Tue Feb 14 03:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13139346 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 E5EE3C61DA4 for ; Tue, 14 Feb 2023 03:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231516AbjBNDqY (ORCPT ); Mon, 13 Feb 2023 22:46:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjBNDqW (ORCPT ); Mon, 13 Feb 2023 22:46:22 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59737EB57 for ; Mon, 13 Feb 2023 19:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676346329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rXXqhL3i2rw+CD2SWSpGnLLy2TCQWbs5XnC6wXJkit0=; b=H+04QcFP/CmeYZtX+i9Y+lhuE65wjAlyfWZBc45D0CDUwx4+pS8yX8Tye23ufqWUSbjZ6s rpP6uTktvqSh9J4eVFLoVncdVw5BB9UrrwKQu7xLqiCPJf9jQhQ/PRKi2J/Z9PzaADsoxt t2nXhZBFKQtz3whmqvPABqCWCepybIw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-396-ahTsTAxNNyiILwCNL55fQA-1; Mon, 13 Feb 2023 22:45:11 -0500 X-MC-Unique: ahTsTAxNNyiILwCNL55fQA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94889101A55E; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) Received: from virt-mtcollins-01.lab.eng.rdu2.redhat.com (virt-mtcollins-01.lab.eng.rdu2.redhat.com [10.8.1.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E1FAC16022; Tue, 14 Feb 2023 03:45:11 +0000 (UTC) From: shahuang@redhat.com To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Shaoqin Huang , Andrew Jones Subject: [kvm-unit-tests 3/3] arm64: microbench: Use gic_enable_irq() macro in microbench test Date: Mon, 13 Feb 2023 22:44:53 -0500 Message-Id: <20230214034453.148494-4-shahuang@redhat.com> In-Reply-To: <20230214034453.148494-1-shahuang@redhat.com> References: <20230214034453.148494-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Shaoqin Huang Use gic_enable_irq() to clean up code. Signed-off-by: Shaoqin Huang --- arm/micro-bench.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/arm/micro-bench.c b/arm/micro-bench.c index 8436612..090fda6 100644 --- a/arm/micro-bench.c +++ b/arm/micro-bench.c @@ -212,24 +212,11 @@ static void lpi_exec(void) static bool timer_prep(void) { - void *gic_isenabler; - gic_enable_defaults(); install_irq_handler(EL1H_IRQ, gic_irq_handler); local_irq_enable(); - switch (gic_version()) { - case 2: - gic_isenabler = gicv2_dist_base() + GICD_ISENABLER; - break; - case 3: - gic_isenabler = gicv3_sgi_base() + GICR_ISENABLER0; - break; - default: - assert_msg(0, "Unreachable"); - } - - writel(1 << PPI(TIMER_VTIMER_IRQ), gic_isenabler); + gic_enable_irq(PPI(TIMER_VTIMER_IRQ)); write_sysreg(ARCH_TIMER_CTL_IMASK | ARCH_TIMER_CTL_ENABLE, cntv_ctl_el0); isb();