From: Guenter Roeck <linux@roeck-us.net>
To: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Jean Delvare <khali@linux-fr.org>
Subject: [PATCH 08/14] i8k: Force SMM to run on CPU 0
Date: Sat, 14 Dec 2013 09:30:15 -0800 [thread overview]
Message-ID: <1387042221-3671-9-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1387042221-3671-1-git-send-email-linux@roeck-us.net>
On Studio 1555 with dual-core CPU, reading sensor attributes
exported by this driver resulted in random failures combined
with system hangups and forced logouts. Information in
drivers/firmware/dcdbas.c suggests that SMM accesses must
run on CPU 0. With this patch, the problems are gone,
suggesting that this is in fact the case.
Code derived from drivers/firmware/dcdbas.c.
Cc: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/char/i8k.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index ad0acef..264be2b 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -31,6 +31,7 @@
#include <linux/hwmon-sysfs.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/sched.h>
#include <linux/i8k.h>
@@ -130,6 +131,17 @@ static int i8k_smm(struct smm_regs *regs)
{
int rc;
int eax = regs->eax;
+ cpumask_var_t old_mask;
+
+ /* SMM requires CPU 0 */
+ if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
+ return -ENOMEM;
+ cpumask_copy(old_mask, ¤t->cpus_allowed);
+ set_cpus_allowed_ptr(current, cpumask_of(0));
+ if (smp_processor_id() != 0) {
+ rc = -EBUSY;
+ goto out;
+ }
#if defined(CONFIG_X86_64)
asm volatile("pushq %%rax\n\t"
@@ -185,9 +197,12 @@ static int i8k_smm(struct smm_regs *regs)
: "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
#endif
if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax)
- return -EINVAL;
+ rc = -EINVAL;
- return 0;
+out:
+ set_cpus_allowed_ptr(current, old_mask);
+ free_cpumask_var(old_mask);
+ return rc;
}
/*
--
1.7.9.7
next prev parent reply other threads:[~2013-12-14 17:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 17:30 [PATCH 00/12] i8k patch series Guenter Roeck
2013-12-14 17:30 ` [PATCH 01/14] i8k: Convert to use pr_ functions instead of printk Guenter Roeck
2013-12-14 17:30 ` [PATCH 02/14] i8k: Fix various checkpatch warnings and errors Guenter Roeck
2013-12-14 17:30 ` [PATCH 03/14] i8k: Convert to use to hwmon_device_register_with_groups hwmon API Guenter Roeck
2013-12-14 17:30 ` [PATCH 04/14] i8k: Support additional temperature sensors Guenter Roeck
2013-12-14 17:30 ` [PATCH 05/14] MAINTAINERS: Add myself as i8k maintainer Guenter Roeck
2013-12-14 17:30 ` [PATCH 06/14] i8k: Remove obsolete link to out-of-tree driver Guenter Roeck
2013-12-14 17:30 ` [PATCH 07/14] i8k: Drop driver version number and info message at startup Guenter Roeck
2013-12-14 17:30 ` Guenter Roeck [this message]
2013-12-14 17:30 ` [PATCH 09/14] i8k: Add copyright Guenter Roeck
2013-12-14 17:30 ` [PATCH 10/14] i8k: Add support for Dell Studio laptops Guenter Roeck
2013-12-14 17:30 ` [PATCH 11/14] i8k: Add support for Dell XPS M140 Guenter Roeck
2013-12-14 17:30 ` [PATCH 12/14] i8k: Use driver_data field of dmi_system_id to override fan multiplier Guenter Roeck
2013-12-14 17:30 ` [PATCH 13/14] i8k: Stop reading SMM BIOS version during driver probe Guenter Roeck
2013-12-14 17:30 ` [PATCH 14/14] i8k: Implement hwmon based fan speed control Guenter Roeck
2013-12-14 17:38 ` [PATCH 00/12] i8k patch series Guenter Roeck
2013-12-14 18:45 ` Arnd Bergmann
2013-12-14 19:03 ` [lm-sensors] " Jean Delvare
2013-12-14 19:50 ` Guenter Roeck
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=1387042221-3671-9-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
/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