From patchwork Fri Aug 19 23:14:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Hoemann X-Patchwork-Id: 598738 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E273CC28D13 for ; Fri, 19 Aug 2022 23:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243832AbiHSXO6 (ORCPT ); Fri, 19 Aug 2022 19:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243825AbiHSXO6 (ORCPT ); Fri, 19 Aug 2022 19:14:58 -0400 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFEAEDAB96; Fri, 19 Aug 2022 16:14:56 -0700 (PDT) Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27JLOHRQ021597; Fri, 19 Aug 2022 23:14:43 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=nCwDyrezujJ59TpPL9d8GNAEdr/akhU/9hhx7cy4SIU=; b=HLgsRdkjgIxtDy5osrj+RmELjHU+JZ2dJesw8Luo3LiOF5xjrEG7R6Kw506n4/lUh5zp haY73TkRoUwUCvWGeIoIAjnfUxRsaX4II/6giKwBwyIAmgkMMdXwmZr4pw/Dh3vED54S D/sNeoyGZpUVPr7GFKz/hHuMeS39PzbLJ1PBsCU7jDGxFPSsdg98As/rNdIpmIQEeQ6E xQXHkU58eGgd8OKB3oh0DBDbK1cG41tkiBw68yW+d0wC9t20SNwD5Z3CcuYnyqduL/Bu sFl7p0lfPHxgfTqhfiQ6R5XYw9pMrVZKSnN3R7mY8xAz2emVzJaCKHvm1KJ/O6883YOP yQ== Received: from p1lg14880.it.hpe.com (p1lg14880.it.hpe.com [16.230.97.201]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3j2jd3gmtk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 Aug 2022 23:14:42 +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 p1lg14880.it.hpe.com (Postfix) with ESMTPS id 06319800E80; Fri, 19 Aug 2022 23:14:42 +0000 (UTC) Received: from anatevka.americas.hpqcorp.net (unknown [16.231.227.36]) by p1lg14885.dc01.its.hpecorp.net (Postfix) with ESMTP id 9E0E7807C18; Fri, 19 Aug 2022 23:14:41 +0000 (UTC) From: Jerry Hoemann To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH 1/2] watchdog/hpwdt: Build issue for ARM64 platforms Date: Fri, 19 Aug 2022 17:14:22 -0600 Message-Id: <20220819231423.1236664-2-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819231423.1236664-1-jerry.hoemann@hpe.com> References: <20220819231423.1236664-1-jerry.hoemann@hpe.com> MIME-Version: 1.0 X-Proofpoint-GUID: KzCAKyntMivfCG8jzbfH7h1rSjJWTlSQ X-Proofpoint-ORIG-GUID: KzCAKyntMivfCG8jzbfH7h1rSjJWTlSQ X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-19_12,2022-08-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 mlxlogscore=986 lowpriorityscore=0 impostorscore=0 phishscore=0 adultscore=0 mlxscore=0 clxscore=1015 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208190087 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Fixes commit d48b0e173715 ("x86, nmi, drivers: Fix nmi splitup build bug") Include only if CONFIG_HPWDT_NMI_DECODING is defined. Signed-off-by: Jerry Hoemann --- drivers/watchdog/hpwdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index a5006a58e0db..f79f932bca14 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -20,7 +20,9 @@ #include #include #include +#ifdef CONFIG_HPWDT_NMI_DECODING #include +#endif #include #define HPWDT_VERSION "2.0.4" From patchwork Fri Aug 19 23:14:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Hoemann X-Patchwork-Id: 599704 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F640C32793 for ; Fri, 19 Aug 2022 23:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242454AbiHSXPB (ORCPT ); Fri, 19 Aug 2022 19:15:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243753AbiHSXO5 (ORCPT ); Fri, 19 Aug 2022 19:14:57 -0400 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95B68D6B86; Fri, 19 Aug 2022 16:14:56 -0700 (PDT) Received: from pps.filterd (m0150245.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 27JMQ0nU006341; Fri, 19 Aug 2022 23:14:43 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=bZVPoBLa7kzC7ngjxts8A2kCfZwCa+4hmXlOFHo/trc=; b=QbQCoG6BM+a6mgCk7URGBoG+sW7uMbDoX0lORw2xwYAS8Z3LtY9WS+SVCoSr/hD+F5vq 5QZ0ZypUuB06WxGLolXerAuy0vDbxLY0Z8R4QvuBETw1o9onxO03CS+gTkCWV5udGQs5 wg8iAGT8DeihEDQkvOOwkqJkQKOTmVMvmcJUJuya7jOSCxVwuDWi9NkmlY2KB+a371sd QDzqhwfrFIXNnu/N24rf0ntqd3/TxQS9fO9zTwSyzdWVQM4fgQzQ+7S25lTb3GrFHbEW tEhlz1kauLwcECWLOnqqmDop2mcuNiyc7u+wS46DoUHvDqu7IjwMidKTEx7MOcj9khoX VA== Received: from p1lg14879.it.hpe.com (p1lg14879.it.hpe.com [16.230.97.200]) by mx0b-002e3701.pphosted.com (PPS) with ESMTPS id 3j2kab083u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 19 Aug 2022 23:14:43 +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 7255CD2E7; Fri, 19 Aug 2022 23:14:42 +0000 (UTC) Received: from anatevka.americas.hpqcorp.net (unknown [16.231.227.36]) by p1lg14885.dc01.its.hpecorp.net (Postfix) with ESMTP id 14184808801; Fri, 19 Aug 2022 23:14:42 +0000 (UTC) From: Jerry Hoemann To: linux@roeck-us.net, wim@linux-watchdog.org Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Jerry Hoemann Subject: [PATCH 2/2] watchdog: Enable HP_WATCHDOG for ARM64 systems. Date: Fri, 19 Aug 2022 17:14:23 -0600 Message-Id: <20220819231423.1236664-3-jerry.hoemann@hpe.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220819231423.1236664-1-jerry.hoemann@hpe.com> References: <20220819231423.1236664-1-jerry.hoemann@hpe.com> MIME-Version: 1.0 X-Proofpoint-GUID: vIZ9SO3ByVoGvMRyocoV79kmIW2HObyT X-Proofpoint-ORIG-GUID: vIZ9SO3ByVoGvMRyocoV79kmIW2HObyT X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-19_12,2022-08-18_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=687 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208190087 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Enable HP_WATCHDOG for ARM64 systems. HPWDT_NMI_DECODING requires x86. Signed-off-by: Jerry Hoemann --- drivers/watchdog/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9295492d24f7..cd643e50681e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1315,7 +1315,7 @@ config IT87_WDT config HP_WATCHDOG tristate "HP ProLiant iLO2+ Hardware Watchdog Timer" select WATCHDOG_CORE - depends on X86 && PCI + depends on (ARM64 || X86) && PCI help A software monitoring watchdog and NMI handling driver. This driver will detect lockups and provide a stack trace. This is a driver that @@ -1325,7 +1325,7 @@ config HP_WATCHDOG config HPWDT_NMI_DECODING bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer" - depends on HP_WATCHDOG + depends on X86 && HP_WATCHDOG default y help Enables the NMI handler for the watchdog pretimeout NMI and the iLO