From patchwork Wed Apr 5 19:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1765714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kyeZb6+n; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsFSz6rgpz1yZT for ; Thu, 6 Apr 2023 05:44:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pk93V-0005xI-Au; Wed, 05 Apr 2023 19:44:29 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pk93R-0005wV-P0 for kernel-team@lists.ubuntu.com; Wed, 05 Apr 2023 19:44:25 +0000 Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 1205A3F162 for ; Wed, 5 Apr 2023 19:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1680723865; bh=8XI0g4n90jIONy9YlhswZn5i6YIMQFaz4BlF8MEZEmY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kyeZb6+n2b6nz4rj2woFuZYM6LM5ECOYq4rN1nabZuAiLd/Bhcz/Wr3MS+c92nD1W COnvKOri72NRdjg8JsX6DLVWNFhRAF9H3+m4qTmLTX3Ml4JETZPIFbk9wHqB2edMeU fh4AyFZGCzYq6/8sEFKbgYuK9D94sP+lMOXOhBIzqh0j7ZD0rLD/RCjrRh8gbc4Bx0 0ThNogIfH9pCux9CIvKxOL3ksUxY/m/xJFjQnW6NtfI/NA4FYmgZ2Epv9mkXMMfDrN ZlSZFex8PDFem9FpzR/TVMbEbdm91MmPFotMMGrzxWJP88mNIoNhyyTZiHg2BJaafs /c0yUCG0S5a6g== Received: by mail-ot1-f71.google.com with SMTP id e7-20020a05683013c700b0069f924eb636so13300535otq.8 for ; Wed, 05 Apr 2023 12:44:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680723863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8XI0g4n90jIONy9YlhswZn5i6YIMQFaz4BlF8MEZEmY=; b=u1JH2ihhXTJvo/bDch7pltz3ZfhlyKu49L8M4YTQWa2t9d2qDj4qSdQc9cf9huYC3Y 9fTDNoX0mc6jRNrfh6guNqW1igPM80VJOvMQgWqiUccVgMzX2uKPo6162SIt/Qo5oWdE jvli/0mBqyBAkGoikNqUcxLzmeV+WOkutZ96Qj6fFrsY/5YsnWp5RpY640SJ3WcTnvxa 0Yf5qbpzgWXsc32ctW/D2eSjMQngr4flveAWTX14tvVbx4FboCrJR6NSWw81Zoz1Q7DT amzEUJAvxOqcDKXcUetf8vOjvn5kJOVHvSQw42sTdkJsfnEixpOjr9Zuk1NKUR2msmiE oL6g== X-Gm-Message-State: AAQBX9esP9e+HbzfHxf/7ta14B/42V64NQW4x8zjh2qysCCVdACrtIBg aR+JwF6GG84ZMJTIAfYuvNkaR2gZjiBQIbmq4oXB7Nvct0/rYdiv7Ql5Yei0E85phCiXd+E1Y+7 fY+ppN7oQtijh7X1kzyOYjp0j2yo5Z3Pt5fwiAZRB4GM3YVVpGw== X-Received: by 2002:a05:6870:438b:b0:177:ab68:aa9a with SMTP id r11-20020a056870438b00b00177ab68aa9amr4197085oah.1.1680723863138; Wed, 05 Apr 2023 12:44:23 -0700 (PDT) X-Google-Smtp-Source: AKy350ZkeUGDwTIiFWpURah4MlHZDXPvFvqERN4K+KENKPNUR2rXmekjwsUWQqmyyGmdsrS1PQOUuQ== X-Received: by 2002:a05:6870:438b:b0:177:ab68:aa9a with SMTP id r11-20020a056870438b00b00177ab68aa9amr4197077oah.1.1680723862753; Wed, 05 Apr 2023 12:44:22 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:5484:869b:2630:869]) by smtp.gmail.com with ESMTPSA id yg21-20020a05687c009500b0016a37572d17sm6471215oab.2.2023.04.05.12.44.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 12:44:22 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V2 1/2] watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. Date: Wed, 5 Apr 2023 14:44:18 -0500 Message-Id: <20230405194419.13535-2-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230405194419.13535-1-michael.reed@canonical.com> References: <20230405194419.13535-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jerry Hoemann Enable HP_WATCHDOG for ARM64 systems. HPWDT_NMI_DECODING requires X86 as NMI handlers are X86 specific. BugLink: https://bugs.launchpad.net/bugs/2008751 Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20220820202821.1263837-3-jerry.hoemann@hpe.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Add arm64 option to CONFIG_HP_WATCHDOG CONFIG_HP_WATCHDOG is used in module hpwdt. A software monitoring watchdog and NMI handling driver. This driver will detect lockups and provide a stack trace. This is a driver that will only load on an HP ProLiant system with a minimum of iLO2 support. This option allow it to build on arm64. (backported from commit 891862d5ba11da739ac796221ff64e4ccf5a275f) Signed-off-by: Michael Reed [Michael Reed - Added arm64 option to the config file for CONFIG_HP_WATCHDOG] --- debian.master/config/annotations | 2 +- drivers/watchdog/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index e24b4d05ff1f..33c935c94c78 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -10465,7 +10465,7 @@ CONFIG_ITCO_WDT policy<{'amd64': 'm'}> CONFIG_ITCO_VENDOR_SUPPORT policy<{'amd64': 'y'}> CONFIG_IT8712F_WDT policy<{'amd64': 'm'}> CONFIG_IT87_WDT policy<{'amd64': 'm'}> -CONFIG_HP_WATCHDOG policy<{'amd64': 'm'}> +CONFIG_HP_WATCHDOG policy<{'amd64': 'm', 'arm64': 'm'}> CONFIG_HPWDT_NMI_DECODING policy<{'amd64': 'y'}> CONFIG_KEMPLD_WDT policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> CONFIG_SC1200_WDT policy<{'amd64': 'm'}> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 5db5c5221663..1525f9aefb8b 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1274,7 +1274,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 @@ -1284,7 +1284,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 From patchwork Wed Apr 5 19:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1765716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=fNLofr4A; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PsFSz74j2z1yZh for ; Thu, 6 Apr 2023 05:44:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pk93V-0005xU-He; Wed, 05 Apr 2023 19:44:29 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pk93T-0005wq-Ka for kernel-team@lists.ubuntu.com; Wed, 05 Apr 2023 19:44:27 +0000 Received: from mail-oa1-f69.google.com (mail-oa1-f69.google.com [209.85.160.69]) (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 smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id CAE0D3F128 for ; Wed, 5 Apr 2023 19:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1680723866; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fNLofr4A06t1D+R0PDh3SoK/bErvYkV42SwQ8DUldY7y2uMhPcR0iHlrBSgk1KsQA wmCH2bv76qArjbwWrjOwf8AXRC7ugFsPSCwkoMjvcBiTpLPcWA82m03n0WWP/GyHWL FQEu74E7HXRb3yHRlYJWhkhmUOJ1mP8GJujQvEnFcohav8zQxU3ZwiRHLUc4wMObD9 vcWzjRBesIEHZCUmBqoTGB3SaZF4bexty1NBmj7NFQkgjdMRzCD0SXZcYW2ITVxs/i crQ8QPVDRN7aB4nFVRmYTUmCJDVFEL+m6ikUg4DjH/LhDXedlx5IitcEDK345nHaag AM0FEBXlkBagQ== Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-17afa2c993cso19407776fac.2 for ; Wed, 05 Apr 2023 12:44:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680723865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; b=jeUcXRI4hCYVLm1VRFbU4jiq6A1vJHAxLEOIp3LxXQANp5HxC5snjcKXSK0F1xITN0 x70yHIjPVW7+8GK8R1vNb2UXBz0wEWOdyzns4INSupDo2Q9u1zvT2bES75sGjszZVQv0 hfGcqAb/39e5hfQ7PW0dSJWv/V8pbUwn1kudBFvh2vtJtoEwDU0afsKI04GcFTEgiQ1I MDfCwHE8ib3hvCE6rJHcKuDWQCJi51erURN8tI/sbgOoYoHes/IK593KmVwHb0xX7t92 A4pIbVYeXLoLICOV7nmOZY4zoVUXNjPyd4smR+yiT8ltOha4fOx3FeunISEEdr4ktBKU p2tw== X-Gm-Message-State: AAQBX9caTNMlXSbHrb8LOPmWK3uEEW3fZXV30iGW3zbZ9PO/MCZi7wV6 b2/eZgdW0U7NefZMXPoJYy9NaEbihtMWkgFLIuzzA9BbchvvPprlMtTZH5uTawkQwxvI3gCaMq5 V6Lc+VNLX9rzjLKlVp/S1nEkfAavobT7Ma5esYztJz0495TGqVw== X-Received: by 2002:aca:3386:0:b0:389:6e38:96be with SMTP id z128-20020aca3386000000b003896e3896bemr3569818oiz.36.1680723864153; Wed, 05 Apr 2023 12:44:24 -0700 (PDT) X-Google-Smtp-Source: AKy350aHVxJBubZC8HPf2YPq49jshE0/dkz6cNeYgftR8MDTLJ4WbGXKJaRqz7yuBs0KN3mFVa3K8w== X-Received: by 2002:aca:3386:0:b0:389:6e38:96be with SMTP id z128-20020aca3386000000b003896e3896bemr3569810oiz.36.1680723863513; Wed, 05 Apr 2023 12:44:23 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:5484:869b:2630:869]) by smtp.gmail.com with ESMTPSA id i2-20020a4aab02000000b005251e3f92ecsm6957779oon.47.2023.04.05.12.44.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 12:44:23 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V2 2/2] watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING Date: Wed, 5 Apr 2023 14:44:19 -0500 Message-Id: <20230405194419.13535-3-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230405194419.13535-1-michael.reed@canonical.com> References: <20230405194419.13535-1-michael.reed@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jerry Hoemann Fixes: d48b0e173715 ("x86, nmi, drivers: Fix nmi splitup build bug") Arm64 does not support NMI and has no . Include only if CONFIG_HPWDT_NMI_DECODING is defined to avoid build failure on non-existent header file on Arm64. BugLink: https://bugs.launchpad.net/bugs/2008751 Signed-off-by: Jerry Hoemann Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/20220820202821.1263837-2-jerry.hoemann@hpe.com Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck (cherry picked from commit ed835d8171fc884c7750cdd54128df16d4571e3a) Signed-off-by: Michael Reed --- 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"