From: Greg Kroah-Hartman Date: Fri, 19 Jun 2020 12:20:20 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.228~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14256067947f6892e0429c52ccb98c86279c2200;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch hwmon-k10temp-add-amd-family-17h-model-60h-pci-match.patch --- diff --git a/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch b/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch new file mode 100644 index 00000000000..ada320820f3 --- /dev/null +++ b/queue-5.4/edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch @@ -0,0 +1,71 @@ +From b6bea24d41519e8c31e4798f1c1a3f67e540c5d0 Mon Sep 17 00:00:00 2001 +From: Alexander Monakov +Date: Sun, 10 May 2020 20:48:42 +0000 +Subject: EDAC/amd64: Add AMD family 17h model 60h PCI IDs + +From: Alexander Monakov + +commit b6bea24d41519e8c31e4798f1c1a3f67e540c5d0 upstream. + +Add support for AMD Renoir (4000-series Ryzen CPUs). + +Signed-off-by: Alexander Monakov +Signed-off-by: Borislav Petkov +Acked-by: Yazen Ghannam +Link: https://lkml.kernel.org/r/20200510204842.2603-4-amonakov@ispras.ru +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/edac/amd64_edac.c | 14 ++++++++++++++ + drivers/edac/amd64_edac.h | 3 +++ + 2 files changed, 17 insertions(+) + +--- a/drivers/edac/amd64_edac.c ++++ b/drivers/edac/amd64_edac.c +@@ -2317,6 +2317,16 @@ static struct amd64_family_type family_t + .dbam_to_cs = f17_addr_mask_to_cs_size, + } + }, ++ [F17_M60H_CPUS] = { ++ .ctl_name = "F17h_M60h", ++ .f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0, ++ .f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6, ++ .max_mcs = 2, ++ .ops = { ++ .early_channel_count = f17_early_channel_count, ++ .dbam_to_cs = f17_addr_mask_to_cs_size, ++ } ++ }, + [F17_M70H_CPUS] = { + .ctl_name = "F17h_M70h", + .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, +@@ -3366,6 +3376,10 @@ static struct amd64_family_type *per_fam + fam_type = &family_types[F17_M30H_CPUS]; + pvt->ops = &family_types[F17_M30H_CPUS].ops; + break; ++ } else if (pvt->model >= 0x60 && pvt->model <= 0x6f) { ++ fam_type = &family_types[F17_M60H_CPUS]; ++ pvt->ops = &family_types[F17_M60H_CPUS].ops; ++ break; + } else if (pvt->model >= 0x70 && pvt->model <= 0x7f) { + fam_type = &family_types[F17_M70H_CPUS]; + pvt->ops = &family_types[F17_M70H_CPUS].ops; +--- a/drivers/edac/amd64_edac.h ++++ b/drivers/edac/amd64_edac.h +@@ -120,6 +120,8 @@ + #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee + #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490 + #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496 ++#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F0 0x1448 ++#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F6 0x144e + #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440 + #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446 + +@@ -291,6 +293,7 @@ enum amd_families { + F17_CPUS, + F17_M10H_CPUS, + F17_M30H_CPUS, ++ F17_M60H_CPUS, + F17_M70H_CPUS, + NUM_FAMILIES, + }; diff --git a/queue-5.4/hwmon-k10temp-add-amd-family-17h-model-60h-pci-match.patch b/queue-5.4/hwmon-k10temp-add-amd-family-17h-model-60h-pci-match.patch new file mode 100644 index 00000000000..8aec6090c0a --- /dev/null +++ b/queue-5.4/hwmon-k10temp-add-amd-family-17h-model-60h-pci-match.patch @@ -0,0 +1,36 @@ +From 279f0b3a4b80660fba6faadc2ca2fa426bf3f7e9 Mon Sep 17 00:00:00 2001 +From: Alexander Monakov +Date: Sun, 10 May 2020 20:48:41 +0000 +Subject: hwmon: (k10temp) Add AMD family 17h model 60h PCI match + +From: Alexander Monakov + +commit 279f0b3a4b80660fba6faadc2ca2fa426bf3f7e9 upstream. + +Add support for retrieving Tdie and Tctl on AMD Renoir (4000-series +Ryzen CPUs). + +It appears SMU offsets for reading current/voltage and CCD temperature +have changed for this generation (reads from currently used offsets +yield zeros), so those features cannot be enabled so trivially. + +Signed-off-by: Alexander Monakov +Signed-off-by: Borislav Petkov +Acked-by: Guenter Roeck +Link: https://lkml.kernel.org/r/20200510204842.2603-3-amonakov@ispras.ru +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/hwmon/k10temp.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/hwmon/k10temp.c ++++ b/drivers/hwmon/k10temp.c +@@ -349,6 +349,7 @@ static const struct pci_device_id k10tem + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, ++ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, + { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, + {} diff --git a/queue-5.4/series b/queue-5.4/series index f0cdd4573d7..830cb3e568d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -206,3 +206,5 @@ b43_legacy-fix-connection-problem-with-wpa3.patch media-ov5640-fix-use-of-destroyed-mutex.patch clk-mediatek-assign-the-initial-value-to-clk_init_data-of-mtk_mux.patch igb-report-speed-and-duplex-as-unknown-when-device-is-runtime-suspended.patch +hwmon-k10temp-add-amd-family-17h-model-60h-pci-match.patch +edac-amd64-add-amd-family-17h-model-60h-pci-ids.patch