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 5/7] hwmon: (it87) Allow multiple chip IDs for force_id
Date: Fri, 27 Jan 2023 15:41:14 +1100 [thread overview]
Message-ID: <20230127044116.1257799-6-frank@crawford.emu.id.au> (raw)
In-Reply-To: <20230127044116.1257799-1-frank@crawford.emu.id.au>
Extend the force_id module parameter to allow specifying one or both
chip IDs separately. If only a single parameter is given it defaults
to using that value for all chips, similar to previous usage.
Signed-off-by: Frank Crawford <frank@crawford.emu.id.au>
---
v2:
* No change.
---
drivers/hwmon/it87.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 61a1a2c643ed..f41da0896097 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -175,8 +175,9 @@ static inline void superio_exit(int ioreg, bool noexit)
#define IT87_SIO_VID_REG 0xfc /* VID value */
#define IT87_SIO_BEEP_PIN_REG 0xf6 /* Beep pin mapping */
-/* Force chip ID to specified value. Should only be used for testing */
-static unsigned short force_id;
+/* Force chip IDs to specified values. Should only be used for testing */
+static unsigned short force_id[2];
+static unsigned int force_id_cnt;
/* ACPI resource conflicts are ignored if this parameter is set to 1 */
static bool ignore_resource_conflict;
@@ -2410,7 +2411,7 @@ static const struct attribute_group it87_group_auto_pwm = {
/* SuperIO detection - will change isa_address if a chip is found */
static int __init it87_find(int sioaddr, unsigned short *address,
- struct it87_sio_data *sio_data)
+ struct it87_sio_data *sio_data, int chip_cnt)
{
int err;
u16 chip_type;
@@ -2426,8 +2427,12 @@ static int __init it87_find(int sioaddr, unsigned short *address,
if (chip_type == 0xffff)
goto exit;
- if (force_id)
- chip_type = force_id;
+ if (force_id_cnt == 1) {
+ /* If only one value given use for all chips */
+ if (force_id[0])
+ chip_type = force_id[0];
+ } else if (force_id[chip_cnt])
+ chip_type = force_id[chip_cnt];
switch (chip_type) {
case IT8705F_DEVID:
@@ -3419,7 +3424,7 @@ static int __init sm_it87_init(void)
for (i = 0; i < ARRAY_SIZE(sioaddr); i++) {
memset(&sio_data, 0, sizeof(struct it87_sio_data));
isa_address[i] = 0;
- err = it87_find(sioaddr[i], &isa_address[i], &sio_data);
+ err = it87_find(sioaddr[i], &isa_address[i], &sio_data, i);
if (err || isa_address[i] == 0)
continue;
/*
@@ -3468,8 +3473,8 @@ static void __exit sm_it87_exit(void)
MODULE_AUTHOR("Chris Gauthron, Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver");
-module_param(force_id, ushort, 0);
-MODULE_PARM_DESC(force_id, "Override the detected device ID");
+module_param_array(force_id, ushort, &force_id_cnt, 0);
+MODULE_PARM_DESC(force_id, "Override one or more detected device ID(s)");
module_param(ignore_resource_conflict, bool, 0);
MODULE_PARM_DESC(ignore_resource_conflict, "Ignore ACPI resource conflict");
--
2.39.1
next prev parent reply other threads:[~2023-01-27 4:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 4:41 [PATCH v2 0/7] hwmon: (it87) Complete handling multi-chip configuration Frank Crawford
2023-01-27 4:41 ` [PATCH v2 1/7] hwmon: (it87) Allow disabling exiting of configuration mode Frank Crawford
2023-01-27 4:41 ` [PATCH v2 2/7] hwmon: (it87) Disable configuration exit for certain chips Frank Crawford
2023-01-27 4:41 ` [PATCH v2 3/7] hwmon: (it87) List full chip model name Frank Crawford
2023-01-27 4:41 ` [PATCH v2 4/7] hwmon: (it87) Add chip_id in some info message Frank Crawford
2023-01-27 4:41 ` Frank Crawford [this message]
2023-01-27 4:41 ` [PATCH v2 6/7] hwmon: (it87) Add new chipset IT87952E Frank Crawford
2023-01-27 4:41 ` [PATCH v2 7/7] hwmon: (it87) Updated documentation for recent updates to it87 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=20230127044116.1257799-6-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 NNTP newsgroup(s).