Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

Merge tag 'pci-v5.1-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
"I apologize for sending these so late in the cycle. We went back and

Merge tag 'pci-v5.1-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
"I apologize for sending these so late in the cycle. We went back and
forth about how to deal with the unexpected logging of intentional
link state changes and finally decided to just config them off by
default.

PCI fixes:

- Stop ignoring "pci=disable_acs_redir" parameter (Logan Gunthorpe)

- Use shared MSI/MSI-X vector for Link Bandwidth Management (Alex
Williamson)

- Add Kconfig option for Link Bandwidth notification messages (Keith
Busch)"

* tag 'pci-v5.1-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/LINK: Add Kconfig option (default off)
PCI/portdrv: Use shared MSI/MSI-X vector for Bandwidth Management
PCI: Fix issue with "pci=disable_acs_redir" parameter being ignored

show more ...

PCI/LINK: Add Kconfig option (default off)

e8303bb7a75c ("PCI/LINK: Report degraded links via link bandwidth
notification") added dmesg logging whenever a link changes speed or width
to a state that

PCI/LINK: Add Kconfig option (default off)

e8303bb7a75c ("PCI/LINK: Report degraded links via link bandwidth
notification") added dmesg logging whenever a link changes speed or width
to a state that is considered degraded. Unfortunately, it cannot
differentiate signal integrity-related link changes from those
intentionally initiated by an endpoint driver, including drivers that may
live in userspace or VMs when making use of vfio-pci. Some GPU drivers
actively manage the link state to save power, which generates a stream of
messages like this:

vfio-pci 0000:07:00.0: 32.000 Gb/s available PCIe bandwidth, limited by 2.5 GT/s x16 link at 0000:00:02.0 (capable of 64.000 Gb/s with 5 GT/s x16 link)

Since we can't distinguish the intentional changes from the signal
integrity issues, leave the reporting turned off by default. Add a Kconfig
option to turn it on if desired.

Fixes: e8303bb7a75c ("PCI/LINK: Report degraded links via link bandwidth notification")
Link: https://lore.kernel.org/linux-pci/20190501142942.26972-1-keith.busch@intel.com
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

show more ...

Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-next

Linux 5.1-rc1

We forgot to reset the branch last merge window thus mlx5-next is outdated
and stil

Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-next

Linux 5.1-rc1

We forgot to reset the branch last merge window thus mlx5-next is outdated
and still based on 5.0-rc2. This merge commit is needed to sync mlx5-next
branch with 5.1-rc1.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

show more ...

Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.1

A few core fixes along with the driver specific ones, mainly fixing

Merge tag 'asoc-fix-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.1

A few core fixes along with the driver specific ones, mainly fixing
small issues that only affect x86 platforms for various reasons (their
unusual machine enumeration mechanisms mainly, plus a fix for error
handling in topology).

There's some of the driver fixes that look larger than they are, like
the hdmi-codec changes which resulted in an indentation change, and most
of the other large changes are for new drivers like the STM32 changes.

show more ...

Merge remote-tracking branch 'net/master'

Merge tag 'v5.1-rc1' into asoc-5.1

Linux 5.1-rc1

Merge tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- Use match_string() instead of reimplementing it (Andy Shevchenko)

Merge tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- Use match_string() instead of reimplementing it (Andy Shevchenko)

- Enable SERR# forwarding for all bridges (Bharat Kumar Gogada)

- Use Latency Tolerance Reporting if already enabled by platform (Bjorn
Helgaas)

- Save/restore LTR info for suspend/resume (Bjorn Helgaas)

- Fix DPC use of uninitialized data (Dongdong Liu)

- Probe bridge window attributes only once at enumeration-time to fix
device accesses during rescan (Bjorn Helgaas)

- Return BAR size (not "size -1 ") from pci_size() to simplify code (Du
Changbin)

- Use config header type (not class code) identify bridges more
reliably (Honghui Zhang)

- Work around Intel Denverton incorrect Trace Hub BAR size reporting
(Alexander Shishkin)

- Reorder pciehp cached state/hardware state updates to avoid missed
interrupts (Mika Westerberg)

- Turn ibmphp semaphores into completions or mutexes (Arnd Bergmann)

- Mark expected switch fall-through (Mathieu Malaterre)

- Use of_node_name_eq() for node name comparisons (Rob Herring)

- Add ACS and pciehp quirks for HXT SD4800 (Shunyong Yang)

- Consolidate Rohm Vendor ID definitions (Andy Shevchenko)

- Use u32 (not __u32) for things not exposed to userspace (Logan
Gunthorpe)

- Fix locking semantics of bus and slot reset interfaces (Alex
Williamson)

- Update PCIEPORTBUS Kconfig help text (Hou Zhiqiang)

- Allow portdrv to claim subtractive decode Ports so PCIe services will
work for them (Honghui Zhang)

- Report PCIe links that become degraded at run-time (Alexandru
Gagniuc)

- Blacklist Gigabyte X299 Root Port power management to fix Thunderbolt
hotplug (Mika Westerberg)

- Revert runtime PM suspend/resume callbacks that broke PME on network
cable plug (Mika Westerberg)

- Disable Data Link State Changed interrupts to prevent wakeup
immediately after suspend (Mika Westerberg)

- Extend altera to support Stratix 10 (Ley Foon Tan)

- Allow building altera driver on ARM64 (Ley Foon Tan)

- Replace Douglas with Tom Joseph as Cadence PCI host/endpoint
maintainer (Lorenzo Pieralisi)

- Add DT support for R-Car RZ/G2E (R8A774C0) (Fabrizio Castro)

- Add dra72x/dra74x/dra76x SoC compatible strings (Kishon Vijay Abraham I)

- Enable x2 mode support for dra72x/dra74x/dra76x SoC (Kishon Vijay
Abraham I)

- Configure dra7xx PHY to PCIe mode (Kishon Vijay Abraham I)

- Simplify dwc (remove unnecessary header includes, name variables
consistently, reduce inverted logic, etc) (Gustavo Pimentel)

- Add i.MX8MQ support (Andrey Smirnov)

- Add message to help debug dwc MSI-X mask bit errors (Gustavo
Pimentel)

- Work around imx7d PCIe PLL erratum (Trent Piepho)

- Don't assert qcom reset GPIO during probe (Bjorn Andersson)

- Skip dwc MSI init if MSIs have been disabled (Lucas Stach)

- Use memcpy_fromio()/memcpy_toio() instead of plain memcpy() in PCI
endpoint framework (Wen Yang)

- Add interface to discover supported endpoint features to replace a
bitfield that wasn't flexible enough (Kishon Vijay Abraham I)

- Implement the new supported-feature interface for designware-plat,
dra7xx, rockchip, cadence (Kishon Vijay Abraham I)

- Fix issues with 64-bit BAR in endpoints (Kishon Vijay Abraham I)

- Add layerscape endpoint mode support (Xiaowei Bao)

- Remove duplicate struct hv_vp_set in favor of struct hv_vpset (Maya
Nakamura)

- Rework hv_irq_unmask() to use cpumask_to_vpset() instead of
open-coded reimplementation (Maya Nakamura)

- Align Hyper-V struct retarget_msi_interrupt arguments (Maya Nakamura)

- Fix mediatek MMIO size computation to enable full size of available
MMIO space (Honghui Zhang)

- Fix mediatek DMA window size computation to allow endpoint DMA access
to full DRAM address range (Honghui Zhang)

- Fix mvebu prefetchable BAR regression caused by common bridge
emulation that assumed all bridges had prefetchable windows (Thomas
Petazzoni)

- Make advk_pci_bridge_emul_ops static (Wei Yongjun)

- Configure MPS settings for VMD root ports (Jon Derrick)

* tag 'pci-v5.1-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (92 commits)
PCI: Update PCIEPORTBUS Kconfig help text
PCI: Fix "try" semantics of bus and slot reset
PCI/LINK: Report degraded links via link bandwidth notification
dt-bindings: PCI: altera: Add altr,pcie-root-port-2.0
PCI: altera: Enable driver on ARM64
PCI: altera: Add Stratix 10 PCIe support
PCI/PME: Fix possible use-after-free on remove
PCI: aardvark: Make symbol 'advk_pci_bridge_emul_ops' static
PCI: dwc: skip MSI init if MSIs have been explicitly disabled
PCI: hv: Refactor hv_irq_unmask() to use cpumask_to_vpset()
PCI: hv: Replace hv_vp_set with hv_vpset
PCI: hv: Add __aligned(8) to struct retarget_msi_interrupt
PCI: mediatek: Enlarge PCIe2AHB window size to support 4GB DRAM
PCI: mediatek: Fix memory mapped IO range size computation
PCI: dwc: Remove superfluous shifting in definitions
PCI: dwc: Make use of GENMASK/FIELD_PREP
PCI: dwc: Make use of BIT() in constant definitions
PCI: dwc: Share code for dw_pcie_rd/wr_other_conf()
PCI: dwc: Make use of IS_ALIGNED()
PCI: imx6: Add code to request/control "pcie_aux" clock for i.MX8MQ
...

show more ...

Merge branch 'pci/portdrv'

- Allow portdrv to claim subtractive decode Ports so PCIe services will
work for them (Honghui Zhang)

- Report PCIe links that become degraded at run-time (Alexan

Merge branch 'pci/portdrv'

- Allow portdrv to claim subtractive decode Ports so PCIe services will
work for them (Honghui Zhang)

- Report PCIe links that become degraded at run-time (Alexandru Gagniuc)

* pci/portdrv:
PCI/LINK: Report degraded links via link bandwidth notification
PCI/portdrv: Support PCIe services on subtractive decode bridges
PCI/portdrv: Use conventional Device ID table formatting

show more ...

PCI/LINK: Report degraded links via link bandwidth notification

A warning is generated when a PCIe device is probed with a degraded link,
but there was no similar mechanism to warn when the link bec

PCI/LINK: Report degraded links via link bandwidth notification

A warning is generated when a PCIe device is probed with a degraded link,
but there was no similar mechanism to warn when the link becomes degraded
after probing. The Link Bandwidth Notification provides this mechanism.

Use the Link Bandwidth Management Interrupt to detect bandwidth changes,
and rescan the bandwidth, looking for the weakest point. This is the same
logic used in probe().

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>

show more ...

Merge tag 'v4.20' into for-linus

Sync with mainline to get linux/overflow.h among other things.

Merge tag 'v4.20' into next

Merge with mainline to bring in the new APIs.

Merge branch 'for-4.19/cougar' into for-linus

New device support for hid-cougar

Merge branch 'iomap-write' into linux-gfs2/for-next

Pull in the gfs2 iomap-write changes: Tweak the existing code to
properly support iomap write and eliminate an unnecessary special case
in gfs2_bl

Merge branch 'iomap-write' into linux-gfs2/for-next

Pull in the gfs2 iomap-write changes: Tweak the existing code to
properly support iomap write and eliminate an unnecessary special case
in gfs2_block_map. Implement iomap write support for buffered and
direct I/O. Simplify some of the existing code and eliminate code that
is no longer used:

gfs2: Remove gfs2_write_{begin,end}
gfs2: iomap direct I/O support
gfs2: gfs2_extent_length cleanup
gfs2: iomap buffered write support
gfs2: Further iomap cleanups

This is based on the following changes on the xfs 'iomap-4.19-merge'
branch:

iomap: add private pointer to struct iomap
iomap: add a page_done callback
iomap: generic inline data handling
iomap: complete partial direct I/O writes synchronously
iomap: mark newly allocated buffer heads as new
fs: factor out a __generic_write_end helper

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

show more ...

Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.

Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

show more ...

Merge remote-tracking branch 'gpio/ib-aspeed' into upstream-ready

Merge the GPIO tree "ib-aspeed" topic branch which contains pre-requisites
for subsequent changes. This branch is also in gpio "next

Merge remote-tracking branch 'gpio/ib-aspeed' into upstream-ready

Merge the GPIO tree "ib-aspeed" topic branch which contains pre-requisites
for subsequent changes. This branch is also in gpio "next".

show more ...

Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Linux 4.18-rc2

Merge tag 'v4.18-rc2' into next-general

Merge to Linux 4.18-rc2 for security subsystem developers.

Merge branch 'linus' into x86/urgent

Required to queue a dependent fix.

Merge tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull more PCI updates from Bjorn Helgaas:

- squash AER directory into drivers/pci/pcie/aer.c (Bjorn Hel

Merge tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull more PCI updates from Bjorn Helgaas:

- squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

- collect all native hardware drivers under drivers/pci/controller/
(Shawn Lin)

* tag 'pci-v4.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/AER: Use "PCI Express" consistently in Kconfig text
PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
PCI/AER: Squash Kconfig.debug into Kconfig
PCI/AER: Move private AER things to aerdrv.c
PCI/AER: Move aer_irq() declaration to portdrv.h
PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
PCI/AER: Remove duplicate pcie_port_bus_type declaration
PCI/AER: Squash ecrc.c into aerdrv.c
PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
PCI/AER: Squash aerdrv_core.c into aerdrv.c
PCI/AER: Reorder code to group probe/remove stuff together
PCI/AER: Remove forward declarations
PCI: Collect all native drivers under drivers/pci/controller/

show more ...

Merge branch 'pci/aer-squash'

- squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

* pci/aer-squash:
PCI/AER: Use "PCI Express" consistently in Kconfig text
PCI/AER: Hoist aerdr

Merge branch 'pci/aer-squash'

- squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

* pci/aer-squash:
PCI/AER: Use "PCI Express" consistently in Kconfig text
PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
PCI/AER: Squash Kconfig.debug into Kconfig
PCI/AER: Move private AER things to aerdrv.c
PCI/AER: Move aer_irq() declaration to portdrv.h
PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
PCI/AER: Remove duplicate pcie_port_bus_type declaration
PCI/AER: Squash ecrc.c into aerdrv.c
PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
PCI/AER: Squash aerdrv_core.c into aerdrv.c
PCI/AER: Reorder code to group probe/remove stuff together
PCI/AER: Remove forward declarations

show more ...

PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/

Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/ so they're next to
other PCIe service drivers. No functional change intended.

Sig

PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/

Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/ so they're next to
other PCIe service drivers. No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>

show more ...

Merge branch 'for-4.18/alps' into for-linus

hid-alps driver cleanups wrt. t4_read_write_register() handling
from Christophe Jaillet

Merge tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- unify AER decoding for native and ACPI CPER sources (Alexandru

Merge tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:

- unify AER decoding for native and ACPI CPER sources (Alexandru
Gagniuc)

- add TLP header info to AER tracepoint (Thomas Tai)

- add generic pcie_wait_for_link() interface (Oza Pawandeep)

- handle AER ERR_FATAL by removing and re-enumerating devices, as
Downstream Port Containment does (Oza Pawandeep)

- factor out common code between AER and DPC recovery (Oza Pawandeep)

- stop triggering DPC for ERR_NONFATAL errors (Oza Pawandeep)

- share ERR_FATAL recovery path between AER and DPC (Oza Pawandeep)

- disable ASPM L1.2 substate if we don't have LTR (Bjorn Helgaas)

- respect platform ownership of LTR (Bjorn Helgaas)

- clear interrupt status in top half to avoid interrupt storm (Oza
Pawandeep)

- neaten pci=earlydump output (Andy Shevchenko)

- avoid errors when extended config space inaccessible (Gilles Buloz)

- prevent sysfs disable of device while driver attached (Christoph
Hellwig)

- use core interface to report PCIe link properties in bnx2x, bnxt_en,
cxgb4, ixgbe (Bjorn Helgaas)

- remove unused pcie_get_minimum_link() (Bjorn Helgaas)

- fix use-before-set error in ibmphp (Dan Carpenter)

- fix pciehp timeouts caused by Command Completed errata (Bjorn
Helgaas)

- fix refcounting in pnv_php hotplug (Julia Lawall)

- clear pciehp Presence Detect and Data Link Layer Status Changed on
resume so we don't miss hotplug events (Mika Westerberg)

- only request pciehp control if we support it, so platform can use
ACPI hotplug otherwise (Mika Westerberg)

- convert SHPC to be builtin only (Mika Westerberg)

- request SHPC control via _OSC if we support it (Mika Westerberg)

- simplify SHPC handoff from firmware (Mika Westerberg)

- fix an SHPC quirk that mistakenly included *all* AMD bridges as well
as devices from any vendor with device ID 0x7458 (Bjorn Helgaas)

- assign a bus number even to non-native hotplug bridges to leave
space for acpiphp additions, to fix a common Thunderbolt xHCI
hot-add failure (Mika Westerberg)

- keep acpiphp from scanning native hotplug bridges, to fix common
Thunderbolt hot-add failures (Mika Westerberg)

- improve "partially hidden behind bridge" messages from core (Mika
Westerberg)

- add macros for PCIe Link Control 2 register (Frederick Lawler)

- replace IB/hfi1 custom macros with PCI core versions (Frederick
Lawler)

- remove dead microblaze and xtensa code (Bjorn Helgaas)

- use dev_printk() when possible in xtensa and mips (Bjorn Helgaas)

- remove unused pcie_port_acpi_setup() and portdrv_acpi.c (Bjorn
Helgaas)

- add managed interface to get PCI host bridge resources from OF (Jan
Kiszka)

- add support for unbinding generic PCI host controller (Jan Kiszka)

- fix memory leaks when unbinding generic PCI host controller (Jan
Kiszka)

- request legacy VGA framebuffer only for VGA devices to avoid false
device conflicts (Bjorn Helgaas)

- turn on PCI_COMMAND_IO & PCI_COMMAND_MEMORY in pci_enable_device()
like everybody else, not in pcibios_fixup_bus() (Bjorn Helgaas)

- add generic enable function for simple SR-IOV hardware (Alexander
Duyck)

- use generic SR-IOV enable for ena, nvme (Alexander Duyck)

- add ACS quirk for Intel 7th & 8th Gen mobile (Alex Williamson)

- add ACS quirk for Intel 300 series (Mika Westerberg)

- enable register clock for Armada 7K/8K (Gregory CLEMENT)

- reduce Keystone "link already up" log level (Fabio Estevam)

- move private DT functions to drivers/pci/ (Rob Herring)

- factor out dwc CONFIG_PCI Kconfig dependencies (Rob Herring)

- add DesignWare support to the endpoint test driver (Gustavo
Pimentel)

- add DesignWare support for endpoint mode (Gustavo Pimentel)

- use devm_ioremap_resource() instead of devm_ioremap() in dra7xx and
artpec6 (Gustavo Pimentel)

- fix Qualcomm bitwise NOT issue (Dan Carpenter)

- add Qualcomm runtime PM support (Srinivas Kandagatla)

- fix DesignWare enumeration below bridges (Koen Vandeputte)

- use usleep() instead of mdelay() in endpoint test (Jia-Ju Bai)

- add configfs entries for pci_epf_driver device IDs (Kishon Vijay
Abraham I)

- clean up pci_endpoint_test driver (Gustavo Pimentel)

- update Layerscape maintainer email addresses (Minghuan Lian)

- add COMPILE_TEST to improve build test coverage (Rob Herring)

- fix Hyper-V bus registration failure caused by domain/serial number
confusion (Sridhar Pitchai)

- improve Hyper-V refcounting and coding style (Stephen Hemminger)

- avoid potential Hyper-V hang waiting for a response that will never
come (Dexuan Cui)

- implement Mediatek chained IRQ handling (Honghui Zhang)

- fix vendor ID & class type for Mediatek MT7622 (Honghui Zhang)

- add Mobiveil PCIe host controller driver (Subrahmanya Lingappa)

- add Mobiveil MSI support (Subrahmanya Lingappa)

- clean up clocks, MSI, IRQ mappings in R-Car probe failure paths
(Marek Vasut)

- poll more frequently (5us vs 5ms) while waiting for R-Car data link
active (Marek Vasut)

- use generic OF parsing interface in R-Car (Vladimir Zapolskiy)

- add R-Car V3H (R8A77980) "compatible" string (Sergei Shtylyov)

- add R-Car gen3 PHY support (Sergei Shtylyov)

- improve R-Car PHYRDY polling (Sergei Shtylyov)

- clean up R-Car macros (Marek Vasut)

- use runtime PM for R-Car controller clock (Dien Pham)

- update arm64 defconfig for Rockchip (Shawn Lin)

- refactor Rockchip code to facilitate both root port and endpoint
mode (Shawn Lin)

- add Rockchip endpoint mode driver (Shawn Lin)

- support VMD "membar shadow" feature (Jon Derrick)

- support VMD bus number offsets (Jon Derrick)

- add VMD "no AER source ID" quirk for more device IDs (Jon Derrick)

- remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig
selections (Bjorn Helgaas)

- clean up quirks.c organization and whitespace (Bjorn Helgaas)

* tag 'pci-v4.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (144 commits)
PCI/AER: Replace struct pcie_device with pci_dev
PCI/AER: Remove unused parameters
PCI: qcom: Include gpio/consumer.h
PCI: Improve "partially hidden behind bridge" log message
PCI: Improve pci_scan_bridge() and pci_scan_bridge_extend() doc
PCI: Move resource distribution for single bridge outside loop
PCI: Account for all bridges on bus when distributing bus numbers
ACPI / hotplug / PCI: Drop unnecessary parentheses
ACPI / hotplug / PCI: Mark stale PCI devices disconnected
ACPI / hotplug / PCI: Don't scan bridges managed by native hotplug
PCI: hotplug: Add hotplug_is_native()
PCI: shpchp: Add shpchp_is_native()
PCI: shpchp: Fix AMD POGO identification
PCI: mobiveil: Add MSI support
PCI: mobiveil: Add Mobiveil PCIe Host Bridge IP driver
PCI/AER: Decode Error Source Requester ID
PCI/AER: Remove aer_recover_work_func() forward declaration
PCI/DPC: Use the generic pcie_do_fatal_recovery() path
PCI/AER: Pass service type to pcie_do_fatal_recovery()
PCI/DPC: Disable ERR_NONFATAL handling by DPC
...

show more ...

Merge branch 'pci/aer'

- unify AER decoding for native and ACPI CPER sources (Alexandru Gagniuc)

- add TLP header info to AER tracepoint (Thomas Tai)

- add generic pcie_wait_for_link() inter

Merge branch 'pci/aer'

- unify AER decoding for native and ACPI CPER sources (Alexandru Gagniuc)

- add TLP header info to AER tracepoint (Thomas Tai)

- add generic pcie_wait_for_link() interface (Oza Pawandeep)

- handle AER ERR_FATAL by removing and re-enumerating devices, as
Downstream Port Containment does (Oza Pawandeep)

- factor out common code between AER and DPC recovery (Oza Pawandeep)

- stop triggering DPC for ERR_NONFATAL errors (Oza Pawandeep)

- share ERR_FATAL recovery path between AER and DPC (Oza Pawandeep)

* pci/aer:
PCI/AER: Replace struct pcie_device with pci_dev
PCI/AER: Remove unused parameters
PCI/AER: Decode Error Source Requester ID
PCI/AER: Remove aer_recover_work_func() forward declaration
PCI/DPC: Use the generic pcie_do_fatal_recovery() path
PCI/AER: Pass service type to pcie_do_fatal_recovery()
PCI/DPC: Disable ERR_NONFATAL handling by DPC
PCI/portdrv: Add generic pcie_port_find_device()
PCI/portdrv: Add generic pcie_port_find_service()
PCI/AER: Factor out error reporting to drivers/pci/pcie/err.c
PCI/AER: Rename error recovery interfaces to generic PCI naming
PCI/AER: Handle ERR_FATAL with removal and re-enumeration of devices
PCI: Add generic pcie_wait_for_link() interface
PCI/AER: Add TLP header information to tracepoint
PCI/AER: Unify error bit printing for native and CPER reporting

show more ...