mirror of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
synced 2025-09-17 12:30:58 +10:00
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
This commit is contained in:
commit
3de914864c
3
.mailmap
3
.mailmap
@ -413,6 +413,8 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
|
||||
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
|
||||
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
|
||||
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
|
||||
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
|
||||
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
|
||||
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
|
||||
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
|
||||
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
|
||||
@ -451,6 +453,7 @@ Maheshwar Ajja <quic_majja@quicinc.com> <majja@codeaurora.org>
|
||||
Malathi Gottam <quic_mgottam@quicinc.com> <mgottam@codeaurora.org>
|
||||
Manikanta Pubbisetty <quic_mpubbise@quicinc.com> <mpubbise@codeaurora.org>
|
||||
Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
|
||||
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
|
||||
Manoj Basapathi <quic_manojbm@quicinc.com> <manojbm@codeaurora.org>
|
||||
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
|
||||
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
|
||||
|
@ -8,6 +8,6 @@ PCI NVMe Function
|
||||
|
||||
The PCI NVMe endpoint function implements a PCI NVMe controller using the NVMe
|
||||
subsystem target core code. The driver for this function resides with the NVMe
|
||||
subsystem as drivers/nvme/target/nvmet-pciep.c.
|
||||
subsystem as drivers/nvme/target/pci-epf.c.
|
||||
|
||||
See Documentation/nvme/nvme-pci-endpoint-target.rst for more details.
|
||||
|
44
MAINTAINERS
44
MAINTAINERS
@ -2102,7 +2102,7 @@ F: arch/arm/plat-*/
|
||||
|
||||
ARM/ACTIONS SEMI ARCHITECTURE
|
||||
M: Andreas Färber <afaerber@suse.de>
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-actions@lists.infradead.org (moderated for non-subscribers)
|
||||
S: Maintained
|
||||
@ -2354,7 +2354,7 @@ F: arch/arm/boot/dts/intel/axm/
|
||||
F: arch/arm/mach-axxia/
|
||||
|
||||
ARM/BITMAIN ARCHITECTURE
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/arm/bitmain.yaml
|
||||
@ -3021,7 +3021,7 @@ F: include/linux/soc/qcom/
|
||||
F: include/soc/qcom/
|
||||
|
||||
ARM/RDA MICRO ARCHITECTURE
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-unisoc@lists.infradead.org (moderated for non-subscribers)
|
||||
S: Maintained
|
||||
@ -3718,7 +3718,7 @@ F: Documentation/admin-guide/aoe/
|
||||
F: drivers/block/aoe/
|
||||
|
||||
ATC260X PMIC MFD DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
M: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
|
||||
L: linux-actions@lists.infradead.org
|
||||
S: Maintained
|
||||
@ -6721,7 +6721,7 @@ S: Orphan
|
||||
F: drivers/mtd/nand/raw/denali*
|
||||
|
||||
DESIGNWARE EDMA CORE IP DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: dmaengine@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/dma/dw-edma/
|
||||
@ -8536,7 +8536,7 @@ S: Maintained
|
||||
F: drivers/edac/pnd2_edac.[ch]
|
||||
|
||||
EDAC-QCOM
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
L: linux-edac@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -12120,7 +12120,7 @@ M: Andy Shevchenko <andy@kernel.org>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
S: Supported
|
||||
F: arch/x86/include/asm/intel-mid.h
|
||||
F: arch/x86/pci/intel_mid_pci.c
|
||||
F: arch/x86/pci/intel_mid.c
|
||||
F: arch/x86/platform/intel-mid/
|
||||
F: drivers/dma/hsu/
|
||||
F: drivers/extcon/extcon-intel-mrfld.c
|
||||
@ -14664,7 +14664,7 @@ F: drivers/hid/hid-mcp2221.c
|
||||
|
||||
MCP251XFD SPI-CAN NETWORK DRIVER
|
||||
M: Marc Kleine-Budde <mkl@pengutronix.de>
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
R: Thomas Kopp <thomas.kopp@microchip.com>
|
||||
L: linux-can@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -15644,7 +15644,7 @@ F: arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
|
||||
F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
|
||||
|
||||
MHI BUS
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: mhi@lists.linux.dev
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -18546,7 +18546,7 @@ F: drivers/pci/controller/dwc/pci-exynos.c
|
||||
|
||||
PCI DRIVER FOR SYNOPSYS DESIGNWARE
|
||||
M: Jingoo Han <jingoohan1@gmail.com>
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-pci@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
|
||||
@ -18581,8 +18581,8 @@ F: Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
|
||||
F: drivers/pci/controller/pcie-xilinx-cpm.c
|
||||
|
||||
PCI ENDPOINT SUBSYSTEM
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Krzysztof Wilczyński <kw@linux.com>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
M: Krzysztof Wilczyński <kwilczynski@kernel.org>
|
||||
R: Kishon Vijay Abraham I <kishon@kernel.org>
|
||||
L: linux-pci@vger.kernel.org
|
||||
S: Supported
|
||||
@ -18633,8 +18633,8 @@ F: drivers/pci/controller/pci-xgene-msi.c
|
||||
|
||||
PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
|
||||
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
|
||||
M: Krzysztof Wilczyński <kw@linux.com>
|
||||
R: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Krzysztof Wilczyński <kwilczynski@kernel.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
R: Rob Herring <robh@kernel.org>
|
||||
L: linux-pci@vger.kernel.org
|
||||
S: Supported
|
||||
@ -18781,7 +18781,7 @@ F: Documentation/devicetree/bindings/pci/microchip*
|
||||
F: drivers/pci/controller/plda/*microchip*
|
||||
|
||||
PCIE DRIVER FOR QUALCOMM MSM
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-pci@vger.kernel.org
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -18817,7 +18817,7 @@ F: Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml
|
||||
F: drivers/pci/controller/plda/pcie-starfive.c
|
||||
|
||||
PCIE ENDPOINT DRIVER FOR QUALCOMM
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-pci@vger.kernel.org
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -19935,7 +19935,7 @@ F: drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
|
||||
F: drivers/iommu/msm_iommu*
|
||||
|
||||
QUALCOMM IPC ROUTER (QRTR) DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Maintained
|
||||
F: include/trace/events/qrtr.h
|
||||
@ -19943,7 +19943,7 @@ F: include/uapi/linux/qrtr.h
|
||||
F: net/qrtr/
|
||||
|
||||
QUALCOMM IPCC MAILBOX DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
|
||||
@ -19977,7 +19977,7 @@ F: Documentation/devicetree/bindings/media/qcom,*-iris.yaml
|
||||
F: drivers/media/platform/qcom/iris/
|
||||
|
||||
QUALCOMM NAND CONTROLLER DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-mtd@lists.infradead.org
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
S: Maintained
|
||||
@ -22512,7 +22512,7 @@ F: Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml
|
||||
F: drivers/media/i2c/imx283.c
|
||||
|
||||
SONY IMX290 SENSOR DRIVER
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://linuxtv.org/media.git
|
||||
@ -22521,7 +22521,7 @@ F: drivers/media/i2c/imx290.c
|
||||
|
||||
SONY IMX296 SENSOR DRIVER
|
||||
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://linuxtv.org/media.git
|
||||
@ -24817,7 +24817,7 @@ S: Maintained
|
||||
F: drivers/ufs/host/ufs-mediatek*
|
||||
|
||||
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS
|
||||
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
M: Manivannan Sadhasivam <mani@kernel.org>
|
||||
L: linux-arm-msm@vger.kernel.org
|
||||
L: linux-scsi@vger.kernel.org
|
||||
S: Maintained
|
||||
|
@ -8,13 +8,13 @@ obj-$(CONFIG_PCI_OLPC) += olpc.o
|
||||
obj-$(CONFIG_PCI_XEN) += xen.o
|
||||
|
||||
obj-y += fixup.o
|
||||
obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
|
||||
obj-$(CONFIG_ACPI) += acpi.o
|
||||
obj-y += legacy.o irq.o
|
||||
|
||||
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
|
||||
obj-$(CONFIG_X86_INTEL_CE) += ce4100.o
|
||||
obj-$(CONFIG_X86_INTEL_MID) += intel_mid.o
|
||||
|
||||
obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o
|
||||
obj-$(CONFIG_X86_NUMACHIP) += numachip.o
|
||||
|
||||
obj-y += common.o early.o
|
||||
obj-y += bus_numa.o
|
||||
|
@ -8,7 +8,6 @@ config DRM_ACCEL_QAIC
|
||||
depends on DRM_ACCEL
|
||||
depends on PCI && HAS_IOMEM
|
||||
depends on MHI_BUS
|
||||
depends on MMU
|
||||
select CRC32
|
||||
help
|
||||
Enables driver for Qualcomm's Cloud AI accelerator PCIe cards that are
|
||||
|
@ -83,7 +83,7 @@ config FIREWIRE_KUNIT_SELF_ID_SEQUENCE_HELPER_TEST
|
||||
|
||||
config FIREWIRE_OHCI
|
||||
tristate "OHCI-1394 controllers"
|
||||
depends on PCI && FIREWIRE && MMU
|
||||
depends on PCI && FIREWIRE
|
||||
help
|
||||
Enable this driver if you have a FireWire controller based
|
||||
on the OHCI specification. For all practical purposes, this
|
||||
|
@ -462,7 +462,7 @@ source "drivers/gpu/drm/imagination/Kconfig"
|
||||
|
||||
config DRM_HYPERV
|
||||
tristate "DRM Support for Hyper-V synthetic video device"
|
||||
depends on DRM && PCI && MMU && HYPERV
|
||||
depends on DRM && PCI && HYPERV
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_GEM_SHMEM_HELPER
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
config DRM_AMDGPU
|
||||
tristate "AMD GPU"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
depends on !UML
|
||||
select FW_LOADER
|
||||
select DRM_CLIENT
|
||||
@ -68,7 +68,6 @@ config DRM_AMDGPU_CIK
|
||||
config DRM_AMDGPU_USERPTR
|
||||
bool "Always enable userptr write support"
|
||||
depends on DRM_AMDGPU
|
||||
depends on MMU
|
||||
select HMM_MIRROR
|
||||
select MMU_NOTIFIER
|
||||
help
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_AST
|
||||
tristate "AST server chips"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_GEM_SHMEM_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_GMA500
|
||||
tristate "Intel GMA500/600/3600/3650 KMS Framebuffer"
|
||||
depends on DRM && PCI && X86 && MMU && HAS_IOPORT
|
||||
depends on DRM && PCI && X86 && HAS_IOPORT
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_KMS_HELPER
|
||||
select FB_IOMEM_HELPERS if DRM_FBDEV_EMULATION
|
||||
|
@ -2,7 +2,6 @@
|
||||
config DRM_HISI_HIBMC
|
||||
tristate "DRM Support for Hisilicon Hibmc"
|
||||
depends on DRM && PCI
|
||||
depends on MMU
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_DISPLAY_HELPER
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
config DRM_LOONGSON
|
||||
tristate "DRM support for Loongson Graphics"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
depends on LOONGARCH || MIPS || COMPILE_TEST
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_KMS_HELPER
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_MGAG200
|
||||
tristate "Matrox G200"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_GEM_SHMEM_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_NOUVEAU
|
||||
tristate "Nouveau (NVIDIA) cards"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
select IOMMU_API
|
||||
select FW_LOADER
|
||||
select FW_CACHE if PM_SLEEP
|
||||
@ -94,7 +94,6 @@ config DRM_NOUVEAU_SVM
|
||||
bool "(EXPERIMENTAL) Enable SVM (Shared Virtual Memory) support"
|
||||
depends on DEVICE_PRIVATE
|
||||
depends on DRM_NOUVEAU
|
||||
depends on MMU
|
||||
depends on STAGING
|
||||
select HMM_MIRROR
|
||||
select MMU_NOTIFIER
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_QXL
|
||||
tristate "QXL virtual GPU"
|
||||
depends on DRM && PCI && MMU && HAS_IOPORT
|
||||
depends on DRM && PCI && HAS_IOPORT
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_TTM
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
config DRM_RADEON
|
||||
tristate "ATI Radeon"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
depends on AGP || !AGP
|
||||
select FW_LOADER
|
||||
select DRM_CLIENT_SELECTION
|
||||
|
@ -37,7 +37,7 @@ config DRM_BOCHS
|
||||
|
||||
config DRM_CIRRUS_QEMU
|
||||
tristate "Cirrus driver for QEMU emulated device"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_GEM_SHMEM_HELPER
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
config DRM_VMWGFX
|
||||
tristate "DRM driver for VMware Virtual GPU"
|
||||
depends on DRM && PCI && MMU
|
||||
depends on DRM && PCI
|
||||
depends on (X86 && HYPERVISOR_GUEST) || ARM64
|
||||
select DRM_CLIENT_SELECTION
|
||||
select DRM_TTM
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_XE
|
||||
tristate "Intel Xe Graphics"
|
||||
depends on DRM && PCI && MMU && (m || (y && KUNIT=y))
|
||||
depends on DRM && PCI && (m || (y && KUNIT=y))
|
||||
select INTERVAL_TREE
|
||||
# we need shmfs for the swappable backing store, and in particular
|
||||
# the shmem_readpage() which depends upon tmpfs
|
||||
|
@ -96,7 +96,6 @@ config BNX2
|
||||
config CNIC
|
||||
tristate "QLogic CNIC support"
|
||||
depends on PCI && (IPV6 || IPV6=n)
|
||||
depends on MMU
|
||||
select BNX2
|
||||
select UIO
|
||||
help
|
||||
|
@ -21,6 +21,7 @@ config GENERIC_PCI_IOMAP
|
||||
menuconfig PCI
|
||||
bool "PCI support"
|
||||
depends on HAVE_PCI
|
||||
depends on MMU
|
||||
help
|
||||
This option enables support for the PCI local bus, including
|
||||
support for PCI-X and the foundations for PCI Express support.
|
||||
|
@ -4222,7 +4222,7 @@ unsigned long __weak pci_address_to_pio(phys_addr_t address)
|
||||
#ifndef pci_remap_iospace
|
||||
int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr)
|
||||
{
|
||||
#if defined(PCI_IOBASE) && defined(CONFIG_MMU)
|
||||
#if defined(PCI_IOBASE)
|
||||
unsigned long vaddr = (unsigned long)PCI_IOBASE + res->start;
|
||||
|
||||
if (!(res->flags & IORESOURCE_IO))
|
||||
@ -4255,7 +4255,7 @@ EXPORT_SYMBOL(pci_remap_iospace);
|
||||
*/
|
||||
void pci_unmap_iospace(struct resource *res)
|
||||
{
|
||||
#if defined(PCI_IOBASE) && defined(CONFIG_MMU)
|
||||
#if defined(PCI_IOBASE)
|
||||
unsigned long vaddr = (unsigned long)PCI_IOBASE + res->start;
|
||||
|
||||
vunmap_range(vaddr, vaddr + resource_size(res));
|
||||
|
@ -772,8 +772,7 @@ static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type)
|
||||
{
|
||||
struct pci_dev *bridge = bus->self;
|
||||
|
||||
pci_info(bridge, "PCI bridge to %pR\n",
|
||||
&bus->busn_res);
|
||||
pci_info(bridge, "PCI bridge to %pR\n", &bus->busn_res);
|
||||
|
||||
if (type & IORESOURCE_IO)
|
||||
pci_setup_bridge_io(bridge);
|
||||
@ -2298,8 +2297,8 @@ void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus)
|
||||
|
||||
/* Depth last, allocate resources and update the hardware. */
|
||||
__pci_bus_assign_resources(bus, add_list, &fail_head);
|
||||
if (add_list)
|
||||
BUG_ON(!list_empty(add_list));
|
||||
if (WARN_ON_ONCE(add_list && !list_empty(add_list)))
|
||||
free_list(add_list);
|
||||
tried_times++;
|
||||
|
||||
/* Any device complain? */
|
||||
@ -2361,7 +2360,8 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
|
||||
pci_bridge_distribute_available_resources(bridge, &add_list);
|
||||
|
||||
__pci_bridge_assign_resources(bridge, &add_list, &fail_head);
|
||||
BUG_ON(!list_empty(&add_list));
|
||||
if (WARN_ON_ONCE(!list_empty(&add_list)))
|
||||
free_list(&add_list);
|
||||
tried_times++;
|
||||
|
||||
if (list_empty(&fail_head))
|
||||
@ -2437,7 +2437,8 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
|
||||
|
||||
__pci_bus_size_bridges(bridge->subordinate, &added);
|
||||
__pci_bridge_assign_resources(bridge, &added, &failed);
|
||||
BUG_ON(!list_empty(&added));
|
||||
if (WARN_ON_ONCE(!list_empty(&added)))
|
||||
free_list(&added);
|
||||
|
||||
if (!list_empty(&failed)) {
|
||||
ret = -ENOSPC;
|
||||
@ -2493,6 +2494,7 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
|
||||
__pci_bus_size_bridges(dev->subordinate, &add_list);
|
||||
up_read(&pci_bus_sem);
|
||||
__pci_bus_assign_resources(bus, &add_list, NULL);
|
||||
BUG_ON(!list_empty(&add_list));
|
||||
if (WARN_ON_ONCE(!list_empty(&add_list)))
|
||||
free_list(&add_list);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
|
||||
|
@ -5,7 +5,6 @@ config SCSI_BNX2X_FCOE
|
||||
depends on (IPV6 || IPV6=n)
|
||||
depends on LIBFC
|
||||
depends on LIBFCOE
|
||||
depends on MMU
|
||||
select NETDEVICES
|
||||
select ETHERNET
|
||||
select NET_VENDOR_BROADCOM
|
||||
|
@ -4,7 +4,6 @@ config SCSI_BNX2_ISCSI
|
||||
depends on NET
|
||||
depends on PCI
|
||||
depends on (IPV6 || IPV6=n)
|
||||
depends on MMU
|
||||
select SCSI_ISCSI_ATTRS
|
||||
select NETDEVICES
|
||||
select ETHERNET
|
||||
|
@ -1,6 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menu "VFIO support for PCI devices"
|
||||
depends on PCI && MMU
|
||||
depends on PCI
|
||||
|
||||
config VFIO_PCI_CORE
|
||||
tristate
|
||||
|
@ -2741,9 +2741,6 @@ void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
|
||||
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#define pci_printk(level, pdev, fmt, arg...) \
|
||||
dev_printk(level, &(pdev)->dev, fmt, ##arg)
|
||||
|
||||
#define pci_emerg(pdev, fmt, arg...) dev_emerg(&(pdev)->dev, fmt, ##arg)
|
||||
#define pci_alert(pdev, fmt, arg...) dev_alert(&(pdev)->dev, fmt, ##arg)
|
||||
#define pci_crit(pdev, fmt, arg...) dev_crit(&(pdev)->dev, fmt, ##arg)
|
||||
|
Loading…
Reference in New Issue
Block a user