From: Andrey Panin <pazke@donpac.ru>
To: torvalds@osdl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] Port PIIX4 I2C driver to new DMI probing
Date: Thu, 6 May 2004 14:32:38 +0400 [thread overview]
Message-ID: <1083839558750@donpac.ru> (raw)
In-Reply-To: <10838395553579@donpac.ru>
diff -urN -X /usr/share/dontdiff linux-2.6.6-rc3.vanlila/arch/i386/kernel/dmi_scan.c linux-2.6.6-rc3/arch/i386/kernel/dmi_scan.c
--- linux-2.6.6-rc3.vanlila/arch/i386/kernel/dmi_scan.c 2004-05-05 22:27:49.000000000 +0400
+++ linux-2.6.6-rc3/arch/i386/kernel/dmi_scan.c 2004-05-05 22:28:57.000000000 +0400
@@ -15,7 +15,6 @@
unsigned long dmi_broken;
EXPORT_SYMBOL(dmi_broken);
-int is_unsafe_smbus;
int es7000_plat = 0;
struct dmi_header
@@ -221,19 +220,6 @@
return 0;
}
-/*
- * Don't access SMBus on IBM systems which get corrupted eeproms
- */
-
-static __init int disable_smbus(struct dmi_system_id *d)
-{
- if (is_unsafe_smbus == 0) {
- is_unsafe_smbus = 1;
- printk(KERN_INFO "%s machine detected. Disabling SMBus accesses.\n", d->ident);
- }
- return 0;
-}
-
/*
* The Intel 440GX hall of shame.
*
@@ -476,14 +462,6 @@
#endif
/*
- * SMBus / sensors settings
- */
-
- { disable_smbus, "IBM", {
- DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
- } },
-
- /*
* Some Athlon laptops have really fucked PST tables.
* A BIOS update is all that can save them.
* Mention this, and disable cpufreq.
@@ -711,5 +689,3 @@
else
printk(KERN_INFO "DMI not present.\n");
}
-
-EXPORT_SYMBOL(is_unsafe_smbus);
diff -urN -X /usr/share/dontdiff linux-2.6.6-rc3.vanlila/drivers/i2c/busses/i2c-piix4.c linux-2.6.6-rc3/drivers/i2c/busses/i2c-piix4.c
--- linux-2.6.6-rc3.vanlila/drivers/i2c/busses/i2c-piix4.c 2004-05-05 20:15:38.000000000 +0400
+++ linux-2.6.6-rc3/drivers/i2c/busses/i2c-piix4.c 2004-05-05 22:32:23.000000000 +0400
@@ -40,6 +40,7 @@
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/apm_bios.h>
+#include <linux/dmi.h>
#include <asm/io.h>
@@ -114,18 +115,13 @@
static unsigned short piix4_smba = 0;
static struct i2c_adapter piix4_adapter;
-/*
- * Get DMI information.
- */
-static int __devinit ibm_dmi_probe(void)
-{
-#ifdef CONFIG_X86
- extern int is_unsafe_smbus;
- return is_unsafe_smbus;
-#else
- return 0;
-#endif
-}
+static struct dmi_system_id __devinitdata piix4_dmi_table[] = {
+ {
+ .ident = "IBM",
+ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
+ },
+ { },
+};
static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
const struct pci_device_id *id)
@@ -138,7 +134,8 @@
dev_info(&PIIX4_dev->dev, "Found %s device\n", pci_name(PIIX4_dev));
- if(ibm_dmi_probe()) {
+ /* Don't access SMBus on IBM systems which get corrupted eeproms */
+ if (dmi_check_system(piix4_dmi_table)) {
dev_err(&PIIX4_dev->dev, "IBM Laptop detected; this module "
"may corrupt your serial eeprom! Refusing to load "
"module!\n");
next prev parent reply other threads:[~2004-05-06 10:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-06 10:32 [PATCH 0/6] Simplify DMI matching data Andrey Panin
2004-05-06 10:32 ` [PATCH 1/6] Export DMI probe function Andrey Panin
2004-05-06 10:32 ` [PATCH 2/6] Whitespace cleanups Andrey Panin
2004-05-06 10:32 ` [PATCH 3/6] Port sonypi driver to new DMI probing Andrey Panin
2004-05-06 10:32 ` [PATCH 4/6] Port APM BIOS " Andrey Panin
2004-05-06 10:32 ` [PATCH 5/6] Move HP Pavilion irq workaround where it belongs Andrey Panin
2004-05-06 10:32 ` Andrey Panin [this message]
2004-05-06 10:53 ` [PATCH 6/6] Port PIIX4 I2C driver to new DMI probing Christoph Hellwig
2004-05-06 11:26 ` Andrey Panin
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=1083839558750@donpac.ru \
--to=pazke@donpac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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