From patchwork Thu Aug 24 09:28:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 716536 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1237568wrp; Thu, 24 Aug 2023 02:34:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+9g4EOUyPcZiQU97GwRHkP0OjHulpLZroUS5m5SADEJIB85o//53xCVY1Ylh6D2sKYkxo X-Received: by 2002:a05:620a:440e:b0:76c:b7f0:2b94 with SMTP id v14-20020a05620a440e00b0076cb7f02b94mr19441391qkp.7.1692869655673; Thu, 24 Aug 2023 02:34:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869655; cv=none; d=google.com; s=arc-20160816; b=FnaqwVeXN428M/i92J5Ir7qysMHORKO5SF9q1GBor6ald1FBhPr5BppvYA8TskkzJc 3+MCc5Ccc7MtupqUSaGfutX9GZ7jdFZSQKn8RWo+kz6Pfv94ZrIRiFUfDGc0sdFhLuif MShNlmVIrSCoRo8+mhW9ete8lBB3wbOT0kLwVQ9St40Wf2lRaJUoDsQcD08znXj0vRCP V/oml8Js3SyZcbS7AEeuWWKcV35mzL5ScVbMZQdLGjQxBec657Pg41+gRueuoP6oeIBX CVOjSNMn6ZW4zH2vbwA3V0QUd9gqoZo8F18dvA4QfJtHwvSnCXMR0kYFxkC/UJGUeG5B 9uSQ== 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=cvOJMWgOIR1DH7YY1zi4TyROxQHSO4tBJ9shorpuc1Y=; fh=bFDrUYhlTVi/QyetgXx/byg2+yO/22Hp9SjwoefyKLk=; b=s7A2bciJlD5+lLEkk8wfFIacFOIkHkWN6h3376qTpDTz8WtASoVZBcUH2Afr9dHxVb xPJNcJ0f4dGYhEkNbh0qD/0AZdZtUPD98hpZ3XUGObTsnkjQE8iHmyRCDKASitpFpKyZ m2w9qj9AyKADcg9cLfUfCC3vMyb4LwZPsWlVMuqr8SpeZ/7a+f4xcIgXHM8t0wvuQJHq slMJC6lFt1cD5rbonqaJmyoYErm/NpQcp52CqZp+EEM6q0AAdoHxdKwliEtNDQbqoKv4 23IfeulOx/wwyyz2rSeNbACwbt2PXhtqp9cA0P0nffNrX6v+KUtLDEGMMimbHEh0ujAE 9iIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AJxoyxFy; 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 l12-20020a05620a28cc00b0076ebaab564esi1140876qkp.0.2023.08.24.02.34.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Aug 2023 02:34:15 -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=AJxoyxFy; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ6eD-0004PO-KK; Thu, 24 Aug 2023 05:29:01 -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 1qZ6e9-00047S-4J for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:59 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6dz-0004yj-Ih for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:53 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-4fe61ae020bso10092715e87.2 for ; Thu, 24 Aug 2023 02:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692869324; x=1693474124; 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=cvOJMWgOIR1DH7YY1zi4TyROxQHSO4tBJ9shorpuc1Y=; b=AJxoyxFyPueKtXYZ0IMmqlHG+cA2wTNfb3RRllFHFLPR6/v75fiuZdaYmFlWWvfzHm DlwBHGYdv8NNiEVJqSFkvq4gZeTlUodXhxbb03T16ufwDn0B4eaNlpZ/We8cWiErb8yN AIl/rZ+WuZoa3DMVrgHYYzstnAhDEXDQrqdb8TfgM8Y1z2+ihfMzDdrdexTrvG4MHYT3 sYLNk4jjvr5Mn9CAtTivLSjG2E6+Bk0of3J7NWc+3PGs2Mp2dObC/Tlh+TStzqhDrtku NZkXb/QNjXY8foL7lqTnpy3XClqHcwT5Uz31lmTsH8Xvl08lrNlgFQTYziqYgk0RbwPV OW2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692869324; x=1693474124; 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=cvOJMWgOIR1DH7YY1zi4TyROxQHSO4tBJ9shorpuc1Y=; b=URzKsrQJm2avRPliFQoXvMBkn2c19QWGY5dBPeTRqdLIkfJ5pPXJ6EMMmbT69+x6Q0 SOZyHGQvaW4N/Qp+WzkiG3ej6z8gKZGtbHNn/QBo51+VKiafGmDh9oMbJusNqbVKwWzR m/oZ1jA8yM/E052aKP0dB/VHe5obC10ob8orEhYk+aaBQDSy+dUhdoB0ntzlfhF29xKi wcSFIZXHZDOx8GTW6n1B794rvKAxotYXyu42jTqlZIC2BW1iMs0fvqMp6n2bRI9xFiHr c4TbpPr1gmyxeuuJyaos9sCqSKE0P41Pd69aGi+wXNQBNqcbxM4uM/Gks2crDZCubc+n 83cw== X-Gm-Message-State: AOJu0YzV9Eeu0hq0ErLMvbp68k4UQjtSellqUi4FMxdVo+GGmNeVuHae svvxhmzUOMAnFsFlKX2bN9+d76+yOO8bCXyr2O0= X-Received: by 2002:a05:6512:615:b0:4fd:d213:dfd4 with SMTP id b21-20020a056512061500b004fdd213dfd4mr10337277lfe.20.1692869324564; Thu, 24 Aug 2023 02:28:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b00317b5c8a4f1sm21844004wro.60.2023.08.24.02.28.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 02:28:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/35] target/arm/ptw: Don't set fi->s1ptw for UnsuppAtomicUpdate fault Date: Thu, 24 Aug 2023 10:28:14 +0100 Message-Id: <20230824092836.2239644-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824092836.2239644-1-peter.maydell@linaro.org> References: <20230824092836.2239644-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=peter.maydell@linaro.org; helo=mail-lf1-x133.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For an Unsupported Atomic Update fault where the stage 1 translation table descriptor update can't be done because it's to an unsupported memory type, this is a stage 1 abort (per the Arm ARM R_VSXXT). This means we should not set fi->s1ptw, because this will cause the code in the get_phys_addr_lpae() error-exit path to mark it as stage 2. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230807141514.19075-2-peter.maydell@linaro.org --- target/arm/ptw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8f94100c61f..bafeb876ad7 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -701,7 +701,6 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, if (unlikely(!host)) { fi->type = ARMFault_UnsuppAtomicUpdate; - fi->s1ptw = true; return 0; }