From patchwork Wed May 17 09:10:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 682919 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp252253wrt; Wed, 17 May 2023 02:15:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5qVdc51DJhG1GMyhTwC82Bt+/BOK2WNM12HbdHKcuwxBNfUlkYa6/ehsOjYs3GLM3QJUOU X-Received: by 2002:ac8:5992:0:b0:3ef:3510:7c40 with SMTP id e18-20020ac85992000000b003ef35107c40mr65939344qte.65.1684314957724; Wed, 17 May 2023 02:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684314957; cv=none; d=google.com; s=arc-20160816; b=oFSCr20+s5/nWIjUj5bZ7wAK3u/RzBmH73olSvIdCHTrsBiNAG3jjFhOsHA40Okw+F 8YgEhHoaFLZSQFoBj7SkdhMfdF7g7jEq8oSktK7xe5g9+p2tR2aK9c06D15Ru7tZ4ArR T8vCua3oqarq5N8Ifnt152PeUMBId5nUIJ5MXYXpnIaaLVzHx26aVGmfiB+bT/Fwb9eh 2+NJeiyJrPATfvqMLoKW6mByMHZibnRElkyWUlk1flzDs+NXjbIbqVbddlaMfofhGDJS bnif8uck0U6MD3AIdDNTyaBihsXlxCQ7efD/pE49sOf0ePJTNIFSf+xFrhvHw/2zU9Ah kIkA== 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:cc:to :from; bh=GamS3+Kc+NwOXwImuX97lvHh6uivd76pqWR7sL14SgE=; b=R9IHcAjrtpc/lLA2EG8C27Jw99e4uZsDOYRBkopRkNaAcJ4/G/80nVmJY5tfp+YEmW hmn4bjAr6b6DJnRedh0lZQfizH+BR2GzlGNUm24I/9ec5gVm1MMfyLr01/LBM7DnfMnE 6C4+UthkTf+uwNrr+NNpjN1Ib8aAYbicG2XvBgJJKceXksMUl0HxyGF33JFw/WemjGbr vW3GD+0A49IFXdGTM1Plf2CTVsYxPtHsXEo5uF7fVHFakad8iKYEnLvCk7MFreDWOlHh t3aS4NVVPFU8W4f2oFkYZUzxSjJMZlRwPhxzWXF9BjD1hrJCVxd6+HAvaKb68iIjg5cX V6RA== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q5-20020a05620a038500b0074e36f1b99dsi1050284qkm.233.2023.05.17.02.15.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 May 2023 02:15:57 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzDBj-0000wB-SU; Wed, 17 May 2023 05:11:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzDBi-0000uB-A9; Wed, 17 May 2023 05:11:14 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzDBg-0006OU-Bx; Wed, 17 May 2023 05:11:14 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A3AD36831; Wed, 17 May 2023 12:10:44 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 15C8C5F01; Wed, 17 May 2023 12:10:44 +0300 (MSK) Received: (nullmailer pid 3626699 invoked by uid 1000); Wed, 17 May 2023 09:10:42 -0000 From: Michael Tokarev To: qemu-stable@nongnu.org Cc: qemu-devel@nongnu.org, Peter Maydell , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v7.2.3 11/30] hw/intc/allwinner-a10-pic: Don't use set_bit()/clear_bit() Date: Wed, 17 May 2023 12:10:23 +0300 Message-Id: <20230517091042.3626593-11-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The Allwinner PIC model uses set_bit() and clear_bit() to update the values in its irq_pending[] array when an interrupt arrives. However it is using these functions wrongly: they work on an array of type 'long', and it is passing an array of type 'uint32_t'. Because the code manually figures out the right array element, this works on little-endian hosts and on 32-bit big-endian hosts, where bits 0..31 in a 'long' are in the same place as they are in a 'uint32_t'. However it breaks on 64-bit big-endian hosts. Remove the use of set_bit() and clear_bit() in favour of using deposit32() on the array element. This fixes a bug where on big-endian 64-bit hosts the guest kernel would hang early on in bootup. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-id: 20230424152833.1334136-1-peter.maydell@linaro.org (cherry picked from commit 2c5fa0778c3b4307f9f3af7f27886c46d129c62f) Signed-off-by: Michael Tokarev --- hw/intc/allwinner-a10-pic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c index 8cca124807..4875e68ba6 100644 --- a/hw/intc/allwinner-a10-pic.c +++ b/hw/intc/allwinner-a10-pic.c @@ -49,12 +49,9 @@ static void aw_a10_pic_update(AwA10PICState *s) static void aw_a10_pic_set_irq(void *opaque, int irq, int level) { AwA10PICState *s = opaque; + uint32_t *pending_reg = &s->irq_pending[irq / 32]; - if (level) { - set_bit(irq % 32, (void *)&s->irq_pending[irq / 32]); - } else { - clear_bit(irq % 32, (void *)&s->irq_pending[irq / 32]); - } + *pending_reg = deposit32(*pending_reg, irq % 32, 1, level); aw_a10_pic_update(s); }