From nobody Mon Dec 15 01:52:37 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1677449329; cv=none; d=zohomail.com; s=zohoarc; b=ZT7+QIxVXffKR6eShYMHP2gsarnLOIX3JuVKZhfeSdGuRt1vQdDS54Cx1AajULFdnZ4JgTYKFDMAZSduJ5dSriBnlWXHMzIYvH9OKN72Z2NkfEfXBzU/He0B+BqhXtgTrSNYemoJW+rtnpnCV5ZXY4m0LZjTVg6HeNaqP7EZNkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677449329; h=Content-Type:Cc: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=C2ip3b5EiKYFYCP04yKL6DAvOdXYau4SFVNkWV7zyvk=; b=ikXKwRwLcLrfjxBY+5/5hDevY3nuYzHLAJShPLseINbhHHaup4DI2tXWmlolU+lxNbv7Ps/AUKV2X8ic++whqxJ+7X7RTtcTZIurT6VEd3NslMqFHepy37Htnarufi2BJi3qmoa+JHWHNAdFsHmrL9TXIVZMnZS5cLWlvHXi06U= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167744932982115.076045647373348; Sun, 26 Feb 2023 14:08:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWPB2-0002ZC-NQ; Sun, 26 Feb 2023 17:07:28 -0500 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 <3G9j7YwgKCuAUOQUVCHCIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--smostafa.bounces.google.com>) id 1pWPB1-0002Z4-LS for qemu-devel@nongnu.org; Sun, 26 Feb 2023 17:07:27 -0500 Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3G9j7YwgKCuAUOQUVCHCIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--smostafa.bounces.google.com>) id 1pWPAz-0003x3-R3 for qemu-devel@nongnu.org; Sun, 26 Feb 2023 17:07:27 -0500 Received: by mail-wm1-x349.google.com with SMTP id e17-20020a05600c219100b003e21fa60ec1so2105744wme.2 for ; Sun, 26 Feb 2023 14:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=C2ip3b5EiKYFYCP04yKL6DAvOdXYau4SFVNkWV7zyvk=; b=Wg5OgIM5RWbI8inVSWtUeZE8DSaUh8LCFbgSieu+jkcr8TNpqDPsXOE5UQbhLt++we aWlS26ws3eIJHc69lisNy5iOE8N59yfz2rqSsmgUeohqngRWy0s4nHYRxf6RfOUslFRr cIy5UvqZ4TGb63SrRa4dJpqs8K9sAYtSFt1KmNzwGw33yfRKBzfcXqEPoYS1OYap0fSQ Xac2HIZyYxqTot5HLvRHypsMReXmpRF0wHxmYOd1+JcRp77klh88kr2tDGkBh0YvrWk8 AG67KkQ5ADQZVHsYzg4T0WVplN3visVERkrIK1vQRxMkYsz6AYNGtBpYh2mpUUvyrq91 CqHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C2ip3b5EiKYFYCP04yKL6DAvOdXYau4SFVNkWV7zyvk=; b=Ax+hTXY16/QUZQdnjho97qbRoVcnqL/S+d14arwpKeDlXaC3eZ5KJjsWVcPK6v/Ad+ onGzTZEwMWHR5xYtnFjbnh+aKDmNDw7NIVbjHNWOWdLBnEPscmQAt+hgernUnWHyYt1j 8ASy/Qn8AUSOsKOKf81kK11aKZOygF+fqHjfz0FYtGuSgBHD61ragKUM0JMtXI2KEJwq ow1DVulNiKwciFRw1gTQnzlQvCjYfnl4XNiyU1bxpY9PBTdDeE/l1DdKn1QvU1dXsXtx mw3CqeRmT2KqF1p4LNGHMNVMoFEng6Oly+CCFLjnP5nY8Mf9xxTXtvha7OOrhuwUM9d+ LZfg== X-Gm-Message-State: AO0yUKX8HTTCX1THb1WEcoy/bkf1JlkiJsGOnE3RmEaC5U9WMEGe8PTX K+rMNwCJFteGGBBxOYCuoYNpSCq8Deph+E9E2P8KOCMiguszSMP75FesjZVMzziD8vYo+EY535p V7yKTw4Mg3IAhFJwwl0UXnS/8jt6doAYFnCp6sqO/sqMQxbVeIexio5YRA7EphYBrLw== X-Google-Smtp-Source: AK7set9HKoF19uM9h/SrAegTuAYOGaFGT7Bsu/38V7FiOW5LwWJwZVRsGAq7Tr1A7JfroPNhn+qwojm5BQX2aQ== X-Received: from mostafa.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:333c]) (user=smostafa job=sendgmr) by 2002:a05:600c:1d19:b0:3e2:db9:6fa9 with SMTP id l25-20020a05600c1d1900b003e20db96fa9mr1863374wms.4.1677449243874; Sun, 26 Feb 2023 14:07:23 -0800 (PST) Date: Sun, 26 Feb 2023 22:06:49 +0000 In-Reply-To: <20230226220650.1480786-1-smostafa@google.com> Mime-Version: 1.0 References: <20230226220650.1480786-1-smostafa@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230226220650.1480786-11-smostafa@google.com> Subject: [RFC PATCH v2 10/11] hw/arm/smmuv3: Populate OAS based on CPU PARANGE From: Mostafa Saleh To: qemu-devel@nongnu.org Cc: jean-philippe@linaro.org, eric.auger@redhat.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, Mostafa Saleh 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::349; envelope-from=3G9j7YwgKCuAUOQUVCHCIQQING.EQOSGOW-FGXGNPQPIPW.QTI@flex--smostafa.bounces.google.com; helo=mail-wm1-x349.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1677449330242100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" OAS used to be hardcoded to 44 bits, however according to SMMU manual 6.3.6 SMMU_IDR5, OAS must match the system physical address size, so we read it from CPU PARANGE. Remove PA_MAX and pa_range as they were not used. Add SMMUv3State as an argument to decode_cd, so it can read the SMMU OAS. As CPU can use PARANGE with 52 bits, add 52 bits check to oas2bits, and cap OAS to 48 bits for stage-1 and stage-2 if granule is not 64KB as specified for SMMUv3.1 and later. Signed-off-by: Mostafa Saleh --- hw/arm/smmu-common.c | 13 +++++++++---- hw/arm/smmuv3-internal.h | 15 ++------------- hw/arm/smmuv3.c | 41 ++++++++++++++++++++++++++++++++++------ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index e4b477af10..3a2b06fd7f 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -307,7 +307,7 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, dma_addr_t baseaddr, indexmask; int stage =3D cfg->stage; SMMUTransTableInfo *tt =3D select_tt(cfg, iova); - uint8_t level, granule_sz, inputsize, stride; + uint8_t level, granule_sz, inputsize, stride, oas; =20 if (!tt || tt->disabled) { info->type =3D SMMU_PTW_ERR_TRANSLATION; @@ -319,7 +319,12 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, inputsize =3D 64 - tt->tsz; level =3D 4 - (inputsize - 4) / stride; indexmask =3D SMMU_IDXMSK(inputsize, stride, level); - baseaddr =3D extract64(tt->ttb, 0, 48); + oas =3D cfg->oas; + if (tt->granule_sz !=3D 16) { + oas =3D MIN(oas, 48); + } + + baseaddr =3D extract64(tt->ttb, 0, oas); baseaddr &=3D ~indexmask; =20 while (level < SMMU_LEVELS) { @@ -416,8 +421,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, * Get the ttb from concatenated structure. * The offset is the idx * size of each ttb(number of ptes * (sizeof(p= te)) */ - uint64_t baseaddr =3D extract64(cfg->s2cfg.vttb, 0, 48) + (1 << stride= ) * - idx * sizeof(uint64_t); + uint64_t baseaddr =3D extract64(cfg->s2cfg.vttb, 0, cfg->s2cfg.oas) + + (1 << stride) * idx * sizeof(uint64_t); dma_addr_t indexmask =3D SMMU_IDXMSK(inputsize, stride, level); =20 baseaddr &=3D ~indexmask; diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h index 3388e1a5f8..25ae12fb5c 100644 --- a/hw/arm/smmuv3-internal.h +++ b/hw/arm/smmuv3-internal.h @@ -564,23 +564,12 @@ static inline int oas2bits(int oas_field) return 44; case 5: return 48; + case 6: + return 52; } return -1; } =20 -static inline int pa_range(STE *ste) -{ - int oas_field =3D MIN(STE_S2PS(ste), SMMU_IDR5_OAS); - - if (!STE_S2AA64(ste)) { - return 40; - } - - return oas2bits(oas_field); -} - -#define MAX_PA(ste) ((1 << pa_range(ste)) - 1) - /* CD fields */ =20 #define CD_VALID(x) extract32((x)->word[0], 31, 1) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 7297f6adc1..bc4ec202f4 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -238,6 +238,13 @@ void smmuv3_record_event(SMMUv3State *s, SMMUEventInfo= *info) =20 static void smmuv3_init_regs(SMMUv3State *s) { + /* + * According to 6.3.6 SMMU_IDR5, OAS must match the system physical ad= dress + * size. + */ + ARMCPU *armcpu =3D ARM_CPU(qemu_get_cpu(0)); + uint8_t oas =3D FIELD_EX64(armcpu->isar.id_aa64mmfr0, ID_AA64MMFR0, PA= RANGE); + /** * IDR0: stage1 only, AArch64 only, coherent access, 16b ASID, * multi-level stream table @@ -265,7 +272,7 @@ static void smmuv3_init_regs(SMMUv3State *s) s->idr[5] =3D FIELD_DP32(s->idr[5], IDR5, GRAN4K, 1); s->idr[5] =3D FIELD_DP32(s->idr[5], IDR5, GRAN16K, 1); s->idr[5] =3D FIELD_DP32(s->idr[5], IDR5, GRAN64K, 1); - s->idr[5] =3D FIELD_DP32(s->idr[5], IDR5, OAS, SMMU_IDR5_OAS); /* 44 b= its */ + s->idr[5] =3D FIELD_DP32(s->idr[5], IDR5, OAS, oas); =20 s->cmdq.base =3D deposit64(s->cmdq.base, 0, 5, SMMU_CMDQS); s->cmdq.prod =3D 0; @@ -374,6 +381,7 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, STE *ste, SMMUEventInfo *event) { uint32_t config; + uint8_t oas =3D FIELD_EX32(s->idr[5], IDR5, OAS); =20 if (!STE_VALID(ste)) { if (!event->inval_ste_allowed) { @@ -450,7 +458,16 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cf= g, } =20 =20 - cfg->s2cfg.oas =3D oas2bits(MIN(STE_S2PS(ste), SMMU_IDR5_OAS)); + cfg->s2cfg.oas =3D oas2bits(MIN(STE_S2PS(ste), oas)); + /* + * For SMMUv3.1 and later, when OAS =3D=3D IAS =3D=3D 52, the stag= e 2 input + * range is further limited to 48 bits unless STE.S2TG indicates a + * 64KB granule. + */ + if (cfg->s2cfg.granule_sz !=3D 16) { + cfg->s2cfg.oas =3D MIN(cfg->s2cfg.oas, 48); + } + /* * It is ILLEGAL for the address in S2TTB to be outside the range * described by the effective S2PS value. @@ -607,10 +624,12 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid= , STE *ste, return 0; } =20 -static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) +static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg, CD *cd, + SMMUEventInfo *event) { int ret =3D -EINVAL; int i; + uint8_t oas =3D FIELD_EX32(s->idr[5], IDR5, OAS); =20 if (!CD_VALID(cd) || !CD_AARCH64(cd)) { goto bad_cd; @@ -630,7 +649,8 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEve= ntInfo *event) cfg->stage =3D 1; =20 cfg->oas =3D oas2bits(CD_IPS(cd)); - cfg->oas =3D MIN(oas2bits(SMMU_IDR5_OAS), cfg->oas); + cfg->oas =3D MIN(oas2bits(oas), cfg->oas); + cfg->tbi =3D CD_TBI(cd); cfg->asid =3D CD_ASID(cd); =20 @@ -658,9 +678,18 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEv= entInfo *event) goto bad_cd; } =20 + /* + * An address greater than 48 bits in size can only be output from= a + * TTD when, in SMMUv3.1 and later, the effective IPS is 52 and a = 64KB + * granule is in use for that translation table + */ + if (tt->granule_sz !=3D 16) { + oas =3D MIN(cfg->oas, 48); + } + tt->tsz =3D tsz; tt->ttb =3D CD_TTB(cd, i); - if (tt->ttb & ~(MAKE_64BIT_MASK(0, cfg->oas))) { + if (tt->ttb & ~(MAKE_64BIT_MASK(0, oas))) { goto bad_cd; } tt->had =3D CD_HAD(cd, i); @@ -719,7 +748,7 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, = SMMUTransCfg *cfg, return ret; } =20 - return decode_cd(cfg, &cd, event); + return decode_cd(s, cfg, &cd, event); } =20 /** --=20 2.39.2.637.g21b0678d19-goog