1 files changed, 16 insertions, 11 deletions

diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 0afbb2658cbc..735c74a4cbdb 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -227,7 +227,8 @@ static int check_pcc_chan(int pcc_ss_id, bool chk_err_bit)
         if (likely(!ret))
                 pcc_ss_data->platform_owns_pcc = false;
         else
-                pr_err("PCC check channel failed. Status=%x\n", status);
+                pr_err("PCC check channel failed for ss: %d. Status=%x\n",
+                       pcc_ss_id, status);
 
         return ret;
 }
@@ -291,7 +292,8 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd)
                         time_delta = ktime_ms_delta(ktime_get(),
                                                     pcc_ss_data->last_mpar_reset);
                         if ((time_delta < 60 * MSEC_PER_SEC) && pcc_ss_data->last_mpar_reset) {
-                                pr_debug("PCC cmd not sent due to MPAR limit");
+                                pr_debug("PCC cmd for subspace %d not sent due to MPAR limit",
+                                         pcc_ss_id);
                                 ret = -EIO;
                                 goto end;
                         }
@@ -312,8 +314,8 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd)
         /* Ring doorbell */
         ret = mbox_send_message(pcc_ss_data->pcc_channel, &cmd);
         if (ret < 0) {
-                pr_err("Err sending PCC mbox message. cmd:%d, ret:%d\n",
-                                cmd, ret);
+                pr_err("Err sending PCC mbox message. ss: %d cmd:%d, ret:%d\n",
+                       pcc_ss_id, cmd, ret);
                 goto end;
         }
 
@@ -553,7 +555,8 @@ static int register_pcc_channel(int pcc_ss_idx)
                         pcc_mbox_request_channel(&cppc_mbox_cl, pcc_ss_idx);
 
                 if (IS_ERR(pcc_data[pcc_ss_idx]->pcc_channel)) {
-                        pr_err("Failed to find PCC communication channel\n");
+                        pr_err("Failed to find PCC channel for subspace %d\n",
+                               pcc_ss_idx);
                         return -ENODEV;
                 }
 
@@ -566,7 +569,8 @@ static int register_pcc_channel(int pcc_ss_idx)
                 cppc_ss = (pcc_data[pcc_ss_idx]->pcc_channel)->con_priv;
 
                 if (!cppc_ss) {
-                        pr_err("No PCC subspace found for CPPC\n");
+                        pr_err("No PCC subspace found for %d CPPC\n",
+                               pcc_ss_idx);
                         return -ENODEV;
                 }
 
@@ -584,7 +588,8 @@ static int register_pcc_channel(int pcc_ss_idx)
                 pcc_data[pcc_ss_idx]->pcc_comm_addr =
                         acpi_os_ioremap(cppc_ss->base_address, cppc_ss->length);
                 if (!pcc_data[pcc_ss_idx]->pcc_comm_addr) {
-                        pr_err("Failed to ioremap PCC comm region mem\n");
+                        pr_err("Failed to ioremap PCC comm region mem for %d\n",
+                               pcc_ss_idx);
                         return -ENOMEM;
                 }
 
@@ -973,8 +978,8 @@ static int cpc_read(int cpu, struct cpc_register_resource *reg_res, u64 *val)
                         *val = readq_relaxed(vaddr);
                         break;
                 default:
-                        pr_debug("Error: Cannot read %u bit width from PCC\n",
-                                        reg->bit_width);
+                        pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n",
+                                 reg->bit_width, pcc_ss_id);
                         ret_val = -EFAULT;
         }
 
@@ -1012,8 +1017,8 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
                         writeq_relaxed(val, vaddr);
                         break;
                 default:
-                        pr_debug("Error: Cannot write %u bit width to PCC\n",
-                                        reg->bit_width);
+                        pr_debug("Error: Cannot write %u bit width to PCC for ss: %d\n",
+                                 reg->bit_width, pcc_ss_id);
                         ret_val = -EFAULT;
                         break;
         }