Merge branches 'for-next/sysreg', 'for-next/sme', 'for-next/kselftest', 'for-next...

[linux-2.6-microblaze.git] / arch / arm64 / kernel / cpuinfo.c

diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 3796952..eb4378c 100644 (file)
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -119,6 +119,12 @@ static const char *const hwcap_str[] = {
        [KERNEL_HWCAP_CSSC]             = "cssc",
        [KERNEL_HWCAP_RPRFM]            = "rprfm",
        [KERNEL_HWCAP_SVE2P1]           = "sve2p1",
+       [KERNEL_HWCAP_SME2]             = "sme2",
+       [KERNEL_HWCAP_SME2P1]           = "sme2p1",
+       [KERNEL_HWCAP_SME_I16I32]       = "smei16i32",
+       [KERNEL_HWCAP_SME_BI32I32]      = "smebi32i32",
+       [KERNEL_HWCAP_SME_B16B16]       = "smeb16b16",
+       [KERNEL_HWCAP_SME_F16F16]       = "smef16f16",
 };
 
 #ifdef CONFIG_COMPAT
@@ -146,6 +152,12 @@ static const char *const compat_hwcap_str[] = {
        [COMPAT_KERNEL_HWCAP(VFPD32)]   = NULL, /* Not possible on arm64 */
        [COMPAT_KERNEL_HWCAP(LPAE)]     = "lpae",
        [COMPAT_KERNEL_HWCAP(EVTSTRM)]  = "evtstrm",
+       [COMPAT_KERNEL_HWCAP(FPHP)]     = "fphp",
+       [COMPAT_KERNEL_HWCAP(ASIMDHP)]  = "asimdhp",
+       [COMPAT_KERNEL_HWCAP(ASIMDDP)]  = "asimddp",
+       [COMPAT_KERNEL_HWCAP(ASIMDFHM)] = "asimdfhm",
+       [COMPAT_KERNEL_HWCAP(ASIMDBF16)] = "asimdbf16",
+       [COMPAT_KERNEL_HWCAP(I8MM)]     = "i8mm",
 };
 
 #define COMPAT_KERNEL_HWCAP2(x)        const_ilog2(COMPAT_HWCAP2_ ## x)
@@ -155,6 +167,8 @@ static const char *const compat_hwcap2_str[] = {
        [COMPAT_KERNEL_HWCAP2(SHA1)]    = "sha1",
        [COMPAT_KERNEL_HWCAP2(SHA2)]    = "sha2",
        [COMPAT_KERNEL_HWCAP2(CRC32)]   = "crc32",
+       [COMPAT_KERNEL_HWCAP2(SB)]      = "sb",
+       [COMPAT_KERNEL_HWCAP2(SSBS)]    = "ssbs",
 };
 #endif /* CONFIG_COMPAT */