* [PATCH 1/1] watchdog: add support for MCP78S chipset in nv_tco
@ 2016-07-15 8:53 Alexey Kunitskiy
2016-07-16 17:15 ` [1/1] " Guenter Roeck
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Kunitskiy @ 2016-07-15 8:53 UTC (permalink / raw)
To: Wim Van Sebroeck; +Cc: linux-watchdog
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 <alexey.kv@gmail.com>
--- 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, },
+ { 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-15 8:53 [PATCH 1/1] watchdog: add support for MCP78S chipset in nv_tco Alexey Kunitskiy
@ 2016-07-16 17:15 ` Guenter Roeck
2016-07-17 7:14 ` [PATCH v2 1/1] " Alexey Kunitskiy
0 siblings, 1 reply; 7+ messages in thread
From: Guenter Roeck @ 2016-07-16 17:15 UTC (permalink / raw)
To: Alexey Kunitskiy; +Cc: Wim Van Sebroeck, linux-watchdog
On Fri, Jul 15, 2016 at 11:53:34AM +0300, Alexey Kunitskiy wrote:
> 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 <alexey.kv@gmail.com>
>
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
>
> -----------------
> Regards,
> Aleksey Kunitskiy
> ---
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> 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, },
> + { 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);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-16 17:15 ` [1/1] " Guenter Roeck
@ 2016-07-17 7:14 ` Alexey Kunitskiy
2016-07-17 14:33 ` Guenter Roeck
2016-07-17 20:32 ` Wim Van Sebroeck
0 siblings, 2 replies; 7+ messages in thread
From: Alexey Kunitskiy @ 2016-07-17 7:14 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Wim Van Sebroeck, linux-watchdog
On Sat, 16 Jul 2016 10:15:40 -0700
Guenter Roeck <linux@roeck-us.net> wrote:
> On Fri, Jul 15, 2016 at 11:53:34AM +0300, Alexey Kunitskiy wrote:
> > 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 <alexey.kv@gmail.com>
> >
>
> 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.
I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -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 <alexey.kv@gmail.com>
>
> Thanks,
> Guenter
>
> >
> > -----------------
> > Regards,
> > Aleksey Kunitskiy
> > ---
> > To unsubscribe from this list: send the line "unsubscribe
> > linux-watchdog" in the body of a message to
> > majordomo@vger.kernel.org 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, },
> > + { 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-17 7:14 ` [PATCH v2 1/1] " Alexey Kunitskiy
@ 2016-07-17 14:33 ` Guenter Roeck
2016-07-17 16:34 ` Alexey Kunitskiy
2016-07-17 20:32 ` Wim Van Sebroeck
1 sibling, 1 reply; 7+ messages in thread
From: Guenter Roeck @ 2016-07-17 14:33 UTC (permalink / raw)
To: Alexey Kunitskiy; +Cc: Wim Van Sebroeck, linux-watchdog
On 07/17/2016 12:14 AM, Alexey Kunitskiy wrote:
> On Sat, 16 Jul 2016 10:15:40 -0700
> Guenter Roeck <linux@roeck-us.net> wrote:
>
>> On Fri, Jul 15, 2016 at 11:53:34AM +0300, Alexey Kunitskiy wrote:
>>> 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 <alexey.kv@gmail.com>
>>>
>>
>> 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.
>
> I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:
>
> diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
> --- a/drivers/watchdog/nv_tco.c
> +++ b/drivers/watchdog/nv_tco.c
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
> @@ -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 <alexey.kv@gmail.com>
>
>>
>> Thanks,
>> Guenter
>>
>>>
>>> -----------------
>>> Regards,
>>> Aleksey Kunitskiy
>>> ---
>>> To unsubscribe from this list: send the line "unsubscribe
>>> linux-watchdog" in the body of a message to
>>> majordomo@vger.kernel.org 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, },
>>> + { 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-17 14:33 ` Guenter Roeck
@ 2016-07-17 16:34 ` Alexey Kunitskiy
2016-07-17 18:44 ` Guenter Roeck
0 siblings, 1 reply; 7+ messages in thread
From: Alexey Kunitskiy @ 2016-07-17 16:34 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Wim Van Sebroeck, linux-watchdog
Add support for MCP78S chipset in nv_tco watchdog driver
Signed-off-by: Aleksey Kunitskiy <alexey.kv@gmail.com>
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-17 16:34 ` Alexey Kunitskiy
@ 2016-07-17 18:44 ` Guenter Roeck
0 siblings, 0 replies; 7+ messages in thread
From: Guenter Roeck @ 2016-07-17 18:44 UTC (permalink / raw)
To: Alexey Kunitskiy; +Cc: Wim Van Sebroeck, linux-watchdog
On 07/17/2016 09:34 AM, Alexey Kunitskiy wrote:
> Add support for MCP78S chipset in nv_tco watchdog driver
>
> Signed-off-by: Aleksey Kunitskiy <alexey.kv@gmail.com>
>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
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
> diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
> --- a/drivers/watchdog/nv_tco.c
> +++ b/drivers/watchdog/nv_tco.c
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/1] watchdog: add support for MCP78S chipset in nv_tco
2016-07-17 7:14 ` [PATCH v2 1/1] " Alexey Kunitskiy
2016-07-17 14:33 ` Guenter Roeck
@ 2016-07-17 20:32 ` Wim Van Sebroeck
1 sibling, 0 replies; 7+ messages in thread
From: Wim Van Sebroeck @ 2016-07-17 20:32 UTC (permalink / raw)
To: Alexey Kunitskiy; +Cc: Guenter Roeck, linux-watchdog
Hi Aleksey,
> On Sat, 16 Jul 2016 10:15:40 -0700
> Guenter Roeck <linux@roeck-us.net> wrote:
>
> > On Fri, Jul 15, 2016 at 11:53:34AM +0300, Alexey Kunitskiy wrote:
> > > 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 <alexey.kv@gmail.com>
> > >
> >
> > 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.
>
> I've just followed guide in kernel doc to generate patch using 'diff -up'. Please find a new one atop of mainline kernel:
>
> diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
> --- a/drivers/watchdog/nv_tco.c
> +++ b/drivers/watchdog/nv_tco.c
> @@ -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 <alexey.kv@gmail.com>
>
> >
> > Thanks,
> > Guenter
> >
> > >
> > > -----------------
> > > Regards,
> > > Aleksey Kunitskiy
> > > ---
> > > To unsubscribe from this list: send the line "unsubscribe
> > > linux-watchdog" in the body of a message to
> > > majordomo@vger.kernel.org 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, },
> > > + { 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
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-07-17 20:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-15 8:53 [PATCH 1/1] watchdog: add support for MCP78S chipset in nv_tco Alexey Kunitskiy
2016-07-16 17:15 ` [1/1] " Guenter Roeck
2016-07-17 7:14 ` [PATCH v2 1/1] " Alexey Kunitskiy
2016-07-17 14:33 ` Guenter Roeck
2016-07-17 16:34 ` Alexey Kunitskiy
2016-07-17 18:44 ` Guenter Roeck
2016-07-17 20:32 ` Wim Van Sebroeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.