From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933623AbcI0CUM (ORCPT ); Mon, 26 Sep 2016 22:20:12 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:46035 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932914AbcI0CUE (ORCPT ); Mon, 26 Sep 2016 22:20:04 -0400 Subject: Re: [PATCH] watchdog: hpwdt: add support for iLO5 To: Brian Boylston , linux-watchdog@vger.kernel.org References: <20160926185714.10866-1-brian.boylston@hpe.com> Cc: linux-kernel@vger.kernel.org, wim@iguana.be, nigel.croxon@hpe.com From: Guenter Roeck Message-ID: Date: Mon, 26 Sep 2016 19:20:00 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160926185714.10866-1-brian.boylston@hpe.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/26/2016 11:57 AM, Brian Boylston wrote: > iLO5 will offer the same watchdog timer as previous generations, but the > PCI subsystem vendor ID will be PCI_VENDOR_ID_HP_3PAR (0x1590) instead of > PCI_VENDOR_ID_HP (0x103c). Add 0x1590 to the whitelist and be more > specific when ignoring the 103c,1979 device. > > Signed-off-by: Brian Boylston Reviewed-by: Guenter Roeck > --- > drivers/watchdog/hpwdt.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c > index 8f89bd8..70c7194 100644 > --- a/drivers/watchdog/hpwdt.c > +++ b/drivers/watchdog/hpwdt.c > @@ -39,7 +39,7 @@ > #include > #include > > -#define HPWDT_VERSION "1.3.3" > +#define HPWDT_VERSION "1.4.0" > #define SECS_TO_TICKS(secs) ((secs) * 1000 / 128) > #define TICKS_TO_SECS(ticks) ((ticks) * 128 / 1000) > #define HPWDT_MAX_TIMER TICKS_TO_SECS(65535) > @@ -814,7 +814,8 @@ static int hpwdt_init_one(struct pci_dev *dev, > * not run on a legacy ASM box. > * 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->subsystem_vendor != PCI_VENDOR_ID_HP_3PAR) { > dev_warn(&dev->dev, > "This server does not have an iLO2+ ASIC.\n"); > return -ENODEV; > @@ -823,7 +824,8 @@ static int hpwdt_init_one(struct pci_dev *dev, > /* > * Ignore all auxilary iLO devices with the following PCI ID > */ > - if (dev->subsystem_device == 0x1979) > + if (dev->subsystem_vendor == PCI_VENDOR_ID_HP && > + dev->subsystem_device == 0x1979) > return -ENODEV; > > if (pci_enable_device(dev)) { >