From patchwork Tue May 30 13:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 686874 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp737564wru; Tue, 30 May 2023 06:30:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7JMeNPNpDRO75nKdKyDWFX98Y+CctZgj0G7HKPoFqRQMoVYWTl/t/zJgrcqQoQQ9vM3StA X-Received: by 2002:a05:620a:43a3:b0:75d:117:1d0 with SMTP id a35-20020a05620a43a300b0075d011701d0mr1148703qkp.47.1685453417129; Tue, 30 May 2023 06:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685453417; cv=none; d=google.com; s=arc-20160816; b=Ktao1zd+Ob7uR5aHE03S+JnB0n7dKlg9mAkL/umCXps4rlUHuFW0XdhMg1Vj8azROF nlD8vF9kEUSxlc5tJNAo+aHU3ttW7sqz/IWA3TR1SBjWp9Gq2w8Rww9K/grVMqREJxWQ O4a+gbZYMyRDV54GZGd/RbaQ3wG5d3pBvAj4bG/Dft7d9eaq+5p5VVIw56EjArMno0Qc oG82py0emBfrk5DfL5QHQXkwtXMeVoVUbZ4HloSzWSVjI2sE5YT+a2Xyqw/Z5iMS4gNR 30S/WeO1Q+Ja8hOZSGMw7HJy0qo9XAFvOcXBxnqGV9g/pv3sVHfaXGp1urZAb0gMYHYu /DKA== 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=tZZp8qZUnh7rN2MKTpirZeB50VkCYddXBSRoN/swsXM=; b=Esf3pwI9NgL+laDi50MOPBHzOYCqhgLTLYWdfJm7zojhLcIA+0arMbHPcRs4P/k2hp JQOl9ex/ZrjtjaPcItuLKV1qkHNife2TVnPbwDKqEVvC9v5GKJEF1EbWi39XArgTL+rM fLsXVPPZfRG7boju3GVJwrgdSMUus+GG0QSDdMhKhJr+OOyN3M1b5ktcJvABUVS3BRpQ pkO07Mn53oudacezCXc+egNV+IUNdE+Ve2djsFCMrkIk2GhaOVA14kf3cTq7jnGv2mE6 9Wf8sqUdI86TiQftlclx5/gzrEY1PMTIrjb6mBjZrcNQiwc9RX+goO9f10BZ3QZe7Lgq 7EJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rnMxpHjO; 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 u27-20020a05620a121b00b007592174cb03si6259229qkj.153.2023.05.30.06.30.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 May 2023 06:30:17 -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=rnMxpHjO; 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 1q3zNM-0006n1-Pr; Tue, 30 May 2023 09:27:00 -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 1q3zMr-0005e7-Ql for qemu-devel@nongnu.org; Tue, 30 May 2023 09:26:32 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q3zMo-0001OW-Oa for qemu-devel@nongnu.org; Tue, 30 May 2023 09:26:29 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4f4d6aee530so4702446e87.2 for ; Tue, 30 May 2023 06:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685453183; x=1688045183; 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=tZZp8qZUnh7rN2MKTpirZeB50VkCYddXBSRoN/swsXM=; b=rnMxpHjOfpzZScZ2fn9OnKFLjNtklExaIa1fBI63+u4bT6K1PxLJJzfFvBUBh/97PD pryI9WogbXnD1vD2YzY4ICwQ7E+UJzILdSrPl636MhfYSoyEDtDK/nW3iAGzqkoy76qt mjn9FiMMq9gx23wWxtpVfHIp4GaAIG1dEGm4G3sBRFnJvIOKDPemcBj7Eg7P3NewLF0V FxfxmVmxYMrQCdPIUQD0wRvsUsfsAPtv9YkLrNIycWBHXlHW0HNWzNWoIj5JvFcwG91U z3T+nYCJqpPxkzTgo5q2ZbsvVJeVxPcW7TabfBbIusmENWbvUqM6gfANM44Nrp1oV9qN fqGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685453183; x=1688045183; 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=tZZp8qZUnh7rN2MKTpirZeB50VkCYddXBSRoN/swsXM=; b=QvBha2EycGHOOO6MBHSYtPtyIdCCTdbs5Jv00ENmFApw3ECnDLxRMptg4ZbS8EdhpT DUdzDCIcvWEUq9CnlqmRlEzP+G5KBMbZliuLuF3LmoYpV48mZi8e1uic6coQZzFzP5kp 7BUc+3mq/QXGspK547LCUh7JPjUZhx5QqcRCWdwx9IRwMT7ufCXQqsB0c6jSV4RQBuJg UKxMSDve9kjH5uiJxcL/acSAz6sQ0VVaZpRbAod1mt4NQgJ2fcNAARB2ecE8Utp4ZPFe slqKcAgxmCofU5yhXji1HSEAM3mVvkVOWTOu71yoD1Pa7kvrkFAn8fYvIJpiEOiKXlT0 etkw== X-Gm-Message-State: AC+VfDxvtdGXKj1tMKmTCZodOwjrEYzx4g40b5Qt4Q3MHj6uL6BsecmB scs0fIYuzLOiRAUSXK8RAQwrxz00KYKt0jUY3h4= X-Received: by 2002:ac2:5637:0:b0:4f3:af46:1941 with SMTP id b23-20020ac25637000000b004f3af461941mr767664lff.34.1685453182889; Tue, 30 May 2023 06:26:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p19-20020a1c7413000000b003f60e143d38sm17463615wmc.11.2023.05.30.06.26.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 06:26:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/21] hw/arm/smmuv3: Add missing fields for IDR0 Date: Tue, 30 May 2023 14:26:01 +0100 Message-Id: <20230530132620.1583658-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230530132620.1583658-1-peter.maydell@linaro.org> References: <20230530132620.1583658-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=peter.maydell@linaro.org; helo=mail-lf1-x136.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, 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: Mostafa Saleh In preparation for adding stage-2 support. Add IDR0 fields related to stage-2. VMID16: 16-bit VMID supported. S2P: Stage-2 translation supported. They are described in 6.3.1 SMMU_IDR0. No functional change intended. Reviewed-by: Richard Henderson Reviewed-by: Eric Auger Signed-off-by: Mostafa Saleh Tested-by: Eric Auger Tested-by: Jean-Philippe Brucker Message-id: 20230516203327.2051088-2-smostafa@google.com Signed-off-by: Peter Maydell --- hw/arm/smmuv3-internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h index e8f0ebf25e3..183d5ac8dca 100644 --- a/hw/arm/smmuv3-internal.h +++ b/hw/arm/smmuv3-internal.h @@ -34,10 +34,12 @@ typedef enum SMMUTranslationStatus { /* MMIO Registers */ REG32(IDR0, 0x0) + FIELD(IDR0, S2P, 0 , 1) FIELD(IDR0, S1P, 1 , 1) FIELD(IDR0, TTF, 2 , 2) FIELD(IDR0, COHACC, 4 , 1) FIELD(IDR0, ASID16, 12, 1) + FIELD(IDR0, VMID16, 18, 1) FIELD(IDR0, TTENDIAN, 21, 2) FIELD(IDR0, STALL_MODEL, 24, 2) FIELD(IDR0, TERM_MODEL, 26, 1)