From 235b29178d568e03a805a9153c4fbd204c3c209a Mon Sep 17 00:00:00 2001
From: Gunes Bayir <gunes.bayir@arm.com>
Date: Wed, 10 Nov 2021 14:21:42 +0000
Subject: Prevent overriding SVE support if disabled in hwcaps

Resolves: COMPMID-4971

Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Change-Id: I8f64409a4feeb92c0e99025cf87a984a1fa188a3
---
 src/common/cpuinfo/CpuIsaInfo.cpp |  4 ----
 src/common/cpuinfo/CpuModel.cpp   | 13 -------------
 src/common/cpuinfo/CpuModel.h     |  8 --------
 3 files changed, 25 deletions(-)

diff --git a/src/common/cpuinfo/CpuIsaInfo.cpp b/src/common/cpuinfo/CpuIsaInfo.cpp
index 7899e0dd92..616553377a 100644
--- a/src/common/cpuinfo/CpuIsaInfo.cpp
+++ b/src/common/cpuinfo/CpuIsaInfo.cpp
@@ -125,10 +125,6 @@ void allowlisted_model_features(CpuIsaInfo &isa, CpuModel model)
     {
         isa.fp16 = model_supports_fp16(model);
     }
-    if(isa.sve == false)
-    {
-        isa.sve = model_supports_sve(model);
-    }
 }
 } // namespace
 
diff --git a/src/common/cpuinfo/CpuModel.cpp b/src/common/cpuinfo/CpuModel.cpp
index 2579057f89..6382ffd5b4 100644
--- a/src/common/cpuinfo/CpuModel.cpp
+++ b/src/common/cpuinfo/CpuModel.cpp
@@ -75,19 +75,6 @@ bool model_supports_dot(CpuModel model)
     }
 }
 
-bool model_supports_sve(CpuModel model)
-{
-    switch(model)
-    {
-        case CpuModel::A510:
-        case CpuModel::V1:
-        case CpuModel::A64FX:
-            return true;
-        default:
-            return false;
-    }
-}
-
 CpuModel midr_to_model(uint32_t midr)
 {
     CpuModel model = CpuModel::GENERIC;
diff --git a/src/common/cpuinfo/CpuModel.h b/src/common/cpuinfo/CpuModel.h
index 071efc4b3f..4bd294e326 100644
--- a/src/common/cpuinfo/CpuModel.h
+++ b/src/common/cpuinfo/CpuModel.h
@@ -59,14 +59,6 @@ CpuModel midr_to_model(uint32_t midr);
  */
 bool model_supports_fp16(CpuModel model);
 
-/** Check if a model supports SVE
- *
- * @note This is used in case of old kernel configurations where some capabilities are not exposed.
- *
- * @param[in] model Model to check for whitelisted capabilities
- */
-bool model_supports_sve(CpuModel model);
-
 /** Check if a model supports dot product
  *
  * @note This is used in case of old kernel configurations where some capabilities are not exposed.
-- 
cgit v1.2.1