watchdog: add support for MCP78S chipset in nv_tco

PATCH In review Alexey Kunitskiy 3 participants 7 messages Jul 15, 2016 – Jul 17, 2016 Watchdog device drivers

Share & tools

Alexey Kunitskiy

author

2016-07-15 08:53 UTC #0 lore raw

PATCH 1/1 watchdog: add support for MCP78S chipset in nv_tco

Add support for MCP78S chipset in nv_tco watchdog driver
Patch tested successfully on 4.1.27 kernel and ASUS M4N78-AM V2 motherboard

Signed-off-by Aleksey Kunitskiy <[email protected]>

watchdog/nv_tco.c renamed from watchdog/nv_tco.c.orig +2 -0

@@ -294,6 +294,8 @@ static const struct pci_device_id tco_pc
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
 };
 MODULE_DEVICE_TABLE(pci, tco_pci_tbl);

-----------------
Regards,
Aleksey Kunitskiy

Guenter Roeck

maintainer

2016-07-16 17:15 UTC #1 lore raw

Quoted 5 lines · Alexey Kunitskiy

Add support for MCP78S chipset in nv_tco watchdog driver
Patch tested successfully on 4.1.27 kernel and ASUS M4N78-AM V2 motherboard
Signed-off-by Aleksey Kunitskiy <[email protected]>

The patch must be based on an old kernel; the driver was enhanced about a year ago to add support for a different chip. That change is not included in your patch, causing it to fail to apply.

Also, your patch does not follow the normal patch format, and thus fails to apply when using "git am", which complains that the to-be-patched file does not exist.

Please make sure that the patch applies cleeanly to the latest upstream kernel.

Thanks,
Guenter

Quoted 20 lines

-----------------
Regards,
Aleksey Kunitskiy
---
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
watchdog/nv_tco.c renamed from watchdog/nv_tco.c.orig +2 -0
@@ -294,6 +294,8 @@ static const struct pci_device_id tco_pc
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
 };
 MODULE_DEVICE_TABLE(pci, tco_pci_tbl);

Alexey Kunitskiy

author

2016-07-17 07:14 UTC #2 lore raw

Quoted 12 lines · On Sat, 16 Jul 2016 10:15:40 -0700 Guenter Roeck <[email protected]> wrote:

Quoted 6 lines · Alexey Kunitskiy
Add support for MCP78S chipset in nv_tco watchdog driver Patch tested successfully on 4.1.27 kernel and ASUS M4N78-AM V2 motherboard
Signed-off-by Aleksey Kunitskiy <[email protected]>
The patch must be based on an old kernel; the driver was enhanced about a year ago to add support for a different chip. That change is not included in your patch, causing it to fail to apply.

Quoted 6 lines

Also, your patch does not follow the normal patch format, and thus fails to apply when using "git am", which complains that the to-be-patched file does not exist.
Please make sure that the patch applies cleeanly to the latest upstream kernel.

I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:

drivers/watchdog/nv_tco.c +2 -0

@@ -294,6 +294,8 @@
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */

Signed-off-by Aleksey Kunitskiy <[email protected]>

Quoted 14 lines

Thanks,
Guenter
Quoted 10 lines
-----------------
Regards,
Aleksey Kunitskiy
---
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

Quoted 12 lines

Review
Quoted 12 lines
--- drivers/watchdog/nv_tco.c.orig 2016-07-14
22:28:15.721583870 +0300 +++ drivers/watchdog/nv_tco.c
2016-07-14 22:28:48.838310400 +0300 @@ -294,6 +294,8 @@ static
const struct pci_device_id tco_pc PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS, PCI_ANY_ID, PCI_ANY_ID, },
(quoted diff) +1 -0
+	{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
(quoted diff) +1 -0
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
 };
 MODULE_DEVICE_TABLE(pci, tco_pci_tbl);

-----------------
Regards,
Aleksey Kunitskiy

Guenter Roeck

maintainer

2016-07-17 14:33 UTC #3 lore raw

drivers/watchdog/nv_tco.c

Quoted 27 lines · Alexey Kunitskiy

Quoted 12 lines · On Sat, 16 Jul 2016 10:15:40 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 6 lines · Alexey Kunitskiy
Add support for MCP78S chipset in nv_tco watchdog driver Patch tested successfully on 4.1.27 kernel and ASUS M4N78-AM V2 motherboard
Signed-off-by Aleksey Kunitskiy <[email protected]>
The patch must be based on an old kernel; the driver was enhanced about a year ago to add support for a different chip. That change is not included in your patch, causing it to fail to apply.
Quoted 6 lines
Also, your patch does not follow the normal patch format, and thus fails to apply when using "git am", which complains that the to-be-patched file does not exist.
Please make sure that the patch applies cleeanly to the latest upstream kernel.
I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:
drivers/watchdog/nv_tco.c +0 -0

That is better. Notice the difference: The file names start with "a/" and "b/". Your previous patch started with "drivers/", and the file names differed. In that situation, git doesn't know how to apply the patch.

Can you send it as a clean patch, one that can be applied without editing ?

Thanks,
Guenter

Quoted 47 lines

drivers/watchdog/nv_tco.c +2 -0
@@ -294,6 +294,8 @@
  	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
  	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS,
  	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ 0, },			/* End of list */
Signed-off-by Aleksey Kunitskiy <[email protected]>
Quoted 14 lines
Thanks,
Guenter
Quoted 10 lines
-----------------
Regards,
Aleksey Kunitskiy
---
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
Quoted 12 lines
drivers/watchdog/nv_tco.c
Quoted 12 lines
--- drivers/watchdog/nv_tco.c.orig 2016-07-14
22:28:15.721583870 +0300 +++ drivers/watchdog/nv_tco.c
2016-07-14 22:28:48.838310400 +0300 @@ -294,6 +294,8 @@ static
const struct pci_device_id tco_pc PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS, PCI_ANY_ID, PCI_ANY_ID, },
(quoted diff) +1 -0
+	{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
drivers/watchdog/nv_tco.c +1 -0
+	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ 0, },			/* End of list */
  };
  MODULE_DEVICE_TABLE(pci, tco_pci_tbl);
-----------------
Regards,
Aleksey Kunitskiy

Alexey Kunitskiy

author

2016-07-17 16:34 UTC #4 lore raw

Add support for MCP78S chipset in nv_tco watchdog driver

Signed-off-by Aleksey Kunitskiy <[email protected]>

drivers/watchdog/nv_tco.c +2 -0

@@ -294,6 +294,8 @@
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */

-----------------
Regards,
Aleksey Kunitskiy

Guenter Roeck

maintainer Reviewed-by

2016-07-17 18:44 UTC #5 lore raw

Quoted 4 lines · Alexey Kunitskiy

Add support for MCP78S chipset in nv_tco watchdog driver
Signed-off-by Aleksey Kunitskiy <[email protected]>

Reviewed-by Guenter Roeck <[email protected]>

Note that new patch revisions should never be sent as reply, and that "Regards, ..." ended up in the description when applying the patch. I'll include the patch in my pull request to Wim, but please keep in mind that patches may get lost if sent as reply to previous e-mails.

Thanks,
Guenter

Quoted 22 lines

drivers/watchdog/nv_tco.c +2 -1
@@ -294,6 +294,8 @@
  	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
  	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS,
  	  PCI_ANY_ID, PCI_ANY_ID, },
  	{ 0, },			/* End of list */
 
 
-----------------
Regards,
Aleksey Kunitskiy
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Wim Van Sebroeck

2016-07-17 20:32 UTC #6 lore raw

In reply to Alexey Kunitskiy

Hi Aleksey,

Quoted 65 lines

Quoted 12 lines · On Sat, 16 Jul 2016 10:15:40 -0700 Guenter Roeck <[email protected]> wrote:
Quoted 6 lines · Alexey Kunitskiy
Add support for MCP78S chipset in nv_tco watchdog driver Patch tested successfully on 4.1.27 kernel and ASUS M4N78-AM V2 motherboard
Signed-off-by Aleksey Kunitskiy <[email protected]>
The patch must be based on an old kernel; the driver was enhanced about a year ago to add support for a different chip. That change is not included in your patch, causing it to fail to apply.
Quoted 6 lines
Also, your patch does not follow the normal patch format, and thus fails to apply when using "git am", which complains that the to-be-patched file does not exist.
Please make sure that the patch applies cleeanly to the latest upstream kernel.
I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:
drivers/watchdog/nv_tco.c +2 -0
@@ -294,6 +294,8 @@
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
+	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS,
 	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
Signed-off-by Aleksey Kunitskiy <[email protected]>
Quoted 25 lines
Thanks,
Guenter
Quoted 21 lines
-----------------
Regards,
Aleksey Kunitskiy
---
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
--- drivers/watchdog/nv_tco.c.orig 2016-07-14
22:28:15.721583870 +0300 +++ drivers/watchdog/nv_tco.c
2016-07-14 22:28:48.838310400 +0300 @@ -294,6 +294,8 @@ static
const struct pci_device_id tco_pc PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SMBUS, PCI_ANY_ID, PCI_ANY_ID, },
(quoted diff) +1 -0
+	{ PCI_VENDOR_ID_NVIDIA,
PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS,
drivers/watchdog/nv_tco.c +1 -0
+	  PCI_ANY_ID, PCI_ANY_ID, },
 	{ 0, },			/* End of list */
 };

Quoted 8 lines

Quoted 1 line
Quoted 1 line
MODULE_DEVICE_TABLE(pci, tco_pci_tbl);
-----------------
Regards,
Aleksey Kunitskiy

This patch has been added to linux-watchdog-next.

Kind regards,
Wim.