42 files changed, 635 insertions, 50 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 69dd13947182..d47de7aa9443 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6787,6 +6787,12 @@ S:	Maintained
 F:      mm/memory-failure.c
 F:      mm/hwpoison-inject.c
 
+HYGON PROCESSOR SUPPORT
+M:      Pu Wen <puwen@hygon.cn>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      arch/x86/kernel/cpu/hygon.c
+
 Hyper-V CORE AND DRIVERS
 M:      "K. Y. Srinivasan" <kys@microsoft.com>
 M:      Haiyang Zhang <haiyangz@microsoft.com>
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 638411f22267..6adce15268bd 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -426,6 +426,20 @@ config CPU_SUP_AMD
 
           If unsure, say N.
 
+config CPU_SUP_HYGON
+        default y
+        bool "Support Hygon processors" if PROCESSOR_SELECT
+        select CPU_SUP_AMD
+        help
+          This enables detection, tunings and quirks for Hygon processors
+
+          You need this enabled if you want your kernel to run on an
+          Hygon CPU. Disabling this option on other types of CPUs
+          makes the kernel a tiny bit smaller. Disabling it on an Hygon
+          CPU might render the kernel unbootable.
+
+          If unsure, say N.
+
 config CPU_SUP_CENTAUR
         default y
         bool "Support Centaur processors" if PROCESSOR_SELECT
diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index c84584bb9402..7d2d7c801dba 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -669,6 +669,10 @@ static int __init amd_core_pmu_init(void)
                  * We fallback to using default amd_get_event_constraints.
                  */
                 break;
+        case 0x18:
+                pr_cont("Fam18h ");
+                /* Using default amd_get_event_constraints. */
+                break;
         default:
                 pr_err("core perfctr but no constraints; unknown hardware!\n");
                 return -ENODEV;
diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 8671de126eac..398df6eaa109 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -515,17 +515,19 @@ static int __init amd_uncore_init(void)
 {
         int ret = -ENODEV;
 
-        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD &&
+            boot_cpu_data.x86_vendor != X86_VENDOR_HYGON)
                 return -ENODEV;
 
         if (!boot_cpu_has(X86_FEATURE_TOPOEXT))
                 return -ENODEV;
 
-        if (boot_cpu_data.x86 == 0x17) {
+        if (boot_cpu_data.x86 == 0x17 || boot_cpu_data.x86 == 0x18) {
                 /*
-                 * For F17h, the Northbridge counters are repurposed as Data
-                 * Fabric counters. Also, L3 counters are supported too. The PMUs
-                 * are exported based on  family as either L2 or L3 and NB or DF.
+                 * For F17h or F18h, the Northbridge counters are
+                 * repurposed as Data Fabric counters. Also, L3
+                 * counters are supported too. The PMUs are exported
+                 * based on family as either L2 or L3 and NB or DF.
                  */
                 num_counters_nb           = NUM_COUNTERS_NB;
                 num_counters_llc          = NUM_COUNTERS_L3;
@@ -557,7 +559,9 @@ static int __init amd_uncore_init(void)
                 if (ret)
                         goto fail_nb;
 
-                pr_info("AMD NB counters detected\n");
+                pr_info("%s NB counters detected\n",
+                        boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?
+                                "HYGON" : "AMD");
                 ret = 0;
         }
 
@@ -571,7 +575,9 @@ static int __init amd_uncore_init(void)
                 if (ret)
                         goto fail_llc;
 
-                pr_info("AMD LLC counters detected\n");
+                pr_info("%s LLC counters detected\n",
+                        boot_cpu_data.x86_vendor == X86_VENDOR_HYGON ?
+                                "HYGON" : "AMD");
                 ret = 0;
         }
 
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index de32741d041a..106911b603bd 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1797,6 +1797,10 @@ static int __init init_hw_perf_events(void)
         case X86_VENDOR_AMD:
                 err = amd_pmu_init();
                 break;
+        case X86_VENDOR_HYGON:
+                err = amd_pmu_init();
+                x86_pmu.name = "HYGON";
+                break;
         default:
                 err = -ENOTSUPP;
         }
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index fddb6d26239f..1ae4e5791afa 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -103,6 +103,9 @@ static inline u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)
 
 static inline bool amd_gart_present(void)
 {
+        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+                return false;
+
         /* GART present only on Fam15h, upto model 0fh */
         if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
             (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model < 0x10))
diff --git a/arch/x86/include/asm/cacheinfo.h b/arch/x86/include/asm/cacheinfo.h
index e958e28f7ab5..86b63c7feab7 100644
--- a/arch/x86/include/asm/cacheinfo.h
+++ b/arch/x86/include/asm/cacheinfo.h
@@ -3,5 +3,6 @@