From patchwork Thu Apr 20 19:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1771581 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=v/2SGq2S; 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 4Q2SCs2jfrz23tj for ; Fri, 21 Apr 2023 05:20:07 +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 1ppZoz-0005DD-U7; Thu, 20 Apr 2023 19:19:57 +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 1ppZov-0005CK-W7 for kernel-team@lists.ubuntu.com; Thu, 20 Apr 2023 19:19:53 +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 D1B374131D for ; Thu, 20 Apr 2023 19:19:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1682018393; bh=h1o4pQD8DbWi0TkTxY+U9R4wCRoKi3YzegxRzDudDpw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=v/2SGq2SMSv6np48G8Zy4CnZQx/3tyqQy2g8xa9BzdP5UrN7Khcgba+zcaZW39VbF HIKMY/UZYkWG34E9ONArYsdbkSMi50Oj7rlqG4i7HguG5uMv+qRBj0tHE4UFJjjytS M+If1tCHwbmQEumbOPMuj/aPP4AV0ft8dW7SSfZ5N1/H6NFvttCd6eef12EMchqpTo EzOFabP7NxDHMeuGgm9AseIbStwJ1tqH7QhoiM/32MYiP/A48NgvoEkPqmJVJoRde1 9f9W5f0pv6lLJ1/7YOIuNbh7DeRRe/DG3IXfxaynY9uV2FWj9aPjle5zj7Ir5AUiU9 i9CBCt6OZh7Rw== Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-18799a4ca81so886131fac.3 for ; Thu, 20 Apr 2023 12:19:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682018392; x=1684610392; 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=h1o4pQD8DbWi0TkTxY+U9R4wCRoKi3YzegxRzDudDpw=; b=WBUIcZ8mC57xBuU6Z27pTXKTDK6FmWjImOgP9qJxNwfZYyUXmdDIec2YTxJpD1lFbn uFiE7yy78BLmu98dleF2fvLeu9kKP/iHH+/KG6P4AXWm01OXayYPn6GOFhPbd53LuOyb D1peT8dIOjAqHWS7TmhuHCa513yG3xMuJCmvPyHSJtxJxVqTqn2/Ot8HKDiHB8kxKa6D NYrV792nTDJqHbOu35Qu6zOpGff2WGRi73S91zOFnZfh9klqtEJGmufk+Cq8r92hnGd3 oWJ1XO/q61dE/BO6cG0cn8MfZQ7LrzHooaIJ98XpgxJUP+btMfH1cA4Rotjv4FCamDBe rNBg== X-Gm-Message-State: AAQBX9dNu0mE00+/FnsXejWm7reykvokMndQYtBX++wY1hf86UQKWOSc G6imevHeJhzcmrRdd+4r+s+mFzWCYYQRpmdkOUihU1jzx6DdbL8CzoetIFseOur5HzIdpXJoaJk 6qcQmvt9gUsO72PQ45a85vHYFpBTqLzPuSMUcgBHwXtb9k2TdGQ== X-Received: by 2002:a05:6870:b68d:b0:183:cf64:1527 with SMTP id cy13-20020a056870b68d00b00183cf641527mr1945950oab.19.1682018392574; Thu, 20 Apr 2023 12:19:52 -0700 (PDT) X-Google-Smtp-Source: AKy350YOFOaayXdop57HZJ3tTQASdGz5jdYn4XCpoKTwgVGHE/CsEWR491exFbvTRV3LkiQifUAUlQ== X-Received: by 2002:a05:6870:b68d:b0:183:cf64:1527 with SMTP id cy13-20020a056870b68d00b00183cf641527mr1945939oab.19.1682018392244; Thu, 20 Apr 2023 12:19:52 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:dd30:1444:7da:3b03]) by smtp.gmail.com with ESMTPSA id w1-20020a056830110100b006a3842a32b6sm1044925otq.42.2023.04.20.12.19.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 12:19:51 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V3 1/3] watchdog/hpwdt: Enable HP_WATCHDOG for ARM64 systems. Date: Thu, 20 Apr 2023 14:19:45 -0500 Message-Id: <20230420191947.12021-2-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420191947.12021-1-michael.reed@canonical.com> References: <20230420191947.12021-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 (cherry picked from commit 891862d5ba11da739ac796221ff64e4ccf5a275f) Signed-off-by: Michael Reed --- drivers/watchdog/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Thu Apr 20 19:19:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1771583 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=M3WQg2uX; 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 4Q2SCs2fHYz23th for ; Fri, 21 Apr 2023 05:20:07 +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 1ppZp0-0005DQ-3q; Thu, 20 Apr 2023 19:19:58 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ppZox-0005CY-Ik for kernel-team@lists.ubuntu.com; Thu, 20 Apr 2023 19:19:55 +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-0.canonical.com (Postfix) with ESMTPS id F0A163F19A for ; Thu, 20 Apr 2023 19:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1682018394; bh=yTKTMeXnvriBFMwPk0+Xa6qjV8o19mYvmXaeeU5C9sc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M3WQg2uX7ihlCBJ3Ua2wicyojPOxAqcu/FIKpgbFM/qrafV8f+quuyG5T8ecRmsQZ cp9cIW11OsdIrC0QfAo6T71+1S4pIognIC1O1/zsbLdgKdEuaOh0nKma/IEVlz+KcA iNt7z68otWz02R7n3tyRTHx52K1UgYtKvBwGCJ1CG9VLI24Vplqf+Wxoe42k3YOPfx bnNj8KjNF0HAATXUIpWittaF3eB258cwH656drphHRZ4mi51UKytvUE2Tf25AQGiF6 eIgTqLTbADZoeqC1woJfMAfAfQ/ESLNvavKrcEPNenI0l5G4NbZVetbheli0woBThj qJXtPIVuEiaxQ== Received: by mail-ot1-f71.google.com with SMTP id 46e09a7af769-6a5ef2c2a19so371316a34.2 for ; Thu, 20 Apr 2023 12:19:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682018393; x=1684610393; 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=yTKTMeXnvriBFMwPk0+Xa6qjV8o19mYvmXaeeU5C9sc=; b=WTQwhNF8vukNig5JCk9XbPAFJPix4AjwWTYfZ+n+fSJbaR7/7liCM4pY2+349oQf4R 0H1e6+SFzkQw3/VWkFYS+6fYr1VadVUIBWpA+Cjsw+OMXLytwUzi68JOjV8LXauMbe+t iMQPp0jdOmaFLLeIDOe98+AEs/1VyLcz8sHi4DcKUROoZPD7nPSFB0FrW2bnUph2pvWG GbJDtnE9wVugO7XcKIpoYwJxHUbYMWokNuOPtmnIECosmeotb7ZICv+jJAN+ZMHU/ys7 R+RrdQZEJICcmFWJz4lX8H/Th3OhFRUOW05j8vqx7o38KTV97NvPfW0bjPYE55NOjMQJ b8sQ== X-Gm-Message-State: AAQBX9dyq9VbKs1Q1/7xSkpnnzi0fO2nk5CIAlZNzrJGMf/mQo0kn49A RTzb6Y6irWYTvT4I25ijt4m5xyak/0Za1PjvYKLxC08Ieja/ksqnmRF/T2NqykDwtuXLhMaxo8U zjLb/ygqNLwumLmkL9rKdx4RArfDix2wwVKI801rUDIUyv8c5yQ== X-Received: by 2002:a05:6830:1d76:b0:6a6:5b7:9a75 with SMTP id l22-20020a0568301d7600b006a605b79a75mr1439939oti.2.1682018393663; Thu, 20 Apr 2023 12:19:53 -0700 (PDT) X-Google-Smtp-Source: AKy350Y/6sVOKmxVdLLf78xvDFyMjvXQwCUJJh6Bv3hzN0RTN6zSJg+U8gS0tNjs3NAIGLaFXFBAeA== X-Received: by 2002:a05:6830:1d76:b0:6a6:5b7:9a75 with SMTP id l22-20020a0568301d7600b006a605b79a75mr1439931oti.2.1682018393336; Thu, 20 Apr 2023 12:19:53 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:dd30:1444:7da:3b03]) by smtp.gmail.com with ESMTPSA id a26-20020a9d6e9a000000b006a6080ba7desm997809otr.58.2023.04.20.12.19.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 12:19:52 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V3 2/3] UBUNTU: [Config] Add arm64 option to CONFIG_HP_WATCHDOG Date: Thu, 20 Apr 2023 14:19:46 -0500 Message-Id: <20230420191947.12021-3-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420191947.12021-1-michael.reed@canonical.com> References: <20230420191947.12021-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: Michael Reed BugLink: https://bugs.launchpad.net/bugs/2008751 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. Signed-off-by: Michael Reed --- debian.master/config/annotations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index a531e19a9288..480a7073f0c1 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'}> From patchwork Thu Apr 20 19:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Reed X-Patchwork-Id: 1771582 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=hFmOycJP; 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 4Q2SCs1T9fz1ybF for ; Fri, 21 Apr 2023 05:20:07 +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 1ppZp1-0005Di-A2; Thu, 20 Apr 2023 19:19:59 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ppZoz-0005Co-EJ for kernel-team@lists.ubuntu.com; Thu, 20 Apr 2023 19:19:57 +0000 Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.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-0.canonical.com (Postfix) with ESMTPS id CC8783F19A for ; Thu, 20 Apr 2023 19:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1682018396; bh=nz1DoWubzP0gkJDhzbY174wICScv3go6bfKivPBd0UE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hFmOycJP2yuS8Pn1suPbT5qbFxYrWpx+P9rtXy4mbHTv396QnHpMaQ2Czk3YCL91q 6Ku0Mg+3feGPT5wa2C1d5voetUb6RXUztABfAz6vmDNzXeT2oiQ12C3MVpe8i67cMK JdNTHJBvmvRdaqjDt6kYQJ7tXHlx58lDOqPFL+da56F995ug5kZ9HTyKnp9Ify5qCW d9AcQoG26uBENBtOVlSVNlZEa9BKsbFj6fqTxP5ZEbtZOtZQDCeg5KcM641UdDWHGX LRgWudls61XvVnmrnYHf+a+M5b9HWCfaNDHA8Cv+pnge39xS0h5JuxSU7nt7S6C2Co Quz3du34wPXFw== Received: by mail-ot1-f69.google.com with SMTP id 46e09a7af769-6a3e08f6232so375688a34.0 for ; Thu, 20 Apr 2023 12:19:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682018395; x=1684610395; 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=GfjJAhevuV+Ch1DzZe8VUERhO364GMHGhGMaAdDEAtG4HTLnvAgTCs4vVOsNb0FN/0 X2Ye8lTxcR89A8ND+mjNHngvw0tGEk9E9LoBOcD4e4tHMJHnU/X+SfYxzi//MFzVBJCk +csf3884PrOYYsM94RmYYG1ohjM4C+YqlriNngOu6zxSs4IYBv+IatgVqvQov+LSXL4G 1QuwA8EFq5eWulQN/RmqV7QCwzv+HZkjQA73T6edrZW/fQbhPtIZYNmat96wnzQT+9Zu Mb50AyOgmz1w/prQNqBNnKNbgNZVFDRM2OpNEQCSrkXNtynqdm4uDmtYHmuibnHkgX8w Q1oA== X-Gm-Message-State: AAQBX9fGKqi64+vJ/4lDCviBcWvU16Z06Dv3VXmg/rAA7DuMnXjZZnzw Ma4jSNkTYIgiA6SYX0kuWQZ8sZOc3/r1lKIw2PQP1JNOeIRLG7NrWEsNSgEhx4VDNb74mJryazk ijb01RctxJka2rHAqfo9R/gT1Xc1sPlMTwFCNNOPAOZ46LgiBDg== X-Received: by 2002:a9d:6b01:0:b0:6a6:814:478c with SMTP id g1-20020a9d6b01000000b006a60814478cmr1338721otp.28.1682018394897; Thu, 20 Apr 2023 12:19:54 -0700 (PDT) X-Google-Smtp-Source: AKy350YhNQPpmMf5O5neEeH/wD6ocLjmTJSAkrnx8Dowu2adGpwbkDRoNtO/S52AOKMpBeKE6g6AMw== X-Received: by 2002:a9d:6b01:0:b0:6a6:814:478c with SMTP id g1-20020a9d6b01000000b006a60814478cmr1338709otp.28.1682018394597; Thu, 20 Apr 2023 12:19:54 -0700 (PDT) Received: from localhost ([2600:1700:1d0:5e50:dd30:1444:7da:3b03]) by smtp.gmail.com with ESMTPSA id z13-20020a9d62cd000000b006a2cc609ddasm1058088otk.2.2023.04.20.12.19.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 12:19:54 -0700 (PDT) From: Michael Reed To: kernel-team@lists.ubuntu.com Subject: [SRU J/K][PATCH V3 3/3] watchdog/hpwdt: Include nmi.h only if CONFIG_HPWDT_NMI_DECODING Date: Thu, 20 Apr 2023 14:19:47 -0500 Message-Id: <20230420191947.12021-4-michael.reed@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420191947.12021-1-michael.reed@canonical.com> References: <20230420191947.12021-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"