2015-11-19 09:56:10

by Denis Turischev

[permalink] [raw]
Subject: [PATCH] sp5100_tco: Add AMD Mullins platform support

AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
reuse the existent sp5100_tco driver.

Signed-off-by: Denis Turischev <[email protected]>

diff -Nru linux-4.3.orig/drivers/watchdog/sp5100_tco.c linux-4.3/drivers/watchdog/sp5100_tco.c
--- linux-4.3.orig/drivers/watchdog/sp5100_tco.c 2015-11-02 02:05:25.000000000 +0200
+++ linux-4.3/drivers/watchdog/sp5100_tco.c 2015-11-19 11:08:06.272777718 +0200
@@ -306,6 +306,8 @@
static const struct pci_device_id sp5100_tco_pci_tbl[] = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
PCI_ANY_ID, },
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
+ PCI_ANY_ID, },
{ 0, }, /* End of list */
};
MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);


2015-11-19 16:13:27

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH] sp5100_tco: Add AMD Mullins platform support

On 11/19/2015 01:56 AM, Denis Turischev wrote:
> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> reuse the existent sp5100_tco driver.
>
> Signed-off-by: Denis Turischev <[email protected]>
>
> diff -Nru linux-4.3.orig/drivers/watchdog/sp5100_tco.c linux-4.3/drivers/watchdog/sp5100_tco.c
> --- linux-4.3.orig/drivers/watchdog/sp5100_tco.c 2015-11-02 02:05:25.000000000 +0200
> +++ linux-4.3/drivers/watchdog/sp5100_tco.c 2015-11-19 11:08:06.272777718 +0200
> @@ -306,6 +306,8 @@
> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
> PCI_ANY_ID, },
> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
> + PCI_ANY_ID, },
> { 0, }, /* End of list */
> };
> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
> --

Your patch does not apply to the latest kernel. Can you rebase to v4.4-rc1 and resubmit ?

Thanks,
Guenter

2015-11-20 02:36:07

by Huang Rui

[permalink] [raw]
Subject: Re: [PATCH] sp5100_tco: Add AMD Mullins platform support

Hi Denis,

On Thu, Nov 19, 2015 at 05:56:00PM +0800, Denis Turischev wrote:
> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> reuse the existent sp5100_tco driver.
>

Thank you to add this support!
Actually, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS is only the SMBus device id
on AMD mullins but also on many other AMD platforms. Could you please
share some test method to me, that I am glad to do some quick tests. :)

Thanks,
Rui

> Signed-off-by: Denis Turischev <[email protected]>
>
> diff -Nru linux-4.3.orig/drivers/watchdog/sp5100_tco.c linux-4.3/drivers/watchdog/sp5100_tco.c
> --- linux-4.3.orig/drivers/watchdog/sp5100_tco.c 2015-11-02 02:05:25.000000000 +0200
> +++ linux-4.3/drivers/watchdog/sp5100_tco.c 2015-11-19 11:08:06.272777718 +0200
> @@ -306,6 +306,8 @@
> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
> PCI_ANY_ID, },
> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
> + PCI_ANY_ID, },
> { 0, }, /* End of list */
> };
> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2015-11-22 08:54:18

by Denis Turischev

[permalink] [raw]
Subject: Re: [PATCH] sp5100_tco: Add AMD Mullins platform support

Hi Rui,

On 11/20/2015 04:33 AM, Huang Rui wrote:
> Hi Denis,
>
> On Thu, Nov 19, 2015 at 05:56:00PM +0800, Denis Turischev wrote:
>> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
>> reuse the existent sp5100_tco driver.
>>
>
> Thank you to add this support!
> Actually, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS is only the SMBus device id
> on AMD mullins but also on many other AMD platforms. Could you please
> share some test method to me, that I am glad to do some quick tests. :)

My device is Compulabs's fitlet. It's a fanless mini PC, also known as mintbox mini.
http://fit-pc.com/wiki/index.php/Fit-PC_Product_Line:_fitlet
Processor's datasheet:
http://support.amd.com/TechDocs/52740_16h_Models_30h-3Fh_BKDG.pdf

The dmesg output:
sp5100_tco: SP5100/SB800 TCO WatchDog Timer Driver v0.05
sp5100_tco: PCI Revision ID: 0x42
sp5100_tco: Using 0xfeb00000 for watchdog MMIO address
sp5100_tco: Last reboot was not triggered by watchdog.
sp5100_tco: initialized (0xffffc90000702000). heartbeat=60 sec (nowayout=0)

Please let me know if you need any other info or tests to be performed.

Denis

>
> Thanks,
> Rui
>
>> Signed-off-by: Denis Turischev <[email protected]>
>>
>> diff -Nru linux-4.3.orig/drivers/watchdog/sp5100_tco.c linux-4.3/drivers/watchdog/sp5100_tco.c
>> --- linux-4.3.orig/drivers/watchdog/sp5100_tco.c 2015-11-02 02:05:25.000000000 +0200
>> +++ linux-4.3/drivers/watchdog/sp5100_tco.c 2015-11-19 11:08:06.272777718 +0200
>> @@ -306,6 +306,8 @@
>> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
>> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
>> PCI_ANY_ID, },
>> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
>> + PCI_ANY_ID, },
>> { 0, }, /* End of list */
>> };
>> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/

2015-11-23 03:36:03

by Huang Rui

[permalink] [raw]
Subject: Re: [PATCH] sp5100_tco: Add AMD Mullins platform support

On Sun, Nov 22, 2015 at 10:54:08AM +0200, Denis Turischev wrote:
> Hi Rui,
>
> On 11/20/2015 04:33 AM, Huang Rui wrote:
> > Hi Denis,
> >
> > On Thu, Nov 19, 2015 at 05:56:00PM +0800, Denis Turischev wrote:
> >> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> >> reuse the existent sp5100_tco driver.
> >>
> >
> > Thank you to add this support!
> > Actually, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS is only the SMBus device id
> > on AMD mullins but also on many other AMD platforms. Could you please
> > share some test method to me, that I am glad to do some quick tests. :)
>
> My device is Compulabs's fitlet. It's a fanless mini PC, also known as mintbox mini.
> http://fit-pc.com/wiki/index.php/Fit-PC_Product_Line:_fitlet
> Processor's datasheet:
> http://support.amd.com/TechDocs/52740_16h_Models_30h-3Fh_BKDG.pdf
>
> The dmesg output:
> sp5100_tco: SP5100/SB800 TCO WatchDog Timer Driver v0.05
> sp5100_tco: PCI Revision ID: 0x42
> sp5100_tco: Using 0xfeb00000 for watchdog MMIO address
> sp5100_tco: Last reboot was not triggered by watchdog.
> sp5100_tco: initialized (0xffffc90000702000). heartbeat=60 sec (nowayout=0)
>

I verified it in my side. Thank you. :)
And found AMD new Carrizo platform also supported sp5100_tco watchdog.
I will send a patch to add support to KernCZ(Carrizo) chipset later.

Tested-by: Huang Rui <[email protected]>

2015-11-23 07:59:50

by Denis Turischev

[permalink] [raw]
Subject: [PATCH v2] sp5100_tco: Add AMD Mullins platform support

AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
reuse the existent sp5100_tco driver.

v2: rebased to v4.4-rc2

Signed-off-by: Denis Turischev <[email protected]>

diff -Nru linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c linux-4.4-rc2/drivers/watchdog/sp5100_tco.c
--- linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c 2015-11-23 02:45:59.000000000 +0200
+++ linux-4.4-rc2/drivers/watchdog/sp5100_tco.c 2015-11-23 09:51:48.701245853 +0200
@@ -306,6 +306,8 @@
static const struct pci_device_id sp5100_tco_pci_tbl[] = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
PCI_ANY_ID, },
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
+ PCI_ANY_ID, },
{ 0, }, /* End of list */
};
MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);

2015-11-23 16:53:57

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH v2] sp5100_tco: Add AMD Mullins platform support

On 11/22/2015 11:59 PM, Denis Turischev wrote:
> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> reuse the existent sp5100_tco driver.
>
> v2: rebased to v4.4-rc2
>
> Signed-off-by: Denis Turischev <[email protected]>
>
> diff -Nru linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c linux-4.4-rc2/drivers/watchdog/sp5100_tco.c
> --- linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c 2015-11-23 02:45:59.000000000 +0200
> +++ linux-4.4-rc2/drivers/watchdog/sp5100_tco.c 2015-11-23 09:51:48.701245853 +0200
> @@ -306,6 +306,8 @@
> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
> PCI_ANY_ID, },
> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
> + PCI_ANY_ID, },
> { 0, }, /* End of list */
> };
> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);

$ scripts/checkpatch.pl index.html
ERROR: trailing whitespace
#32: FILE: drivers/watchdog/sp5100_tco.c:310:
+^I PCI_ANY_ID, }, $

total: 1 errors, 0 warnings, 8 lines checked

Please fix.

Guenter

2015-11-24 08:46:21

by Denis Turischev

[permalink] [raw]
Subject: [PATCH v3] sp5100_tco: Add AMD Mullins platform support

AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
reuse the existent sp5100_tco driver.

v2: rebased to v4.4-rc2
v3: fixed trailing whitespace

Signed-off-by: Denis Turischev <[email protected]>

diff -Nru linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c linux-4.4-rc2/drivers/watchdog/sp5100_tco.c
--- linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c 2015-11-23 02:45:59.000000000 +0200
+++ linux-4.4-rc2/drivers/watchdog/sp5100_tco.c 2015-11-23 09:51:48.701245853 +0200
@@ -306,6 +306,8 @@
static const struct pci_device_id sp5100_tco_pci_tbl[] = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
PCI_ANY_ID, },
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
+ PCI_ANY_ID, },
{ 0, }, /* End of list */
};
MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);

2015-11-24 13:53:04

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH v3] sp5100_tco: Add AMD Mullins platform support

On 11/24/2015 12:46 AM, Denis Turischev wrote:
> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> reuse the existent sp5100_tco driver.
>
> v2: rebased to v4.4-rc2
> v3: fixed trailing whitespace
>
> Signed-off-by: Denis Turischev <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

>
> diff -Nru linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c linux-4.4-rc2/drivers/watchdog/sp5100_tco.c
> --- linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c 2015-11-23 02:45:59.000000000 +0200
> +++ linux-4.4-rc2/drivers/watchdog/sp5100_tco.c 2015-11-23 09:51:48.701245853 +0200
> @@ -306,6 +306,8 @@
> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
> PCI_ANY_ID, },
> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
> + PCI_ANY_ID, },
> { 0, }, /* End of list */
> };
> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
>

2015-12-27 19:45:16

by Wim Van Sebroeck

[permalink] [raw]
Subject: Re: [PATCH v3] sp5100_tco: Add AMD Mullins platform support

Hi Denis,

> AMD Mullins watchdog is fully compatible to the previous Hudson chipset,
> reuse the existent sp5100_tco driver.
>
> v2: rebased to v4.4-rc2
> v3: fixed trailing whitespace
>
> Signed-off-by: Denis Turischev <[email protected]>
>
> diff -Nru linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c linux-4.4-rc2/drivers/watchdog/sp5100_tco.c
> --- linux-4.4-rc2.orig/drivers/watchdog/sp5100_tco.c 2015-11-23 02:45:59.000000000 +0200
> +++ linux-4.4-rc2/drivers/watchdog/sp5100_tco.c 2015-11-23 09:51:48.701245853 +0200
> @@ -306,6 +306,8 @@
> static const struct pci_device_id sp5100_tco_pci_tbl[] = {
> { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID,
> PCI_ANY_ID, },
> + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID,
> + PCI_ANY_ID, },
> { 0, }, /* End of list */
> };
> MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);

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

Kind regards,
Wim.