From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
To: andriy.shevchenko@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org, prarit@redhat.com,
linux-kernel@vger.kernel.org,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: [PATCH 19/27] tools/power/x86/intel-speed-select: Kernel interface error handling
Date: Thu, 5 Mar 2020 14:45:30 -0800 [thread overview]
Message-ID: <20200305224538.490864-20-srinivas.pandruvada@linux.intel.com> (raw)
In-Reply-To: <20200305224538.490864-1-srinivas.pandruvada@linux.intel.com>
Treat a case when mailbox/mmio command can't be handled by the kernel
drivers when the module is removed or send a command which no driver can
handle. In this case ENOTTY result is returned, so print error.
Also when the isst_if_mmio module is removed, we can't send CLOS message
messages via Mailbox on non SKX based platforms. When this module is
removed, isst_platform_info.mmio_supported is set to 0. So it can't be
used as a condition to send via mailbox. Here replace check for Skylake
based platform to send via mailbox, other platforms can't use mailbox in
lieu of MMIO.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
.../x86/intel-speed-select/isst-config.c | 28 +++++++++++++++----
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/tools/power/x86/intel-speed-select/isst-config.c b/tools/power/x86/intel-speed-select/isst-config.c
index 48915470c572..2ab902c18bcc 100644
--- a/tools/power/x86/intel-speed-select/isst-config.c
+++ b/tools/power/x86/intel-speed-select/isst-config.c
@@ -95,6 +95,14 @@ int is_clx_n_platform(void)
return 0;
}
+int is_skx_based_platform(void)
+{
+ if (cpu_model == 0x55)
+ return 1;
+
+ return 0;
+}
+
static int update_cpu_model(void)
{
unsigned int ebx, ecx, edx;
@@ -695,7 +703,11 @@ static int isst_send_mmio_command(unsigned int cpu, unsigned int reg, int write,
}
if (ioctl(fd, cmd, &io_regs) == -1) {
- perror("ISST_IF_IO_CMD");
+ if (errno == ENOTTY) {
+ perror("ISST_IF_IO_COMMAND\n");
+ fprintf(stderr, "Check presence of kernel modules: isst_if_mmio\n");
+ exit(0);
+ }
fprintf(outf, "Error: mmio_cmd cpu:%d reg:%x read_write:%x\n",
cpu, reg, write);
} else {
@@ -724,7 +736,7 @@ int isst_send_mbox_command(unsigned int cpu, unsigned char command,
"mbox_send: cpu:%d command:%x sub_command:%x parameter:%x req_data:%x\n",
cpu, command, sub_command, parameter, req_data);
- if (isst_platform_info.mmio_supported && command == CONFIG_CLOS &&
+ if (!is_skx_based_platform() && command == CONFIG_CLOS &&
sub_command != CLOS_PM_QOS_CONFIG) {
unsigned int value;
int write = 0;
@@ -774,10 +786,14 @@ int isst_send_mbox_command(unsigned int cpu, unsigned char command,
err(-1, "%s open failed", pathname);
if (ioctl(fd, ISST_IF_MBOX_COMMAND, &mbox_cmds) == -1) {
- perror("ISST_IF_MBOX_COMMAND");
- fprintf(outf,
- "Error: mbox_cmd cpu:%d command:%x sub_command:%x parameter:%x req_data:%x\n",
- cpu, command, sub_command, parameter, req_data);
+ if (errno == ENOTTY) {
+ perror("ISST_IF_MBOX_COMMAND\n");
+ fprintf(stderr, "Check presence of kernel modules: isst_if_mbox_pci or isst_if_mbox_msr\n");
+ exit(0);
+ }
+ debug_printf(
+ "Error: mbox_cmd cpu:%d command:%x sub_command:%x parameter:%x req_data:%x errorno:%d\n",
+ cpu, command, sub_command, parameter, req_data, errno);
return -1;
} else {
*resp = mbox_cmds.mbox_cmd[0].resp_data;
--
2.24.1
next prev parent reply other threads:[~2020-03-05 22:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 22:45 [PATCH 00/27] tools/power/x86/intel-speed-select: Enhancements Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 01/27] tools/power/x86/intel-speed-select: Warn for invalid package id Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 02/27] tools/power/x86/intel-speed-select: Make target CPU optional for core-power info Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 03/27] tools/power/x86/intel-speed-select: Enhance core-power info command Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 04/27] tools/power/x86/intel-speed-select: Use more verbiage for clos information Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 05/27] tools/power/x86/intel-speed-select: Special handling for CPU 0 online/offline Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 06/27] tools/power/x86/intel-speed-select: Max CPU count calculation when CPU0 is offline Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 07/27] tools/power/x86/intel-speed-select: Store topology information Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 08/27] tools/power/x86/intel-speed-select: Helpful warning for missing kernel interface Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 09/27] tools/power/x86/intel-speed-select: Enhance help Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 10/27] tools/power/x86/intel-speed-select: Enhance --info option Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 11/27] tools/power/x86/intel-speed-select: Add an API for error/information print Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 12/27] tools/power/x86/intel-speed-select: Improve error display for perf-profile feature Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 13/27] tools/power/x86/intel-speed-select: Check feature status first Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 14/27] tools/power/x86/intel-speed-select: Display error for invalid priority type Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 15/27] tools/power/x86/intel-speed-select: Enhance help for core-power assoc Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 16/27] tools/power/x86/intel-speed-select: Improve output of perf-profile commands Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 17/27] tools/power/x86/intel-speed-select: Improve error display for base-freq feature Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 18/27] tools/power/x86/intel-speed-select: Improve error display for turbo-freq feature Srinivas Pandruvada
2020-03-05 22:45 ` Srinivas Pandruvada [this message]
2020-03-05 22:45 ` [PATCH 20/27] tools/power/x86/intel-speed-select: Improve core-power result and error display Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 21/27] tools/power/x86/intel-speed-select: Show error for invalid CPUs in the options Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 22/27] tools/power/x86/intel-speed-select: Improve CLX commands Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 23/27] tools/power/x86/intel-speed-select: Fix avx options for turbo-freq feature Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 24/27] tools/power/x86/intel-speed-select: Print friendly warning for bad command line Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 25/27] tools/power/x86/intel-speed-select: Add display for enabled cpus count Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 26/27] tools/power/x86/intel-speed-select: Avoid duplicate Package strings for json Srinivas Pandruvada
2020-03-05 22:45 ` [PATCH 27/27] tools/power/x86/intel-speed-select: Update version Srinivas Pandruvada
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=20200305224538.490864-20-srinivas.pandruvada@linux.intel.com \
--to=srinivas.pandruvada@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=prarit@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).