Merge v5.8-rc1 into drm-misc-fixes

Beginning a new release cycles for what will become v5.8. Updating
drm-misc-fixes accordingly.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge branch 'dt/schema-cleanups' into dt/linus

Merge branch 'x86/entry' into ras/core

to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.

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

Pull PCI updates from Bjorn Helgaas:
"Enumeration:

- Program MPS for RCiEP devices (Ashok Raj)

- Fi

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

Pull PCI updates from Bjorn Helgaas:
"Enumeration:

- Program MPS for RCiEP devices (Ashok Raj)

- Fix pci_register_host_bridge() device_register() error handling
(Rob Herring)

- Fix pci_host_bridge struct device release/free handling (Rob
Herring)

Resource management:

- Allow resizing BARs for devices on root bus (Ard Biesheuvel)

Power management:

- Reduce Thunderbolt resume time by working around devices that don't
support DLL Link Active reporting (Mika Westerberg)

- Work around a Pericom USB controller OHCI/EHCI PME# defect
(Kai-Heng Feng)

Virtualization:

- Add ACS quirk for Intel Root Complex Integrated Endpoints (Ashok
Raj)

- Avoid FLR for AMD Starship USB 3.0 (Kevin Buettner)

- Avoid FLR for AMD Matisse HD Audio & USB 3.0 (Marcos Scriven)

Error handling:

- Use only _OSC (not HEST FIRMWARE_FIRST) to determine AER ownership
(Alexandru Gagniuc, Kuppuswamy Sathyanarayanan)

- Reduce verbosity by logging only ACPI_NOTIFY_DISCONNECT_RECOVER
events (Kuppuswamy Sathyanarayanan)

- Don't enable AER by default in Kconfig (Bjorn Helgaas)

Peer-to-peer DMA:

- Add AMD Zen Raven and Renoir Root Ports to whitelist (Alex Deucher)

ASPM:

- Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges (Kai-Heng Feng)

Endpoint framework:

- Fix DMA channel release in test (Kunihiko Hayashi)

- Add page size as argument to pci_epc_mem_init() (Lad Prabhakar)

- Add support to handle multiple base for mapping outbound memory
(Lad Prabhakar)

Generic host bridge driver:

- Support building as module (Rob Herring)

- Eliminate pci_host_common_probe wrappers (Rob Herring)

Amlogic Meson PCIe controller driver:

- Don't use FAST_LINK_MODE to set up link (Marc Zyngier)

Broadcom STB PCIe controller driver:

- Disable ASPM L0s if 'aspm-no-l0s' in DT (Jim Quinlan)

- Fix clk_put() error (Jim Quinlan)

- Fix window register offset (Jim Quinlan)

- Assert fundamental reset on initialization (Nicolas Saenz Julienne)

- Add notify xHCI reset property (Nicolas Saenz Julienne)

- Add init routine for Raspberry Pi 4 VL805 USB controller (Nicolas
Saenz Julienne)

- Sync with Raspberry Pi 4 firmware for VL805 initialization (Nicolas
Saenz Julienne)

Cadence PCIe controller driver:

- Remove "cdns,max-outbound-regions" DT property (replaced by
"ranges") (Kishon Vijay Abraham I)

- Read 32-bit (not 16-bit) Vendor ID/Device ID property from DT
(Kishon Vijay Abraham I)

Marvell Aardvark PCIe controller driver:

- Improve link training (Marek Behún)

- Add PHY support (Marek Behún)

- Add "phys", "max-link-speed", "reset-gpios" to dt-binding (Marek
Behún)

- Train link immediately after enabling training to work around
detection issues with some cards (Pali Rohár)

- Issue PERST via GPIO to work around detection issues (Pali Rohár)

- Don't blindly enable ASPM L0s (Pali Rohár)

- Replace custom macros by standard linux/pci_regs.h macros (Pali
Rohár)

Microsoft Hyper-V host bridge driver:

- Fix probe failure path to release resource (Wei Hu)

- Retry PCI bus D0 entry on invalid device state for kdump (Wei Hu)

Renesas R-Car PCIe controller driver:

- Fix incorrect programming of OB windows (Andrew Murray)

- Add suspend/resume (Kazufumi Ikeda)

- Rename pcie-rcar.c to pcie-rcar-host.c (Lad Prabhakar)

- Add endpoint controller driver (Lad Prabhakar)

- Fix PCIEPAMR mask calculation (Lad Prabhakar)

- Add r8a77961 to DT binding (Yoshihiro Shimoda)

Socionext UniPhier Pro5 controller driver:

- Add endpoint controller driver (Kunihiko Hayashi)

Synopsys DesignWare PCIe controller driver:

- Program outbound ATU upper limit register (Alan Mikhak)

- Fix inner MSI IRQ domain registration (Marc Zyngier)

Miscellaneous:

- Check for platform_get_irq() failure consistently (negative return
means failure) (Aman Sharma)

- Fix several runtime PM get/put imbalances (Dinghao Liu)

- Use flexible-array and struct_size() helpers for code cleanup
(Gustavo A. R. Silva)

- Update & fix issues in bridge emulation of PCIe registers (Jon
Derrick)

- Add macros for bridge window names (PCI_BRIDGE_IO_WINDOW, etc)
(Krzysztof Wilczyński)

- Work around Intel PCH MROMs that have invalid BARs (Xiaochun Lee)"

* tag 'pci-v5.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (100 commits)
PCI: uniphier: Add Socionext UniPhier Pro5 PCIe endpoint controller driver
PCI: Add ACS quirk for Intel Root Complex Integrated Endpoints
PCI/DPC: Print IRQ number used by port
PCI/AER: Use "aer" variable for capability offset
PCI/AER: Remove redundant dev->aer_cap checks
PCI/AER: Remove redundant pci_is_pcie() checks
PCI/AER: Remove HEST/FIRMWARE_FIRST parsing for AER ownership
PCI: tegra: Fix runtime PM imbalance on error
PCI: vmd: Filter resource type bits from shadow register
PCI: tegra194: Fix runtime PM imbalance on error
dt-bindings: PCI: Add UniPhier PCIe endpoint controller description
PCI: hv: Use struct_size() helper
PCI: Rename _DSM constants to align with spec
PCI: Avoid FLR for AMD Starship USB 3.0
PCI: Avoid FLR for AMD Matisse HD Audio & USB 3.0
x86/PCI: Drop unused xen_register_pirq() gsi_override parameter
PCI: dwc: Use private data pointer of "struct irq_domain" to get pcie_port
PCI: amlogic: meson: Don't use FAST_LINK_MODE to set up link
PCI: dwc: Fix inner MSI IRQ domain registration
PCI: dwc: pci-dra7xx: Use devm_platform_ioremap_resource_byname()
...

show more ...

Merge branch 'remotes/lorenzo/pci/host-generic'

- Constify struct pci_ecam_ops (Rob Herring)

- Support building as modules (Rob Herring)

- Eliminate wrappers for pci_host_common_probe() by u

Merge branch 'remotes/lorenzo/pci/host-generic'

- Constify struct pci_ecam_ops (Rob Herring)

- Support building as modules (Rob Herring)

- Eliminate wrappers for pci_host_common_probe() by using DT match table
data (Rob Herring)

* remotes/lorenzo/pci/host-generic:
PCI: host-generic: Eliminate pci_host_common_probe wrappers
PCI: host-generic: Support building as modules
PCI: Constify struct pci_ecam_ops

# Conflicts:
# drivers/pci/controller/dwc/pcie-hisi.c

show more ...

Merge branch 'remotes/lorenzo/pci/dwc'

- Simplify computation of msix_tbl (Jiri Slaby)

- Make hisi_pcie_platform_ops static (Zou Wei)

- Warn about resources above 4G (Alan Mikhak)

- Make

Merge branch 'remotes/lorenzo/pci/dwc'

- Simplify computation of msix_tbl (Jiri Slaby)

- Make hisi_pcie_platform_ops static (Zou Wei)

- Warn about resources above 4G (Alan Mikhak)

- Make intel_pcie_cpu_addr() static (Jason Yan)

- Use devm_platform_ioremap_resource_byname() to simplify code and
improve error checking (Wei Yongjun)

- Fix inner MSI IRQ domain registration so it doesn't confuse debugfs
(Marc Zyngier)

- Don't use FAST_LINK_MODE on meson (Marc Zyngier)

- Add Socionext UniPhier Pro5 PCIe endpoint controller driver and DT
description (Kunihiko Hayashi)

* remotes/lorenzo/pci/dwc:
PCI: uniphier: Add Socionext UniPhier Pro5 PCIe endpoint controller driver
dt-bindings: PCI: Add UniPhier PCIe endpoint controller description
PCI: dwc: Use private data pointer of "struct irq_domain" to get pcie_port
PCI: amlogic: meson: Don't use FAST_LINK_MODE to set up link
PCI: dwc: Fix inner MSI IRQ domain registration
PCI: dwc: pci-dra7xx: Use devm_platform_ioremap_resource_byname()
PCI: dwc: intel: Make intel_pcie_cpu_addr() static
PCI: dwc: Program outbound ATU upper limit register
PCI: dwc: Make hisi_pcie_platform_ops static
PCI: dwc: Clean up computing of msix_tbl

show more ...

PCI: host-generic: Eliminate pci_host_common_probe wrappers

Most ECAM host drivers are just different pci_ecam_ops which can be DT
match table data. That's already the case in some cases, but let's

PCI: host-generic: Eliminate pci_host_common_probe wrappers

Most ECAM host drivers are just different pci_ecam_ops which can be DT
match table data. That's already the case in some cases, but let's
do that for all the ECAM drivers. Then we can use
of_device_get_match_data() in pci_host_common_probe() and eliminate the
probe wrapper functions and use pci_host_common_probe() directly for
probe.

Link: https://lore.kernel.org/r/20200409234923.21598-4-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <amurray@thegoodpenguin.co.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Robert Richter <rrichter@marvell.com>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: Mans Rullgard <mans@mansr.com>
Cc: linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org

show more ...

PCI: dwc: Make hisi_pcie_platform_ops static

Fix the following sparse warning:

drivers/pci/controller/dwc/pcie-hisi.c:365:21: warning:
symbol 'hisi_pcie_platform_ops' was not declared. Should it be

PCI: dwc: Make hisi_pcie_platform_ops static

Fix the following sparse warning:

drivers/pci/controller/dwc/pcie-hisi.c:365:21: warning:
symbol 'hisi_pcie_platform_ops' was not declared. Should it be static?

Link: https://lore.kernel.org/r/1587611883-26960-1-git-send-email-zou_wei@huawei.com
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>

show more ...

PCI: Constify struct pci_ecam_ops

struct pci_ecam_ops is typically DT match table data which is defined to
be const. It's also best practice for ops structs to be const. Ideally,
we'd make struct pc

PCI: Constify struct pci_ecam_ops

struct pci_ecam_ops is typically DT match table data which is defined to
be const. It's also best practice for ops structs to be const. Ideally,
we'd make struct pci_ops const as well, but that becomes pretty
invasive, so for now we just cast it where needed.

Link: https://lore.kernel.org/r/20200409234923.21598-2-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <amurray@thegoodpenguin.co.uk>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Jonathan Chocron <jonnyc@amazon.com>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
Cc: Robert Richter <rrichter@marvell.com>
Cc: Toan Le <toan@os.amperecomputing.com>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>
Cc: Mans Rullgard <mans@mansr.com>
Cc: linux-acpi@vger.kernel.org

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/renames'

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

* pci/renames:
PCI: Collect all native drivers under drivers/pci/controller/

PCI: Collect all native drivers under drivers/pci/controller/

Native PCI drivers for root complex devices were originally all in
drivers/pci/host/. Some of these devices can also be operated in end

PCI: Collect all native drivers under drivers/pci/controller/

Native PCI drivers for root complex devices were originally all in
drivers/pci/host/. Some of these devices can also be operated in endpoint
mode. Drivers for endpoint mode didn't seem to fit in the "host"
directory, so we put both the root complex and endpoint drivers in
per-device directories, e.g., drivers/pci/dwc/, drivers/pci/cadence/, etc.

These per-device directories contain trivial Kconfig and Makefiles and
clutter drivers/pci/. Make a new drivers/pci/controllers/ directory and
collect all the device-specific drivers there.

No functional change intended.

Link: https://lkml.kernel.org/r/1520304202-232891-1-git-send-email-shawn.lin@rock-chips.com
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
[bhelgaas: changelog]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

show more ...