Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp1604088pxm; Thu, 3 Mar 2022 23:06:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIgwCU2K8MVmSu+TCSLxoj4wc8+IXWqW5pcRUvVaaeLX29T6AQifdmJUog15afv7O1J+gp X-Received: by 2002:a05:6402:370b:b0:413:3bcd:3d0e with SMTP id ek11-20020a056402370b00b004133bcd3d0emr25617136edb.178.1646377613502; Thu, 03 Mar 2022 23:06:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646377613; cv=none; d=google.com; s=arc-20160816; b=niMJH9bo4BgbNcWyV6kXWe8wDOCIWZTyQ7/gL+NV5ehVsiMxG5w2DUFbemwNHmCyVW 25W1jEXYGdH2zhpZ3kxFsuZXCF3cSmjYfaHLlYELGEZmlvkz3JUvqCdxJZppaU/uoqYB bM27QVZNgt/iIhnRvUTKEvNje6DsF15Yfzg27RIpPmZQNNCfqoz2DMcllQh2Gicygumu AgHArUuFWVSLwq2kE3eZIgX4fjjonSHGjHwshRQn/LXHEzG0VWwhEqjavFqVspBPCKdR fkKpiU9fR6RuuU1LlYt+snCzrbiU8KglCT7vc5Vp+jCwg9lIr5OeYW89hbfWx6XlR0VW ZlRg== 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 :ironport-sdr; bh=GIElpoyF1KKhTQAbAclZSAj1a5MrDNAswxFeybeDjJw=; b=g/izIQzsaTSIad41ljz1yNI/RCD9EjIO7+6Jr82qJ6YrfqdDTmN6vM93pdpW4mRI/4 QUONHEhWjPZ1CMTuyKazonmx0GsYR24COKQZG6/+vh2cGFzd82YYt7UPq9gaEpM6JCln +/RE3U+mr/TWK4F7e675D/0/SDi8aJYZBE5rOi5A0z0oRnQUTtcOghFdpOHDXeKZRR5Y rZzvZCVymymEZWyfoLRSSLjZsrndK1IPJvx5EnnRKKlh42kqo4iHw09EI6LdHA7sye9A i8ESHgYezbTrc6qXtFqMrs4R2tZZdgmeDttJ2jyswUjCPQV12b2hbq2t1iLYWrBgRy9Z //Rw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb37-20020a1709076da500b006d9f7b3e732si2683879ejc.796.2022.03.03.23.06.30; Thu, 03 Mar 2022 23:06:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238527AbiCDGr4 (ORCPT + 99 others); Fri, 4 Mar 2022 01:47:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238504AbiCDGrs (ORCPT ); Fri, 4 Mar 2022 01:47:48 -0500 Received: from esa11.hc1455-7.c3s2.iphmx.com (esa11.hc1455-7.c3s2.iphmx.com [207.54.90.137]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E76DA18E3C8; Thu, 3 Mar 2022 22:46:59 -0800 (PST) IronPort-SDR: W5DvWfmPs12IvqWG86ZrLc83rxkCU44ifHFKiA6izxMc8uWLVtj6egUmZfi6M+8JEvEJsBQUa2 nJB9ct7C5KLHOnG58h2YDjPAjNlyV9e1HXP8YpP5amwq72cdj4Zkc2G0woXcCC5tAeLZIDEarL AeQCX7P985Ig7kvw47efaanBS6z68pLTXaUGCBv0DXnHLeJyo+QFq/kU4z8alB8DhWd/wdiCz0 wqqA52Q01EjlIeGhbDblYcGcNnTp9AMmML7BuYS0P64rog77AkDxUxvVMTBwJIOt/PT2+IywIF I1LEJ3H3JHpLwNkf77DhPpBS X-IronPort-AV: E=McAfee;i="6200,9189,10275"; a="44623374" X-IronPort-AV: E=Sophos;i="5.90,154,1643641200"; d="scan'208";a="44623374" Received: from unknown (HELO yto-r2.gw.nic.fujitsu.com) ([218.44.52.218]) by esa11.hc1455-7.c3s2.iphmx.com with ESMTP; 04 Mar 2022 15:45:53 +0900 Received: from yto-m1.gw.nic.fujitsu.com (yto-nat-yto-m1.gw.nic.fujitsu.com [192.168.83.64]) by yto-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id A89D4C68B4; Fri, 4 Mar 2022 15:45:52 +0900 (JST) Received: from yto-om2.fujitsu.com (yto-om2.o.css.fujitsu.com [10.128.89.163]) by yto-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id 09B21D0420; Fri, 4 Mar 2022 15:45:51 +0900 (JST) Received: from cn-r05-10.example.com (n3235113.np.ts.nmh.cs.fujitsu.co.jp [10.123.235.113]) by yto-om2.fujitsu.com (Postfix) with ESMTP id 838674007DEED; Fri, 4 Mar 2022 15:45:50 +0900 (JST) From: Hitomi Hasegawa To: linux-arm-kernel@lists.infradead.org, soc@kernel.org, linux-serial@vger.kernel.org, sumit.garg@linaro.org Cc: arnd@arndb.de, olof@lixom.net, catalin.marinas@arm.com, will@kernel.org, gregkh@linuxfoundation.org, jirislaby@kernel.org, jason.wessel@windriver.com, daniel.thompson@linaro.org, dianders@chromium.org, linux-kernel@vger.kernel.org, kgdb-bugreport@lists.sourceforge.net, peterz@infradead.org, hasegawa-hitomi@fujitsu.com Subject: [PATCH v2 2/2] soc: fujitsu: Add A64FX diagnostic interrupt driver Date: Fri, 4 Mar 2022 15:43:24 +0900 Message-Id: <20220304064324.331217-3-hasegawa-hitomi@fujitsu.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220304064324.331217-1-hasegawa-hitomi@fujitsu.com> References: <20220304064324.331217-1-hasegawa-hitomi@fujitsu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,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 Enable diagnostic interrupts for the A64FX. This is done using a pseudo-NMI. Signed-off-by: Hitomi Hasegawa --- MAINTAINERS | 5 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/fujitsu/Kconfig | 13 +++ drivers/soc/fujitsu/Makefile | 3 + drivers/soc/fujitsu/a64fx-diag.c | 151 +++++++++++++++++++++++++++++++ 6 files changed, 174 insertions(+) create mode 100644 drivers/soc/fujitsu/Kconfig create mode 100644 drivers/soc/fujitsu/Makefile create mode 100644 drivers/soc/fujitsu/a64fx-diag.c diff --git a/MAINTAINERS b/MAINTAINERS index dd36acc87ce6..e9663fa92a52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -239,6 +239,11 @@ F: include/trace/events/9p.h F: include/uapi/linux/virtio_9p.h F: net/9p/ +A64FX DIAG DRIVER +M: Hitomi Hasegawa +S: Supported +F: drivers/soc/fujitsu/a64fx-diag.c + A8293 MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index e8a30c4c5aec..0405ff0b3be6 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -8,6 +8,7 @@ source "drivers/soc/atmel/Kconfig" source "drivers/soc/bcm/Kconfig" source "drivers/soc/canaan/Kconfig" source "drivers/soc/fsl/Kconfig" +source "drivers/soc/fujitsu/Kconfig" source "drivers/soc/imx/Kconfig" source "drivers/soc/ixp4xx/Kconfig" source "drivers/soc/litex/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index a05e9fbcd3e0..86596405a39c 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_SOC_CANAAN) += canaan/ obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ +obj-y += fujitsu/ obj-$(CONFIG_ARCH_GEMINI) += gemini/ obj-y += imx/ obj-y += ixp4xx/ diff --git a/drivers/soc/fujitsu/Kconfig b/drivers/soc/fujitsu/Kconfig new file mode 100644 index 000000000000..b41cdac67637 --- /dev/null +++ b/drivers/soc/fujitsu/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "fujitsu SoC drivers" + +config A64FX_DIAG + bool "A64FX diag driver" + depends on ARM64 + help + Say Y here if you want to enable diag interrupt on A64FX. + This driver uses pseudo-NMI if available. + + If unsure, say N. + +endmenu diff --git a/drivers/soc/fujitsu/Makefile b/drivers/soc/fujitsu/Makefile new file mode 100644 index 000000000000..945bc1c14ad0 --- /dev/null +++ b/drivers/soc/fujitsu/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_A64FX_DIAG) += a64fx-diag.o diff --git a/drivers/soc/fujitsu/a64fx-diag.c b/drivers/soc/fujitsu/a64fx-diag.c new file mode 100644 index 000000000000..c6f895cf8912 --- /dev/null +++ b/drivers/soc/fujitsu/a64fx-diag.c @@ -0,0 +1,151 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * A64FX diag driver. + */ + +#include +#include +#include +#include +#include +#include + +#define A64FX_DIAG_IRQ 1 +#define BMC_DIAG_INTERRUPT_STATUS_OFFSET (0x0044) +#define BMC_INTERRUPT_STATUS_MASK ((1U) << 31) +#define BMC_DIAG_INTERRUPT_ENABLE_OFFSET (0x0040) +#define BMC_INTERRUPT_ENABLE_MASK ((1U) << 31) + +struct a64fx_diag_priv { + int irq; + void __iomem *mmsc_reg_base; + bool has_nmi; +}; + +static irqreturn_t a64fx_diag_handler(int irq, void *dev_id) +{ + handle_sysrq('c'); + + return IRQ_HANDLED; +} + +static void a64fx_diag_interrupt_clear(struct a64fx_diag_priv *priv) +{ + u32 mmsc; + const void __iomem *diag_status_reg_addr; + + diag_status_reg_addr = priv->mmsc_reg_base + BMC_DIAG_INTERRUPT_STATUS_OFFSET; + mmsc = readl(diag_status_reg_addr); + if (mmsc & BMC_INTERRUPT_STATUS_MASK) + writel(BMC_INTERRUPT_STATUS_MASK, (void *)diag_status_reg_addr); +} + +static void a64fx_diag_interrupt_enable(struct a64fx_diag_priv *priv) +{ + u32 mmsc; + const void __iomem *diag_enable_reg_addr; + + diag_enable_reg_addr = priv->mmsc_reg_base + BMC_DIAG_INTERRUPT_ENABLE_OFFSET; + mmsc = readl(diag_enable_reg_addr); + if (!(mmsc & BMC_INTERRUPT_ENABLE_MASK)) { + mmsc |= BMC_INTERRUPT_STATUS_MASK; + writel(mmsc, (void *)diag_enable_reg_addr); + } +} + +static void a64fx_diag_interrupt_disable(struct a64fx_diag_priv *priv) +{ + u32 mmsc; + const void __iomem *diag_enable_reg_addr; + + diag_enable_reg_addr = priv->mmsc_reg_base + BMC_DIAG_INTERRUPT_ENABLE_OFFSET; + mmsc = readl(diag_enable_reg_addr); + if (mmsc & BMC_INTERRUPT_ENABLE_MASK) { + mmsc &= ~BMC_INTERRUPT_ENABLE_MASK; + writel(mmsc, (void *)diag_enable_reg_addr); + } +} + +static int a64fx_diag_probe(struct platform_device *pdev) +{ + int ret; + unsigned long irq_flags; + struct device *dev = &pdev->dev; + struct a64fx_diag_priv *priv; + + priv = devm_kzalloc(dev, sizeof(struct a64fx_diag_priv), GFP_KERNEL); + if (priv == NULL) + return -ENOMEM; + + priv->mmsc_reg_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->mmsc_reg_base)) + return PTR_ERR(priv->mmsc_reg_base); + + priv->irq = platform_get_irq(pdev, A64FX_DIAG_IRQ); + if (priv->irq < 0) + return priv->irq; + + platform_set_drvdata(pdev, priv); + + a64fx_diag_interrupt_clear(priv); + a64fx_diag_interrupt_enable(priv); + + irq_flags = IRQF_PERCPU | IRQF_NOBALANCING | IRQF_NO_AUTOEN | + IRQF_NO_THREAD; + ret = request_nmi(priv->irq, &a64fx_diag_handler, irq_flags, + "a64fx_diag_nmi", NULL); + if (ret) { + ret = request_irq(priv->irq, &a64fx_diag_handler, + irq_flags, "a64fx_diag_irq", NULL); + if (ret) { + dev_err(dev, "cannot register IRQ %d\n", ret); + return ret; + } + enable_irq(priv->irq); + priv->has_nmi = false; + dev_info(dev, "registered for IRQ %d\n", priv->irq); + } else { + enable_nmi(priv->irq); + priv->has_nmi = true; + dev_info(dev, "registered for NMI %d\n", priv->irq); + } + + return 0; +} + +static int __exit a64fx_diag_remove(struct platform_device *pdev) +{ + struct a64fx_diag_priv *priv = platform_get_drvdata(pdev); + + a64fx_diag_interrupt_disable(priv); + a64fx_diag_interrupt_clear(priv); + + if (priv->has_nmi) + free_nmi(priv->irq, NULL); + else + free_irq(priv->irq, NULL); + + return 0; +} + +static const struct acpi_device_id a64fx_diag_acpi_match[] = { + { "FUJI2007", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, a64fx_diag_acpi_match); + + +static struct platform_driver a64fx_diag_driver = { + .driver = { + .name = "a64fx_diag_driver", + .acpi_match_table = ACPI_PTR(a64fx_diag_acpi_match), + }, + .probe = a64fx_diag_probe, + .remove = a64fx_diag_remove, +}; + +module_platform_driver(a64fx_diag_driver); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Hitomi Hasegawa "); +MODULE_DESCRIPTION("A64FX diag driver"); -- 2.27.0