From patchwork Fri Apr 22 10:04:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 564826 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp372674map; Fri, 22 Apr 2022 04:19:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzp6p+9IgP2sf79oNlrtvpSnhcYowKj6h20pLdwZ9QMlg4dsGO5XazU/uSXxPAVf8vmEkH8 X-Received: by 2002:ae9:edc7:0:b0:69e:1318:3251 with SMTP id c190-20020ae9edc7000000b0069e13183251mr2265327qkg.57.1650626373994; Fri, 22 Apr 2022 04:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650626373; cv=none; d=google.com; s=arc-20160816; b=OKyesWxcJ3kKUFguqt/TFBjzC1BiK/LpfDv0GQtmMocXzPbQeT27fPMWrMHBvAU9Cv wbpw52UMfqqhl0IPFqtanVRGIRkBvVBGITdaEs0d1Tus3TV6rrPxxQ2KlIdMPvtx8GoG 0VjLR4HEfjekphUQ+MSv8H1YPJg8iiyLK8vC9y9552Az8eK3yuCdyfm1OB6AYj4zGrQF aF5RMomFGDevy7QSBCRoyZFeJupECLQqAcMM+QUB+f11Mank8/5VGDCjlS01eIbJhYSJ bKUN2GFk/kdtphyCLDXTAVhEIuucayTBqrLRKFZSodsZPhq73dzcdxFgKQ0u0TcNrNg7 0WFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Sllr6EGIV1uqtp8xOnIt6F7gaB5mrGXL+fViUdJftLg=; b=GXk2AkTTiPE44JGqQOq4TzWnRviSNPQ9s7BI/9loR2kQQ/pxTSRqMocI/XFlnAPcVc RQ4doN8xfsWKNvDxU6WUWnpvdWEyDLIGRTsQMCoWb/zvXcnDLjraGFhQIRkevXIVKK4I IL5CoGg4C6YyAEzZeY0HrFKA8vgifdgxZnPe59DtlpJnLyvg5ngTiVN5CbGMOmH5HC9p IOIBx2E4YjWeiusSsB1x39LK6hs9WVDguy9w4NKfUQz9kt7rtUblp8JO1m1wxFmDaunx WXRwvSkeIGDoHbU0n6139M4Pjo4oxF3MGvmsbD+BR3YicV0TAs9dv9yWVecrAvA745Hs vkVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BTIArm9x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e16-20020ac85dd0000000b002ebe8c933dasi2283777qtx.192.2022.04.22.04.19.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Apr 2022 04:19:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BTIArm9x; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhrK1-0000K0-I3 for patch@linaro.org; Fri, 22 Apr 2022 07:19:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqA0-0004tD-BC for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:08 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:38897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhq9y-0002qO-LL for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:05:08 -0400 Received: by mail-wm1-x330.google.com with SMTP id r187-20020a1c44c4000000b0038ccb70e239so7618497wma.3 for ; Fri, 22 Apr 2022 03:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Sllr6EGIV1uqtp8xOnIt6F7gaB5mrGXL+fViUdJftLg=; b=BTIArm9xV7nueRM0VgmSqa4zA+lVIdper/Md3paLpjSU0rzXqvTWdbBDaPURIQ96YW gwfbbdeZ3VgtYY20JyZjATZV5T4nPzhY4/UbXEdpVDRV7S5zxWejSkxUUDQBIsfr+FPu 7ZiSqqjfHEjL7NouiktoYOOU+PIwfvFRbRkPdnBr6980sUPciyWaXgh4747ZTWhIs1WL 6vyPQB+24WjlPnhszEoSn08AnuWAi0RvacWA3iPLYNR7WQeA/rTNDFMEnZRPKZAYJnP6 1j13O/hI9kzrntITTLLJSzOrGfUa9jdAsIFIrdfJX8Tbb2dHc+u9sVzP3QhtsdeS1sEF I2LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Sllr6EGIV1uqtp8xOnIt6F7gaB5mrGXL+fViUdJftLg=; b=f3ASIpr/W33N66LZ9AK0Bjl3g+Ejg93m8TPBKlavEprXuUNNYg2VkQBGqw6HRrlnah yXdGJllAtcZMFAy69b/e4iprAmG+2GGI0fyrK0Kl8bWq6kQrtLUiiSEhQDh0IW6Cgj8P uZfbzBwUU7sk20B4LC/2+mstO6lemoXcImRptIqTrbutWm61057lqS0UCInJlX9Z47V8 keNRjbZfE1H/ctEK5RcxyhMAHDOAHdJct7gK4QK4Ok+bMB4fGMDhTdDC1qZYlV6yVHfF qfUUd5tQIjhM6v+I+cvrjS0jCiTK5WtAQcUqlz6Y2N/p+fwkND3uZc1LAiqyfubgTUgk 0Ttw== X-Gm-Message-State: AOAM533nKTevcI4UO6OKruu1SzKb/jCXweZHRJmAzd3cZ9AX4WG6XW8W 8JLjsxNHO+U2QnhNvBemlpO7kTxBdFAnlQ== X-Received: by 2002:a05:600c:1e85:b0:391:ca59:76be with SMTP id be5-20020a05600c1e8500b00391ca5976bemr12412497wmb.184.1650621904981; Fri, 22 Apr 2022 03:05:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e16-20020a05600c2dd000b0038ed449cbdbsm4312148wmh.3.2022.04.22.03.05.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 03:05:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/61] hw/intc/arm_gicv3_redist: Use set_pending_table_bit() in mov handling Date: Fri, 22 Apr 2022 11:04:04 +0100 Message-Id: <20220422100432.2288247-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220422100432.2288247-1-peter.maydell@linaro.org> References: <20220422100432.2288247-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can use our new set_pending_table_bit() utility function in gicv3_redist_mov_lpi() to clear the bit in the source pending table, rather than doing the "load, clear bit, store" ourselves. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20220408141550.1271295-34-peter.maydell@linaro.org --- hw/intc/arm_gicv3_redist.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/intc/arm_gicv3_redist.c b/hw/intc/arm_gicv3_redist.c index 0fbb04f9986..2c4a87318bc 100644 --- a/hw/intc/arm_gicv3_redist.c +++ b/hw/intc/arm_gicv3_redist.c @@ -909,11 +909,9 @@ void gicv3_redist_mov_lpi(GICv3CPUState *src, GICv3CPUState *dest, int irq) * we choose to NOP. If LPIs are disabled on source there's nothing * to be transferred anyway. */ - AddressSpace *as = &src->gic->dma_as; uint64_t idbits; uint32_t pendt_size; uint64_t src_baddr; - uint8_t src_pend; if (!(src->gicr_ctlr & GICR_CTLR_ENABLE_LPIS) || !(dest->gicr_ctlr & GICR_CTLR_ENABLE_LPIS)) { @@ -932,15 +930,10 @@ void gicv3_redist_mov_lpi(GICv3CPUState *src, GICv3CPUState *dest, int irq) src_baddr = src->gicr_pendbaser & R_GICR_PENDBASER_PHYADDR_MASK; - address_space_read(as, src_baddr + (irq / 8), - MEMTXATTRS_UNSPECIFIED, &src_pend, sizeof(src_pend)); - if (!extract32(src_pend, irq % 8, 1)) { + if (!set_pending_table_bit(src, src_baddr, irq, 0)) { /* Not pending on source, nothing to do */ return; } - src_pend &= ~(1 << (irq % 8)); - address_space_write(as, src_baddr + (irq / 8), - MEMTXATTRS_UNSPECIFIED, &src_pend, sizeof(src_pend)); if (irq == src->hpplpi.irq) { /* * We just made this LPI not-pending so only need to update