On Tue, Nov 15, 2022 at 10:38:55PM +1100, Albert Zhou wrote:
> v3->v4: Add Mika's review tag.
>
> v2->v3: Dependency comment made more precise and technical, as suggested
> by Mika Westerberg.
>
> v1->v2: I added comments that PCIe cards with USB4 or Thunderbolt also
> require the hotplug feature. I also added the "default y if USB4" line
> to the relevant config options, as suggested by Lukas Wunner.
>
> Albert Zhou (2):
> pci: hotplug: add dependency info to Kconfig
> pci: pcie: add dependency info to Kconfig
>
> drivers/pci/hotplug/Kconfig | 4 +++-
> drivers/pci/pcie/Kconfig | 6 ++++--
> 2 files changed, 7 insertions(+), 3 deletions(-)
No need to repost just to add Reviewed-by or other tags. b4 does that
automatically.
I squashed these since it's really a single logical change.
I updated to follow the style conventions for subject lines, add
info to subject line, and drop extraneous whitespace change.
Applied to pci/hotplug for v6.2, thanks!
commit e67ad9354a9b ("PCI: pciehp: Enable by default if USB4 enabled")
Author: Albert Zhou <albert.zhou.50@xxxxxxxxx>
Date: Tue Nov 15 22:38:56 2022 +1100
PCI: pciehp: Enable by default if USB4 enabled
Thunderbolt/USB4 PCIe tunneling depends on native PCIe hotplug. Enable
pciehp by default if USB4 is enabled.
[bhelgaas: squash, update subject, commit logs, tidy whitespace]
Link: https://lore.kernel.org/r/20221115113857.35800-2-albert.zhou.50@xxxxxxxxx
Link: https://lore.kernel.org/r/20221115113857.35800-3-albert.zhou.50@xxxxxxxxx
Signed-off-by: Albert Zhou <albert.zhou.50@xxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 840a84bb5ee2..48113b210cf9 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -6,11 +6,14 @@
menuconfig HOTPLUG_PCI
bool "Support for PCI Hotplug"
depends on PCI && SYSFS
+ default y if USB4
help
Say Y here if you have a motherboard with a PCI Hotplug controller.
This allows you to add and remove PCI cards while the machine is
powered up and running.
+ Thunderbolt/USB4 PCIe tunneling depends on native PCIe hotplug.
+
When in doubt, say N.
if HOTPLUG_PCI
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index 788ac8df3f9d..228652a59f27 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -4,6 +4,7 @@
#
config PCIEPORTBUS
bool "PCI Express Port Bus support"
+ default y if USB4
help
This enables PCI Express Port Bus support. Users can then enable
support for Native Hot-Plug, Advanced Error Reporting, Power
@@ -15,9 +16,12 @@ config PCIEPORTBUS
config HOTPLUG_PCI_PCIE
bool "PCI Express Hotplug driver"
depends on HOTPLUG_PCI && PCIEPORTBUS
+ default y if USB4
help
- Say Y here if you have a motherboard that supports PCI Express Native
- Hotplug
+ Say Y here if you have a motherboard that supports PCIe native
+ hotplug.
+
+ Thunderbolt/USB4 PCIe tunneling depends on native PCIe hotplug.
When in doubt, say N.
