From nobody Mon Feb 9 05:10:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1680537790; cv=none; d=zohomail.com; s=zohoarc; b=dB2OpjwUSMpe40YluWzGdBPEqD0ASBUYoQaDBvGhsP3IktdvCv70/pZ5CJEOR5bWUOvgZwco9IIJqIrGfql1DjpWyLShzOSL2AZCVQM9fDyYxwY4fqCE4bR/PCr/Lsjr6QTAOaXrrblQhho3x+h/SdfzJ9dch0V8cy9HZb0raDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680537790; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9qKn2wV1XDVR3SsQesMAZyZNUv+n21KbBYflwsxycVM=; b=jOWcr3EuGmIIbbwEdwPeKKgg9sOigT53IA09+q20MlEykORNrhjHemhOCbPaJmt1dW+oXCBVCUq4xyOmBSAkNlXEegp2xQSs757jWDXCrcvTPHKiusq6CXwu8gHOCdqVs0pgKyH4Fxt9vMcKsIFcjFyvS9cmLqIArn/TaqSZP/A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680537790650926.0691967165519; Mon, 3 Apr 2023 09:03:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjMcl-00059z-He; Mon, 03 Apr 2023 12:01:39 -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 1pjMcX-00055T-UF for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:25 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjMcU-0002B4-47 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:23 -0400 Received: by mail-wr1-x429.google.com with SMTP id e18so29879522wra.9 for ; Mon, 03 Apr 2023 09:01:20 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p1-20020a5d68c1000000b002c59f18674asm10088668wrw.22.2023.04.03.09.01.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 09:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680537679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9qKn2wV1XDVR3SsQesMAZyZNUv+n21KbBYflwsxycVM=; b=tQaGA8+tUINDUEQ7sB1JEdJtWnDGF4JKlrrRQ7t/i4BGg6vguEoEKQjvORYDPhxwYU JgBF0UwIDxAV/Nv5rLN1+//Z3n2krE6ztg8ytTlku7c28jChLYtDINoJ18E3Kmup4VM4 ZcG+qwc7XkI/Fp+cL8IWgVthpEPdIKZy2TQOvUX7fAEeXmAdqBhevOwYyJXZ2WnU5uWn BfoucsNvoyBemVtzQtvRsEgvM0VQXyc64FEdBVk7Zrkj/ZPPSqfmJ8h+Kno/vAQUBEtx Kck4/jaZ1IjLJahOttfbsrxULo5ZNVbyCEwVw4+wadQW6rKTayyx+SQ2Jf3MYzNJosdg LBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680537679; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9qKn2wV1XDVR3SsQesMAZyZNUv+n21KbBYflwsxycVM=; b=xsdOGT/wxuCvQk7yV9dFHBE6wNftQEmvkrLBUdsPuNRfQiVrSaNLBZxe9ZGoXGa7te Vfvds+JO0Md3+7WaKn1yjO7k8odfevAG0wbNKBjFGdnwX97439x7rpqfuu++6djy18DF otFPz8kT0zuywUQ1NM0wHhAvayfjAXSvPeJqzAypHEIREOWtxAuantokrxAH5eniImJL BJziG/SmI7UYme8TDcx+Fj75daUe0NWC3KvYQ3fMc2iwop4L4aeiCsWd4sx5X7rGeUeU F1pGKSz8mgJugoECnbsQxFzvT4zkzNbI1rUkohDkHV3Jqx7uF1gCNfZwCaU5zIDiQXaB twlg== X-Gm-Message-State: AAQBX9ePW0UkBTY0qhaTr5JTsf6FiaRJrFNaM8ffLJdClvEXPVWwONPz wb9P4oahI44XWDxIRlJOjVN19WONxup60eXMh7A= X-Google-Smtp-Source: AKy350ZXUlF21TCGFU4wuCOuM5mmzY8fUh/6aXOq5mxdom9TpQG0gaJiZCm21FN0BIo6pbsGFFcPPw== X-Received: by 2002:adf:d84e:0:b0:2ce:c982:5e4b with SMTP id k14-20020adfd84e000000b002cec9825e4bmr27040210wrl.57.1680537679180; Mon, 03 Apr 2023 09:01:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 1/4] target/arm: Fix non-TCG build failure by inlining pauth_ptr_mask() Date: Mon, 3 Apr 2023 17:01:14 +0100 Message-Id: <20230403160117.3034102-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403160117.3034102-1-peter.maydell@linaro.org> References: <20230403160117.3034102-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680537792613100003 From: Philippe Mathieu-Daud=C3=A9 aarch64_gdb_get_pauth_reg() -- although disabled since commit 5787d17a42 ("target/arm: Don't advertise aarch64-pauth.xml to gdb") is still compiled in. It calls pauth_ptr_mask() which is located in target/arm/tcg/pauth_helper.c, a TCG specific helper. To avoid a linking error when TCG is not enabled: Undefined symbols for architecture arm64: "_pauth_ptr_mask", referenced from: _aarch64_gdb_get_pauth_reg in target_arm_gdbstub64.c.o ld: symbol(s) not found for architecture arm64 clang: error: linker command failed with exit code 1 (use -v to see invoc= ation) - Inline pauth_ptr_mask() in aarch64_gdb_get_pauth_reg() (this is the single user), - Rename pauth_ptr_mask_internal() as pauth_ptr_mask() and inline it in "internals.h", Fixes: e995d5cce4 ("target/arm: Implement gdbstub pauth extension") Suggested-by: Richard Henderson Reviewed-by: Fabiano Rosas Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20230328212516.29592-1-philmd@linaro.org [PMM: reinstated doc comment] Signed-off-by: Peter Maydell --- target/arm/internals.h | 15 ++++++++++----- target/arm/gdbstub64.c | 7 +++++-- target/arm/tcg/pauth_helper.c | 18 +----------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 673519a24a0..c2c70d5918d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -1391,13 +1391,18 @@ bool arm_generate_debug_exceptions(CPUARMState *env= ); =20 /** * pauth_ptr_mask: - * @env: cpu context - * @ptr: selects between TTBR0 and TTBR1 - * @data: selects between TBI and TBID + * @param: parameters defining the MMU setup * - * Return a mask of the bits of @ptr that contain the authentication code. + * Return a mask of the address bits that contain the authentication code, + * given the MMU config defined by @param. */ -uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data); +static inline uint64_t pauth_ptr_mask(ARMVAParameters param) +{ + int bot_pac_bit =3D 64 - param.tsz; + int top_pac_bit =3D 64 - 8 * param.tbi; + + return MAKE_64BIT_MASK(bot_pac_bit, top_pac_bit - bot_pac_bit); +} =20 /* Add the cpreg definitions for debug related system registers */ void define_debug_regs(ARMCPU *cpu); diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index ec1e07f1399..c1f7e8c934b 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -230,8 +230,11 @@ int aarch64_gdb_get_pauth_reg(CPUARMState *env, GByteA= rray *buf, int reg) { bool is_data =3D !(reg & 1); bool is_high =3D reg & 2; - uint64_t mask =3D pauth_ptr_mask(env, -is_high, is_data); - return gdb_get_reg64(buf, mask); + ARMMMUIdx mmu_idx =3D arm_stage1_mmu_idx(env); + ARMVAParameters param; + + param =3D aa64_va_parameters(env, -is_high, mmu_idx, is_data); + return gdb_get_reg64(buf, pauth_ptr_mask(param)); } default: return 0; diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index 20f347332dc..de067fa7168 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -339,17 +339,9 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_= t ptr, uint64_t modifier, return pac | ext | ptr; } =20 -static uint64_t pauth_ptr_mask_internal(ARMVAParameters param) -{ - int bot_pac_bit =3D 64 - param.tsz; - int top_pac_bit =3D 64 - 8 * param.tbi; - - return MAKE_64BIT_MASK(bot_pac_bit, top_pac_bit - bot_pac_bit); -} - static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param) { - uint64_t mask =3D pauth_ptr_mask_internal(param); + uint64_t mask =3D pauth_ptr_mask(param); =20 /* Note that bit 55 is used whether or not the regime has 2 ranges. */ if (extract64(ptr, 55, 1)) { @@ -359,14 +351,6 @@ static uint64_t pauth_original_ptr(uint64_t ptr, ARMVA= Parameters param) } } =20 -uint64_t pauth_ptr_mask(CPUARMState *env, uint64_t ptr, bool data) -{ - ARMMMUIdx mmu_idx =3D arm_stage1_mmu_idx(env); - ARMVAParameters param =3D aa64_va_parameters(env, ptr, mmu_idx, data); - - return pauth_ptr_mask_internal(param); -} - static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifi= er, ARMPACKey *key, bool data, int keynumber) { --=20 2.34.1 From nobody Mon Feb 9 05:10:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1680537752; cv=none; d=zohomail.com; s=zohoarc; b=UIjAsa4X/Yv+Hj52KQDffeVpRyPChH9ggDoJdowlow2Pn2Yjh4n/7HMQ26IVkcJqvN2YC1qtW4/OtxAfdoVsxSV8R4Gu3RDnQTJ3OXgx3PTZ08K9rKjy+TByJ+XmEWpvZ/FdJmmj0L+8Xaee6Jm5LjxXzm/1jGs0iq0lxkoO8+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680537752; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AmlbhI+3LA71Xt6UcR44d//uzKHu0T+b6W9+kDRfosk=; b=jJ+TF/IOAtGrvKq+rMXgFGbPGiJmckjm9lHmVtA0hQdhNf/ihBvfg8ri58ss1N06Q0UytkTxk0A7e0NMwcBCXEeCAKvyAxQEHcHd6fjyrHV/z2EpxENz1dAAUGsQZMr5uN6KrZnQVJj+ToIlgC6xVmLtQSWOFOjQ/a/hYBE4UwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680537752837344.73478088143213; Mon, 3 Apr 2023 09:02:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjMck-00059d-Sz; Mon, 03 Apr 2023 12:01:38 -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 1pjMcX-00055Q-U1 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:25 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjMcU-0002BJ-4o for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:23 -0400 Received: by mail-wr1-x42f.google.com with SMTP id h17so29877487wrt.8 for ; Mon, 03 Apr 2023 09:01:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p1-20020a5d68c1000000b002c59f18674asm10088668wrw.22.2023.04.03.09.01.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 09:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680537680; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AmlbhI+3LA71Xt6UcR44d//uzKHu0T+b6W9+kDRfosk=; b=vD/Y5ccqHkoYX340/2aN+XPYnpdlG0jl1orRl8T5cYFUdkx+yIRBbMk0q0kfAAB8sP SfG9oGn4UHK1JYFSRQerJUyZ9Cb/sWtejG0/KMcfA7d9zkxAgzPh8s+jemgIr5w+G4p9 37UTa/VY9PLBFTcT39mP3TtfUULmS4aY6S3Q2pSawm/aXUtsjvGxy92QQ+LtrCDNiou5 iQiq8DDMlw49RTbHr0KCW6OlM7woymNWfm9rzLwcVAKeeYGjmMY59OH4wpp/si1YOz5W yHzLQb8HdfkCfz7XmDWilpSbRht3rgDI2rMSbWgRGkx7JKZTda3gN3MXtP5jmUfgO6B7 jZ1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680537680; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AmlbhI+3LA71Xt6UcR44d//uzKHu0T+b6W9+kDRfosk=; b=S2ZXSmw4EAkL6cOX5qkfB5NfKmMLw9jIVQHoCY6IeyABpgRUHzkamLOQMlY6YfO4YF akmN+dVuU8nOupCPGQJkx/WcIkQSNs//iL45Yzl3F/IX2X/dgSBSlG3TUw3gPwcatc78 7/9Ce/W09Ax/cWNSceeJSjfVi0ui+PwbV/uDGkCUyxc9Ar4sUkXRUdy8QaoL1m85XVIa 80kRHXj4YpeUhDdOiDLrYzmTNwftWYSwa9zbLSn2pUo93R7kjonvuB+tJzNrvc2lc+zk WMlG3C7PWQ0GhTeg9N5+OPWsQR32lUCp/EpXHlBNHKWSmCIh2Cz//rNzlLTTiPYtWSTR DCJw== X-Gm-Message-State: AAQBX9eB2FaIqxyb0Hqe5uPLUmL/vO4VSgdMqsI9a3v4CUcSQVhRilvw v3hf8f9dkU/oEHV1acpZtF/gmI9mcRLfswXNrbo= X-Google-Smtp-Source: AKy350ZmVCCN97OfrDCYpexZwO1+AXVaSCoDTBtJ42LVDpY2Fe4fKCUVyB+1fIywqFZ/rtVc6CdTLg== X-Received: by 2002:adf:e94c:0:b0:2cf:e688:51bd with SMTP id m12-20020adfe94c000000b002cfe68851bdmr25789024wrn.31.1680537680064; Mon, 03 Apr 2023 09:01:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 2/4] hw/arm: do not free machine->fdt in arm_load_dtb() Date: Mon, 3 Apr 2023 17:01:15 +0100 Message-Id: <20230403160117.3034102-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403160117.3034102-1-peter.maydell@linaro.org> References: <20230403160117.3034102-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680537759187100001 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster At this moment, arm_load_dtb() can free machine->fdt when binfo->dtb_filename is NULL. If there's no 'dtb_filename', 'fdt' will be retrieved by binfo->get_dtb(). If get_dtb() returns machine->fdt, as is the case of machvirt_dtb() from hw/arm/virt.c, fdt now has a pointer to machine->fdt. And, in that case, the existing g_free(fdt) at the end of arm_load_dtb() will make machine->fdt point to an invalid memory region. Since monitor command 'dumpdtb' was introduced a couple of releases ago, running it with any ARM machine that uses arm_load_dtb() will crash QEMU. Let's enable all arm_load_dtb() callers to use dumpdtb properly. Instead of freeing 'fdt', assign it back to ms->fdt. Cc: Peter Maydell Cc: qemu-arm@nongnu.org Fixes: bf353ad55590f ("qmp/hmp, device_tree.c: introduce dumpdtb") Reported-by: Markus Armbruster Signed-off-by: Daniel Henrique Barboza Signed-off-by: Markus Armbruster Reviewed-by: Daniel Henrique Barboza Message-id: 20230328165935.1512846-1-armbru@redhat.com Signed-off-by: Peter Maydell --- hw/arm/boot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 50e5141116b..54f6a3e0b3c 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -689,7 +689,10 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_in= fo *binfo, qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, rom_ptr_for_as(as, addr, size)); =20 - g_free(fdt); + if (fdt !=3D ms->fdt) { + g_free(ms->fdt); + ms->fdt =3D fdt; + } =20 return size; =20 --=20 2.34.1 From nobody Mon Feb 9 05:10:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1680537752; cv=none; d=zohomail.com; s=zohoarc; b=L+cJWitoiqWAFNqdtWtlVQ7z5BxfmWBhFFHU2JzBB0+H4efFm8OI78yq8zN8hM1+0lDecyolhzRwG+tP/+geYX5YzV5n5VOLHt9M4PysNsmfH/33f++8tRGPxv5+iEVFRctoauuWojEffgcMycmW8EeYNKT418c9DguC5KuGFvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680537752; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D0bzLBgoxKzl8wuuz0d2cPzzjDTy7V+sRD0Owr6cPGk=; b=n8JUSw9/nQuoG7VuVd9EVwmej/q2Q6MUM5l1RHIz9BoqevhBkha44NjeGRGdFXHZHXRt0IBQdrdLNzytsqICtzDDa2jO0s8cYIfXoJ8+8rwogWzRgxowLXC3tnCRYOrPOb6sVB+46mKlFb9Y7ELKFEGjQH1mgaQgeoGn8Md3k4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680537752956287.48073955664677; Mon, 3 Apr 2023 09:02:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjMck-00059e-Ss; Mon, 03 Apr 2023 12:01:38 -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 1pjMcX-00055S-Ua for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:25 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjMcU-0002BP-Au for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:23 -0400 Received: by mail-wr1-x432.google.com with SMTP id i9so29899400wrp.3 for ; Mon, 03 Apr 2023 09:01:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p1-20020a5d68c1000000b002c59f18674asm10088668wrw.22.2023.04.03.09.01.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 09:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680537680; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D0bzLBgoxKzl8wuuz0d2cPzzjDTy7V+sRD0Owr6cPGk=; b=q5ejblw0dpKlrjuVEd0VYgD+yndmoA0lN+RorXjENFU6b7uwfZ+CwGUILz5oxkpqhj CQBHXKR3Dhzf5JXrkXfzP9EPl4FbAaKTMM+KrgTKlhTvsWrb+XlBuEjSLljzi3Eb46+m v53Jm070q6QaYz6rXL9ta8VPTRtGc8RWpe+X8yRll0jAlrtN1I4KmiK63KZaK6q/8zVm 6jVIO+DTJpqIcG9YiS6yxb8BINVQWwnoFX52gCCoeIaPc/vAOT6BnpVBGfQMdKmEaVwH oHrDKMZNDYk4mTs70Wa2gvzbVSZl17wdwYazPzRo7r5uCTibrAJix3nWoDvl7lxHOHTG qh0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680537680; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D0bzLBgoxKzl8wuuz0d2cPzzjDTy7V+sRD0Owr6cPGk=; b=hU8EsvLOXVSAtkt2Xqicx+if0Fbqbxc/RS+6MyT/RIy2jaiT+x4yxayt6B/yAYLAKG Bnv7iV+FeUoSRHKUWgGwPci9d27L9R/uwHgwtmacdP9j8xNqrEZyUvfaHYe4ILTh8Pal NmvbUh+2MxVP7JygNZyK+kUUfzfCyG+5n3Nf3hEX+enfo90JoCMzX2mdbqWqL+aW04Yr ggWu3ZRq69IKHUgkevRmf3xa4mYkXNu31kjKEI7N16H4nR99oqx8bC1kQM5undoQUS/C uGgvKQtol15BVUqUZTwk7vXczViR+e3mULqqOs9oz+6n9nMr9N/gnjattqGXWd/oQDX3 p4TA== X-Gm-Message-State: AAQBX9eJFKQDBnkyRU5Ln/ION5eAAGOwRBs3HanYjvbCO55NywKtIe/A e2jSjjt+sjBeGIKS9tGPmOjAVTwWDgcs3+vsSKs= X-Google-Smtp-Source: AKy350ZerOOij0yNdUyCPiNKxnolMItH68i2z0Iw5TatfLHUbinicYkOYlOEKHCteO6nvtrcEm/v7g== X-Received: by 2002:a5d:6a4d:0:b0:2ce:a0c7:153a with SMTP id t13-20020a5d6a4d000000b002cea0c7153amr30605222wrw.14.1680537680446; Mon, 03 Apr 2023 09:01:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 3/4] target/arm: Fix generated code for cpreg reads when HSTR is active Date: Mon, 3 Apr 2023 17:01:16 +0100 Message-Id: <20230403160117.3034102-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403160117.3034102-1-peter.maydell@linaro.org> References: <20230403160117.3034102-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680537762480100001 Content-Type: text/plain; charset="utf-8" In commit 049edada we added some code to handle HSTR_EL2 traps, which we did as an inline "conditionally branch over a gen_exception_insn()". Unfortunately this fails to take account of the fact that gen_exception_insn() will set s->base.is_jmp to DISAS_NORETURN. That means that at the end of the TB we won't generate the necessary code to handle the "branched over the trap and continued normal execution" codepath. The result is that the TCG main loop thinks that we stopped execution of the TB due to a situation that only happens when icount is enabled, and hits an assertion. Explicitly set is_jmp back to DISAS_NEXT so we generate the correct code for when execution continues past this insn. Note that this only happens for cpreg reads; writes will call gen_lookup_tb() which generates a valid end-of-TB. Fixes: 049edada ("target/arm: Make HSTR_EL2 traps take priority over UNDEF-= at-EL1") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1551 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230330101900.2320380-1-peter.maydell@linaro.org --- target/arm/tcg/translate.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 2cb9368b1ba..3c8401e9086 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -4623,6 +4623,12 @@ static void do_coproc_insn(DisasContext *s, int cpnu= m, int is64, tcg_gen_brcondi_i32(TCG_COND_EQ, t, 0, over.label); =20 gen_exception_insn(s, 0, EXCP_UDEF, syndrome); + /* + * gen_exception_insn() will set is_jmp to DISAS_NORETURN, + * but since we're conditionally branching over it, we want + * to assume continue-to-next-instruction. + */ + s->base.is_jmp =3D DISAS_NEXT; set_disas_label(s, over); } } --=20 2.34.1 From nobody Mon Feb 9 05:10:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1680537752; cv=none; d=zohomail.com; s=zohoarc; b=LrMn3wT3dPhBlrJ9YVw21/3ZY2YDh15sT0175ePVC0VLov8nrMQHAXmDJQiPF13WWpWlKeV5WX0FznMtzjBG51bkE2xY/Q/hEAvgRt/hRLvu/QVV0FYxT9sez7opcmii98Hd79gOeSdtnGlJuti2agcunqVpi4O3RSNXn97PyXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680537752; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V/wpFoRtLBHl9IngzkoD10ivVrKdxV4x7qoi+Upw/so=; b=fDYDbchV//Rh6P8i8H3dRWk0z2/y/CLlSsfX3fjGJpssmbdWonRvmlqclLydsgGVClHBY0Z+ybCrl6SbFIj7EWKRn5sMqsD/tOuoPFcA4P+Bd/huJxfUgEIUUIl7dqY/exrpaynUSAyKyDQFuYBUF5OFU49hKtu1Fu6n/Si2NjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1680537752804263.8310843876309; Mon, 3 Apr 2023 09:02:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjMck-00059U-P3; Mon, 03 Apr 2023 12:01:38 -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 1pjMcX-00055R-U7 for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:25 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjMcU-0002BX-Gq for qemu-devel@nongnu.org; Mon, 03 Apr 2023 12:01:24 -0400 Received: by mail-wr1-x42f.google.com with SMTP id m2so29891628wrh.6 for ; Mon, 03 Apr 2023 09:01:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p1-20020a5d68c1000000b002c59f18674asm10088668wrw.22.2023.04.03.09.01.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 09:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680537681; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V/wpFoRtLBHl9IngzkoD10ivVrKdxV4x7qoi+Upw/so=; b=HtbRkW21a7zfV7ELZNgGd5IQ/ZL/bdRZBqsompvJMKp/Sf4tiPzXzz31OAGoxmdBRF 14mhAHYIj0V7WvixvaGjBalgooKBJcVieG2Zml/AeTeXPZwI9tcpp/5GqNZVuQsvhJFk 69Xbc5DcAsbD9ZPQz/feKXpa3hKgO7knmr6Q7gmROpAnn4zGyZm2uLKRvaoapwhlXycW gVattwbREYY9qipBBGhGd6eSoDrRwfPtF5k+mlm2xtexz+l7SMuSrCtRquzOtKkYh0dv TZTwYIh5NeWjyOtKb/zxDOGlZNC/306mIHS68maNFVUwnwZ2qcoAbKb+4UvB/+m0tyqq 7BDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680537681; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V/wpFoRtLBHl9IngzkoD10ivVrKdxV4x7qoi+Upw/so=; b=qlnIafhHdMEbkibCcOSpIWJbFRFbU7HY9TAd/GUcVjGpF+mKws6CHjZeyisAJB6wPh YWsve2JO8mWCvrGAJ6HqQ4Ah4iDT7uP1ylDpVycMb8IurpgutTyxN+k3XoWLRntX5SxM IsJKJ5TYUnj+2KtwRZPSYpC58KXdyDW5k6DM6qczUy4jtArNeM/smLZxgvb2iCYMINPS D1/lKnLl35V5ZkOR+CDBAvvKmeAAdR6Up0zQl0PuqjHmvtlR4cr3iAu9lc7ro3rJ4M1u fL4HWcddPwaJoBEsPxNOIWYj+Ky12L8ajh6vcVPPEy2VcWZQd3a1KWzi5lpzRme8jmV/ XIqg== X-Gm-Message-State: AAQBX9cWYbiXaWFw8dvHEUUkXlSY6DxxdxV5cSfnwzD4MWJXy+LGsQWf 5nA9tmUeaHGmhH6amQsgtB+Y0ToelDPZ+Wx9bzk= X-Google-Smtp-Source: AKy350brUm7g1lvw5FDYGQykiasPe3zhuxW1eRMiIZpXziz1GEE1IyCjo8XtTa5rlVYLhBy+tArERQ== X-Received: by 2002:a5d:6ac8:0:b0:2e4:cc1c:102c with SMTP id u8-20020a5d6ac8000000b002e4cc1c102cmr12430466wrw.48.1680537681185; Mon, 03 Apr 2023 09:01:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 4/4] hw/ssi: Fix Linux driver init issue with xilinx_spi Date: Mon, 3 Apr 2023 17:01:17 +0100 Message-Id: <20230403160117.3034102-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403160117.3034102-1-peter.maydell@linaro.org> References: <20230403160117.3034102-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1680537753999100001 Content-Type: text/plain; charset="utf-8" From: Chris Rauer The problem is that the Linux driver expects the master transaction inhibit bit(R_SPICR_MTI) to be set during driver initialization so that it can detect the fifo size but QEMU defaults it to zero out of reset. The datasheet indicates this bit is active on reset. See page 25, SPI Control Register section: https://www.xilinx.com/content/dam/xilinx/support/documents/ip_documentatio= n/axi_quad_spi/v3_2/pg153-axi-quad-spi.pdf Signed-off-by: Chris Rauer Message-id: 20230323182811.2641044-1-crauer@google.com Reviewed-by: Edgar E. Iglesias Signed-off-by: Peter Maydell --- hw/ssi/xilinx_spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 552927622f4..d4de2e7aabc 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -156,6 +156,7 @@ static void xlx_spi_do_reset(XilinxSPI *s) txfifo_reset(s); =20 s->regs[R_SPISSR] =3D ~0; + s->regs[R_SPICR] =3D R_SPICR_MTI; xlx_spi_update_irq(s); xlx_spi_update_cs(s); } --=20 2.34.1