From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 62C4F418A49; Mon, 3 Aug 2026 13:44:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785764679; cv=none; b=S0LfkxkkwIdpVop/s43xosPBsKJ2VQroo4kLgHXqrdya1o3A5PtwrFUGX4hpb5UEMmqEAb3YIbpxX3DfBwJGqP2fwYiXKkSx6rDI2XxelrGmlQleieKOLHovdGT2aTYt+vIcVAnw83oXH3nxgnKFhBUQZCltMTJfVOFvNzzpH4U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785764679; c=relaxed/simple; bh=a87dBoIo+abuHgtTSNKpMeJOicdZeUlF8rukrl520eU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ebpvBRB2sY5DuGATwF3gisW591U4QRHlU1222x9INk8R86FInYsBfHd8Qv3Tm5Jc6M1tXxEytyNdHpkKF7AptNF/VZ4SvWqu0533T7lbrg6yPY1l2MnhQFz5SpqX5ciSYefD09YECvx0wLzW+3dKEGNa4o6De3LVXM3hmMdsYsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=pMyjQBeB; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="pMyjQBeB" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BE762143D; Mon, 3 Aug 2026 06:44:32 -0700 (PDT) Received: from e122027.cambridge.arm.com (e122027.cambridge.arm.com [10.1.25.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9965A3F66F; Mon, 3 Aug 2026 06:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1785764676; bh=a87dBoIo+abuHgtTSNKpMeJOicdZeUlF8rukrl520eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pMyjQBeBYwoZSI0DbSR2aZTg1nQpOqpGBko74lcraMj2do/JBVxlHmi9zICxzM7de iZEcEpqEky0c+AANwK9eXvydVOl2QjP1Ndgt52P0yU90vYc0XiNtTXKBLkf/sijbYw qQ/ALa0hCmvxwZtXPBgCjnL7vQDdrWON0zgltEN8= From: Steven Price To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Steven Price , Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev, Ganapatrao Kulkarni , Gavin Shan , Shanker Donthineni , Alper Gun , "Aneesh Kumar K . V" , Emi Kisanuki , Vishal Annapurve , WeiLin.Chang@arm.com, Lorenzo Pieralisi Subject: [PATCH v16 04/45] firmware: arm_rmm: Configure the RMM with the host's page size Date: Mon, 3 Aug 2026 14:43:20 +0100 Message-ID: <20260803134403.80630-5-steven.price@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260803134403.80630-1-steven.price@arm.com> References: <20260803134403.80630-1-steven.price@arm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit RMM v2.0 brings the ability to set the RMM's granule size. Check the feature registers and configure the RMM so that it matches the host's page size. This means that operations can be done with a granularity equal to PAGE_SIZE. Reviewed-by: Suzuki K Poulose Signed-off-by: Steven Price --- Changes since v15: * Actually check the feature register for the host's page-size support. Changes since v14: * Move the implementation into drivers/firmware/arm_rmm. Changes since v13: * Moved out of KVM. --- drivers/firmware/arm_rmm/rmi.c | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/firmware/arm_rmm/rmi.c b/drivers/firmware/arm_rmm/rmi.c index 008a783407b4..ff9f76cc199a 100644 --- a/drivers/firmware/arm_rmm/rmi.c +++ b/drivers/firmware/arm_rmm/rmi.c @@ -77,6 +77,63 @@ static int rmi_read_features(void) return 0; } +static int rmi_configure(void) +{ + unsigned long granule_feature; + unsigned long granule_size; + long rmi_ret; + int ret = 0; + struct rmm_config *config; + + switch (PAGE_SIZE) { + case SZ_4K: + granule_size = RMI_GRANULE_SIZE_4KB; + granule_feature = RMI_FEATURE_REGISTER_1_RMI_GRAN_SZ_4KB; + break; + case SZ_16K: + granule_size = RMI_GRANULE_SIZE_16KB; + granule_feature = RMI_FEATURE_REGISTER_1_RMI_GRAN_SZ_16KB; + break; + case SZ_64K: + granule_size = RMI_GRANULE_SIZE_64KB; + granule_feature = RMI_FEATURE_REGISTER_1_RMI_GRAN_SZ_64KB; + break; + default: + BUILD_BUG(); + } + + if (!(rmi_feat_reg(1) & granule_feature)) { + pr_err("RMM does not support %luKB granules\n", + PAGE_SIZE >> 10); + return -ENXIO; + } + + config = (struct rmm_config *)get_zeroed_page(GFP_KERNEL); + if (!config) + return -ENOMEM; + + config->rmi_granule_size = granule_size; + + /* + * For now we set the tracking_region_size to 0 which is the only option + * for 4KB PAGE_SIZE (1GB for 4KB PAGE_SIZE, 32MB/512MB for 16KB/64KB). + * TODO: Support other tracking sizes via Kconfig option for other + * PAGE_SIZES + */ + config->tracking_region_size = 0; + + rmi_ret = rmi_rmm_config_set(virt_to_phys(config)); + if (rmi_ret) { + pr_err("RMM config set failed\n"); + ret = -EINVAL; + goto out_free_config; + } + +out_free_config: + free_page((unsigned long)config); + return ret; +} + static int __init arm64_init_rmi(void) { int ret; @@ -90,6 +147,10 @@ static int __init arm64_init_rmi(void) if (ret) return ret; + ret = rmi_configure(); + if (ret) + return ret; + return 0; } -- 2.43.0