mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Avadhut Naik" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Avadhut Naik <Avadhut.Naik@amd.com>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/misc] EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh
Date: Thu, 10 Aug 2023 12:35:05 -0000	[thread overview]
Message-ID: <169167090547.27769.8367401801807081552.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230809035244.2722455-4-avadhut.naik@amd.com>

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);

      reply	other threads:[~2023-08-10 12:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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-bot2 for Avadhut Naik [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=169167090547.27769.8367401801807081552.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=Avadhut.Naik@amd.com \
    --cc=bp@alien8.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®