From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F14739EF21 for ; Fri, 1 May 2026 11:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634421; cv=none; b=LegjiM4bjiT9jjxAtXMalhVolRJYF/J0cH62D0Cq9EXeNvbdp9wrKXUIVrhnEOL/dtmP5WNiKE/H2t5wKLo6z6BFLzoz6AYzQsHPD6ZpkJ2ahgj9GBSHTYkQKwF4QNEMAy6wr2MT3q2JGnN5vyjxyJJrNmALFxLE2N6R1+hn2MU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634421; c=relaxed/simple; bh=dtlBVLOo14YOqCmNNvP1AMUdNnEW7NiQxpiFymghyvU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IjanYYRxTeXBB1CpwP5jAKUXByOFJ1GqgDsFGKyGqWIr3u3PfzlBRJpCbjUVulTcFCZ5YPldGsjtICSmGRQOu88Ccmhln1lkIg6J5cXpb2KZDxnN6hsieheqJ8AaGB60ncmRNLbBeSh7X2+qT9/4daWNjyg88nG0tK6IGNme0YY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=oU0do3WC; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--smostafa.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oU0do3WC" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-488bd1ee9e7so20149655e9.1 for ; Fri, 01 May 2026 04:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777634417; x=1778239217; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UU83Oeb4MDmTny3jalsI86VqzD8OKMnbSWGrcxMKTpA=; b=oU0do3WCj3zTDey3L+Eyx7w14nRqYsMjx3Li9lwzrnf62No5YbSQ0Lihu9C6Rg+wDa lUR5BHSqHRjtEdZaQDw+pjXOIBsGauxZJ/RmGrE1Sl5tKutJ82akfFd7vgVRMKzOIm23 1aLxaOLA2PjLCIlz9Gg98MEIXG3gfj0xh1y+2lL8PkzKN+oYs1Cd6BQFEkLyY1PxaeV0 /ff22Zhp9MpJpYKjVKbvuGff0J3CxmnHeUm+StIRZKsStp/eI7RbqZ3ol15jbavCTvkp /ujfIwvd2MH6J+YrOYwcBnpgzBGKTqW4jELPe4av6DX5b1NjadptrLtvPDJkB4nW3Tzc TJeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777634417; x=1778239217; 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=UU83Oeb4MDmTny3jalsI86VqzD8OKMnbSWGrcxMKTpA=; b=ZFwu528/TD9QZ5UbcsESwqW9tslxM/AZTpoclcW0mkVdC06KTEFeIq/bifqS4cU0j0 odaRHGUIfNg84+W9mQXSl8LI4FGwZFHKEHBXMlfqdiPp9EW6KLdMhIqmHaEveeGmWNDx fw7rKe7Xx28ICga1zo5IYl9Y/ydn/KHUWnydZvrXWwydVQJXeiXXFAKeZH52GQydLoFn UDKwHLQZkQHxSma3qxWw8cy9UtuYIOCn0xqvT+6pf4wIqlD2nWHRN5x7f+KeSh+FAsAy Fs+QSNimoFsQaR1qZNKCVRpJUD8JaxyvE4ZmeWt4dioCoYnnK1qj6xGnRFZ7zukcCeTZ ANXg== X-Forwarded-Encrypted: i=1; AFNElJ8EmHxOkHf0bZo4Ha8VNs4WZM5J8c1XwaSGYLLqNCO8O7dvOWrG9MgBXVUsVIw1oECMecyoqIVweSYyi9g=@vger.kernel.org X-Gm-Message-State: AOJu0Yysnadbi8hIGd2DbPSHdT1zI7f4+IyzgjKMhBsLhiZLxbKgPQ2q uruBP4Q4yJCQW6baEf8viarufQ389uAwh7/Aio6YjMR7Oqi+EuN6RxWgjqLIqnQrkAHzAPh6EnX BECcF34r/nBFfDw== X-Received: from wrtx8.prod.google.com ([2002:a5d:60c8:0:b0:43d:7331:91da]) (user=smostafa job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:6995:b0:483:709e:f238 with SMTP id 5b1f17b1804b1-48a8ebab77emr40681985e9.29.1777634416769; Fri, 01 May 2026 04:20:16 -0700 (PDT) Date: Fri, 1 May 2026 11:19:15 +0000 In-Reply-To: <20260501111928.259252-1-smostafa@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260501111928.259252-1-smostafa@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260501111928.259252-14-smostafa@google.com> Subject: [PATCH v6 13/25] iommu/arm-smmu-v3-kvm: Probe SMMU HW From: Mostafa Saleh To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, iommu@lists.linux.dev Cc: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, joro@8bytes.org, jean-philippe@linaro.org, jgg@ziepe.ca, mark.rutland@arm.com, qperret@google.com, tabba@google.com, vdonnefort@google.com, sebastianene@google.com, keirf@google.com, Mostafa Saleh Content-Type: text/plain; charset="UTF-8" Probe SMMU features from the IDR register space, most of the logic is common with the kernel. Signed-off-by: Mostafa Saleh --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 6 -- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 6 ++ .../iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c | 78 +++++++++++++++++++ .../iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h | 6 ++ 4 files changed, 90 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 61e6ab364086..157acde0436d 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -4738,12 +4738,6 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu) return 0; } -#define IIDR_IMPLEMENTER_ARM 0x43b -#define IIDR_PRODUCTID_ARM_MMU_600 0x483 -#define IIDR_PRODUCTID_ARM_MMU_700 0x487 -#define IIDR_PRODUCTID_ARM_MMU_L1 0x48a -#define IIDR_PRODUCTID_ARM_MMU_S3 0x498 - static void arm_smmu_device_iidr_probe(struct arm_smmu_device *smmu) { u32 reg; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 64618299d03a..f904f4d19609 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -84,6 +84,12 @@ struct arm_vsmmu; #define IIDR_REVISION GENMASK(15, 12) #define IIDR_IMPLEMENTER GENMASK(11, 0) +#define IIDR_IMPLEMENTER_ARM 0x43b +#define IIDR_PRODUCTID_ARM_MMU_600 0x483 +#define IIDR_PRODUCTID_ARM_MMU_700 0x487 +#define IIDR_PRODUCTID_ARM_MMU_L1 0x48a +#define IIDR_PRODUCTID_ARM_MMU_S3 0x498 + #define ARM_SMMU_AIDR 0x1C #define ARM_SMMU_CR0 0x20 diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c index 9afc314d0acc..d9945db9e102 100644 --- a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm-smmu-v3.c @@ -10,6 +10,7 @@ #include #include "arm_smmu_v3.h" +#include "../arm-smmu-v3.h" size_t __ro_after_init kvm_hyp_arm_smmu_v3_count; struct hyp_arm_smmu_v3_device *kvm_hyp_arm_smmu_v3_smmus; @@ -26,6 +27,77 @@ static void smmu_deinit_device(struct hyp_arm_smmu_v3_device *smmu) smmu->base = NULL; } +static bool smmu_nesting_supported(struct hyp_arm_smmu_v3_device *smmu) +{ + unsigned int implementer, productid, variant, revision; + u32 reg; + + if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1) || + !(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + return false; + + reg = readl_relaxed(smmu->base + ARM_SMMU_IIDR); + implementer = FIELD_GET(IIDR_IMPLEMENTER, reg); + productid = FIELD_GET(IIDR_PRODUCTID, reg); + variant = FIELD_GET(IIDR_VARIANT, reg); + revision = FIELD_GET(IIDR_REVISION, reg); + + if (implementer != IIDR_IMPLEMENTER_ARM) + return true; + + if (productid == IIDR_PRODUCTID_ARM_MMU_600) + return variant >= 2; + else if (productid == IIDR_PRODUCTID_ARM_MMU_700) + return !(variant < 1 || revision < 1); + + return true; +} + +/* + * Mini-probe and validation for the hypervisor. + */ +static int smmu_probe(struct hyp_arm_smmu_v3_device *smmu) +{ + u32 reg; + + /* Similar to the kernel, rely on firmware override. */ + if (!(smmu->features & ARM_SMMU_FEAT_COHERENCY)) + return -EINVAL; + + /* IDR0 */ + reg = readl_relaxed(smmu->base + ARM_SMMU_IDR0); + + smmu->features |= smmu_idr0_features(reg); + if (!smmu_nesting_supported(smmu)) + return -ENXIO; + + if (!(smmu->features & (ARM_SMMU_FEAT_TT_LE | ARM_SMMU_FEAT_TT_BE))) + return -ENXIO; + + reg = readl_relaxed(smmu->base + ARM_SMMU_IDR1); + if (reg & (IDR1_TABLES_PRESET | IDR1_QUEUES_PRESET | IDR1_REL)) + return -EINVAL; + + smmu->sid_bits = FIELD_GET(IDR1_SIDSIZE, reg); + /* Follows the kernel logic */ + if (smmu->sid_bits <= STRTAB_SPLIT) + smmu->features &= ~ARM_SMMU_FEAT_2_LVL_STRTAB; + + reg = readl_relaxed(smmu->base + ARM_SMMU_IDR3); + smmu->features |= smmu_idr3_features(reg); + + reg = readl_relaxed(smmu->base + ARM_SMMU_IDR5); + smmu->pgsize_bitmap = smmu_idr5_to_pgsize(reg); + + smmu->oas = smmu_idr5_to_oas(reg); + if (smmu->oas == 52) + smmu->pgsize_bitmap |= 1ULL << 42; + else if (!smmu->oas) + smmu->oas = 48; + + return 0; +} + static int smmu_init_device(struct hyp_arm_smmu_v3_device *smmu) { unsigned long haddr; @@ -39,8 +111,14 @@ static int smmu_init_device(struct hyp_arm_smmu_v3_device *smmu) return ret; smmu->base = (void __iomem *)haddr; + ret = smmu_probe(smmu); + if (ret) + goto out_ret; return 0; +out_ret: + smmu_deinit_device(smmu); + return ret; } /* Called while is the host is still trusted. */ diff --git a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h index 744ee2b7f0b4..82b84673e85b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/pkvm/arm_smmu_v3.h @@ -12,12 +12,18 @@ * * Other members are filled and used at runtime by the SMMU driver. * @base Virtual address of SMMU registers + * @oas PA size + * @pgsize_bitmap Supported page sizes + * @sid_bits Max number of SID bits supported */ struct hyp_arm_smmu_v3_device { phys_addr_t mmio_addr; size_t mmio_size; void __iomem *base; u32 features; + unsigned long oas; + unsigned long pgsize_bitmap; + unsigned int sid_bits; }; extern size_t kvm_nvhe_sym(kvm_hyp_arm_smmu_v3_count); -- 2.54.0.545.g6539524ca2-goog