Skip to contentSkip to conversation

iTCO_wdt: ICH9DO support

PATCH In review Gabriel C 3 participants 5 messages Apr 30, 2008 – May 5, 2008 Watchdog device drivers

lore
Share & tools
lore

Gabriel C

author
#0 lore raw

PATCH 1/1 iTCO_wdt: ICH9DO support

This patch adds the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bumps the driver version.

Tested on an P5E-VM DO ASUS motherboard.

Signed-off-by Gabriel Craciunescu <[email protected]>

---

Best Regards,

Gabriel

 drivers/watchdog/iTCO_wdt.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/watchdog/iTCO_wdt.c +6 -2
index a0e6809..ea8def2 100644
@@ -44,6 +44,7 @@
  *	82801IB  (ICH9)      : document number 316972-001, 316973-001,
  *	82801IR  (ICH9R)     : document number 316972-001, 316973-001,
  *	82801IH  (ICH9DH)    : document number 316972-001, 316973-001,
+ *	82801IO  (ICH9DO)    : document number 316972-001, 316973-006,
  *	6300ESB  (6300ESB)   : document number 300641-003, 300884-010,
  *	631xESB  (631xESB)   : document number 313082-001, 313075-005,
  *	632xESB  (632xESB)   : document number 313082-001, 313075-005

@@ -55,8 +56,8 @@
 
 /* Module and version information */
 #define DRV_NAME        "iTCO_wdt"
-#define DRV_VERSION     "1.02"
-#define DRV_RELDATE     "26-Jul-2007"
+#define DRV_VERSION     "1.03"
+#define DRV_RELDATE     "30-Apr-2008"
 #define PFX		DRV_NAME ": "
 
 /* Includes */

@@ -104,6 +105,7 @@ enum iTCO_chipsets {
 	TCO_ICH9,	/* ICH9 */
 	TCO_ICH9R,	/* ICH9R */
 	TCO_ICH9DH,	/* ICH9DH */
+	TCO_ICH9DO,     /* ICH9DO */
 	TCO_631XESB,	/* 631xESB/632xESB */
 };
 

@@ -136,6 +138,7 @@ static struct {
 	{"ICH9", 2},
 	{"ICH9R", 2},
 	{"ICH9DH", 2},
+	{"ICH9DO", 2},
 	{"631xESB/632xESB", 2},
 	{NULL,0}
 };

@@ -181,6 +184,7 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
 	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9   )},
 	{ ITCO_PCI_DEVICE(0x2916,				TCO_ICH9R  )},
 	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,		TCO_ICH9DH )},
+	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO )},
 	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,		TCO_631XESB)},
 	{ ITCO_PCI_DEVICE(0x2671,				TCO_631XESB)},
 	{ ITCO_PCI_DEVICE(0x2672,				TCO_631XESB)},
#1 lore raw

drivers/watchdog/iTCO_wdt.c line 60

Quoted 4 lines · On Wed, 30 Apr 2008 16:51:10 +0200 Gabriel C <[email protected]> wrote:
drivers/watchdog/iTCO_wdt.c +2 -2
-#define DRV_VERSION     "1.02"
-#define DRV_RELDATE     "26-Jul-2007"
+#define DRV_VERSION     "1.03"
+#define DRV_RELDATE     "30-Apr-2008"

lol. git-watchdog changes these to

#define DRV_VERSION "1.10"
#define DRV_RELDATE "17-Aug-2007"

Version numbers and dates like this really are pretty pointless. If you get a report against "v1.10", it just is not useful information. You still need to ask "what kernel version" to be able to reliably locate the source for the reporter's driver.

But it's a great way to generate .rej files.

author
#2 lore raw
Quoted 13 lines · Andrew Morton

Review

Quoted 4 lines · On Wed, 30 Apr 2008 16:51:10 +0200 Gabriel C <[email protected]> wrote:
(quoted diff) +2 -2
-#define DRV_VERSION     "1.02"
-#define DRV_RELDATE     "26-Jul-2007"
+#define DRV_VERSION     "1.03"
+#define DRV_RELDATE     "30-Apr-2008"

lol. git-watchdog changes these to

#define DRV_VERSION "1.10"
#define DRV_RELDATE "17-Aug-2007"

Quoted 7 lines

Version numbers and dates like this really are pretty pointless. If you get a report against "v1.10", it just is not useful information. You still need to ask "what kernel version" to be able to reliably locate the source for the reporter's driver.

But it's a great way to generate .rej files.

Really sorry Andrew here the patch without the changes to the driver version.

--

This patch adds the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver.

Tested on an P5E-VM DO ASUS motherboard.

Signed-off-by Gabriel Craciunescu <[email protected]>

---

 drivers/watchdog/iTCO_wdt.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/watchdog/iTCO_wdt.c +4 -0
index a0e6809..7d3203a 100644
@@ -44,6 +44,7 @@
  *	82801IB  (ICH9)      : document number 316972-001, 316973-001,
  *	82801IR  (ICH9R)     : document number 316972-001, 316973-001,
  *	82801IH  (ICH9DH)    : document number 316972-001, 316973-001,
+ *	82801IO  (ICH9DO)    : document number 316972-001, 316973-006,
  *	6300ESB  (6300ESB)   : document number 300641-003, 300884-010,
  *	631xESB  (631xESB)   : document number 313082-001, 313075-005,
  *	632xESB  (632xESB)   : document number 313082-001, 313075-005

@@ -104,6 +105,7 @@ enum iTCO_chipsets {
 	TCO_ICH9,	/* ICH9 */
 	TCO_ICH9R,	/* ICH9R */
 	TCO_ICH9DH,	/* ICH9DH */
+	TCO_ICH9DO,     /* ICH9DO */
 	TCO_631XESB,	/* 631xESB/632xESB */
 };
 

@@ -136,6 +138,7 @@ static struct {
 	{"ICH9", 2},
 	{"ICH9R", 2},
 	{"ICH9DH", 2},
+	{"ICH9DO", 2},
 	{"631xESB/632xESB", 2},
 	{NULL,0}
 };

@@ -181,6 +184,7 @@ static struct pci_device_id iTCO_wdt_pci_tbl[] = {
 	{ ITCO_PCI_DEVICE(0x2918,				TCO_ICH9   )},
 	{ ITCO_PCI_DEVICE(0x2916,				TCO_ICH9R  )},
 	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_2,		TCO_ICH9DH )},
+	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ICH9_4,           TCO_ICH9DO )},
 	{ ITCO_PCI_DEVICE(PCI_DEVICE_ID_INTEL_ESB2_0,		TCO_631XESB)},
 	{ ITCO_PCI_DEVICE(0x2671,				TCO_631XESB)},
 	{ ITCO_PCI_DEVICE(0x2672,				TCO_631XESB)},
#3 lore raw
Quoted 20 lines · On Wed, 30 Apr 2008 20:24:35 +0200 Gabriel C <[email protected]> wrote:
Quoted 19 lines · Andrew Morton

Review

Quoted 4 lines · On Wed, 30 Apr 2008 16:51:10 +0200 Gabriel C <[email protected]> wrote:
(quoted diff) +2 -2
-#define DRV_VERSION     "1.02"
-#define DRV_RELDATE     "26-Jul-2007"
+#define DRV_VERSION     "1.03"
+#define DRV_RELDATE     "30-Apr-2008"

lol. git-watchdog changes these to

#define DRV_VERSION "1.10"
#define DRV_RELDATE "17-Aug-2007"

Version numbers and dates like this really are pretty pointless. If you get a report against "v1.10", it just is not useful information. You still need to ask "what kernel version" to be able to reliably locate the source for the reporter's driver.

Quoted 4 lines
Quoted 1 line

But it's a great way to generate .rej files.

Really sorry Andrew here the patch without the changes to the driver version.

Is OK, I already fixed it (as you saw).

There's nothing to be sorry about - it's not your fault. My email can be summarised down to "Hey, Wim: remove that crap!".

#4 lore raw

Hi Andrew, Gabriel,

Quoted 2 lines

There's nothing to be sorry about - it's not your fault. My email can be summarised down to "Hey, Wim: remove that crap!".

Will work on watchdog related things later this week. And I'll work on removing that crap :-)

Greetings,
Wim.