Skip to content

Commit 3de9148

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/misc'
- Drop 'pci' suffix from intel_mid_pci.c filename to match similar files (Andy Shevchenko) - All platforms with PCI have an MMU, so add PCI Kconfig dependency on MMU to simplify build testing and avoid inadvertent build regressions (Arnd Bergmann) - Update driver path in PCI NVMe function documentation (Rick Wertenbroek) - Remove unused pci_printk() (Ilpo Järvinen) - Warn (not BUG()) about failure to assign optional resources (Ilpo Järvinen) - Update Krzysztof Wilczyński's email address in MAINTAINERS (Krzysztof Wilczyński) - Update Manivannan Sadhasivam's email address in MAINTAINERS (Manivannan Sadhasivam) * pci/misc: MAINTAINERS: Update Manivannan Sadhasivam email address MAINTAINERS: Update Krzysztof Wilczyński email address PCI: Remove unnecessary linesplit in __pci_setup_bridge() PCI: WARN (not BUG()) when we fail to assign optional resources PCI: Remove unused pci_printk() Documentation: Fix path for NVMe PCI endpoint target driver PCI: Add CONFIG_MMU dependency x86/PCI: Drop 'pci' suffix from intel_mid_pci.c
2 parents 27b1aac + 308f8c7 commit 3de9148

File tree

28 files changed

+55
-59
lines changed

28 files changed

+55
-59
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,8 @@ Krishna Manikandan <[email protected]> <[email protected]>
413413
Krzysztof Kozlowski <[email protected]> <[email protected]>
414414
Krzysztof Kozlowski <[email protected]> <[email protected]>
415415
Krzysztof Kozlowski <[email protected]> <[email protected]>
416+
Krzysztof Wilczyński <[email protected]> <[email protected]>
417+
Krzysztof Wilczyński <[email protected]> <[email protected]>
416418
Kshitiz Godara <[email protected]> <[email protected]>
417419
Kuninori Morimoto <[email protected]>
418420
Kuogee Hsieh <[email protected]> <[email protected]>
@@ -451,6 +453,7 @@ Maheshwar Ajja <[email protected]> <[email protected]>
451453
Malathi Gottam <[email protected]> <[email protected]>
452454
Manikanta Pubbisetty <[email protected]> <[email protected]>
453455
Manivannan Sadhasivam <[email protected]> <[email protected]>
456+
Manivannan Sadhasivam <[email protected]> <[email protected]>
454457
Manoj Basapathi <[email protected]> <[email protected]>
455458
Marcin Nowakowski <[email protected]> <[email protected]>
456459
Marc Zyngier <[email protected]> <[email protected]>

‎Documentation/PCI/endpoint/pci-nvme-function.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ PCI NVMe Function
88

99
The PCI NVMe endpoint function implements a PCI NVMe controller using the NVMe
1010
subsystem target core code. The driver for this function resides with the NVMe
11-
subsystem as drivers/nvme/target/nvmet-pciep.c.
11+
subsystem as drivers/nvme/target/pci-epf.c.
1212

1313
See Documentation/nvme/nvme-pci-endpoint-target.rst for more details.

‎MAINTAINERS

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,7 +2102,7 @@ F: arch/arm/plat-*/
21022102

21032103
ARM/ACTIONS SEMI ARCHITECTURE
21042104
M: Andreas Färber <[email protected]>
2105-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
2105+
M: Manivannan Sadhasivam <mani@kernel.org>
21062106
L: [email protected] (moderated for non-subscribers)
21072107
L: [email protected] (moderated for non-subscribers)
21082108
S: Maintained
@@ -2354,7 +2354,7 @@ F: arch/arm/boot/dts/intel/axm/
23542354
F: arch/arm/mach-axxia/
23552355

23562356
ARM/BITMAIN ARCHITECTURE
2357-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
2357+
M: Manivannan Sadhasivam <mani@kernel.org>
23582358
L: [email protected] (moderated for non-subscribers)
23592359
S: Maintained
23602360
F: Documentation/devicetree/bindings/arm/bitmain.yaml
@@ -3021,7 +3021,7 @@ F: include/linux/soc/qcom/
30213021
F: include/soc/qcom/
30223022

30233023
ARM/RDA MICRO ARCHITECTURE
3024-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
3024+
M: Manivannan Sadhasivam <mani@kernel.org>
30253025
L: [email protected] (moderated for non-subscribers)
30263026
L: [email protected] (moderated for non-subscribers)
30273027
S: Maintained
@@ -3718,7 +3718,7 @@ F: Documentation/admin-guide/aoe/
37183718
F: drivers/block/aoe/
37193719

37203720
ATC260X PMIC MFD DRIVER
3721-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
3721+
M: Manivannan Sadhasivam <mani@kernel.org>
37223722
M: Cristian Ciocaltea <[email protected]>
37233723
L: [email protected]
37243724
S: Maintained
@@ -6721,7 +6721,7 @@ S: Orphan
67216721
F: drivers/mtd/nand/raw/denali*
67226722

67236723
DESIGNWARE EDMA CORE IP DRIVER
6724-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
6724+
M: Manivannan Sadhasivam <mani@kernel.org>
67256725
L: [email protected]
67266726
S: Maintained
67276727
F: drivers/dma/dw-edma/
@@ -8536,7 +8536,7 @@ S: Maintained
85368536
F: drivers/edac/pnd2_edac.[ch]
85378537

85388538
EDAC-QCOM
8539-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
8539+
M: Manivannan Sadhasivam <mani@kernel.org>
85408540
L: [email protected]
85418541
L: [email protected]
85428542
S: Maintained
@@ -12120,7 +12120,7 @@ M: Andy Shevchenko <[email protected]>
1212012120
L: [email protected]
1212112121
S: Supported
1212212122
F: arch/x86/include/asm/intel-mid.h
12123-
F: arch/x86/pci/intel_mid_pci.c
12123+
F: arch/x86/pci/intel_mid.c
1212412124
F: arch/x86/platform/intel-mid/
1212512125
F: drivers/dma/hsu/
1212612126
F: drivers/extcon/extcon-intel-mrfld.c
@@ -14664,7 +14664,7 @@ F: drivers/hid/hid-mcp2221.c
1466414664

1466514665
MCP251XFD SPI-CAN NETWORK DRIVER
1466614666
M: Marc Kleine-Budde <[email protected]>
14667-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
14667+
M: Manivannan Sadhasivam <mani@kernel.org>
1466814668
R: Thomas Kopp <[email protected]>
1466914669
L: [email protected]
1467014670
S: Maintained
@@ -15644,7 +15644,7 @@ F: arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
1564415644
F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
1564515645

1564615646
MHI BUS
15647-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
15647+
M: Manivannan Sadhasivam <mani@kernel.org>
1564815648
L: [email protected]
1564915649
L: [email protected]
1565015650
S: Maintained
@@ -18546,7 +18546,7 @@ F: drivers/pci/controller/dwc/pci-exynos.c
1854618546

1854718547
PCI DRIVER FOR SYNOPSYS DESIGNWARE
1854818548
M: Jingoo Han <[email protected]>
18549-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
18549+
M: Manivannan Sadhasivam <mani@kernel.org>
1855018550
L: [email protected]
1855118551
S: Maintained
1855218552
F: Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
@@ -18581,8 +18581,8 @@ F: Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
1858118581
F: drivers/pci/controller/pcie-xilinx-cpm.c
1858218582

1858318583
PCI ENDPOINT SUBSYSTEM
18584-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
18585-
M: Krzysztof Wilczyński <[email protected]>
18584+
M: Manivannan Sadhasivam <mani@kernel.org>
18585+
M: Krzysztof Wilczyński <[email protected]>
1858618586
R: Kishon Vijay Abraham I <[email protected]>
1858718587
L: [email protected]
1858818588
S: Supported
@@ -18633,8 +18633,8 @@ F: drivers/pci/controller/pci-xgene-msi.c
1863318633

1863418634
PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
1863518635
M: Lorenzo Pieralisi <[email protected]>
18636-
M: Krzysztof Wilczyński <[email protected]>
18637-
R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
18636+
M: Krzysztof Wilczyński <[email protected]>
18637+
M: Manivannan Sadhasivam <mani@kernel.org>
1863818638
R: Rob Herring <[email protected]>
1863918639
L: [email protected]
1864018640
S: Supported
@@ -18781,7 +18781,7 @@ F: Documentation/devicetree/bindings/pci/microchip*
1878118781
F: drivers/pci/controller/plda/*microchip*
1878218782

1878318783
PCIE DRIVER FOR QUALCOMM MSM
18784-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
18784+
M: Manivannan Sadhasivam <mani@kernel.org>
1878518785
L: [email protected]
1878618786
L: [email protected]
1878718787
S: Maintained
@@ -18817,7 +18817,7 @@ F: Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml
1881718817
F: drivers/pci/controller/plda/pcie-starfive.c
1881818818

1881918819
PCIE ENDPOINT DRIVER FOR QUALCOMM
18820-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
18820+
M: Manivannan Sadhasivam <mani@kernel.org>
1882118821
L: [email protected]
1882218822
L: [email protected]
1882318823
S: Maintained
@@ -19935,15 +19935,15 @@ F: drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
1993519935
F: drivers/iommu/msm_iommu*
1993619936

1993719937
QUALCOMM IPC ROUTER (QRTR) DRIVER
19938-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
19938+
M: Manivannan Sadhasivam <mani@kernel.org>
1993919939
L: [email protected]
1994019940
S: Maintained
1994119941
F: include/trace/events/qrtr.h
1994219942
F: include/uapi/linux/qrtr.h
1994319943
F: net/qrtr/
1994419944

1994519945
QUALCOMM IPCC MAILBOX DRIVER
19946-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
19946+
M: Manivannan Sadhasivam <mani@kernel.org>
1994719947
L: [email protected]
1994819948
S: Supported
1994919949
F: Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
@@ -19977,7 +19977,7 @@ F: Documentation/devicetree/bindings/media/qcom,*-iris.yaml
1997719977
F: drivers/media/platform/qcom/iris/
1997819978

1997919979
QUALCOMM NAND CONTROLLER DRIVER
19980-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
19980+
M: Manivannan Sadhasivam <mani@kernel.org>
1998119981
L: [email protected]
1998219982
L: [email protected]
1998319983
S: Maintained
@@ -22512,7 +22512,7 @@ F: Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml
2251222512
F: drivers/media/i2c/imx283.c
2251322513

2251422514
SONY IMX290 SENSOR DRIVER
22515-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
22515+
M: Manivannan Sadhasivam <mani@kernel.org>
2251622516
L: [email protected]
2251722517
S: Maintained
2251822518
T: git git://linuxtv.org/media.git
@@ -22521,7 +22521,7 @@ F: drivers/media/i2c/imx290.c
2252122521

2252222522
SONY IMX296 SENSOR DRIVER
2252322523
M: Laurent Pinchart <[email protected]>
22524-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
22524+
M: Manivannan Sadhasivam <mani@kernel.org>
2252522525
L: [email protected]
2252622526
S: Maintained
2252722527
T: git git://linuxtv.org/media.git
@@ -24817,7 +24817,7 @@ S: Maintained
2481724817
F: drivers/ufs/host/ufs-mediatek*
2481824818

2481924819
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS
24820-
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
24820+
M: Manivannan Sadhasivam <mani@kernel.org>
2482124821
L: [email protected]
2482224822
L: [email protected]
2482324823
S: Maintained

‎arch/x86/pci/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ obj-$(CONFIG_PCI_OLPC) += olpc.o
88
obj-$(CONFIG_PCI_XEN) += xen.o
99

1010
obj-y += fixup.o
11-
obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
1211
obj-$(CONFIG_ACPI) += acpi.o
1312
obj-y += legacy.o irq.o
1413

15-
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
14+
obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
15+
obj-$(CONFIG_X86_INTEL_MID) += intel_mid.o
1616

17-
obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o
17+
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
1818

1919
obj-y += common.o early.o
2020
obj-y += bus_numa.o

‎arch/x86/pci/intel_mid_pci.c renamed to ‎arch/x86/pci/intel_mid.c

File renamed without changes.

‎drivers/accel/qaic/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ config DRM_ACCEL_QAIC
88
depends on DRM_ACCEL
99
depends on PCI && HAS_IOMEM
1010
depends on MHI_BUS
11-
depends on MMU
1211
select CRC32
1312
help
1413
Enables driver for Qualcomm's Cloud AI accelerator PCIe cards that are

‎drivers/firewire/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ config FIREWIRE_KUNIT_SELF_ID_SEQUENCE_HELPER_TEST
8383

8484
config FIREWIRE_OHCI
8585
tristate "OHCI-1394 controllers"
86-
depends on PCI && FIREWIRE && MMU
86+
depends on PCI && FIREWIRE
8787
help
8888
Enable this driver if you have a FireWire controller based
8989
on the OHCI specification. For all practical purposes, this

‎drivers/gpu/drm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ source "drivers/gpu/drm/imagination/Kconfig"
462462

463463
config DRM_HYPERV
464464
tristate "DRM Support for Hyper-V synthetic video device"
465-
depends on DRM && PCI && MMU && HYPERV
465+
depends on DRM && PCI && HYPERV
466466
select DRM_CLIENT_SELECTION
467467
select DRM_KMS_HELPER
468468
select DRM_GEM_SHMEM_HELPER

‎drivers/gpu/drm/amd/amdgpu/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
config DRM_AMDGPU
44
tristate "AMD GPU"
5-
depends on DRM && PCI && MMU
5+
depends on DRM && PCI
66
depends on !UML
77
select FW_LOADER
88
select DRM_CLIENT
@@ -68,7 +68,6 @@ config DRM_AMDGPU_CIK
6868
config DRM_AMDGPU_USERPTR
6969
bool "Always enable userptr write support"
7070
depends on DRM_AMDGPU
71-
depends on MMU
7271
select HMM_MIRROR
7372
select MMU_NOTIFIER
7473
help

‎drivers/gpu/drm/ast/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_AST
33
tristate "AST server chips"
4-
depends on DRM && PCI && MMU
4+
depends on DRM && PCI
55
select DRM_CLIENT_SELECTION
66
select DRM_GEM_SHMEM_HELPER
77
select DRM_KMS_HELPER

0 commit comments

Comments
 (0)