From: Frank Crawford <frank@crawford.emu.id.au>
To: Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org, Frank Crawford <frank@crawford.emu.id.au>
Subject: [PATCH v2 2/4] hwmon (it87): Do not enter configuration mode for some chiptypes
Date: Sat, 27 Apr 2024 18:33:03 +1000 [thread overview]
Message-ID: <20240427083317.2077175-3-frank@crawford.emu.id.au> (raw)
In-Reply-To: <20240427083317.2077175-1-frank@crawford.emu.id.au>
Update the configuration mode entry code to allow conditional entry, and
apply to all calls.
Signed-off-by: Frank Crawford <frank@crawford.emu.id.au>
---
drivers/hwmon/it87.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 6eeba3a01e3c..396c2d3afbf7 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -117,7 +117,7 @@ static inline void superio_select(int ioreg, int ldn)
outb(ldn, ioreg + 1);
}
-static inline int superio_enter(int ioreg)
+static inline int superio_enter(int ioreg, bool noentry)
{
/*
* Try to reserve ioreg and ioreg + 1 for exclusive access.
@@ -125,7 +125,8 @@ static inline int superio_enter(int ioreg)
if (!request_muxed_region(ioreg, 2, DRVNAME))
return -EBUSY;
- __superio_enter(ioreg);
+ if (!noentry)
+ __superio_enter(ioreg);
return 0;
}
@@ -742,7 +743,7 @@ static int smbus_disable(struct it87_data *data)
int err;
if (data->smbus_bitmap) {
- err = superio_enter(data->sioaddr);
+ err = superio_enter(data->sioaddr, has_noconf(data));
if (err)
return err;
superio_select(data->sioaddr, PME);
@@ -758,7 +759,7 @@ static int smbus_enable(struct it87_data *data)
int err;
if (data->smbus_bitmap) {
- err = superio_enter(data->sioaddr);
+ err = superio_enter(data->sioaddr, has_noconf(data));
if (err)
return err;
@@ -2674,7 +2675,7 @@ static int __init it87_find(int sioaddr, unsigned short *address,
u16 chip_type;
const struct it87_devices *config = NULL;
- err = superio_enter(sioaddr);
+ err = superio_enter(sioaddr, false);
if (err)
return err;
@@ -3520,7 +3521,7 @@ static void it87_resume_sio(struct platform_device *pdev)
if (!data->need_in7_reroute)
return;
- err = superio_enter(data->sioaddr);
+ err = superio_enter(data->sioaddr, has_noconf(data));
if (err) {
dev_warn(&pdev->dev,
"Unable to enter Super I/O to reroute in7 (%d)",
--
2.44.0
next prev parent reply other threads:[~2024-04-27 8:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-27 8:33 [PATCH v2 0/4] hwmon (it87): Correct handling for configuration mode Frank Crawford
2024-04-27 8:33 ` [PATCH v2 1/4] hwmon (it87): Rename FEAT_CONF_NOEXIT to FEAT_NOCONF as more descriptive of requirement Frank Crawford
2024-04-27 8:33 ` Frank Crawford [this message]
2024-04-27 8:33 ` [PATCH v2 3/4] hwmon (it87): Test for chipset before entering configuration mode Frank Crawford
2024-04-27 11:11 ` Guenter Roeck
2024-04-27 11:53 ` Frank Crawford
2024-04-27 17:00 ` Guenter Roeck
2024-04-28 4:31 ` Frank Crawford
2024-04-28 7:03 ` Guenter Roeck
2024-04-28 7:35 ` Frank Crawford
2024-04-27 8:33 ` [PATCH v2 4/4] hwmon (it87): Remove tests nolonger required Frank Crawford
2024-04-27 9:58 ` [PATCH v2 0/4] hwmon (it87): Correct handling for configuration mode Frank Crawford
-- strict thread matches above, loose matches on Subject: below --
2024-04-28 6:03 Frank Crawford
2024-04-28 6:03 ` [PATCH v2 2/4] hwmon (it87): Do not enter configuration mode for some chiptypes Frank Crawford
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=20240427083317.2077175-3-frank@crawford.emu.id.au \
--to=frank@crawford.emu.id.au \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).