diff options
Diffstat (limited to 'k10-temp.patch')
| -rw-r--r-- | k10-temp.patch | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/k10-temp.patch b/k10-temp.patch deleted file mode 100644 index a785335303de..000000000000 --- a/k10-temp.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- a/drivers/hwmon/k10temp.c -+++ b/drivers/hwmon/k10temp.c -@@ -632,6 +632,7 @@ static const struct pci_device_id k10temp_id_table[] = { - { 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) }, - {} - ---- a/drivers/edac/amd64_edac.c -+++ b/drivers/edac/amd64_edac.c -@@ -2316,6 +2316,16 @@ static struct amd64_family_type family_types[] = { - .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, -@@ -3354,6 +3364,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) - 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 - #define PCI_DEVICE_ID_AMD_19H_DF_F0 0x1650 -@@ -293,6 +295,7 @@ enum amd_families { - F17_CPUS, - F17_M10H_CPUS, - F17_M30H_CPUS, -+ F17_M60H_CPUS, - F17_M70H_CPUS, - F19_CPUS, - NUM_FAMILIES, - ---- a/arch/x86/kernel/amd_nb.c -+++ b/arch/x86/kernel/amd_nb.c -@@ -18,9 +18,11 @@ - #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450 - #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 - #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 -+#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 - #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 - #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654 - -@@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) }, - {} - }; - -@@ -50,6 +53,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, -@@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, ---- a/include/linux/pci_ids.h -+++ b/include/linux/pci_ids.h -@@ -550,6 +550,7 @@ - #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 - #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653 - #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
\ No newline at end of file |