From 5f11cfb675714ba164ccb902469def9f6ca900ec Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:49 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Parse S2MPU MMIO region" This reverts commit 8827315de08f7d4640a9ebdb49d543367acc4129. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I452bb1c9c729685355d34e074baf8b899fa774a8 --- arch/arm64/include/asm/kvm_s2mpu.h | 16 ------- arch/arm64/kvm/iommu/s2mpu.c | 77 +----------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 arch/arm64/include/asm/kvm_s2mpu.h diff --git a/arch/arm64/include/asm/kvm_s2mpu.h b/arch/arm64/include/asm/kvm_s2mpu.h deleted file mode 100644 index ba0db7988117..000000000000 --- a/arch/arm64/include/asm/kvm_s2mpu.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2021 - Google LLC - * Author: David Brazdil - */ - -#ifndef __ARM64_KVM_S2MPU_H__ -#define __ARM64_KVM_S2MPU_H__ - -enum s2mpu_power_state { - S2MPU_POWER_ALWAYS_ON, - S2MPU_POWER_ON, - S2MPU_POWER_OFF, -}; - -#endif /* __ARM64_KVM_S2MPU_H__ */ diff --git a/arch/arm64/kvm/iommu/s2mpu.c b/arch/arm64/kvm/iommu/s2mpu.c index 9a9e2db44037..800d264e4be1 100644 --- a/arch/arm64/kvm/iommu/s2mpu.c +++ b/arch/arm64/kvm/iommu/s2mpu.c @@ -5,84 +5,9 @@ */ #include -#include - -#include -#include - -#define S2MPU_MMIO_SIZE SZ_64K - -static int s2mpu_probe(struct platform_device *pdev) -{ - struct resource *res; - void __iomem *kaddr; - size_t res_size; - enum s2mpu_power_state power_state = S2MPU_POWER_ALWAYS_ON; - u32 power_domain_id = 0; - int ret; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "failed to parse 'reg'"); - return -EINVAL; - } - - /* devm_ioremap_resource internally calls devm_request_mem_region. */ - kaddr = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(kaddr)) { - dev_err(&pdev->dev, "could not ioremap resource: %ld", - PTR_ERR(kaddr)); - return PTR_ERR(kaddr); - } - - if (!PAGE_ALIGNED(res->start)) { - dev_err(&pdev->dev, "base address must be page-aligned (0x%llx)", - res->start); - return -EINVAL; - } - - res_size = resource_size(res); - if (res_size != S2MPU_MMIO_SIZE) { - dev_err(&pdev->dev, - "unexpected device region size (expected=%u, actual=%lu)", - S2MPU_MMIO_SIZE, res_size); - return -EINVAL; - } - - ret = of_property_read_u32(pdev->dev.of_node, "power-domain-id", - &power_domain_id); - if (!ret) { - power_state = S2MPU_POWER_ON; - } else if (ret != -EINVAL) { - dev_err(&pdev->dev, "failed to parse power-domain-id: %d", ret); - return ret; - } - - return 0; -} - -static const struct of_device_id of_table[] = { - { .compatible = "google,s2mpu" }, - {}, -}; - -static struct platform_driver of_driver = { - .driver = { - .name = "kvm,s2mpu", - .of_match_table = of_table, - }, -}; int kvm_s2mpu_init(void) { - int ret; - - ret = platform_driver_probe(&of_driver, s2mpu_probe); - if (ret) - goto out; - kvm_info("S2MPU driver initialized\n"); - -out: - return ret; + return 0; }