From patchwork Thu Mar 2 12:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13157178 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 0EF42C7EE30 for ; Thu, 2 Mar 2023 12:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229688AbjCBMLs (ORCPT ); Thu, 2 Mar 2023 07:11:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbjCBMLr (ORCPT ); Thu, 2 Mar 2023 07:11:47 -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 1AE7F1714A for ; Thu, 2 Mar 2023 04:11:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677759061; 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=jM0YMtHuHyizNYkbKLa/qVtLG7T10pY8cE1PxFIKoSo=; b=Utfqsz1c/zD/b2Tipa+J10UeNsZFHVj5AlIRrBX/igLDcFBPTjtTpGeGroMM5oVR1ZpECb YBLzw4hv21QqEoOP+LBfhyc+d3t1hI8RSZF0Fqs6OC7483NaMi/tm1S+x0ZghbPwNLi3uQ VRA0ciPHN05QB6THsUmB5qPWyabw+6U= 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-132-wSc5omsxNgCioCUT1llORw-1; Thu, 02 Mar 2023 07:10:58 -0500 X-MC-Unique: wSc5omsxNgCioCUT1llORw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED5B829AA2CF; Thu, 2 Mar 2023 12:10:57 +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 D9B102026D76; Thu, 2 Mar 2023 12:10:57 +0000 (UTC) From: Shaoqin Huang To: kvmarm@lists.linux.dev Cc: Shaoqin Huang , Eric Auger , Andrew Jones , kvm@vger.kernel.org (open list:ARM) Subject: [kvm-unit-tests PATCH v2 1/3] arm: gic: Write one bit per time in gic_irq_set_clr_enable() Date: Thu, 2 Mar 2023 07:10:47 -0500 Message-Id: <20230302121049.160466-2-shahuang@redhat.com> In-Reply-To: <20230302121049.160466-1-shahuang@redhat.com> References: <20230302121049.160466-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 where '1' indicates that forwarding of the corresponding interrupt is enabled and then write this value with a mask back where '1' indicates disable the interrupt. 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 Reviewed-by: Eric Auger --- 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 Thu Mar 2 12:10:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13157179 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 F0346C6FA8E for ; Thu, 2 Mar 2023 12:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229494AbjCBMLv (ORCPT ); Thu, 2 Mar 2023 07:11:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbjCBMLt (ORCPT ); Thu, 2 Mar 2023 07:11:49 -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 9CEDD3E601 for ; Thu, 2 Mar 2023 04:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677759061; 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=BnA1zuhpTm2PtZce9SymWm0HXGJokQBnV5kaA5s8cFQ=; b=C3SDbuZtVGkMaBzxIS4iTOpJgi6YGJNes6cMpOTvG16av54iSrAR/DtzXdpn3O0zblfSzm 4N3sofR0tvEb5MRU2G6FEQ/sdgLiKD2wUzTPn8ibSUBs2U5fzDLN+sx5rIdkB6/GBp/NeL cMT32gycbzZNKpG5Pg1Z2DcgAPDm1Nw= 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-173-gpVxZ4u6N_G8B_x3n2pxzg-1; Thu, 02 Mar 2023 07:10:58 -0500 X-MC-Unique: gpVxZ4u6N_G8B_x3n2pxzg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 144A3101A521; Thu, 2 Mar 2023 12:10:58 +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 08A042026D4B; Thu, 2 Mar 2023 12:10:58 +0000 (UTC) From: Shaoqin Huang To: kvmarm@lists.linux.dev Cc: Shaoqin Huang , Eric Auger , Andrew Jones , kvm@vger.kernel.org (open list:ARM) Subject: [kvm-unit-tests PATCH v2 2/3] arm64: timer: Use gic_enable/disable_irq() macro in timer test Date: Thu, 2 Mar 2023 07:10:48 -0500 Message-Id: <20230302121049.160466-3-shahuang@redhat.com> In-Reply-To: <20230302121049.160466-1-shahuang@redhat.com> References: <20230302121049.160466-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use gic_enable/disable_irq() to clean up the code. Signed-off-by: Shaoqin Huang Reviewed-by: Eric Auger --- 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 Thu Mar 2 12:10:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaoqin Huang X-Patchwork-Id: 13157180 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 9D0FAC678D4 for ; Thu, 2 Mar 2023 12:12:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbjCBML7 (ORCPT ); Thu, 2 Mar 2023 07:11:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbjCBML5 (ORCPT ); Thu, 2 Mar 2023 07:11:57 -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 165043E609 for ; Thu, 2 Mar 2023 04:11:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677759067; 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=ncKHv1h1opO4DA5kxu6YhoDiEOVtPQycDQ/UhO4F0qc=; b=MiFQyRtTULULJ7bZJ4f/9l6fX6LvIm12m1JanGQmy7RWaiR/7kX9fF3qHnW0Mcc3G9Ra4P V+cospVaALYdgocHpQy8OdIznK8pql9GYS5FnuuMSa7cyhpW6cwVW6lntjNFYs4djkrsgH HrkX7rqKTEf7Lc1Yhoawx9I+AtSY2Us= 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-173-782Ok0q-P-aI3yjiVDgVNQ-1; Thu, 02 Mar 2023 07:10:58 -0500 X-MC-Unique: 782Ok0q-P-aI3yjiVDgVNQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F4883806107; Thu, 2 Mar 2023 12:10:58 +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 227542026D4B; Thu, 2 Mar 2023 12:10:58 +0000 (UTC) From: Shaoqin Huang To: kvmarm@lists.linux.dev Cc: Shaoqin Huang , Eric Auger , Andrew Jones , kvm@vger.kernel.org (open list:ARM) Subject: [kvm-unit-tests PATCH v2 3/3] arm64: microbench: Use gic_enable_irq() macro in microbench test Date: Thu, 2 Mar 2023 07:10:49 -0500 Message-Id: <20230302121049.160466-4-shahuang@redhat.com> In-Reply-To: <20230302121049.160466-1-shahuang@redhat.com> References: <20230302121049.160466-1-shahuang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use gic_enable_irq() to clean up code. Signed-off-by: Shaoqin Huang Reviewed-by: Eric Auger --- 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();