From patchwork Tue Feb 8 11:39:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 540782 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp495293imo; Tue, 8 Feb 2022 05:36:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLaS9tIWBUFNm8sp6gapdTwPQ9MB/XvcaCSZmN87cGixS9C59qdQYOaQX7qNoT9PE5AAdZ X-Received: by 2002:a25:1106:: with SMTP id 6mr4404527ybr.459.1644327399775; Tue, 08 Feb 2022 05:36:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644327399; cv=none; d=google.com; s=arc-20160816; b=sb7BQJavRRjA/HSWSKs/NNMyVVKBg13giH/23kc1h/RB9LaANXmbcqvAfZieu1NOw+ vT4SKjXufMm4XmtyWROPVNKyPKEWPcpentv4nLZGB+DAtHFMNM3rKp0p/eQxuqIJS1Dp K7qepGXI1Fu7Ds+0LOxNQFeN5KnGc7wMIu9OkYnvtadCGpYCJI+fGLSoZOd2e33KfsFb u+WZbso6wRFmbVOcIo0q9XjhJouZ8/l4LcLkZ8EYNQx8Bv9b+WYXHdAipdDnME1OrWTt V7aJzyy8rphySGfvNtYATMyOdZJqGFOYsmPMDiRRHPx+Yx+bgcDchW0185p4cc3eC5Zj 3Wcg== 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=ZU4Qt8dF8HrU5xx9gXHm/kYMTxx7ioejy8a/MXphI7c=; b=x8TSsz8MURzWXd1hgKxxkw9KjGVbqdek9FJqPm2cCpfidQCsNzA0gjTySbSy7q7i+5 YEcprrVaek0PJDX5jtcoy1pgpByxWkIEOaB/MDiGNiLiyfmxzZve1w2PbUuJMTWrMqa+ JVQsGM+nNKCnwyfFhtneqOTsn1Q86pOKSkIH7yROy1kuBtyrWImd87nWsyw9gpoK7GLJ Tob3eXvY2Z2auOPbA04d6602TwRPZp1vVnZ69x86J1HYiTZ3q9eLYjTzxGAw3Qq18mCM Shjz62Lrc3W849cUTnVpN2oRdub3Px09oyHvFCfUo8Ixkp8OflFuN1q1gezpeI5oMRr3 Tl7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tb574Vxn; 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 a132si4139635ywh.20.2022.02.08.05.36.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Feb 2022 05:36:39 -0800 (PST) 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=Tb574Vxn; 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]:55004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHQff-0006Qe-8h for patch@linaro.org; Tue, 08 Feb 2022 08:36:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHOr0-0000v1-11 for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:14 -0500 Received: from [2a00:1450:4864:20::332] (port=53773 helo=mail-wm1-x332.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHOqt-00029b-MH for qemu-devel@nongnu.org; Tue, 08 Feb 2022 06:40:13 -0500 Received: by mail-wm1-x332.google.com with SMTP id n8so11948210wmk.3 for ; Tue, 08 Feb 2022 03:40:07 -0800 (PST) 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=ZU4Qt8dF8HrU5xx9gXHm/kYMTxx7ioejy8a/MXphI7c=; b=Tb574VxnftOb0xkQQZQm899rPqCTXBLASZM5wfFl/6AA8+zRXQMsZy5y0EELiKDPtV GkaW+Z5Cc/SVAO0v9/l4hbV6xnFESZUFi3hT9PZpxCiaCiU7gQA3rk0Kltx27Lt5irJw cRNxwC4+K5iRRtUBgIGn7vI3Gbx0np1jZQ9S5JjYMpBBet6m0CpELe52P8bZ6n19sRZz N2SiLDg/EAewtxHDfKFGlSLor7DcKWm6OJkIW0wLqRprdOp+Jsmr4AkmB6FulQ/KhBoC jghtlDmDJ4n7xANUIizMe4uD60XK2Z9ppwvg4UjReYNSdvccknuz8Y1DNsiSOLD4N8DI wmdg== 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=ZU4Qt8dF8HrU5xx9gXHm/kYMTxx7ioejy8a/MXphI7c=; b=dNvW5duCdSgohxa89FXdT2iMpfdS1mqjO0IXZm0K2naHYdrjrj3pkRA9REQWmdHf+b 7oG9FdaD//LRQ192BFpu38/Qb5KpubZG0SHu1Q3sFwUuiit4DOgIcbeR/u/jxzS7BfL6 AGbVA7DiJB4IXLZ+DxTWGjxZnrvaOQR9QGWcYhISXcgBO5n7iVY+bAlxLUus21COP2Qn RUUfdaxGlTdXR/zVtXd3MTCSvb63ETpii/a6OZnxfvEGMFF6qXGXiviRGJ/pQKwLQ4od zahWEMzSgQs1iK1zQ7bDUtyYDm4F8Wep/36jPEjGOeLrisxHWXeVvP/eUKsK96puNtXw Mcfg== X-Gm-Message-State: AOAM530s8UDyJ6994Px6P3NaJeXbW+3uLkbS0pXkv2iNNuTbstUP+oWV 2QFDxEAJGePEXoUyhabJaNvF+2Lyjf/QYA== X-Received: by 2002:a1c:1946:: with SMTP id 67mr811785wmz.12.1644320406202; Tue, 08 Feb 2022 03:40:06 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id r11sm4245199wrt.28.2022.02.08.03.40.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 03:40:05 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/39] hw/arm/smmuv3: Fix device reset Date: Tue, 8 Feb 2022 11:39:34 +0000 Message-Id: <20220208113948.3217356-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208113948.3217356-1-peter.maydell@linaro.org> References: <20220208113948.3217356-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::332 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" From: Eric Auger We currently miss a bunch of register resets in the device reset function. This sometimes prevents the guest from rebooting after a system_reset (with virtio-blk-pci). For instance, we may get the following errors: invalid STE smmuv3-iommu-memory-region-0-0 translation failed for iova=0x13a9d2000(SMMU_EVT_C_BAD_STE) Invalid read at addr 0x13A9D2000, size 2, region '(null)', reason: rejected invalid STE smmuv3-iommu-memory-region-0-0 translation failed for iova=0x13a9d2000(SMMU_EVT_C_BAD_STE) Invalid write at addr 0x13A9D2000, size 2, region '(null)', reason: rejected invalid STE Signed-off-by: Eric Auger Message-id: 20220202111602.627429-1-eric.auger@redhat.com Fixes: 10a83cb988 ("hw/arm/smmuv3: Skeleton") Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/smmuv3.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 3b43368be0f..674623aabea 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -278,6 +278,12 @@ static void smmuv3_init_regs(SMMUv3State *s) s->features = 0; s->sid_split = 0; s->aidr = 0x1; + s->cr[0] = 0; + s->cr0ack = 0; + s->irq_ctrl = 0; + s->gerror = 0; + s->gerrorn = 0; + s->statusr = 0; } static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,