Commit 36e3ff44 authored by dann frazier's avatar dann frazier Committed by Wim Van Sebroeck
Browse files

watchdog: hpwdt (4/12): Despecificate driver from iLO2 



This driver supports both iLO2 and iLO3, but our user-visible strings
currently only reference iLO2. Let's just call it "iLO2+" to avoid having
to update strings for each iLO generation. This driver doesn't support
iLO ASICs prior to iLO2, but that is sufficiently explained in Kconfig.

Signed-off-by: default avatardann frazier <dannf@hp.com>
Acked-by: default avatarThomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 923410d0

drivers/watchdog/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -574,11 +574,11 @@ config IT87_WDT 
	  be called it87_wdt.

	  be called it87_wdt.





config HP_WATCHDOG

config HP_WATCHDOG

	tristate "HP Proliant iLO 2 Hardware Watchdog Timer"

	tristate "HP Proliant iLO2+ Hardware Watchdog Timer"

	depends on X86

	depends on X86

	help

	help

	  A software monitoring watchdog and NMI sourcing driver. This driver

	  A software monitoring watchdog and NMI sourcing driver. This driver

	  will detect lockups and provide stack trace. Also, when an NMI

	  will detect lockups and provide a stack trace. Also, when an NMI

	  occurs this driver will make the necessary BIOS calls to log

	  occurs this driver will make the necessary BIOS calls to log

	  the cause of the NMI. This is a driver that will only load on a

	  the cause of the NMI. This is a driver that will only load on a

	  HP ProLiant system with a minimum of iLO2 support.

	  HP ProLiant system with a minimum of iLO2 support.

drivers/watchdog/hpwdt.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -48,8 +48,8 @@ static unsigned long __iomem *hpwdt_timer_reg; 
static unsigned long __iomem *hpwdt_timer_con;

static unsigned long __iomem *hpwdt_timer_con;





static struct pci_device_id hpwdt_devices[] = {

static struct pci_device_id hpwdt_devices[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },

	{ PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },	/* iLO2 */

	{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },

	{ PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },	/* iLO3 */

	{0},			/* terminate list */

	{0},			/* terminate list */

};

};

MODULE_DEVICE_TABLE(pci, hpwdt_devices);

MODULE_DEVICE_TABLE(pci, hpwdt_devices);
@@ -548,7 +548,7 @@ static const struct watchdog_info ident = { 
	.options = WDIOF_SETTIMEOUT |

	.options = WDIOF_SETTIMEOUT |

		   WDIOF_KEEPALIVEPING |

		   WDIOF_KEEPALIVEPING |

		   WDIOF_MAGICCLOSE,

		   WDIOF_MAGICCLOSE,

	.identity = "HP iLO2 HW Watchdog Timer",

	.identity = "HP iLO2+ HW Watchdog Timer",

};

};





static long hpwdt_ioctl(struct file *file, unsigned int cmd,

static long hpwdt_ioctl(struct file *file, unsigned int cmd,
@@ -654,13 +654,13 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, 
	hpwdt_check_nmi_sourcing(dev);

	hpwdt_check_nmi_sourcing(dev);





	/*

	/*

	 * First let's find out if we are on an iLO2 server. We will

	 * First let's find out if we are on an iLO2+ server. We will

	 * not run on a legacy ASM box.

	 * not run on a legacy ASM box.

	 * So we only support the G5 ProLiant servers and higher.

	 * So we only support the G5 ProLiant servers and higher.

	 */

	 */

	if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {

	if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {

		dev_warn(&dev->dev,

		dev_warn(&dev->dev,

			"This server does not have an iLO2 ASIC.\n");

			"This server does not have an iLO2+ ASIC.\n");

		return -ENODEV;

		return -ENODEV;

	}

	}
@@ -674,7 +674,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, 
	pci_mem_addr = pci_iomap(dev, 1, 0x80);

	pci_mem_addr = pci_iomap(dev, 1, 0x80);

	if (!pci_mem_addr) {

	if (!pci_mem_addr) {

		dev_warn(&dev->dev,

		dev_warn(&dev->dev,

			"Unable to detect the iLO2 server memory.\n");

			"Unable to detect the iLO2+ server memory.\n");

		retval = -ENOMEM;

		retval = -ENOMEM;

		goto error_pci_iomap;

		goto error_pci_iomap;

	}

	}