From 45718996645c9f72dd8b9c2ad584bf577d892530 Mon Sep 17 00:00:00 2001
From: SChernykh <sergey.v.chernykh@gmail.com>
Date: Mon, 27 Jan 2020 09:39:39 +0100
Subject: [PATCH] Removed MSR mod for Bulldozer

It turned out to be useless: https://www.reddit.com/r/MoneroMining/comments/et7s7w/psa_amd_opteronfxa6a8a10_owners_needed_to_test/
---
 src/backend/cpu/interfaces/ICpuInfo.h        | 1 -
 src/backend/cpu/platform/AdvancedCpuInfo.cpp | 3 ---
 src/backend/cpu/platform/BasicCpuInfo.cpp    | 3 ---
 src/crypto/rx/RxConfig.cpp                   | 5 ++---
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h
index d8e40394..3ebfa0a0 100644
--- a/src/backend/cpu/interfaces/ICpuInfo.h
+++ b/src/backend/cpu/interfaces/ICpuInfo.h
@@ -47,7 +47,6 @@ public:
         MSR_MOD_NONE,
         MSR_MOD_RYZEN,
         MSR_MOD_INTEL,
-        MSR_MOD_BULLDOZER,
         MSR_MOD_CUSTOM,
         MSR_MOD_MAX
     };
diff --git a/src/backend/cpu/platform/AdvancedCpuInfo.cpp b/src/backend/cpu/platform/AdvancedCpuInfo.cpp
index f6d42ae4..9a1a074d 100644
--- a/src/backend/cpu/platform/AdvancedCpuInfo.cpp
+++ b/src/backend/cpu/platform/AdvancedCpuInfo.cpp
@@ -145,9 +145,6 @@ xmrig::AdvancedCpuInfo::AdvancedCpuInfo() :
             }
             else {
                 m_assembly = Assembly::BULLDOZER;
-                if (family == 21) {
-                    m_msrMod = MSR_MOD_BULLDOZER;
-                }
             }
         }
         else if (m_vendor == VENDOR_INTEL) {
diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp
index c5a25b19..3dbf4817 100644
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -192,9 +192,6 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
             }
             else {
                 m_assembly = Assembly::BULLDOZER;
-                if (family == 21) {
-                    m_msrMod = MSR_MOD_BULLDOZER;
-                }
             }
         }
         else if (memcmp(vendor, "GenuineIntel", 12) == 0) {
diff --git a/src/crypto/rx/RxConfig.cpp b/src/crypto/rx/RxConfig.cpp
index d62189d5..2ec568f9 100644
--- a/src/crypto/rx/RxConfig.cpp
+++ b/src/crypto/rx/RxConfig.cpp
@@ -60,17 +60,16 @@ static const std::array<const char *, RxConfig::ModeMax> modeNames = { "auto", "
 
 
 #ifdef XMRIG_FEATURE_MSR
-constexpr size_t kMsrArraySize = 5;
+constexpr size_t kMsrArraySize = 4;
 
 static const std::array<MsrItems, kMsrArraySize> msrPresets = {
     MsrItems(),
     MsrItems{{ 0xC0011020, 0x0 }, { 0xC0011021, 0x40, ~0x20ULL }, { 0xC0011022, 0x510000 }, { 0xC001102b, 0x1808cc16 }},
     MsrItems{{ 0x1a4, 0xf }},
-    MsrItems{{ 0xc0011022, 0x2010, 0x2010 }, { 0xc001102b, 0x70000, 0x770000 }},
     MsrItems()
 };
 
-static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen", "intel", "bulldozer", "custom" };
+static const std::array<const char *, kMsrArraySize> modNames = { "none", "ryzen", "intel", "custom" };
 
 static_assert (kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
 #endif