shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Read and check S2MPU_VERSION"

Browse Source 
This reverts commit e850485374.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib3390281dd569c34b92781eb8c5e261cd5a056f5
This commit is contained in:
Will Deacon
2022-07-07 15:51:48 +01:00
parent 27da5c847c
commit 7f57318294
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm64/include/asm/kvm_s2mpu.h
View File

@@ -7,23 +7,6 @@
#ifndef __ARM64_KVM_S2MPU_H__
#define __ARM64_KVM_S2MPU_H__
#define REG_NS_VERSION 0x60
#define VERSION_MAJOR_ARCH_VER_MASK GENMASK(31, 28)
#define VERSION_MINOR_ARCH_VER_MASK GENMASK(27, 24)
#define VERSION_REV_ARCH_VER_MASK GENMASK(23, 16)
#define VERSION_RTL_VER_MASK GENMASK(7, 0)
/* Ignore RTL version in driver version check. */
#define VERSION_CHECK_MASK (VERSION_MAJOR_ARCH_VER_MASK | \
VERSION_MINOR_ARCH_VER_MASK | \
VERSION_REV_ARCH_VER_MASK)
enum s2mpu_version {
S2MPU_VERSION_8 = 0x11000000,
S2MPU_VERSION_9 = 0x20000000,
};
enum s2mpu_power_state {
S2MPU_POWER_ALWAYS_ON,
S2MPU_POWER_ON,

12
arch/arm64/kvm/iommu/s2mpu.c
View File

@@ -18,7 +18,7 @@ static int s2mpu_probe(struct platform_device *pdev)
void __iomem *kaddr;
size_t res_size;
enum s2mpu_power_state power_state = S2MPU_POWER_ALWAYS_ON;
u32 version, power_domain_id = 0;
u32 power_domain_id = 0;
int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -58,16 +58,6 @@ static int s2mpu_probe(struct platform_device *pdev)
return ret;
}
version = readl_relaxed(kaddr + REG_NS_VERSION);
switch (version & VERSION_CHECK_MASK) {
case S2MPU_VERSION_8:
case S2MPU_VERSION_9:
break;
default:
dev_err(&pdev->dev, "unexpected version 0x%08x", version);
return -EINVAL;
}
return 0;
}