Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
 165.204.84.17 as permitted sender) receiver=protection.outlook.com;
 client-ip=165.204.84.17; helo=SATLEXMB04.amd.com;
Subject: [PATCH 2/2] hwmon: (k10temp) Support up to 12 CCDs on AMD Family of
 processors
From:   Babu Moger <babu.moger@amd.com>
To:     <clemens@ladisch.de>, <jdelvare@suse.com>, <linux@roeck-us.net>
CC:     <linux-hwmon@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Date:   Tue, 23 Nov 2021 15:16:44 -0600
Message-ID: <163770219414.777059.5794961910830381329.stgit@bmoger-ubuntu>
In-Reply-To: <163770216907.777059.6947726637265961161.stgit@bmoger-ubuntu>
References: <163770216907.777059.6947726637265961161.stgit@bmoger-ubuntu>
User-Agent: StGit/1.1.dev103+g5369f4c
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 21:16:45.7165
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: f9bd9a34-bfd5-49c2-66a1-08d9aec68dee
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT058.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3989
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The current driver can read the temperatures from upto 8 CCDs=0A=
(Core-Complex Die).=0A=
=0A=
The newer AMD Family 19h Models 10h-1Fh and A0h-AFh can support up to=0A=
12 CCDs. Update the driver to read up to 12 CCDs.=0A=
=0A=
Signed-off-by: Babu Moger <babu.moger@amd.com>=0A=
---=0A=
Note: Generated the patch on top of hwmon-next=0A=
=0A=
 drivers/hwmon/k10temp.c |   18 +++++++++++++++---=0A=
 1 file changed, 15 insertions(+), 3 deletions(-)=0A=
=0A=
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c=0A=
index bd436b380a02..d20159e082ab 100644=0A=
--- a/drivers/hwmon/k10temp.c=0A=
+++ b/drivers/hwmon/k10temp.c=0A=
@@ -172,6 +172,10 @@ static const char *k10temp_temp_label[] =3D {=0A=
 	"Tccd6",=0A=
 	"Tccd7",=0A=
 	"Tccd8",=0A=
+	"Tccd9",=0A=
+	"Tccd10",=0A=
+	"Tccd11",=0A=
+	"Tccd12",=0A=
 };=0A=
 =0A=
 static int k10temp_read_labels(struct device *dev,=0A=
@@ -207,7 +211,7 @@ static int k10temp_read_temp(struct device *dev, u32 at=
tr, int channel,=0A=
 			if (*val < 0)=0A=
 				*val =3D 0;=0A=
 			break;=0A=
-		case 2 ... 9:		/* Tccd{1-8} */=0A=
+		case 2 ... 13:		/* Tccd{1-12} */=0A=
 			amd_smn_read(amd_pci_dev_to_node_id(data->pdev),=0A=
 				     ZEN_CCD_TEMP(data->ccd_offset, channel - 2),=0A=
 						  &regval);=0A=
@@ -342,6 +346,10 @@ static const struct hwmon_channel_info *k10temp_info[]=
 =3D {=0A=
 			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
 			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
 			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
+			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
+			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
+			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
+			   HWMON_T_INPUT | HWMON_T_LABEL,=0A=
 			   HWMON_T_INPUT | HWMON_T_LABEL),=0A=
 	NULL=0A=
 };=0A=
@@ -437,13 +445,17 @@ static int k10temp_probe(struct pci_dev *pdev, const =
struct pci_device_id *id)=0A=
 			data->ccd_limit =3D 8;=0A=
 			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
-		case 0x10 ... 0x1f:=0A=
 		case 0x40 ... 0x4f:	/* Yellow Carp */=0A=
-		case 0xa0 ... 0xaf:=0A=
 			data->ccd_offset =3D 0x300;=0A=
 			data->ccd_limit =3D 8;=0A=
 			k10temp_get_ccd_support(pdev, data);=0A=
 			break;=0A=
+		case 0x10 ... 0x1f:=0A=
+		case 0xa0 ... 0xaf:=0A=
+			data->ccd_offset =3D 0x300;=0A=
+			data->ccd_limit =3D 12;=0A=
+			k10temp_get_ccd_support(pdev, data);=0A=
+			break;=0A=
 		}=0A=
 	} else {=0A=
 		data->read_htcreg =3D read_htcreg_pci;=0A=
=0A=