From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Mika Westerberg <westeri@kernel.org>
Cc: Andreas Noever <andreas.noever@gmail.com>,
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>,
Sven Peter <sven@kernel.org>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
<linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Chunfeng Yun <chunfeng.yun@mediatek.com>
Subject: [PATCH v2 4/7] thunderbolt: add platform NHI driver
Date: Tue, 10 Nov 2026 19:48:52 +0800 [thread overview]
Message-ID: <20261110114925.722014-5-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <20261110114925.722014-1-chunfeng.yun@mediatek.com>
Historically, the Thunderbolt/USB4 Native Host Interface (NHI)
controller has been exposed as a PCI device handled by
drivers/thunderbolt/pci.c. However, some SoCs (such as MediaTek
mt8901/mt8992) integrate the NHI as a memory-mapped platform device
described via Device Tree or ACPI.
To support platform-attached NHI controllers:
Introduce platform.c to register a platform driver matching
"usb4-nhi-platform" (OF) and "ACPI0015" (ACPI);
Implement platform tb_nhi_ops hooks for pm, interrupts related;
Support an optional dedicated wake interrupt: on integrated SoCs,
the MAC/PHY reside in a power domain whose clocks and power can be
gated during sleep, preventing the primary NHI interrupt from
acting as a wakeup source; so add an optional dedicated wakeup
interrupt which comes from the always-on power domain.
Clean up the unused nhi_enable_int_throttling() prototype.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2 changes:
* Added CONFIG_USB4_PLATFORM to build the platform driver as a separate
module (thunderbolt_platform.ko), instead of statically embedding it
into thunderbolt.o.
* Renamed plat.c to platform.c, renamed internal functions from nhi_plat_*
to nhi_platform_*, and updated the Device Tree compatible string from
"thunderbolt-platform" to "usb4-nhi-platform".
* Removed domain lifecycle changes (domain.c) and PCI driver cleanups
(pci.c) from this patch, handled by previous patches.
* Squashed the optional dedicated wake IRQ support (previously a separate
patch in v1) directly into this patch.
* Replaced the custom local ISR with the shared tb_nhi_isr(), adopted
the renamed tb_nhi_probe() / tb_nhi_shutdown() / tb_nhi_pm_ops
interfaces, and added -EPROBE_DEFER handling for the wake IRQ.
---
drivers/thunderbolt/Kconfig | 9 ++
drivers/thunderbolt/Makefile | 3 +
drivers/thunderbolt/nhi.h | 1 -
drivers/thunderbolt/pci.c | 1 +
drivers/thunderbolt/platform.c | 172 +++++++++++++++++++++++++++++++++
include/linux/thunderbolt.h | 4 +
6 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 drivers/thunderbolt/platform.c
diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
index 605af440457a..846ab51df7ab 100644
--- a/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@ -27,6 +27,15 @@ config USB4_PCI
To compile this driver a module, choose M here. The module will be
called thunderbolt_pci.
+config USB4_PLATFORM
+ tristate "Support for platform USB4 and Thunderbolt controllers"
+ help
+ Say Y here to add support the USB4 and Thunderbolt host routers
+ for a platform device on such as ARM64 SoCs.
+
+ To compile this driver a module, choose M here. The module will be
+ called thunderbolt_platform.
+
config USB4_CONFIGFS
def_tristate USB4
depends on CONFIGFS_FS && !(USB4=y && CONFIGFS_FS=m)
diff --git a/drivers/thunderbolt/Makefile b/drivers/thunderbolt/Makefile
index a563bf2b0345..334fa4ebdfc8 100644
--- a/drivers/thunderbolt/Makefile
+++ b/drivers/thunderbolt/Makefile
@@ -8,6 +8,9 @@ thunderbolt-objs += usb4_port.o nvm.o retimer.o quirks.o clx.o
obj-${CONFIG_USB4_PCI} += thunderbolt_pci.o
thunderbolt_pci-y := pci.o icm.o
+obj-${CONFIG_USB4_PLATFORM} += thunderbolt_platform.o
+thunderbolt_platform-y := platform.o
+
thunderbolt-${CONFIG_ACPI} += acpi.o
thunderbolt-$(CONFIG_DEBUG_FS) += debugfs.o
thunderbolt-$(CONFIG_USB4_CONFIGFS) += configfs.o
diff --git a/drivers/thunderbolt/nhi.h b/drivers/thunderbolt/nhi.h
index 65f9daf36068..ef5d24d81251 100644
--- a/drivers/thunderbolt/nhi.h
+++ b/drivers/thunderbolt/nhi.h
@@ -27,7 +27,6 @@ enum nhi_mailbox_cmd {
NHI_MAILBOX_ALLOW_ALL_DEVS = 0x23,
};
-void nhi_enable_int_throttling(struct tb_nhi *nhi);
void nhi_disable_interrupts(struct tb_nhi *nhi);
irqreturn_t tb_nhi_isr(int irq, void *data);
irqreturn_t tb_ring_msix(int irq, void *data);
diff --git a/drivers/thunderbolt/pci.c b/drivers/thunderbolt/pci.c
index 9379c598a221..698f47ec63da 100644
--- a/drivers/thunderbolt/pci.c
+++ b/drivers/thunderbolt/pci.c
@@ -736,4 +736,5 @@ static struct pci_driver nhi_driver = {
.shutdown = nhi_pci_shutdown,
.driver.pm = &tb_nhi_pm_ops,
};
+
module_pci_driver(nhi_driver);
diff --git a/drivers/thunderbolt/platform.c b/drivers/thunderbolt/platform.c
new file mode 100644
index 000000000000..3562b6c7ea7d
--- /dev/null
+++ b/drivers/thunderbolt/platform.c
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Thunderbolt driver - NHI driver (Platform bus specific implementation)
+ *
+ * Author: Chunfeng Yun <chunfeng.yun@mediatek.com>
+ */
+
+#include <linux/acpi.h>
+#include <linux/interrupt.h>
+#include <linux/errno.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/pm_wakeirq.h>
+#include <linux/slab.h>
+
+#include "nhi.h"
+#include "tb.h"
+
+static int nhi_platform_init(struct tb_nhi *nhi)
+{
+ /* avoid device link fail for pcie tunnel */
+ pm_runtime_set_active(nhi->dev);
+ pm_runtime_get_noresume(nhi->dev);
+ pm_runtime_enable(nhi->dev);
+
+ device_set_wakeup_capable(nhi->dev, true);
+ device_enable_async_suspend(nhi->dev);
+
+ return 0;
+}
+
+static void nhi_platform_clear_wake_irq(void *dev)
+{
+ dev_pm_clear_wake_irq(dev);
+}
+
+static int nhi_platform_init_irq(struct tb_nhi *nhi)
+{
+ struct device *dev = nhi->dev;
+ int ret;
+
+ ret = devm_request_irq(dev, nhi->irq, tb_nhi_isr, IRQF_NO_SUSPEND,
+ dev_name(dev), nhi);
+ if (ret)
+ return dev_err_probe(dev, ret, "request irq failed\n");
+
+ if (nhi->wake_irq) {
+ ret = dev_pm_set_dedicated_wake_irq(dev, nhi->wake_irq);
+ if (ret) {
+ return dev_err_probe(dev, ret, "set wake irq %d failed\n", nhi->wake_irq);
+ }
+
+ dev_info(dev, "wake irq %d\n", nhi->wake_irq);
+
+ ret = devm_add_action_or_reset(dev, nhi_platform_clear_wake_irq, dev);
+ }
+
+ return ret;
+}
+
+static void nhi_platform_exit(struct tb_nhi *nhi)
+{
+ devm_free_irq(nhi->dev, nhi->irq, nhi);
+ flush_work(&nhi->interrupt_work);
+
+ pm_runtime_put_noidle(nhi->dev);
+ pm_runtime_disable(nhi->dev);
+ pm_runtime_set_suspended(nhi->dev);
+}
+
+static const struct tb_nhi_ops nhi_platform_default_ops = {
+ .init = nhi_platform_init,
+ .shutdown = nhi_platform_exit,
+ .init_interrupts = nhi_platform_init_irq,
+};
+
+static int nhi_platform_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct tb_nhi *nhi;
+
+ nhi = devm_kzalloc(dev, sizeof(*nhi), GFP_KERNEL);
+ if (!nhi)
+ return -ENOMEM;
+
+ nhi->dev = dev;
+ nhi->ops = &nhi_platform_default_ops;
+
+ nhi->iobase = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(nhi->iobase))
+ return PTR_ERR(nhi->iobase);
+
+ nhi->irq = platform_get_irq(pdev, 0);
+ if (nhi->irq < 0)
+ return nhi->irq;
+
+ /* ignore error */
+ nhi->wake_irq = platform_get_irq_optional(pdev, 1);
+ if (nhi->wake_irq == -EPROBE_DEFER)
+ return nhi->wake_irq;
+ else if (nhi->wake_irq < 0)
+ nhi->wake_irq = 0;
+
+ return tb_nhi_probe(nhi);
+}
+
+static void nhi_platform_do_remove(struct platform_device *pdev, bool reset)
+{
+ struct device *dev = &pdev->dev;
+ struct tb *tb = platform_get_drvdata(pdev);
+ struct tb_nhi *nhi = tb->nhi;
+
+ /*
+ * On system shutdown/reboot force a host router reset so the
+ * CM asserts DPR on connected tbt3 devices before the router tree
+ * is removed (see tb_stop()).
+ */
+ if (reset)
+ nhi->host_reset = true;
+
+ pm_runtime_get_sync(dev);
+ pm_runtime_dont_use_autosuspend(dev);
+
+ tb_domain_remove(tb);
+ wait_for_completion(&nhi->domain_released);
+ tb_nhi_shutdown(nhi);
+}
+
+static void nhi_platform_remove(struct platform_device *pdev)
+{
+ nhi_platform_do_remove(pdev, false);
+}
+
+static void nhi_platform_shutdown(struct platform_device *pdev)
+{
+ nhi_platform_do_remove(pdev, true);
+}
+
+
+#ifdef CONFIG_OF
+static const struct of_device_id nhi_platform_of_match[] = {
+ { .compatible = "usb4-nhi-platform" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, nhi_platform_of_match);
+#endif
+
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id nhi_platform_acpi_match[] = {
+ { "ACPI0015", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, nhi_platform_acpi_match);
+#endif
+
+static struct platform_driver nhi_platform_driver = {
+ .probe = nhi_platform_probe,
+ .remove = nhi_platform_remove,
+ .shutdown = nhi_platform_shutdown,
+ .driver = {
+ .name = "thunderbolt",
+ .of_match_table = of_match_ptr(nhi_platform_of_match),
+ .acpi_match_table = ACPI_PTR(nhi_platform_acpi_match),
+ .pm = &tb_nhi_pm_ops,
+ },
+};
+
+module_platform_driver(nhi_platform_driver);
+MODULE_ALIAS("platform:thunderbolt");
+MODULE_DESCRIPTION("Thunderbolt/USB4 platform host interface driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index 57502da29080..72497acac254 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -511,6 +511,8 @@ void tb_service_properties_changed(struct tb_service *svc);
* @going_away: The host controller device is about to disappear so when
* this flag is set, avoid touching the hardware anymore.
* @iommu_dma_protection: An IOMMU will isolate external-facing ports.
+ * @irq: interrupt number of NHI.
+ * @wake_irq: optional dedicated wakeup interrupt.
* @interrupt_work: Work scheduled to handle ring interrupt when no
* MSI-X is used.
* @hop_count: Number of rings (end point hops) supported by NHI.
@@ -532,6 +534,8 @@ struct tb_nhi {
u32 *interrupt_mask;
bool going_away;
bool iommu_dma_protection;
+ int irq;
+ int wake_irq;
struct work_struct interrupt_work;
u32 hop_count;
unsigned long quirks;
--
2.45.2
next prev parent reply other threads:[~2026-11-10 11:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 11:48 [PATCH 0/7] thunderbolt: Add support " Chunfeng Yun
2026-11-10 11:48 ` [PATCH v2 1/7] thunderbolt: Prefix NHI core functions with tb_ and tb_ring_ Chunfeng Yun
2026-11-10 12:42 ` Konrad Dybcio
2026-11-10 11:48 ` [PATCH v2 2/7] thunderbolt: Move ICM mailbox functions to icm.c and internalize interrupt work Chunfeng Yun
2026-11-10 14:24 ` Mika Westerberg
2026-11-10 11:48 ` [PATCH v2 3/7] thunderbolt: Make PCIe NHI support opt-in Chunfeng Yun
2026-11-10 11:48 ` Chunfeng Yun [this message]
2026-11-10 12:43 ` [PATCH v2 4/7] thunderbolt: add platform NHI driver Konrad Dybcio
2026-11-10 14:37 ` Mika Westerberg
2026-11-10 11:48 ` [PATCH v2 5/7] thunderbolt: increase the lane adapter link-up timeout value Chunfeng Yun
2026-11-10 14:39 ` Mika Westerberg
2026-11-10 11:48 ` [PATCH v2 6/7] thunderbolt: decouple the waiting time of TB_PORT_UNPLUGGED and TB_PORT_UP Chunfeng Yun
2026-11-10 14:40 ` Mika Westerberg
2026-11-10 11:48 ` [PATCH v2 7/7] thunderbolt: prevent pcie tunnel activation/teardown warnings Chunfeng Yun
2026-11-10 14:50 ` Mika Westerberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261110114925.722014-5-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=gregkh@linuxfoundation.org \
--cc=konrad.dybcio@oss.qualcomm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=sven@kernel.org \
--cc=westeri@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®