* [PATCH v2 0/3] Updates for AMD Family 1Ah-based Models
@ 2023-08-09 3:52 Avadhut Naik
2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Avadhut Naik @ 2023-08-09 3:52 UTC (permalink / raw)
To: bp, x86, linux-edac
Cc: linux-kernel, mario.limonciello, yazen.ghannam, linux,
linux-hwmon, avadnaik
This patchset adds support for amd64_edac module and temperature monitoring,
through k10temp driver, on AMD's Family 1Ah-based models.
The first patch adds the required PCI IDs for models 00h-1Fh, 20h and
40h-4Fh.
The second patch adds the required support in k10temp driver for AMD's
Family 1Ah-based models.
The third patch adds support in amd64_edac module for models 00h-1Fh and
40h-4Fh.
Changes in v2:
- Modify commit message of the first patch according to the feedback
received.
v1: https://lore.kernel.org/linux-edac/20230706171323.3722900-1-avadhut.naik@amd.com/T/#t
Avadhut Naik (3):
x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models
hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models
EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh
arch/x86/kernel/amd_nb.c | 8 ++++++++
drivers/edac/amd64_edac.c | 15 +++++++++++++++
drivers/hwmon/k10temp.c | 8 +++++++-
include/linux/pci_ids.h | 2 ++
4 files changed, 32 insertions(+), 1 deletion(-)
--
2.34.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models 2023-08-09 3:52 [PATCH v2 0/3] Updates for AMD Family 1Ah-based Models Avadhut Naik @ 2023-08-09 3:52 ` Avadhut Naik 2023-08-10 12:22 ` Borislav Petkov 2023-08-10 12:35 ` [tip: x86/misc] " tip-bot2 for Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 2/3] hwmon: (k10temp) Add thermal support " Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Avadhut Naik 2 siblings, 2 replies; 8+ messages in thread From: Avadhut Naik @ 2023-08-09 3:52 UTC (permalink / raw) To: bp, x86, linux-edac Cc: linux-kernel, mario.limonciello, yazen.ghannam, linux, linux-hwmon, avadnaik From: Avadhut Naik <Avadhut.Naik@amd.com> Add new PCI Device IDs, required to support AMD's new Family 1Ah-based models 00h-1Fh, 20h and 40h-4Fh. Since, models 40h-4Fh and model 20h share some design aspects, the PCI IDs defined in this patch for model 20h are shared by models 40h-4Fh. Co-developed-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> --- arch/x86/kernel/amd_nb.c | 8 ++++++++ include/linux/pci_ids.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 035a3db5330b..356de955e78d 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -24,6 +24,8 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 @@ -39,6 +41,7 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4 #define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 /* Protect the PCI config register pairs used for SMN. */ @@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) }, {} }; @@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) }, {} }; @@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2dc75df1437f..8f9a459e1671 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -576,6 +576,8 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3 +#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models 2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik @ 2023-08-10 12:22 ` Borislav Petkov 2023-08-10 12:35 ` [tip: x86/misc] " tip-bot2 for Avadhut Naik 1 sibling, 0 replies; 8+ messages in thread From: Borislav Petkov @ 2023-08-10 12:22 UTC (permalink / raw) To: Avadhut Naik Cc: x86, linux-edac, linux-kernel, mario.limonciello, yazen.ghannam, linux, linux-hwmon, avadnaik On Tue, Aug 08, 2023 at 10:52:42PM -0500, Avadhut Naik wrote: > From: Avadhut Naik <Avadhut.Naik@amd.com> > > Add new PCI Device IDs, required to support AMD's new Family 1Ah-based > models 00h-1Fh, 20h and 40h-4Fh. > > Since, models 40h-4Fh and model 20h share some design aspects, the PCI > IDs defined in this patch for model 20h are shared by models 40h-4Fh. Avoid having "This patch" or "This commit" in the commit message. It is tautologically useless. Also, do $ git grep 'This patch' Documentation/process for more details. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip: x86/misc] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models 2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik 2023-08-10 12:22 ` Borislav Petkov @ 2023-08-10 12:35 ` tip-bot2 for Avadhut Naik 1 sibling, 0 replies; 8+ messages in thread From: tip-bot2 for Avadhut Naik @ 2023-08-10 12:35 UTC (permalink / raw) To: linux-tip-commits Cc: Mario Limonciello, Avadhut Naik, Borislav Petkov (AMD), x86, linux-kernel The following commit has been merged into the x86/misc branch of tip: Commit-ID: c64016609b6f66b753b5f37929a191477fa584c0 Gitweb: https://git.kernel.org/tip/c64016609b6f66b753b5f37929a191477fa584c0 Author: Avadhut Naik <Avadhut.Naik@amd.com> AuthorDate: Tue, 08 Aug 2023 22:52:42 -05:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Thu, 10 Aug 2023 14:12:48 +02:00 x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Add new PCI Device IDs required to support AMD's new Family 1Ah-based models 00h-1Fh, 20h and 40h-4Fh. [ bp: Zap a useless sentence. ] Co-developed-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230809035244.2722455-2-avadhut.naik@amd.com --- arch/x86/kernel/amd_nb.c | 8 ++++++++ include/linux/pci_ids.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 035a3db..356de95 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -24,6 +24,8 @@ #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT 0x14b5 #define PCI_DEVICE_ID_AMD_19H_M60H_ROOT 0x14d8 #define PCI_DEVICE_ID_AMD_19H_M70H_ROOT 0x14e8 +#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT 0x153a +#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT 0x1507 #define PCI_DEVICE_ID_AMD_MI200_ROOT 0x14bb #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 @@ -39,6 +41,7 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4 0x12c4 #define PCI_DEVICE_ID_AMD_MI200_DF_F4 0x14d4 /* Protect the PCI config register pairs used for SMN. */ @@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) }, {} }; @@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) }, {} }; @@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2dc75df..8f9a459 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -576,6 +576,8 @@ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3 #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3 #define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb +#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3 +#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3 #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 #define PCI_DEVICE_ID_AMD_LANCE 0x2000 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models 2023-08-09 3:52 [PATCH v2 0/3] Updates for AMD Family 1Ah-based Models Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik @ 2023-08-09 3:52 ` Avadhut Naik 2023-08-10 12:35 ` [tip: x86/misc] " tip-bot2 for Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Avadhut Naik 2 siblings, 1 reply; 8+ messages in thread From: Avadhut Naik @ 2023-08-09 3:52 UTC (permalink / raw) To: bp, x86, linux-edac Cc: linux-kernel, mario.limonciello, yazen.ghannam, linux, linux-hwmon, avadnaik From: Avadhut Naik <Avadhut.Naik@amd.com> Add thermal info support for AMD Family 1Ah-based models. Support is provided on a per-socket granularity. Co-developed-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> Acked-by: Guenter Roeck <linux@roeck-us.net> --- drivers/hwmon/k10temp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index a267b11731a8..bae0becfa24b 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET 0xd8200c64 #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4 -/* Common for Zen CPU families (Family 17h and 18h and 19h) */ +/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */ #define ZEN_REPORTED_TEMP_CTRL_BASE 0x00059800 #define ZEN_CCD_TEMP(offset, x) (ZEN_REPORTED_TEMP_CTRL_BASE + \ @@ -475,6 +475,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) k10temp_get_ccd_support(pdev, data, 12); break; } + } else if (boot_cpu_data.x86 == 0x1a) { + data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK; + data->read_tempreg = read_tempreg_nb_zen; + data->is_zen = true; } else { data->read_htcreg = read_htcreg_pci; data->read_tempreg = read_tempreg_pci; @@ -521,6 +525,8 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {} }; -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip: x86/misc] hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models 2023-08-09 3:52 ` [PATCH v2 2/3] hwmon: (k10temp) Add thermal support " Avadhut Naik @ 2023-08-10 12:35 ` tip-bot2 for Avadhut Naik 0 siblings, 0 replies; 8+ messages in thread From: tip-bot2 for Avadhut Naik @ 2023-08-10 12:35 UTC (permalink / raw) To: linux-tip-commits Cc: Mario Limonciello, Avadhut Naik, Borislav Petkov (AMD), Guenter Roeck, x86, linux-kernel The following commit has been merged into the x86/misc branch of tip: Commit-ID: 3cd9da416d5b625d52053c816ee91daf4e97007c Gitweb: https://git.kernel.org/tip/3cd9da416d5b625d52053c816ee91daf4e97007c Author: Avadhut Naik <Avadhut.Naik@amd.com> AuthorDate: Tue, 08 Aug 2023 22:52:43 -05:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Thu, 10 Aug 2023 14:23:57 +02:00 hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models Add thermal info support for AMD Family 1Ah-based models. Support is provided on a per-socket granularity. Co-developed-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20230809035244.2722455-3-avadhut.naik@amd.com --- drivers/hwmon/k10temp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index a267b11..bae0bec 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET 0xd8200c64 #define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET 0xd8200ca4 -/* Common for Zen CPU families (Family 17h and 18h and 19h) */ +/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */ #define ZEN_REPORTED_TEMP_CTRL_BASE 0x00059800 #define ZEN_CCD_TEMP(offset, x) (ZEN_REPORTED_TEMP_CTRL_BASE + \ @@ -475,6 +475,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) k10temp_get_ccd_support(pdev, data, 12); break; } + } else if (boot_cpu_data.x86 == 0x1a) { + data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK; + data->read_tempreg = read_tempreg_nb_zen; + data->is_zen = true; } else { data->read_htcreg = read_htcreg_pci; data->read_tempreg = read_tempreg_pci; @@ -521,6 +525,8 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, {} }; ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh 2023-08-09 3:52 [PATCH v2 0/3] Updates for AMD Family 1Ah-based Models Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 2/3] hwmon: (k10temp) Add thermal support " Avadhut Naik @ 2023-08-09 3:52 ` Avadhut Naik 2023-08-10 12:35 ` [tip: x86/misc] EDAC/amd64: Add support for AMD family 1Ah models " tip-bot2 for Avadhut Naik 2 siblings, 1 reply; 8+ messages in thread From: Avadhut Naik @ 2023-08-09 3:52 UTC (permalink / raw) To: bp, x86, linux-edac Cc: linux-kernel, mario.limonciello, yazen.ghannam, linux, linux-hwmon, avadnaik From: Avadhut Naik <Avadhut.Naik@amd.com> Add the necessary support in the module for AMD's new Family 1Ah-based models 00h-1Fh and 40h-4Fh. Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> --- drivers/edac/amd64_edac.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 597dae7692b1..e3b59c488ed1 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4150,6 +4150,20 @@ static int per_family_init(struct amd64_pvt *pvt) } break; + case 0x1A: + switch (pvt->model) { + case 0x00 ... 0x1f: + pvt->ctl_name = "F1Ah"; + pvt->max_mcs = 12; + pvt->flags.zn_regs_v2 = 1; + break; + case 0x40 ... 0x4f: + pvt->ctl_name = "F1Ah_M40h"; + pvt->flags.zn_regs_v2 = 1; + break; + } + break; + default: amd64_err("Unsupported family!\n"); return -ENODEV; @@ -4344,6 +4358,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { X86_MATCH_VENDOR_FAM(AMD, 0x17, NULL), X86_MATCH_VENDOR_FAM(HYGON, 0x18, NULL), X86_MATCH_VENDOR_FAM(AMD, 0x19, NULL), + X86_MATCH_VENDOR_FAM(AMD, 0x1A, NULL), { } }; MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids); -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip: x86/misc] EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh 2023-08-09 3:52 ` [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Avadhut Naik @ 2023-08-10 12:35 ` tip-bot2 for Avadhut Naik 0 siblings, 0 replies; 8+ messages in thread From: tip-bot2 for Avadhut Naik @ 2023-08-10 12:35 UTC (permalink / raw) To: linux-tip-commits; +Cc: Avadhut Naik, Borislav Petkov (AMD), x86, linux-kernel The following commit has been merged into the x86/misc branch of tip: Commit-ID: c4d07c371283cb0453c8ce187551e4d064cc407e Gitweb: https://git.kernel.org/tip/c4d07c371283cb0453c8ce187551e4d064cc407e Author: Avadhut Naik <Avadhut.Naik@amd.com> AuthorDate: Tue, 08 Aug 2023 22:52:44 -05:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Thu, 10 Aug 2023 14:25:21 +02:00 EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh Add support for family 1Ah-based models 00h-1Fh and 40h-4Fh. [ bp: Simplify. ] Signed-off-by: Avadhut Naik <Avadhut.Naik@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230809035244.2722455-4-avadhut.naik@amd.com --- drivers/edac/amd64_edac.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 597dae7..9b6642d 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4150,6 +4150,20 @@ static int per_family_init(struct amd64_pvt *pvt) } break; + case 0x1A: + switch (pvt->model) { + case 0x00 ... 0x1f: + pvt->ctl_name = "F1Ah"; + pvt->max_mcs = 12; + pvt->flags.zn_regs_v2 = 1; + break; + case 0x40 ... 0x4f: + pvt->ctl_name = "F1Ah_M40h"; + pvt->flags.zn_regs_v2 = 1; + break; + } + break; + default: amd64_err("Unsupported family!\n"); return -ENODEV; @@ -4344,6 +4358,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { X86_MATCH_VENDOR_FAM(AMD, 0x17, NULL), X86_MATCH_VENDOR_FAM(HYGON, 0x18, NULL), X86_MATCH_VENDOR_FAM(AMD, 0x19, NULL), + X86_MATCH_VENDOR_FAM(AMD, 0x1A, NULL), { } }; MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids); ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-08-10 12:35 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-08-09 3:52 [PATCH v2 0/3] Updates for AMD Family 1Ah-based Models Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 1/3] x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models Avadhut Naik 2023-08-10 12:22 ` Borislav Petkov 2023-08-10 12:35 ` [tip: x86/misc] " tip-bot2 for Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 2/3] hwmon: (k10temp) Add thermal support " Avadhut Naik 2023-08-10 12:35 ` [tip: x86/misc] " tip-bot2 for Avadhut Naik 2023-08-09 3:52 ` [PATCH v2 3/3] EDAC/amd64: Add support for AMD Family 1Ah Models 00h-1Fh and 40h-4Fh Avadhut Naik 2023-08-10 12:35 ` [tip: x86/misc] EDAC/amd64: Add support for AMD family 1Ah models " tip-bot2 for Avadhut Naik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®