sp5100_tco: fix the device check for SB800 and later chipsets
PATCH 1/2 sp5100_tco: fix the device check for SB800 and later chipsets
For SB800 and later chipsets, the register definitions are the same with SB800. And for SB700 and older chipsets, the definitions should be same with SP5100/SB7x0.
---
Hi Guenter,
These two patches should be on top of "sp5100_tco: Add AMD Mullins platform support". And are rebased at watchdog-next branch.
Thanks,
Rui
--- drivers/watchdog/sp5100_tco.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/watchdog/sp5100_tco.c +16 -12
@@ -333,21 +333,24 @@ static unsigned char sp5100_tco_setupdevice(void)if (!sp5100_tco_pci)return 0 ; -pr_info ("PCI Revision ID: 0x%x\n" , sp5100_tco_pci->revision); +pr_info ("PCI Vendor ID: 0x%x, Device ID: 0x%x, Revision ID: 0x%x\n" , + sp5100_tco_pci->vendor, sp5100_tco_pci->device, + sp5100_tco_pci->revision);/* * Determine type of southbridge chipset. */ -if (sp5100_tco_pci->revision >=0x40 ) { - dev_name =SB800_DEVNAME ; - index_reg =SB800_IO_PM_INDEX_REG ; - data_reg =SB800_IO_PM_DATA_REG ; - base_addr =SB800_PM_WATCHDOG_BASE ; - }else { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { dev_name =SP5100_DEVNAME ; index_reg =SP5100_IO_PM_INDEX_REG ; data_reg =SP5100_IO_PM_DATA_REG ; base_addr =SP5100_PM_WATCHDOG_BASE ; + }else { + dev_name =SB800_DEVNAME ; + index_reg =SB800_IO_PM_INDEX_REG ; + data_reg =SB800_IO_PM_DATA_REG ; + base_addr =SB800_PM_WATCHDOG_BASE ; }/* Request the IO ports used by this driver */
@@ -383,7 +386,12 @@ static unsigned char sp5100_tco_setupdevice(void)* Secondly, Find the watchdog timer MMIO address * from SBResource_MMIO register. */ -if (sp5100_tco_pci->revision >=0x40 ) { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { +/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ +pci_read_config_dword (sp5100_tco_pci, +SP5100_SB_RESOURCE_MMIO_BASE , &val); + }else {/* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */ outb (SB800_PM_ACPI_MMIO_EN +3 ,SB800_IO_PM_INDEX_REG ); val =inb (SB800_IO_PM_DATA_REG );
@@ -393,10 +401,6 @@ static unsigned char sp5100_tco_setupdevice(void) val = val <<8 |inb (SB800_IO_PM_DATA_REG );outb (SB800_PM_ACPI_MMIO_EN +0 ,SB800_IO_PM_INDEX_REG ); val = val <<8 |inb (SB800_IO_PM_DATA_REG ); - }else { -/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ -pci_read_config_dword (sp5100_tco_pci, -SP5100_SB_RESOURCE_MMIO_BASE , &val); }/* The SBResource_MMIO is enabled and mapped memory space? */
Signature · 1 line
1.9.1
PATCH 2/2 sp5100_tco: Add AMD Carrizo platform support
sp5100_tco watchdog is also supported on AMD KernCZ chipset of Carrizo platform.
--- drivers/watchdog/sp5100_tco.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/sp5100_tco.c +2 -0
@@ -308,6 +308,8 @@ static const struct pci_device_id sp5100_tco_pci_tbl[] = { PCI_ANY_ID, }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,PCI_ANY_ID , PCI_ANY_ID, }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, PCI_ANY_ID, + PCI_ANY_ID, }, { 0, }, /* End of list */ };MODULE_DEVICE_TABLE (pci, sp5100_tco_pci_tbl);
Signature · 1 line
1.9.1
Re: [PATCH 2/2] sp5100_tco: Add AMD Carrizo platform support
Quoted 5 lines · Huang Rui
sp5100_tcowatchdog is also supported on AMD KernCZ chipset of Carrizo platform.Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>
Quoted 18 lines
--- drivers/watchdog/sp5100_tco.c | 2 ++ 1 file changed, 2 insertions(+)drivers/watchdog/sp5100_tco.c +2
-0@@ -308,6 +308,8 @@ static const struct pci_device_id sp5100_tco_pci_tbl[] = { PCI_ANY_ID, }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,PCI_ANY_ID , PCI_ANY_ID, }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, PCI_ANY_ID, + PCI_ANY_ID, }, { 0, }, /* End of list */ };MODULE_DEVICE_TABLE (pci, sp5100_tco_pci_tbl);
Re: [PATCH 2/2] sp5100_tco: Add AMD Carrizo platform support
In reply to Huang RuiHi Rui,
Quoted 25 lines
sp5100_tcowatchdog is also supported on AMD KernCZ chipset of Carrizo platform.Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>--- drivers/watchdog/sp5100_tco.c | 2 ++ 1 file changed, 2 insertions(+)drivers/watchdog/sp5100_tco.c +2
-0@@ -308,6 +308,8 @@ static const struct pci_device_id sp5100_tco_pci_tbl[] = { PCI_ANY_ID, }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,PCI_ANY_ID , PCI_ANY_ID, }, + { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, PCI_ANY_ID, + PCI_ANY_ID, }, { 0, }, /* End of list */ };MODULE_DEVICE_TABLE (pci, sp5100_tco_pci_tbl);Signature · 1 line
1.9.1
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
Quoted 6 lines · Huang Rui
For SB800 and later chipsets, the register definitions are the same with SB800. And for SB700 and older chipsets, the definitions should be same with SP5100/SB7x0.
Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>
Would it make sense to rework this driver as pci driver ?
Thanks,
Guenter
Quoted 76 lines
---
Hi Guenter,
These two patches should be on top of "
sp5100_tco: Add AMD Mullins platform support". And are rebased at watchdog-next branch.Thanks,
Rui--- drivers/watchdog/sp5100_tco.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)drivers/watchdog/sp5100_tco.c +16
-12@@ -333,21 +333,24 @@ static unsigned char sp5100_tco_setupdevice(void)if (!sp5100_tco_pci)return 0 ; -pr_info ("PCI Revision ID: 0x%x\n" , sp5100_tco_pci->revision); +pr_info ("PCI Vendor ID: 0x%x, Device ID: 0x%x, Revision ID: 0x%x\n" , + sp5100_tco_pci->vendor, sp5100_tco_pci->device, + sp5100_tco_pci->revision);/* * Determine type of southbridge chipset. */ -if (sp5100_tco_pci->revision >=0x40 ) { - dev_name =SB800_DEVNAME ; - index_reg =SB800_IO_PM_INDEX_REG ; - data_reg =SB800_IO_PM_DATA_REG ; - base_addr =SB800_PM_WATCHDOG_BASE ; - }else { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { dev_name =SP5100_DEVNAME ; index_reg =SP5100_IO_PM_INDEX_REG ; data_reg =SP5100_IO_PM_DATA_REG ; base_addr =SP5100_PM_WATCHDOG_BASE ; + }else { + dev_name =SB800_DEVNAME ; + index_reg =SB800_IO_PM_INDEX_REG ; + data_reg =SB800_IO_PM_DATA_REG ; + base_addr =SB800_PM_WATCHDOG_BASE ; }/* Request the IO ports used by this driver */ @@ -383,7 +386,12 @@ static unsigned char sp5100_tco_setupdevice(void)* Secondly, Find the watchdog timer MMIO address * from SBResource_MMIO register. */ -if (sp5100_tco_pci->revision >=0x40 ) { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { +/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ +pci_read_config_dword (sp5100_tco_pci, +SP5100_SB_RESOURCE_MMIO_BASE , &val); + }else {/* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */ outb (SB800_PM_ACPI_MMIO_EN +3 ,SB800_IO_PM_INDEX_REG ); val =inb (SB800_IO_PM_DATA_REG );@@ -393,10 +401,6 @@ static unsigned char sp5100_tco_setupdevice(void) val = val <<8 |inb (SB800_IO_PM_DATA_REG );outb (SB800_PM_ACPI_MMIO_EN +0 ,SB800_IO_PM_INDEX_REG ); val = val <<8 |inb (SB800_IO_PM_DATA_REG ); - }else { -/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ -pci_read_config_dword (sp5100_tco_pci, -SP5100_SB_RESOURCE_MMIO_BASE , &val); }/* The SBResource_MMIO is enabled and mapped memory space? */
Quoted 5 lines · Guenter Roeck
Quoted 4 lines · Huang Rui
For SB800 and later chipsets, the register definitions are the same with SB800. And for SB700 and older chipsets, the definitions should be same with SP5100/SB7x0.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Would it make sense to rework this driver as pci driver ?
I agree with you. Actually, I thought about this stuff. But sp5100 watchdog is not a pci device in AMD chipset. In another word, it doesn't export a pci header to OS. At current, we use SMBus pci device id and vendor id to detect watchdog on the AMD chipset (Because AMD use SMBus device id and revsion to identify different chipset version). At the same time, SMbus has its own driver piix4_smbus. Looks like we don't have a pci header to enumerate the watchdog.
Thanks,
Rui
Guenter Roeck
maintainerQuoted 14 lines · Huang Rui
Quoted 5 lines · Guenter Roeck
Quoted 4 lines · Huang Rui
For SB800 and later chipsets, the register definitions are the same with SB800. And for SB700 and older chipsets, the definitions should be same with SP5100/SB7x0.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Would it make sense to rework this driver as pci driver ?
Quoted 8 lines
I agree with you. Actually, I thought about this stuff. But sp5100 watchdog is not a pci device in AMD chipset. In another word, it doesn't export a pci header to OS. At current, we use SMBus pci device id and vendor id to detect watchdog on the AMD chipset (Because AMD use SMBus device id and revsion to identify different chipset version). At the same time, SMbus has its own driver
piix4_smbus. Looks like we don't have a pci header to enumerate the watchdog.
Ok, thanks for the clarification. Odd way to detect the chip, but I guess one has to use what is available.
Thanks,
Guenter
Hi Rui,
Quoted 84 lines
For SB800 and later chipsets, the register definitions are the same with SB800. And for SB700 and older chipsets, the definitions should be same with SP5100/SB7x0.
Signed-off-by Huang Rui <[email protected]>Cc Denis Turischev <[email protected]>---
Hi Guenter,
These two patches should be on top of "
sp5100_tco: Add AMD Mullins platform support". And are rebased at watchdog-next branch.Thanks,
Rui--- drivers/watchdog/sp5100_tco.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)drivers/watchdog/sp5100_tco.c +16
-12@@ -333,21 +333,24 @@ static unsigned char sp5100_tco_setupdevice(void)if (!sp5100_tco_pci)return 0 ; -pr_info ("PCI Revision ID: 0x%x\n" , sp5100_tco_pci->revision); +pr_info ("PCI Vendor ID: 0x%x, Device ID: 0x%x, Revision ID: 0x%x\n" , + sp5100_tco_pci->vendor, sp5100_tco_pci->device, + sp5100_tco_pci->revision);/* * Determine type of southbridge chipset. */ -if (sp5100_tco_pci->revision >=0x40 ) { - dev_name =SB800_DEVNAME ; - index_reg =SB800_IO_PM_INDEX_REG ; - data_reg =SB800_IO_PM_DATA_REG ; - base_addr =SB800_PM_WATCHDOG_BASE ; - }else { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { dev_name =SP5100_DEVNAME ; index_reg =SP5100_IO_PM_INDEX_REG ; data_reg =SP5100_IO_PM_DATA_REG ; base_addr =SP5100_PM_WATCHDOG_BASE ; + }else { + dev_name =SB800_DEVNAME ; + index_reg =SB800_IO_PM_INDEX_REG ; + data_reg =SB800_IO_PM_DATA_REG ; + base_addr =SB800_PM_WATCHDOG_BASE ; }/* Request the IO ports used by this driver */ @@ -383,7 +386,12 @@ static unsigned char sp5100_tco_setupdevice(void)* Secondly, Find the watchdog timer MMIO address * from SBResource_MMIO register. */ -if (sp5100_tco_pci->revision >=0x40 ) { +if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + sp5100_tco_pci->revision <0x40 ) { +/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ +pci_read_config_dword (sp5100_tco_pci, +SP5100_SB_RESOURCE_MMIO_BASE , &val); + }else {/* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */ outb (SB800_PM_ACPI_MMIO_EN +3 ,SB800_IO_PM_INDEX_REG ); val =inb (SB800_IO_PM_DATA_REG );@@ -393,10 +401,6 @@ static unsigned char sp5100_tco_setupdevice(void) val = val <<8 |inb (SB800_IO_PM_DATA_REG );outb (SB800_PM_ACPI_MMIO_EN +0 ,SB800_IO_PM_INDEX_REG ); val = val <<8 |inb (SB800_IO_PM_DATA_REG ); - }else { -/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ -pci_read_config_dword (sp5100_tco_pci, -SP5100_SB_RESOURCE_MMIO_BASE , &val); }/* The SBResource_MMIO is enabled and mapped memory space? */ Signature · 1 line
1.9.1
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.