From patchwork Thu Sep 14 14:57:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 722544 Delivered-To: patch@linaro.org Received: by 2002:adf:f0d1:0:b0:31d:da82:a3b4 with SMTP id x17csp436835wro; Thu, 14 Sep 2023 07:58:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4mVEQikr78n4KAnWLkpT8jCiFqnzRT3e4dVlLjKz3Aqn/HIPR23d6MRzfaeS0wAIZ8OA7 X-Received: by 2002:a05:6830:18cd:b0:6bc:96c3:b6ce with SMTP id v13-20020a05683018cd00b006bc96c3b6cemr6858630ote.16.1694703531946; Thu, 14 Sep 2023 07:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694703531; cv=none; d=google.com; s=arc-20160816; b=bQVQC+QsU5YOX8zX/DfyA9wcm6ZPLpvLlBL6ACl0CZlfYTSVoMCSxT7pHcyX7kUNgD c35jHd8BOH0qaJhRBrJp3wyqFH889P8PQ+nnFC6dVGqu69C4Xfcl9Pms6qC4qO+nA1u4 SC7U8UVJBkUYpSfmZpZcyjFNxyg7zq5dQPNakG3XUPDIPFxIa6lXeztI9F1gff/sy1uD t5JhO/v80vRORvhClZLGpAcQUPxzFpysSw7MHxynQksfqVT2CLj8e6Kuxfslu7H/bv3H 5oYLANEiFPF1z2/aijuAceDLnmYgKudO/RWaVwHG6uk7YS0xQf5OBY2EquOlLcpePQQ4 WO9A== 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:dkim-signature; bh=5tmvXXEw+PIenQIWy8ii+pQoWpYFcR+dhA762ZF8vgU=; fh=NY6IStX7ee+XRQ7VxbbREYpTmmSHrTCVjRm7wDQyZLI=; b=ukZKBmNSOc56i5x1OdflY9EKWiMBN9A65O5nsMcMBuPpE0g4Q3lBQyQcjP9SMZE7dY htchE5hegde7RJRWR51MAyeIAvKK6idL4lcwS+ba+ezIidpX3a/mVRiBcxJY8a/+eu+a +0AxnrzCgX2IFidxE85IQ2ZfiIq7wQ2Ci3VJYq5Z8iUyLkFdiWzhD3hC1lyF5nOLVE29 0XFn3edmC+1dNVRb75vvooKDA+idDb87Hq2vz7ELzLi5chagir046xDzOi4GGFbgAtnX aO1UUz9GwhRhHldI7EWtcPe6eASz50HCVlUl0GVkLAOI+9MIC8ykdoq+NVbZvj7cyEsG i6/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yVyqLT6q; 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 d9-20020a0caa09000000b0064f7b3cdee6si920546qvb.510.2023.09.14.07.58.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Sep 2023 07:58:51 -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=yVyqLT6q; 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 1qgnmM-000166-Px; Thu, 14 Sep 2023 10:57:14 -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 1qgnmL-00014r-4B for qemu-devel@nongnu.org; Thu, 14 Sep 2023 10:57:13 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qgnmI-0004O3-RV for qemu-devel@nongnu.org; Thu, 14 Sep 2023 10:57:12 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-401ec23be82so11096735e9.0 for ; Thu, 14 Sep 2023 07:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694703429; x=1695308229; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5tmvXXEw+PIenQIWy8ii+pQoWpYFcR+dhA762ZF8vgU=; b=yVyqLT6qz5spH23sy8LP6fT/XWzcglPhIF0vcopmtQsUH9j6qJm7+Jgq5TDIeIm4eo F5gsKbyf7nCUKwVzeIkaogSQgZPwUMBCWlB/RnTB1G6d2vYLZrlHBOhlIxmE1l6NS4FD 8nWW8wtokeqQL/SGEublhpu2Fk6+Q2pvwUaRfaeab8WSBCNQfStW2krLzlbv3lNZnTKg jmmIcEVMzXKzxOyJ6P6AGaiZofpGtbukv+qj5YaVzj/iFv6Mnf/TQtNDKFAaDtGM4s4M mJjUuthDv2WiE2dEHNPO/caJJfTg25qmL8lbKoyIiOuUBEsTyHzWA26Tw6X2+MmC3lZj zKVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694703429; x=1695308229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5tmvXXEw+PIenQIWy8ii+pQoWpYFcR+dhA762ZF8vgU=; b=T3GyB+ZXTZ6BD5MTkueyxBMIjmCCC3hYOb7KnWuPuUm/pdSpVniDPTbsmljlSN6z5H aTe+1+92gxoLTo0VtdVRo2wQQqSwrXsw8HtxUKTnOwL4Ge6GvGH+ptpZDOdyR1pf6aQB 4d6IGdW6ZFl8F3+V+Cm98JWr+lLOL/6KHmf7EAVuNBmDvdEhubqP6jkfQzhH+JufezE9 +iKtAYat2KlAO7oXQPlgkQxZyNc7oocfvQRsI7JXIxwIuztweePBdHYMkU3QXrL2/Saj JnR91CFzdFwSZmkJxx2NDvJa3LoscLDnIVBH1R9KnHFDZIR2w6kwVEsV0p+BOOpER2X5 ALKA== X-Gm-Message-State: AOJu0YwwhutKbeFG0u+7VFC9o8CgBPJR/4SJjr+wXG4BPhOPpgc/bwzN BadQMcw/L7+SihnuIB4HFgQ6WpsKiNsY1gt0h34= X-Received: by 2002:a5d:6211:0:b0:31d:1833:4135 with SMTP id y17-20020a5d6211000000b0031d18334135mr4213971wru.28.1694703429214; Thu, 14 Sep 2023 07:57:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y15-20020a5d470f000000b0031981c500aasm1978483wrq.25.2023.09.14.07.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 07:57:08 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Eric Auger , Mostafa Saleh Subject: [PATCH 2/3] hw/arm/smmuv3: Sort ID register setting into field order Date: Thu, 14 Sep 2023 15:57:04 +0100 Message-Id: <20230914145705.1648377-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914145705.1648377-1-peter.maydell@linaro.org> References: <20230914145705.1648377-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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=unavailable 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 In smmuv3_init_regs() when we set the various bits in the ID registers, we do this almost in order of the fields in the registers, but not quite. Move the initialization of SMMU_IDR3.RIL and SMMU_IDR5.OAS into their correct places. Signed-off-by: Peter Maydell Reviewed-by: Eric Auger --- hw/arm/smmuv3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 1e9be8e89af..94d388fc950 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -278,15 +278,15 @@ static void smmuv3_init_regs(SMMUv3State *s) s->idr[1] = FIELD_DP32(s->idr[1], IDR1, EVENTQS, SMMU_EVENTQS); s->idr[1] = FIELD_DP32(s->idr[1], IDR1, CMDQS, SMMU_CMDQS); - s->idr[3] = FIELD_DP32(s->idr[3], IDR3, RIL, 1); s->idr[3] = FIELD_DP32(s->idr[3], IDR3, HAD, 1); + s->idr[3] = FIELD_DP32(s->idr[3], IDR3, RIL, 1); s->idr[3] = FIELD_DP32(s->idr[3], IDR3, BBML, 2); + s->idr[5] = FIELD_DP32(s->idr[5], IDR5, OAS, SMMU_IDR5_OAS); /* 44 bits */ /* 4K, 16K and 64K granule support */ s->idr[5] = FIELD_DP32(s->idr[5], IDR5, GRAN4K, 1); s->idr[5] = FIELD_DP32(s->idr[5], IDR5, GRAN16K, 1); s->idr[5] = FIELD_DP32(s->idr[5], IDR5, GRAN64K, 1); - s->idr[5] = FIELD_DP32(s->idr[5], IDR5, OAS, SMMU_IDR5_OAS); /* 44 bits */ s->cmdq.base = deposit64(s->cmdq.base, 0, 5, SMMU_CMDQS); s->cmdq.prod = 0;