From 56e8d62cee982fdce2cc9a4dc548839286b9b5d6 Mon Sep 17 00:00:00 2001 From: Iwona Winiarska Date: Mon, 9 May 2022 14:19:55 +0200 Subject: hwmon: peci-cputemp: Add Domain ID support Change peci-cputemp hwmon device name to use both CPU ID and Domain ID. Use the corresponding Domain ID value in PECI commands. Signed-off-by: Iwona Winiarska --- drivers/hwmon/peci-cputemp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/peci-cputemp.c b/drivers/hwmon/peci-cputemp.c index a4a7f8cc0108..37ba56838aae 100644 --- a/drivers/hwmon/peci-cputemp.c +++ b/drivers/hwmon/peci-cputemp.c @@ -113,7 +113,7 @@ static int get_temp_targets(struct peci_cputemp *priv) re_msg.params.pci_cfg.function = 1; re_msg.params.pci_cfg.reg = 0x94; re_msg.rx_len = 4; - re_msg.domain_id = 0; + re_msg.domain_id = priv->mgr->client->domain_id; ret = peci_command(priv->mgr->client->adapter, PECI_CMD_RD_END_PT_CFG, sizeof(re_msg), &re_msg); @@ -380,7 +380,7 @@ static int check_resolved_cores(struct peci_cputemp *priv) msg.bus = 14; msg.reg = 0xd4; msg.rx_len = 4; - msg.domain_id = 0; + msg.domain_id = priv->mgr->client->domain_id; ret = peci_command(priv->mgr->client->adapter, PECI_CMD_RD_PCI_CFG_LOCAL, sizeof(msg), &msg); @@ -413,7 +413,7 @@ static int check_resolved_cores(struct peci_cputemp *priv) msg.bus = 1; msg.reg = 0xb4; msg.rx_len = 4; - msg.domain_id = 0; + msg.domain_id = priv->mgr->client->domain_id; ret = peci_command(priv->mgr->client->adapter, PECI_CMD_RD_PCI_CFG_LOCAL, sizeof(msg), &msg); @@ -497,8 +497,8 @@ static int peci_cputemp_probe(struct platform_device *pdev) priv->dev = dev; priv->gen_info = mgr->gen_info; - snprintf(priv->name, PECI_NAME_SIZE, "peci_cputemp.cpu%d", - mgr->client->addr - PECI_BASE_ADDR); + snprintf(priv->name, PECI_NAME_SIZE, "peci_cputemp.cpu%d.%d", + mgr->client->addr - PECI_BASE_ADDR, mgr->client->domain_id); priv->temp_config[priv->config_idx++] = config_table[channel_die]; priv->temp_config[priv->config_idx++] = config_table[channel_dts]; -- cgit v1.2.3