Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI / CPPC: Update all pr_(debug/err) messages to log the susbspace id

CPPC dirver is aware of multiple PCC subspace IDs. Enhance the debug
and error messages in the driver to print the subspace id. In case of
error it will be helpful to find which particular subspace is failing.

Signed-off-by: George Cherian <george.cherian@cavium.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

George Cherian and committed by
Rafael J. Wysocki
d29abc83 91ab883e

+16 -11
+16 -11
drivers/acpi/cppc_acpi.c
··· 227 227 if (likely(!ret)) 228 228 pcc_ss_data->platform_owns_pcc = false; 229 229 else 230 - pr_err("PCC check channel failed. Status=%x\n", status); 230 + pr_err("PCC check channel failed for ss: %d. Status=%x\n", 231 + pcc_ss_id, status); 231 232 232 233 return ret; 233 234 } ··· 292 291 time_delta = ktime_ms_delta(ktime_get(), 293 292 pcc_ss_data->last_mpar_reset); 294 293 if ((time_delta < 60 * MSEC_PER_SEC) && pcc_ss_data->last_mpar_reset) { 295 - pr_debug("PCC cmd not sent due to MPAR limit"); 294 + pr_debug("PCC cmd for subspace %d not sent due to MPAR limit", 295 + pcc_ss_id); 296 296 ret = -EIO; 297 297 goto end; 298 298 } ··· 314 312 /* Ring doorbell */ 315 313 ret = mbox_send_message(pcc_ss_data->pcc_channel, &cmd); 316 314 if (ret < 0) { 317 - pr_err("Err sending PCC mbox message. cmd:%d, ret:%d\n", 318 - cmd, ret); 315 + pr_err("Err sending PCC mbox message. ss: %d cmd:%d, ret:%d\n", 316 + pcc_ss_id, cmd, ret); 319 317 goto end; 320 318 } 321 319 ··· 555 553 pcc_mbox_request_channel(&cppc_mbox_cl, pcc_ss_idx); 556 554 557 555 if (IS_ERR(pcc_data[pcc_ss_idx]->pcc_channel)) { 558 - pr_err("Failed to find PCC communication channel\n"); 556 + pr_err("Failed to find PCC channel for subspace %d\n", 557 + pcc_ss_idx); 559 558 return -ENODEV; 560 559 } 561 560 ··· 569 566 cppc_ss = (pcc_data[pcc_ss_idx]->pcc_channel)->con_priv; 570 567 571 568 if (!cppc_ss) { 572 - pr_err("No PCC subspace found for CPPC\n"); 569 + pr_err("No PCC subspace found for %d CPPC\n", 570 + pcc_ss_idx); 573 571 return -ENODEV; 574 572 } 575 573 ··· 588 584 pcc_data[pcc_ss_idx]->pcc_comm_addr = 589 585 acpi_os_ioremap(cppc_ss->base_address, cppc_ss->length); 590 586 if (!pcc_data[pcc_ss_idx]->pcc_comm_addr) { 591 - pr_err("Failed to ioremap PCC comm region mem\n"); 587 + pr_err("Failed to ioremap PCC comm region mem for %d\n", 588 + pcc_ss_idx); 592 589 return -ENOMEM; 593 590 } 594 591 ··· 978 973 *val = readq_relaxed(vaddr); 979 974 break; 980 975 default: 981 - pr_debug("Error: Cannot read %u bit width from PCC\n", 982 - reg->bit_width); 976 + pr_debug("Error: Cannot read %u bit width from PCC for ss: %d\n", 977 + reg->bit_width, pcc_ss_id); 983 978 ret_val = -EFAULT; 984 979 } 985 980 ··· 1017 1012 writeq_relaxed(val, vaddr); 1018 1013 break; 1019 1014 default: 1020 - pr_debug("Error: Cannot write %u bit width to PCC\n", 1021 - reg->bit_width); 1015 + pr_debug("Error: Cannot write %u bit width to PCC for ss: %d\n", 1016 + reg->bit_width, pcc_ss_id); 1022 1017 ret_val = -EFAULT; 1023 1018 break; 1024 1019 }