From patchwork Wed Dec 13 21:53:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Hoemann X-Patchwork-Id: 178314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8116114dys; Wed, 13 Dec 2023 13:54:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IH2bq1vVn69RooEfPsXFgP941cw67xPCeV5F8BsoWnq61D34EcIhVrTx6xo6bUmayH87xC5 X-Received: by 2002:a17:90a:aa8b:b0:288:76d7:4227 with SMTP id l11-20020a17090aaa8b00b0028876d74227mr3860684pjq.52.1702504472722; Wed, 13 Dec 2023 13:54:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702504472; cv=none; d=google.com; s=arc-20160816; b=O3vJhad4vAJh9aNpHqPMudZXj73QcbAYG1JIGQrBUxkTo/1bguj3zg01v0BHjwNS/U lAPnyGxF4LmhtYJpt4myPUbHllXk3t3frwzY9d1U+kwJaG0duy4HztC84xs6a4fy7uU9 6LtxNBAxoyw/htUWdg+IT7cypiCRfJLQFHrMjsssj7dYFzW7+PW6+wT8WLs+O6wRf+NO R8h7hh7rPesORsnM8jn716n4WG/qkpTeMSvPHU8GhBzxYUCFGdwmJNd0cawR6DgLyre/ MIM+U2+ywzSSZerkQK93Z0jXOLjrTq9buuxMr7DVhBGR0CrsFQ8z92WI9bAuPHIhb9mJ Em0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/mc35BB7pN+bTQ14JgWZrfQ8eiHQQLtvFVxq/fsszlc=; fh=s2FcH2/2z57QXtxx6SONt3s06nuBgGZZL6sBSMKeqbU=; b=rcJW3erRyUV4oJlFUYXtilYUrl6nH1/GwhXWtZy8ZSMP+DbtDVAjLdevm6HIZm9k2V 3/ud/1sWpTho/33M28u5kfB5twDwQQXvUP+a/mel6E4As2Vi4xJQ8fRYjWIO5a6hXSU9 cW097dEAiIcczla7ERLEximLP1p1A+nfXN8wwqyjr4K8ahEOYHPYF9KJYhA4kz6KpA4g 1INmIFMgd7dQb11NUsInKWvbRqTjkpTUcI9Zo09g6y0zKDzU4PJ19pw2DL3idxiI7wuD LF//a1wZn3G+T5G5HSAij5LN+zFLS37DbYpyWvX/sZ3FUiSjBrV13JT4UxVvqwbz9JzO jpXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=OouDOYdH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id d9-20020a17090a114900b0028ac6190f03si3014345pje.8.2023.12.13.13.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:54:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=OouDOYdH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 29DA1826F7FE; Wed, 13 Dec 2023 13:54:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442658AbjLMVyK (ORCPT + 99 others); Wed, 13 Dec 2023 16:54:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233861AbjLMVyC (ORCPT ); Wed, 13 Dec 2023 16:54:02 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C337E3; Wed, 13 Dec 2023 13:54:08 -0800 (PST) Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDL31A1016672; Wed, 13 Dec 2023 21:53:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=/mc35BB7pN+bTQ14JgWZrfQ8eiHQQLtvFVxq/fsszlc=; b=OouDOYdHgXHG5XVl+pyVtruSEruAJaAe9d1QiBESMEYxdBkAnqKNV1mfCV7HOm9e1URD E9lI8KbQprBhvhfz/9nn+oZ/X1igO2s46E5CGAf8Gm/OUZPQ7jS92uiO4XMgYTCIGhQR +QBPdv8x4GBPrisYqTKqbFYZOtqtcHbhgQUFO12Yrl9b5yDeh9nEOczJzE6SFwheeT4w vYFWibI8lfF8d/NMFBrS00R23ZUe7+ZdURC58YddzgwAOKpZBkz7VGNbggLL5gjZr8C/ Tw7zdzJSURrFy1cyZZf8Dihq6K7z1kOnkcQ9x5dgk9vke1dIzgkTUaZe7jy4z5KWUbze Gw== Received: from p1lg14878.it.hpe.com ([16.230.97.204]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3uydkrc49m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 21:53:52 +0000 Received: from p1lg14885.dc01.its.hpecorp.net (unknown [10.119.18.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14878.it.hpe.com (Postfix) with ESMTPS id 02BD213152; Wed, 13 Dec 2023 21:53:52 +0000 (UTC) Received: from anatevka.americas.hpqcorp.net (unknown [16.231.227.39]) by p1lg14885.dc01.its.hpecorp.net (Postfix) with ESMTP id 91C64800472; Wed, 13 Dec 2023 21:53:51 +0000 (UTC) From: Jerry Hoemann To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH v2 1/3] watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO Date: Wed, 13 Dec 2023 14:53:38 -0700 Message-ID: <20231213215340.495734-2-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231213215340.495734-1-jerry.hoemann@hpe.com> References: <20231213215340.495734-1-jerry.hoemann@hpe.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: lQKZrEfkl6YnOP9D1O6kyoL07T5tlA7I X-Proofpoint-GUID: lQKZrEfkl6YnOP9D1O6kyoL07T5tlA7I X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_14,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 malwarescore=0 suspectscore=0 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130154 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Dec 2023 13:54:30 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785205330111917271 X-GMAIL-MSGID: 1785205330111917271 Avoid unnecessary crashes by claiming only NMIs that are due to ERROR signalling or generated by the hpwdt hardware device. The code does this, but only for iLO5. The intent was to preserve legacy, Gen9 and earlier, semantics of using hpwdt for error containtment as hardware/firmware would signal fatal IO errors as an NMI with the expectation of hpwdt crashing the system. Howerver, these IO errors should be received by hpwdt as an NMI_IO_CHECK. So the test is overly permissive and should not be limited to only ilo5. We need to enable this protection for future iLOs not matching the current PCI IDs. Fixes: 62290a5c194b ("watchdog: hpwdt: Claim NMIs generated by iLO5") Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck --- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index f79f932bca14..79ed1626d8ea 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -178,7 +178,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) "3. OA Forward Progress Log\n" "4. iLO Event Log"; - if (ilo5 && ulReason == NMI_UNKNOWN && !mynmi) + if (ulReason == NMI_UNKNOWN && !mynmi) return NMI_DONE; if (ilo5 && !pretimeout && !mynmi) From patchwork Wed Dec 13 21:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Hoemann X-Patchwork-Id: 178313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8116061dys; Wed, 13 Dec 2023 13:54:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7tZ8gqrSAF4jqXUyK/kLVXcW88nEk0ui/37IGKGqrKBlzI2/eyDPy+a8+4LGfFYKjor8n X-Received: by 2002:a05:6e02:b22:b0:35d:5995:1d66 with SMTP id e2-20020a056e020b2200b0035d59951d66mr14249030ilu.43.1702504466387; Wed, 13 Dec 2023 13:54:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702504466; cv=none; d=google.com; s=arc-20160816; b=kOIS+9/U6N1nBysU0Rv0X+Sn1yiODshsngYfwzotIkpQN8eIG9pb4av8zsXPRm9yVN KiG4tlM57e/dKkjmUcB99Do+toIx34mKcZskP2iyWKqZ57M/QCDYXo0ajINXul5ocJcy fH1t4EKfImRiX/q7mEKJMm2v1Wkz+KVRxc2EGN5YdHHnnpVLs8MEFpZyxox/UTm79vpC ZWURZhzr2n+xUxvwGILFD63KNfQdYaNUxoFivIhAgZrexdyNqRJ0aWifaRrqgCtoZUr+ JIUj8TAJblVDEBpneI5cwFm2R8tjNemSeDZR/TjMBLQ5hnWHAQBmoy+HLRCEXmYfJ5CS 3SwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=93anGPWaV+nF7AivhePM52WtbZOAbrqQj80AlF5LYy4=; fh=s2FcH2/2z57QXtxx6SONt3s06nuBgGZZL6sBSMKeqbU=; b=IMtIBSa0bYbmyxYylznRCAUS0mkpn2YIcuowFeYzfskugSoPhRzNt/c0rGb662IHnN e6cMBkBXilf8lnSizRMQqsXYqSFDNHvGG/IByge29TILua5/b5FkV9pBpYXPtXwirvoq ulPUv4oAz7moEVvQIJsSlNLyTksjxFYYDH7JUrTBgVNky6SCCiHNsQgWGEcAXHflnHzP 8KRR6Py8ihVQxs4phY3g1jc6178CPax3o9fVjjRsj0BQtflLY/f6WrstHlgK+S9tOZRx J5NK2VQFYLiygbdyFGt32NjHq1cZ3m5wKyZnaXzy79IvCR2UKOm4SswEqCo67orNHRjA /glw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=NEH+lHY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id k1-20020a6568c1000000b005b96c4292basi10004723pgt.29.2023.12.13.13.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:54:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=NEH+lHY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8EB4D8069F3B; Wed, 13 Dec 2023 13:54:24 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442568AbjLMVyG (ORCPT + 99 others); Wed, 13 Dec 2023 16:54:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjLMVyB (ORCPT ); Wed, 13 Dec 2023 16:54:01 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BCDBDB; Wed, 13 Dec 2023 13:54:08 -0800 (PST) Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDKph5E023132; Wed, 13 Dec 2023 21:53:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=93anGPWaV+nF7AivhePM52WtbZOAbrqQj80AlF5LYy4=; b=NEH+lHY7Ebr1W8yzUR3nmjXPe1HKjyU2appqJX8OCjKJBvln/ciLv+qd+jWIZzqsA/Iz /UtFGNLVWz/1jz5k1fNDUpm4fKuVkZuSM+he4rB1rXC1gvMr7YAaC11Yb+vWRdPxvCSq EtaSGE1sFESFShnKR/ir9tpLh1190vNRbyk+pt6LupsnM6A9huQNtAg7qZOm8Pk70PXa gp8rbMk4EUWMEo54TnovsnLLH9aNMQ2H4yb0ptkEWszvAoLRa7olzxxlF0lq/9rjkY4V FhGdMnkw2xC9sOC0rLiJD5NPk629qhdcIUOCSg1tCA0mhe+w7hP/yDJABayZIFJJeQjn Bw== Received: from p1lg14879.it.hpe.com ([16.230.97.200]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3uydkrc49p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 21:53:53 +0000 Received: from p1lg14885.dc01.its.hpecorp.net (unknown [10.119.18.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14879.it.hpe.com (Postfix) with ESMTPS id 77C2F132D2; Wed, 13 Dec 2023 21:53:52 +0000 (UTC) Received: from anatevka.americas.hpqcorp.net (unknown [16.231.227.39]) by p1lg14885.dc01.its.hpecorp.net (Postfix) with ESMTP id 0C51C8000B4; Wed, 13 Dec 2023 21:53:52 +0000 (UTC) From: Jerry Hoemann To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH v2 2/3] watchdog/hpwdt: Remove redundant test. Date: Wed, 13 Dec 2023 14:53:39 -0700 Message-ID: <20231213215340.495734-3-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231213215340.495734-1-jerry.hoemann@hpe.com> References: <20231213215340.495734-1-jerry.hoemann@hpe.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: GGyzWKnUGx6usK_7Br-VJ6XSeOKVPAte X-Proofpoint-GUID: GGyzWKnUGx6usK_7Br-VJ6XSeOKVPAte X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_14,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=796 priorityscore=1501 malwarescore=0 suspectscore=0 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130154 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Dec 2023 13:54:24 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785205322966739767 X-GMAIL-MSGID: 1785205322966739767 ProLiants of vintage to have an iLO 5, no longer send watchdog NMI as an IO CHECK. They are presented to hpwdt_pretimeout as NMI_UNKNOWN. The preceding if statement rejects if !mynmi irrespective of value of pretimeout making this if statement redundant. Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck --- drivers/watchdog/hpwdt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 79ed1626d8ea..d5c0aa3ef069 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -181,9 +181,6 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) if (ulReason == NMI_UNKNOWN && !mynmi) return NMI_DONE; - if (ilo5 && !pretimeout && !mynmi) - return NMI_DONE; - if (kdumptimeout < 0) hpwdt_stop(); else if (kdumptimeout == 0) From patchwork Wed Dec 13 21:53:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Hoemann X-Patchwork-Id: 178315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8116121dys; Wed, 13 Dec 2023 13:54:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOhmd00j/PtdEaiPkDIoUNqG9newTjJbErMJlGatu/w0cWw0jeN6AojPjJjSEsM0judXYI X-Received: by 2002:a05:6358:419d:b0:170:4168:8b91 with SMTP id w29-20020a056358419d00b0017041688b91mr11218079rwc.24.1702504474275; Wed, 13 Dec 2023 13:54:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702504474; cv=none; d=google.com; s=arc-20160816; b=P3GOecCBVdTUr3P9Vl57WbY53KJWY0Y4TCS9IJNChrAudnGPFvj7XD8yttxLg6J0Kn uRaYuzLTdU76aFYChgYpy7TQIfLm0hPjr/1zRt0yPG+6U18yJiU9IL8nD+ApRnZGyFyz dOkq/uFaxXmoVYkI8Y0Gd+EhFbrzUhnHwsTQ3VhW0LIu+kQqeNEFIMGSkpIJqMen7lyN qLYukTVpirl6TCAenD3VVLbGioNeeXlpW8BxYHJ0h/rUngbUtI4xsM4mrXVsqSA8+UbQ 8wtytVw6kLMHH2d8bJvWT/8ADOpCDIwJyluZ/AX1HAcRH62825LT4dUPGFI3KgdtY/+4 ZDZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F3XM/iTwy0EIQD79Zi6C9dxzthptKdfMe5DQ9M3l66U=; fh=s2FcH2/2z57QXtxx6SONt3s06nuBgGZZL6sBSMKeqbU=; b=dJAVrwT5T0FpocIf2iBdC032c/gOkJW1C8t407dReMVcu78peuA6tQTH0nuTpJwXgl AgR4rBnsYKrMgSgIDcAYD6BhHzNc19b5cNgA8Un/u4VqqI+q/dCXeyYLyafVTKGSkVia W6CI4yMMbBTJ6bggm8xbJ0gGM8BOQB7IyEcr1mz9uO2IILYKsuR/9OdLcpOU9MIDUaa9 aJyyn6bX6QiJspFGNxQpyCKuDx+4noOIVzJrR3tB0j74JK5odgIo68XU/akkPD5q3m58 CoA3RC7nFUSpmTksmR4Fwg46c60VBrQHzCi8qH5xjwyfpNmGVo2SyHtGVjff87ZYszHf Uv+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=epAiYqZf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id j3-20020a056a00130300b006ce08655e27si10136981pfu.332.2023.12.13.13.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:54:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=epAiYqZf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hpe.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 45EE7802F7CA; Wed, 13 Dec 2023 13:54:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442666AbjLMVyN (ORCPT + 99 others); Wed, 13 Dec 2023 16:54:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233862AbjLMVyC (ORCPT ); Wed, 13 Dec 2023 16:54:02 -0500 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AAD4E0; Wed, 13 Dec 2023 13:54:08 -0800 (PST) Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BDL2GXH020125; Wed, 13 Dec 2023 21:53:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pps0720; bh=F3XM/iTwy0EIQD79Zi6C9dxzthptKdfMe5DQ9M3l66U=; b=epAiYqZfvq/mAyPq7GdEl4rp6c7sBAVQ1kLbcWeajoVz7nK+YduvQAdr4277bB+lfbv4 9o6Kn8TKf1lyjl/uuiWvAcUoLcG9YjySYbAF/hiavECbEjwZrL7rOA6mPLSJbezj5bby TyNiv1L2Va+S46ABJ6qTGb+ivZ9gGxhuUoKNWfV8N8miJvzzB/jXwiX5a8WOm3ufCNhw aoDFTROPsYnG8pn6RZvMVf7nvqNeGun1P1djcYFtAbpO9aN/jQdSiA2YSXlaqCyNsbxQ nuuOllDPRbrduRufOpgEWEq5GMSi2gQG0B7OrX4+veUvyJWj2Lt8cZvGnjuFg3SUQeRH 0Q== Received: from p1lg14878.it.hpe.com ([16.230.97.204]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3uy89nffwd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Dec 2023 21:53:53 +0000 Received: from p1lg14885.dc01.its.hpecorp.net (unknown [10.119.18.236]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by p1lg14878.it.hpe.com (Postfix) with ESMTPS id E7542131A9; Wed, 13 Dec 2023 21:53:52 +0000 (UTC) Received: from anatevka.americas.hpqcorp.net (unknown [16.231.227.39]) by p1lg14885.dc01.its.hpecorp.net (Postfix) with ESMTP id 81A40800472; Wed, 13 Dec 2023 21:53:52 +0000 (UTC) From: Jerry Hoemann To: linux@roeck-us.net Cc: wim@linux-watchdog.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH v2 3/3] watchdog/hpwdt: Remove unused variable Date: Wed, 13 Dec 2023 14:53:40 -0700 Message-ID: <20231213215340.495734-4-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231213215340.495734-1-jerry.hoemann@hpe.com> References: <20231213215340.495734-1-jerry.hoemann@hpe.com> MIME-Version: 1.0 X-Proofpoint-GUID: LIEevNw-2-8NirO5KXYar8IAuEU3V1In X-Proofpoint-ORIG-GUID: LIEevNw-2-8NirO5KXYar8IAuEU3V1In X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-13_14,2023-12-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 mlxscore=0 impostorscore=0 mlxlogscore=977 clxscore=1015 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312130154 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Dec 2023 13:54:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785205331519417932 X-GMAIL-MSGID: 1785205331519417932 Remove the unused variable ilo5. Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck --- drivers/watchdog/hpwdt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index d5c0aa3ef069..138dc8d8ca3d 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -33,7 +33,6 @@ #define DEFAULT_MARGIN 30 #define PRETIMEOUT_SEC 9 -static bool ilo5; static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */ static bool nowayout = WATCHDOG_NOWAYOUT; static bool pretimeout = IS_ENABLED(CONFIG_HPWDT_NMI_DECODING); @@ -360,9 +359,6 @@ static int hpwdt_init_one(struct pci_dev *dev, pretimeout ? "on" : "off"); dev_info(&dev->dev, "kdumptimeout: %d.\n", kdumptimeout); - if (dev->subsystem_vendor == PCI_VENDOR_ID_HP_3PAR) - ilo5 = true; - return 0; error_wd_register: