From: Henrik Rydberg <rydberg@euromail.se> To: Guenter Roeck <linux@roeck-us.net> Cc: Chris Murphy <bugzilla@colorremedies.com>, Josh Boyer <jwboyer@fedoraproject.org>, khali@linux-fr.org, lm-sensors@lm-sensors.org, "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org> Subject: Re: applesmc oops in 3.10/3.11 Date: Wed, 9 Oct 2013 10:29:39 +0200 [thread overview] Message-ID: <20131009082939.GA13963@polaris.bitmath.org> (raw) In-Reply-To: <20131008162905.GA20665@roeck-us.net> Hi Guenter, > > I want to make one more test tomorrow, then I'll send a proper patch. Thanks! > > > Ok, great. And here it is, with compiler warning fixed. Thanks everybody, Henrik >From 18fa0f55b764ad0fe5fc49f81bae281e5110ed56 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg <rydberg@euromail.se> Date: Wed, 2 Oct 2013 19:15:03 +0200 Subject: [PATCH] hwmon: (applesmc) Always read until end of data The crash reported and investigated in commit 5f4513 turned out to be caused by a change to the read interface on newer (2012) SMCs. Tests by Chris show that simply reading the data valid line is enough for the problem to go away. Additional tests show that the newer SMCs no longer wait for the number of requested bytes, but start sending data right away. Apparently the number of bytes to read is no longer specified as before, but instead found out by reading until end of data. Failure to read until end of data confuses the state machine, which eventually causes the crash. As a remedy, assuming bit0 is the read valid line, make sure there is nothing more to read before leaving the read function. Tested to resolve the original problem, and runtested on MBA3,1, MBP4,1, MBP8,2, MBP10,1, MBP10,2. The patch seems to have no effect on machines before 2012. Tested-by: Chris Murphy <chris@cmurf.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> --- drivers/hwmon/applesmc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 98814d1..3288f13 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -230,6 +230,7 @@ static int send_argument(const char *key) static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) { + u8 status, data = 0; int i; if (send_command(cmd) || send_argument(key)) { @@ -237,6 +238,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) return -EIO; } + /* This has no effect on newer (2012) SMCs */ if (send_byte(len, APPLESMC_DATA_PORT)) { pr_warn("%.4s: read len fail\n", key); return -EIO; @@ -250,6 +252,17 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) buffer[i] = inb(APPLESMC_DATA_PORT); } + /* Read the data port until bit0 is cleared */ + for (i = 0; i < 16; i++) { + udelay(APPLESMC_MIN_WAIT); + status = inb(APPLESMC_CMD_PORT); + if (!(status & 0x01)) + break; + data = inb(APPLESMC_DATA_PORT); + } + if (i) + pr_warn("flushed %d bytes, last value is: %d\n", i, data); + return 0; } -- 1.8.3.4
WARNING: multiple messages have this Message-ID (diff)
From: Henrik Rydberg <rydberg@euromail.se> To: Guenter Roeck <linux@roeck-us.net> Cc: Chris Murphy <bugzilla@colorremedies.com>, Josh Boyer <jwboyer@fedoraproject.org>, khali@linux-fr.org, lm-sensors@lm-sensors.org, "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org> Subject: Re: [lm-sensors] applesmc oops in 3.10/3.11 Date: Wed, 09 Oct 2013 08:29:39 +0000 [thread overview] Message-ID: <20131009082939.GA13963@polaris.bitmath.org> (raw) In-Reply-To: <20131008162905.GA20665@roeck-us.net> Hi Guenter, > > I want to make one more test tomorrow, then I'll send a proper patch. Thanks! > > > Ok, great. And here it is, with compiler warning fixed. Thanks everybody, Henrik From 18fa0f55b764ad0fe5fc49f81bae281e5110ed56 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg <rydberg@euromail.se> Date: Wed, 2 Oct 2013 19:15:03 +0200 Subject: [PATCH] hwmon: (applesmc) Always read until end of data The crash reported and investigated in commit 5f4513 turned out to be caused by a change to the read interface on newer (2012) SMCs. Tests by Chris show that simply reading the data valid line is enough for the problem to go away. Additional tests show that the newer SMCs no longer wait for the number of requested bytes, but start sending data right away. Apparently the number of bytes to read is no longer specified as before, but instead found out by reading until end of data. Failure to read until end of data confuses the state machine, which eventually causes the crash. As a remedy, assuming bit0 is the read valid line, make sure there is nothing more to read before leaving the read function. Tested to resolve the original problem, and runtested on MBA3,1, MBP4,1, MBP8,2, MBP10,1, MBP10,2. The patch seems to have no effect on machines before 2012. Tested-by: Chris Murphy <chris@cmurf.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> --- drivers/hwmon/applesmc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 98814d1..3288f13 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -230,6 +230,7 @@ static int send_argument(const char *key) static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) { + u8 status, data = 0; int i; if (send_command(cmd) || send_argument(key)) { @@ -237,6 +238,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) return -EIO; } + /* This has no effect on newer (2012) SMCs */ if (send_byte(len, APPLESMC_DATA_PORT)) { pr_warn("%.4s: read len fail\n", key); return -EIO; @@ -250,6 +252,17 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) buffer[i] = inb(APPLESMC_DATA_PORT); } + /* Read the data port until bit0 is cleared */ + for (i = 0; i < 16; i++) { + udelay(APPLESMC_MIN_WAIT); + status = inb(APPLESMC_CMD_PORT); + if (!(status & 0x01)) + break; + data = inb(APPLESMC_DATA_PORT); + } + if (i) + pr_warn("flushed %d bytes, last value is: %d\n", i, data); + return 0; } -- 1.8.3.4 _______________________________________________ lm-sensors mailing list lm-sensors@lm-sensors.org http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
next prev parent reply other threads:[~2013-10-09 8:27 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-09-25 19:06 applesmc oops in 3.10/3.11 Josh Boyer 2013-09-25 19:06 ` [lm-sensors] " Josh Boyer 2013-09-25 19:56 ` Guenter Roeck 2013-09-25 19:56 ` [lm-sensors] " Guenter Roeck 2013-09-25 21:48 ` Henrik Rydberg 2013-09-25 21:48 ` [lm-sensors] " Henrik Rydberg 2013-09-25 22:08 ` Guenter Roeck 2013-09-25 22:08 ` [lm-sensors] " Guenter Roeck 2013-09-26 6:34 ` Henrik Rydberg 2013-09-26 6:34 ` [lm-sensors] " Henrik Rydberg 2013-09-26 10:36 ` Guenter Roeck 2013-09-26 10:36 ` [lm-sensors] " Guenter Roeck 2013-09-26 11:13 ` Henrik Rydberg 2013-09-26 11:13 ` [lm-sensors] " Henrik Rydberg 2013-09-26 10:53 ` Guenter Roeck 2013-09-26 10:53 ` [lm-sensors] " Guenter Roeck 2013-09-26 11:11 ` Henrik Rydberg 2013-09-26 11:11 ` [lm-sensors] " Henrik Rydberg 2013-09-27 16:21 ` Josh Boyer 2013-09-27 16:21 ` [lm-sensors] " Josh Boyer 2013-09-27 17:12 ` Guenter Roeck 2013-09-27 17:12 ` [lm-sensors] " Guenter Roeck 2013-09-27 17:41 ` Chris Murphy 2013-09-27 17:41 ` [lm-sensors] " Chris Murphy 2013-09-27 17:59 ` Guenter Roeck 2013-09-27 17:59 ` [lm-sensors] " Guenter Roeck 2013-09-27 18:03 ` Chris Murphy 2013-09-27 18:03 ` [lm-sensors] " Chris Murphy 2013-09-27 23:33 ` Guenter Roeck 2013-09-27 23:33 ` [lm-sensors] " Guenter Roeck 2013-10-01 1:57 ` Chris Murphy 2013-10-01 1:57 ` [lm-sensors] " Chris Murphy 2013-10-01 3:37 ` Guenter Roeck 2013-10-01 3:37 ` [lm-sensors] " Guenter Roeck 2013-10-01 10:55 ` Henrik Rydberg 2013-10-01 10:55 ` [lm-sensors] " Henrik Rydberg 2013-10-01 15:19 ` Guenter Roeck 2013-10-01 15:19 ` [lm-sensors] " Guenter Roeck 2013-10-01 15:33 ` Chris Murphy 2013-10-01 15:33 ` [lm-sensors] " Chris Murphy 2013-10-01 16:24 ` Guenter Roeck 2013-10-01 16:24 ` [lm-sensors] " Guenter Roeck 2013-10-02 1:09 ` Chris Murphy 2013-10-02 1:09 ` [lm-sensors] " Chris Murphy 2013-10-02 3:51 ` Guenter Roeck 2013-10-02 3:51 ` [lm-sensors] " Guenter Roeck 2013-10-02 3:55 ` Chris Murphy 2013-10-02 3:55 ` [lm-sensors] " Chris Murphy 2013-10-02 4:02 ` Guenter Roeck 2013-10-02 4:02 ` [lm-sensors] " Guenter Roeck 2013-10-02 9:53 ` Henrik Rydberg 2013-10-02 9:53 ` [lm-sensors] " Henrik Rydberg 2013-10-02 13:30 ` Guenter Roeck 2013-10-02 13:30 ` [lm-sensors] " Guenter Roeck 2013-10-02 16:34 ` Henrik Rydberg 2013-10-02 16:34 ` [lm-sensors] " Henrik Rydberg 2013-10-02 16:47 ` Guenter Roeck 2013-10-02 16:47 ` [lm-sensors] " Guenter Roeck 2013-10-02 17:24 ` Henrik Rydberg 2013-10-02 17:24 ` [lm-sensors] " Henrik Rydberg 2013-10-02 18:02 ` Guenter Roeck 2013-10-02 18:02 ` [lm-sensors] " Guenter Roeck 2013-10-02 18:33 ` Chris Murphy 2013-10-02 18:33 ` [lm-sensors] " Chris Murphy 2013-10-02 20:59 ` Guenter Roeck 2013-10-02 20:59 ` [lm-sensors] " Guenter Roeck 2013-10-02 21:34 ` Chris Murphy 2013-10-02 21:34 ` [lm-sensors] " Chris Murphy 2013-10-02 23:32 ` Guenter Roeck 2013-10-02 23:32 ` [lm-sensors] " Guenter Roeck 2013-10-07 23:42 ` Guenter Roeck 2013-10-07 23:42 ` [lm-sensors] " Guenter Roeck 2013-10-07 23:46 ` Chris Murphy 2013-10-07 23:46 ` [lm-sensors] " Chris Murphy 2013-10-08 15:48 ` Guenter Roeck 2013-10-08 15:48 ` [lm-sensors] " Guenter Roeck 2013-10-08 16:29 ` Henrik Rydberg 2013-10-08 16:29 ` [lm-sensors] " Henrik Rydberg 2013-10-08 16:29 ` Guenter Roeck 2013-10-08 16:29 ` [lm-sensors] " Guenter Roeck 2013-10-09 8:29 ` Henrik Rydberg [this message] 2013-10-09 8:29 ` Henrik Rydberg 2013-10-09 16:52 ` Guenter Roeck 2013-10-09 16:52 ` [lm-sensors] " Guenter Roeck 2013-09-27 18:01 ` Guenter Roeck 2013-09-27 18:01 ` [lm-sensors] " 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=20131009082939.GA13963@polaris.bitmath.org \ --to=rydberg@euromail.se \ --cc=bugzilla@colorremedies.com \ --cc=jwboyer@fedoraproject.org \ --cc=khali@linux-fr.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.