From: Brad Campbell <brad@fnarfbargle.com>
To: linux-hwmon@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
hns@goldelico.com, Guenter Roeck <linux@roeck-us.net>,
Andreas Kemnade <andreas@kemnade.info>,
Jean Delvare <jdelvare@suse.com>,
Henrik Rydberg <rydberg@bitmath.org>
Subject: [PATCH v1] applesmc: Cleanups on top of re-work comms
Date: Wed, 11 Nov 2020 15:55:31 +1100 [thread overview]
Message-ID: <4ed933bd-9bb9-f09f-0e0c-d82893d7ac76@fnarfbargle.com> (raw)
In-Reply-To: <e5c6242a-5207-0f9a-5803-2dc164425b5b@fnarfbargle.com>
A few small cleanups on top of the comms changes for applesmc.c :
send_byte() is always called with APPLESMC_CMD_PORT, so simplify.
Remove redundant check from smc_sane().
Consolidate writing length with other setup parameters.
Consolidate read and write error messages to a single statement each.
Length and error consolidation suggested by Henrik Rydberg <rydberg@bitmath.org>
Signed-off-by: Brad Campbell <brad@fnarfbargle.com>
Index: linux-stable/drivers/hwmon/applesmc.c
===================================================================
--- linux-stable.orig/drivers/hwmon/applesmc.c
+++ linux-stable/drivers/hwmon/applesmc.c
@@ -176,7 +176,7 @@ static int wait_status(u8 val, u8 mask)
/* send_byte - Write to SMC data port. Callers must hold applesmc_lock. */
-static int send_byte(u8 cmd, u16 port)
+static int send_byte(u8 cmd)
{
int status;
@@ -186,7 +186,7 @@ static int send_byte(u8 cmd, u16 port)
status = wait_status(SMC_STATUS_BUSY, SMC_STATUS_BUSY);
if (status)
return status;
- outb(cmd, port);
+ outb(cmd, APPLESMC_DATA_PORT);
return 0;
}
@@ -219,10 +219,7 @@ static int smc_sane(void)
ret = send_command(APPLESMC_READ_CMD);
if (ret)
return ret;
- ret = wait_status(0, SMC_STATUS_BUSY);
- if (!ret)
- return ret;
- return -EIO;
+ return wait_status(0, SMC_STATUS_BUSY);
}
static int send_argument(const char *key)
@@ -230,7 +227,7 @@ static int send_argument(const char *key
int i;
for (i = 0; i < 4; i++)
- if (send_byte(key[i], APPLESMC_DATA_PORT))
+ if (send_byte(key[i]))
return -EIO;
return 0;
}
@@ -245,23 +242,14 @@ static int read_smc(u8 cmd, const char *
if (ret)
return ret;
- if (send_command(cmd) || send_argument(key)) {
- pr_warn("%.4s: read arg fail\n", key);
- 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;
- }
+ if (send_command(cmd) || send_argument(key) || send_byte(len))
+ goto err;
for (i = 0; i < len; i++) {
if (wait_status(SMC_STATUS_AWAITING_DATA | SMC_STATUS_BUSY,
- SMC_STATUS_AWAITING_DATA | SMC_STATUS_BUSY) < 0) {
- pr_warn("%.4s: read data[%d] fail\n", key, i);
- return -EIO;
- }
+ SMC_STATUS_AWAITING_DATA | SMC_STATUS_BUSY))
+ goto err;
+
buffer[i] = inb(APPLESMC_DATA_PORT);
}
@@ -277,6 +265,9 @@ static int read_smc(u8 cmd, const char *
pr_warn("flushed %d bytes, last value is: %d\n", i, data);
return wait_status(0, SMC_STATUS_BUSY);
+err:
+ pr_warn("read cmd fail: %x %.4s %d\n", cmd, key, len);
+ return -EIO;
}
static int write_smc(u8 cmd, const char *key, const u8 *buffer, u8 len)
@@ -288,24 +279,17 @@ static int write_smc(u8 cmd, const char
if (ret)
return ret;
- if (send_command(cmd) || send_argument(key)) {
- pr_warn("%s: write arg fail\n", key);
- return -EIO;
- }
+ if (send_command(cmd) || send_argument(key) || send_byte(len))
+ goto err;
- if (send_byte(len, APPLESMC_DATA_PORT)) {
- pr_warn("%.4s: write len fail\n", key);
- return -EIO;
- }
-
- for (i = 0; i < len; i++) {
- if (send_byte(buffer[i], APPLESMC_DATA_PORT)) {
- pr_warn("%s: write data fail\n", key);
- return -EIO;
- }
- }
+ for (i = 0; i < len; i++)
+ if (send_byte(buffer[i]))
+ goto err;
return wait_status(0, SMC_STATUS_BUSY);
+err:
+ pr_warn("write cmd fail: %x %.4s %d\n", cmd, key, len);
+ return -EIO;
}
static int read_register_count(unsigned int *count)
next prev parent reply other threads:[~2020-11-11 4:56 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 8:54 [REGRESSION] hwmon: (applesmc) avoid overlong udelay() Andreas Kemnade
2020-09-30 16:44 ` Guenter Roeck
2020-09-30 20:00 ` Arnd Bergmann
2020-10-01 22:22 ` Andreas Kemnade
2020-10-02 4:07 ` Guenter Roeck
2020-10-06 7:02 ` Andreas Kemnade
2020-11-02 23:56 ` Brad Campbell
2020-11-03 5:56 ` Brad Campbell
2020-11-04 13:20 ` Andreas Kemnade
2020-11-05 2:18 ` Brad Campbell
2020-11-05 4:22 ` Brad Campbell
2020-11-05 4:43 ` Guenter Roeck
2020-11-05 5:05 ` Brad Campbell
2020-11-05 5:26 ` Guenter Roeck
2020-11-05 5:47 ` [PATCH] applesmc: Re-work SMC comms v1 Brad Campbell
2020-11-05 7:26 ` [PATCH] applesmc: Re-work SMC comms v2 Brad Campbell
2020-11-05 7:56 ` Henrik Rydberg
2020-11-05 8:15 ` Andreas Kemnade
2020-11-05 8:30 ` Brad Campbell
2020-11-05 10:31 ` Henrik Rydberg
2020-11-06 16:26 ` Henrik Rydberg
2020-11-06 20:02 ` Henrik Rydberg
2020-11-07 18:31 ` Henrik Rydberg
2020-11-08 0:09 ` Brad Campbell
2020-11-08 8:22 ` Henrik Rydberg
2020-11-08 1:00 ` [PATCH v3] applesmc: Re-work SMC comms Brad Campbell
2020-11-08 8:35 ` Henrik Rydberg
2020-11-08 10:14 ` Henrik Rydberg
2020-11-08 11:57 ` Brad Campbell
2020-11-08 12:04 ` Henrik Rydberg
2020-11-09 13:06 ` Brad Campbell
2020-11-09 17:08 ` Henrik Rydberg
2020-11-09 22:52 ` Brad Campbell
2020-11-08 16:06 ` Guenter Roeck
2020-11-09 0:25 ` Brad Campbell
2020-11-10 2:04 ` Brad Campbell
2020-11-10 4:55 ` Guenter Roeck
2020-11-10 5:40 ` Brad Campbell
2020-11-10 16:02 ` Guenter Roeck
2020-11-09 8:44 ` Andreas Kemnade
2020-11-09 9:51 ` Brad Campbell
2020-11-11 3:37 ` [PATCH v4 0/1] " Brad Campbell
2020-11-11 4:55 ` Brad Campbell [this message]
2020-11-11 3:38 ` [PATCH v4 1/1] " Brad Campbell
2020-11-11 5:56 ` Guenter Roeck
2020-11-11 7:05 ` Brad Campbell
2020-11-11 13:06 ` [PATCH v5 " Brad Campbell
2020-11-11 20:05 ` Henrik Rydberg
2020-11-11 23:28 ` Brad Campbell
2020-11-12 3:08 ` [PATCH v6 " Brad Campbell
2020-11-12 17:20 ` Guenter Roeck
2020-11-06 23:11 ` [PATCH] applesmc: Re-work SMC comms v2 Brad Campbell
2020-11-05 8:12 ` Andreas Kemnade
2020-11-05 16:12 ` Guenter Roeck
2020-11-06 0:02 ` Brad Campbell
2020-11-06 3:08 ` Guenter Roeck
2020-11-09 9:27 ` [PATCH] applesmc: Re-work SMC comms v1 kernel test robot
2020-11-05 9:48 ` [REGRESSION] hwmon: (applesmc) avoid overlong udelay() Arnd Bergmann
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=4ed933bd-9bb9-f09f-0e0c-d82893d7ac76@fnarfbargle.com \
--to=brad@fnarfbargle.com \
--cc=andreas@kemnade.info \
--cc=arnd@arndb.de \
--cc=hns@goldelico.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rydberg@bitmath.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;
as well as URLs for NNTP newsgroup(s).