Merge remote-tracking branch 'torvalds/master' into perf/urgent

To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':

7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arche

Merge remote-tracking branch 'torvalds/master' into perf/urgent

To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':

7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arches
1fd450f99272 libbpf: Fix up generation of bpf_helper_defs.h

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

show more ...

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

Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].

[1] http://lore.kern

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

Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].

[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

show more ...

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge mainline/master into arm/fixes

This brings in the mainline tree right after armsoc contents was merged
this release cycle, so that we can re-run savedefconfig, etc.

Signed-off-by: Olof Johans

Merge mainline/master into arm/fixes

This brings in the mainline tree right after armsoc contents was merged
this release cycle, so that we can re-run savedefconfig, etc.

Signed-off-by: Olof Johansson <olof@lixom.net>

show more ...

drm/radeon: Don't include <drm/drm_pci.h>

Including <drm/drm_pci.h> is unnecessary in most cases. Replace
these instances.

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

drm/radeon: Don't include <drm/drm_pci.h>

Including <drm/drm_pci.h> is unnecessary in most cases. Replace
these instances.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203100406.9674-9-tzimmermann@suse.de

show more ...

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

Pull PCI updates from Bjorn Helgaas:
"Enumeration:

- Warn if a host bridge has no NUMA info (Yunsheng L

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

Pull PCI updates from Bjorn Helgaas:
"Enumeration:

- Warn if a host bridge has no NUMA info (Yunsheng Lin)

- Add PCI_STD_NUM_BARS for the number of standard BARs (Denis
Efremov)

Resource management:

- Fix boot-time Embedded Controller GPE storm caused by incorrect
resource assignment after ACPI Bus Check Notification (Mika
Westerberg)

- Protect pci_reassign_bridge_resources() against concurrent
addition/removal (Benjamin Herrenschmidt)

- Fix bridge dma_ranges resource list cleanup (Rob Herring)

- Add "pci=hpmmiosize" and "pci=hpmmioprefsize" parameters to control
the MMIO and prefetchable MMIO window sizes of hotplug bridges
independently (Nicholas Johnson)

- Fix MMIO/MMIO_PREF window assignment that assigned more space than
desired (Nicholas Johnson)

- Only enforce bus numbers from bridge EA if the bridge has EA
devices downstream (Subbaraya Sundeep)

- Consolidate DT "dma-ranges" parsing and convert all host drivers to
use shared parsing (Rob Herring)

Error reporting:

- Restore AER capability after resume (Mayurkumar Patel)

- Add PoisonTLPBlocked AER counter (Rajat Jain)

- Use for_each_set_bit() to simplify AER code (Andy Shevchenko)

- Fix AER kernel-doc (Andy Shevchenko)

- Add "pcie_ports=dpc-native" parameter to allow native use of DPC
even if platform didn't grant control over AER (Olof Johansson)

Hotplug:

- Avoid returning prematurely from sysfs requests to enable or
disable a PCIe hotplug slot (Lukas Wunner)

- Don't disable interrupts twice when suspending hotplug ports (Mika
Westerberg)

- Fix deadlocks when PCIe ports are hot-removed while suspended (Mika
Westerberg)

Power management:

- Remove unnecessary ASPM locking (Bjorn Helgaas)

- Add support for disabling L1 PM Substates (Heiner Kallweit)

- Allow re-enabling Clock PM after it has been disabled (Heiner
Kallweit)

- Add sysfs attributes for controlling ASPM link states (Heiner
Kallweit)

- Remove CONFIG_PCIEASPM_DEBUG, including "link_state" and "clk_ctl"
sysfs files (Heiner Kallweit)

- Avoid AMD FCH XHCI USB PME# from D0 defect that prevents wakeup on
USB 2.0 or 1.1 connect events (Kai-Heng Feng)

- Move power state check out of pci_msi_supported() (Bjorn Helgaas)

- Fix incorrect MSI-X masking on resume and revert related nvme quirk
for Kingston NVME SSD running FW E8FK11.T (Jian-Hong Pan)

- Always return devices to D0 when thawing to fix hibernation with
drivers like mlx4 that used legacy power management (previously we
only did it for drivers with new power management ops) (Dexuan Cui)

- Clear PCIe PME Status even for legacy power management (Bjorn
Helgaas)

- Fix PCI PM documentation errors (Bjorn Helgaas)

- Use dev_printk() for more power management messages (Bjorn Helgaas)

- Apply D2 delay as milliseconds, not microseconds (Bjorn Helgaas)

- Convert xen-platform from legacy to generic power management (Bjorn
Helgaas)

- Removed unused .resume_early() and .suspend_late() legacy power
management hooks (Bjorn Helgaas)

- Rearrange power management code for clarity (Rafael J. Wysocki)

- Decode power states more clearly ("4" or "D4" really refers to
"D3cold") (Bjorn Helgaas)

- Notice when reading PM Control register returns an error (~0)
instead of interpreting it as being in D3hot (Bjorn Helgaas)

- Add missing link delays required by the PCIe spec (Mika Westerberg)

Virtualization:

- Move pci_prg_resp_pasid_required() to CONFIG_PCI_PRI (Bjorn
Helgaas)

- Allow VFs to use PRI (the PF PRI is shared by the VFs, but the code
previously didn't recognize that) (Kuppuswamy Sathyanarayanan)

- Allow VFs to use PASID (the PF PASID capability is shared by the
VFs, but the code previously didn't recognize that) (Kuppuswamy
Sathyanarayanan)

- Disconnect PF and VF ATS enablement, since ATS in PFs and
associated VFs can be enabled independently (Kuppuswamy
Sathyanarayanan)

- Cache PRI and PASID capability offsets (Kuppuswamy Sathyanarayanan)

- Cache the PRI PRG Response PASID Required bit (Bjorn Helgaas)

- Consolidate ATS declarations in linux/pci-ats.h (Krzysztof
Wilczynski)

- Remove unused PRI and PASID stubs (Bjorn Helgaas)

- Removed unnecessary EXPORT_SYMBOL_GPL() from ATS, PRI, and PASID
interfaces that are only used by built-in IOMMU drivers (Bjorn
Helgaas)

- Hide PRI and PASID state restoration functions used only inside the
PCI core (Bjorn Helgaas)

- Add a DMA alias quirk for the Intel VCA NTB (Slawomir Pawlowski)

- Serialize sysfs sriov_numvfs reads vs writes (Pierre Crégut)

- Update Cavium ACS quirk for ThunderX2 and ThunderX3 (George
Cherian)

- Fix the UPDCR register address in the Intel ACS quirk (Steffen
Liebergeld)

- Unify ACS quirk implementations (Bjorn Helgaas)

Amlogic Meson host bridge driver:

- Fix meson PERST# GPIO polarity problem (Remi Pommarel)

- Add DT bindings for Amlogic Meson G12A (Neil Armstrong)

- Fix meson clock names to match DT bindings (Neil Armstrong)

- Add meson support for Amlogic G12A SoC with separate shared PHY
(Neil Armstrong)

- Add meson extended PCIe PHY functions for Amlogic G12A USB3+PCIe
combo PHY (Neil Armstrong)

- Add arm64 DT for Amlogic G12A PCIe controller node (Neil Armstrong)

- Add commented-out description of VIM3 USB3/PCIe mux in arm64 DT
(Neil Armstrong)

Broadcom iProc host bridge driver:

- Invalidate iProc PAXB address mapping before programming it
(Abhishek Shah)

- Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)

Cadence host bridge driver:

- Refactor Cadence PCIe host controller to use as a library for both
host and endpoint (Tom Joseph)

Freescale Layerscape host bridge driver:

- Add layerscape LS1028a support (Xiaowei Bao)

Intel VMD host bridge driver:

- Add VMD bus 224-255 restriction decode (Jon Derrick)

- Add VMD 8086:9A0B device ID (Jon Derrick)

- Remove Keith from VMD maintainer list (Keith Busch)

Marvell ARMADA 3700 / Aardvark host bridge driver:

- Use LTSSM state to build link training flag since Aardvark doesn't
implement the Link Training bit (Remi Pommarel)

- Delay before training Aardvark link in case PERST# was asserted
before the driver probe (Remi Pommarel)

- Fix Aardvark issues with Root Control reads and writes (Remi
Pommarel)

- Don't rely on jiffies in Aardvark config access path since
interrupts may be disabled (Remi Pommarel)

- Fix Aardvark big-endian support (Grzegorz Jaszczyk)

Marvell ARMADA 370 / XP host bridge driver:

- Make mvebu_pci_bridge_emul_ops static (Ben Dooks)

Microsoft Hyper-V host bridge driver:

- Add hibernation support for Hyper-V virtual PCI devices (Dexuan
Cui)

- Track Hyper-V pci_protocol_version per-hbus, not globally (Dexuan
Cui)

- Avoid kmemleak false positive on hv hbus buffer (Dexuan Cui)

Mobiveil host bridge driver:

- Change mobiveil csr_read()/write() function names that conflict
with riscv arch functions (Kefeng Wang)

NVIDIA Tegra host bridge driver:

- Fix Tegra CLKREQ dependency programming (Vidya Sagar)

Renesas R-Car host bridge driver:

- Remove unnecessary header include from rcar (Andrew Murray)

- Tighten register index checking for rcar inbound range programming
(Marek Vasut)

- Fix rcar inbound range alignment calculation to improve packing of
multiple entries (Marek Vasut)

- Update rcar MACCTLR setting to match documentation (Yoshihiro
Shimoda)

- Clear bit 0 of MACCTLR before PCIETCTLR.CFINIT per manual
(Yoshihiro Shimoda)

- Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
Horman)

Rockchip host bridge driver:

- Make rockchip 0V9 and 1V8 power regulators non-optional (Robin
Murphy)

Socionext UniPhier host bridge driver:

- Set uniphier to host (RC) mode always (Kunihiko Hayashi)

Endpoint drivers:

- Fix endpoint driver sign extension problem when shifting page
number to phys_addr_t (Alan Mikhak)

Misc:

- Add NumaChip SPDX header (Krzysztof Wilczynski)

- Replace EXTRA_CFLAGS with ccflags-y (Krzysztof Wilczynski)

- Remove unused includes (Krzysztof Wilczynski)

- Removed unused sysfs attribute groups (Ben Dooks)

- Remove PTM and ASPM dependencies on PCIEPORTBUS (Bjorn Helgaas)

- Add PCIe Link Control 2 register field definitions to replace magic
numbers in AMDGPU and Radeon CIK/SI (Bjorn Helgaas)

- Fix incorrect Link Control 2 Transmit Margin usage in AMDGPU and
Radeon CIK/SI PCIe Gen3 link training (Bjorn Helgaas)

- Use pcie_capability_read_word() instead of pci_read_config_word()
in AMDGPU and Radeon CIK/SI (Frederick Lawler)

- Remove unused pci_irq_get_node() Greg Kroah-Hartman)

- Make asm/msi.h mandatory and simplify PCI_MSI_IRQ_DOMAIN Kconfig
(Palmer Dabbelt, Michal Simek)

- Read all 64 bits of Switchtec part_event_bitmap (Logan Gunthorpe)

- Fix erroneous intel-iommu dependency on CONFIG_AMD_IOMMU (Bjorn
Helgaas)

- Fix bridge emulation big-endian support (Grzegorz Jaszczyk)

- Fix dwc find_next_bit() usage (Niklas Cassel)

- Fix pcitest.c fd leak (Hewenliang)

- Fix typos and comments (Bjorn Helgaas)

- Fix Kconfig whitespace errors (Krzysztof Kozlowski)"

* tag 'pci-v5.5-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (160 commits)
PCI: Remove PCI_MSI_IRQ_DOMAIN architecture whitelist
asm-generic: Make msi.h a mandatory include/asm header
Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
PCI/MSI: Fix incorrect MSI-X masking on resume
PCI/MSI: Move power state check out of pci_msi_supported()
PCI/MSI: Remove unused pci_irq_get_node()
PCI: hv: Avoid a kmemleak false positive caused by the hbus buffer
PCI: hv: Change pci_protocol_version to per-hbus
PCI: hv: Add hibernation support
PCI: hv: Reorganize the code in preparation of hibernation
MAINTAINERS: Remove Keith from VMD maintainer
PCI/ASPM: Remove PCIEASPM_DEBUG Kconfig option and related code
PCI/ASPM: Add sysfs attributes for controlling ASPM link states
PCI: Fix indentation
drm/radeon: Prefer pcie_capability_read_word()
drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions
drm/radeon: Correct Transmit Margin masks
drm/amdgpu: Prefer pcie_capability_read_word()
PCI: uniphier: Set mode register to host mode
drm/amdgpu: Replace numbers with PCI_EXP_LNKCTL2 definitions
...

show more ...

Merge branch 'pci/misc'

- Add NumaChip SPDX header (Krzysztof Wilczynski)

- Replace EXTRA_CFLAGS with ccflags-y (Krzysztof Wilczynski)

- Remove unused includes (Krzysztof Wilczynski)

- Av

Merge branch 'pci/misc'

- Add NumaChip SPDX header (Krzysztof Wilczynski)

- Replace EXTRA_CFLAGS with ccflags-y (Krzysztof Wilczynski)

- Remove unused includes (Krzysztof Wilczynski)

- Avoid AMD FCH XHCI USB PME# from D0 defect that prevents wakeup on USB
2.0 or 1.1 connect events (Kai-Heng Feng)

- Removed unused sysfs attribute groups (Ben Dooks)

- Remove PTM and ASPM dependencies on PCIEPORTBUS (Bjorn Helgaas)

- Add PCIe Link Control 2 register field definitions to replace magic
numbers in AMDGPU and Radeon CIK/SI (Bjorn Helgaas)

- Fix incorrect Link Control 2 Transmit Margin usage in AMDGPU and Radeon
CIK/SI PCIe Gen3 link training (Bjorn Helgaas)

- Use pcie_capability_read_word() instead of pci_read_config_word() in
AMDGPU and Radeon CIK/SI (Frederick Lawler)

* pci/misc:
drm/radeon: Prefer pcie_capability_read_word()
drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions
drm/radeon: Correct Transmit Margin masks
drm/amdgpu: Prefer pcie_capability_read_word()
drm/amdgpu: Replace numbers with PCI_EXP_LNKCTL2 definitions
drm/amdgpu: Correct Transmit Margin masks
PCI: Add #defines for Enter Compliance, Transmit Margin
PCI: Allow building PCIe things without PCIEPORTBUS
PCI: Remove PCIe Kconfig dependencies on PCI
PCI/ASPM: Remove dependency on PCIEPORTBUS
PCI/PTM: Remove dependency on PCIEPORTBUS
PCI/PTM: Remove spurious "d" from granularity message
PCI: sysfs: Remove unused attribute groups
x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect
PCI: Remove unused includes and superfluous struct declaration
x86/PCI: Replace deprecated EXTRA_CFLAGS with ccflags-y
x86/PCI: Correct SPDX comment style
x86/PCI: Add NumaChip SPDX GPL-2.0 to replace COPYING boilerplate

show more ...

Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm

Pull drm updates from Dave Airlie:
"Lots of stuff in here, though it hasn't been too insane this merge
apart from dealing

Merge tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm

Pull drm updates from Dave Airlie:
"Lots of stuff in here, though it hasn't been too insane this merge
apart from dealing with the security fun.

uapi:
- export different colorspace properties on DP vs HDMI
- new fourcc for ARM 16x16 block format
- syncobj: allow querying last submitted timeline value
- DRM_FORMAT_BIG_ENDIAN defined as unsigned

core:
- allow using gem vma manager in ttm
- connector/encoder/bridge doc fixes
- allow more than 3 encoders for a connector
- displayport mst suspend/resume reprobing support
- vram lazy unmapping, uniform vram mm and gem vram
- edid cleanups + AVI informframe bar info
- displayport helpers - dpcd parser added

dp_cec:
- Allow a connector to be associated with a cec device

ttm:
- pipelining with no_gpu_wait fix
- always keep BOs on the LRU

sched:
- allow free_job routine to sleep

i915:
- Block userptr from mappable GTT
- i915 perf uapi versioning
- OA stream dynamic reconfiguration
- make context persistence optional
- introduce DRM_I915_UNSTABLE Kconfig
- add fake lmem testing under unstable
- BT.2020 support for DP MSA
- struct mutex elimination
- Tigerlake display/PLL/power management improvements
- Jasper Lake PCH support
- refactor PMU for multiple GPUs
- Icelake firmware update
- Split out vga + switcheroo code

amdgpu:
- implement dma-buf import/export without helpers
- vega20 RAS enablement
- DC i2c over aux fixes
- renoir GPU reset
- DC HDCP support
- BACO support for CI/VI asics
- MSI-X support
- Arcturus EEPROM support
- Arcturus VCN encode support
- VCN dynamic powergating on RV/RV2

amdkfd:
- add navi12/14/renoir support to kfd

radeon:
- SI dpm fix ported from amdgpu
- fix bad DMA on ppc platforms

gma500:
- memory leak fixes

qxl:
- convert to new gem mmap

exynos:
- build warning fix

komeda:
- add aclk sysfs attribute

v3d:
- userspace cleanup uapi change

i810:
- fix for underflow in dispatch ioctls

ast:
- refactor show_cursor

mgag200:
- refactor show_cursor

arcgpu:
- encoder finding improvements

mediatek:
- mipi_tx, dsi and partial crtc support for MT8183 SoC
- rotation support

meson:
- add suspend/resume support

omap:
- misc refactors

tegra:
- DisplayPort support for Tegra 210, 186 and 194.
- IOMMU-backed DMA API fixes

panfrost:
- fix lockdep issue
- simplify devfreq integration

rcar-du:
- R8A774B1 SoC support
- fixes for H2 ES2.0

sun4i:
- vcc-dsi regulator support

virtio-gpu:
- vmexit vs spinlock fix
- move to gem shmem helpers
- handle large command buffers with cma"

* tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm: (1855 commits)
drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10
drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub
drm/amd/amdgpu/sriov skip RLCG s/r list for arcturus VF.
drm/amd/amdgpu/sriov temporarily skip ras,dtm,hdcp for arcturus VF
drm/amdgpu/gfx10: re-init clear state buffer after gpu reset
merge fix for "ftrace: Rework event_create_dir()"
drm/amdgpu: Update Arcturus golden registers
drm/amdgpu/gfx10: fix out-of-bound mqd_backup array access
drm/amdgpu/gfx10: explicitly wait for cp idle after halt/unhalt
Revert "drm/amd/display: enable S/G for RAVEN chip"
drm/amdgpu: disable gfxoff on original raven
drm/amdgpu: remove experimental flag for Navi14
drm/amdgpu: disable gfxoff when using register read interface
drm/amdgpu/powerplay: properly set PP_GFXOFF_MASK (v2)
drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2
drm/radeon: fix bad DMA from INTERRUPT_CNTL2
drm/amd/display: Fix debugfs on MST connectors
drm/amdgpu/nv: add asic func for fetching vbios from rom directly
drm/amdgpu: put flush_delayed_work at first
drm/amdgpu/vcn2.5: fix the enc loop with hw fini
...

show more ...

Merge tag 'drm-next-5.5-2019-11-22' of git://people.freedesktop.org/~agd5f/linux into drm-next

drm-next-5.5-2019-11-22:

amdgpu:
- Fix bad DMA on some PPC platforms
- MMHUB fix for powergating
- BAC

Merge tag 'drm-next-5.5-2019-11-22' of git://people.freedesktop.org/~agd5f/linux into drm-next

drm-next-5.5-2019-11-22:

amdgpu:
- Fix bad DMA on some PPC platforms
- MMHUB fix for powergating
- BACO fix for Navi
- Misc raven fixes
- Enable vbios fetch directly from rom on navi
- debugfs fix for DC
- SR-IOV fixes for arcturus
- Misc power fixes

radeon:
- Fix bad DMA on some PPC platforms

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191122203025.3787-1-alexander.deucher@amd.com

show more ...

Merge branch 'next' into for-linus

Prepare input updates for 5.5 merge window.

drm/radeon: fix bad DMA from INTERRUPT_CNTL2

The INTERRUPT_CNTL2 register expects a valid DMA address, but is
currently set with a GPU MC address. This can cause problems on
systems that detect the

drm/radeon: fix bad DMA from INTERRUPT_CNTL2

The INTERRUPT_CNTL2 register expects a valid DMA address, but is
currently set with a GPU MC address. This can cause problems on
systems that detect the resulting DMA read from an invalid address
(found on a Power8 guest).

Instead, use the DMA address of the dummy page because it will always
be safe.

Fixes: d8f60cfc9345 ("drm/radeon/kms: Add support for interrupts on r6xx/r7xx chips (v3)")
Fixes: 25a857fbe973 ("drm/radeon/kms: add support for interrupts on SI")
Fixes: a59781bbe528 ("drm/radeon: add support for interrupts on CIK (v5)")
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

drm/radeon: Prefer pcie_capability_read_word()

Commit 8c0d3a02c130 ("PCI: Add accessors for PCI Express Capability")
added accessors for the PCI Express Capability so that drivers didn't
need to be

drm/radeon: Prefer pcie_capability_read_word()

Commit 8c0d3a02c130 ("PCI: Add accessors for PCI Express Capability")
added accessors for the PCI Express Capability so that drivers didn't
need to be aware of differences between v1 and v2 of the PCI
Express Capability.

Replace pci_read_config_word() and pci_write_config_word() calls with
pcie_capability_read_word() and pcie_capability_write_word().

Link: https://lore.kernel.org/r/20191118003513.10852-1-fred@fredlawl.com
Signed-off-by: Frederick Lawler <fred@fredlawl.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions

Replace hard-coded magic numbers with the descriptive PCI_EXP_LNKCTL2
definitions. No functional change intended.

Link: https://lore.ke

drm/radeon: Replace numbers with PCI_EXP_LNKCTL2 definitions

Replace hard-coded magic numbers with the descriptive PCI_EXP_LNKCTL2
definitions. No functional change intended.

Link: https://lore.kernel.org/r/20191112173503.176611-4-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

drm/radeon: Correct Transmit Margin masks

Previously we masked PCIe Link Control 2 register values with "7 << 9",
which was apparently intended to be the Transmit Margin field, but instead
was the h

drm/radeon: Correct Transmit Margin masks

Previously we masked PCIe Link Control 2 register values with "7 << 9",
which was apparently intended to be the Transmit Margin field, but instead
was the high order bit of Transmit Margin, the Enter Modified Compliance
bit, and the Compliance SOS bit.

Correct the mask to "7 << 7", which is the Transmit Margin field.

Link: https://lore.kernel.org/r/20191112173503.176611-3-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

drm/radeon: fix bad DMA from INTERRUPT_CNTL2

The INTERRUPT_CNTL2 register expects a valid DMA address, but is
currently set with a GPU MC address. This can cause problems on
systems that detect the

drm/radeon: fix bad DMA from INTERRUPT_CNTL2

The INTERRUPT_CNTL2 register expects a valid DMA address, but is
currently set with a GPU MC address. This can cause problems on
systems that detect the resulting DMA read from an invalid address
(found on a Power8 guest).

Instead, use the DMA address of the dummy page because it will always
be safe.

Fixes: d8f60cfc9345 ("drm/radeon/kms: Add support for interrupts on r6xx/r7xx chips (v3)")
Fixes: 25a857fbe973 ("drm/radeon/kms: add support for interrupts on SI")
Fixes: a59781bbe528 ("drm/radeon: add support for interrupts on CIK (v5)")
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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

Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9

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

Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

show more ...

Merge branch 'linus' into x86/hyperv

Pick up upstream fixes to avoid conflicts.

Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next

drm-next-5.5-2019-11-01:

amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arc

Merge tag 'drm-next-5.5-2019-11-01' of git://people.freedesktop.org/~agd5f/linux into drm-next

drm-next-5.5-2019-11-01:

amdgpu:
- Add EEPROM support for Arcturus
- Enable VCN encode support for Arcturus
- Misc PSP fixes
- Misc DC fixes
- swSMU cleanup

amdkfd:
- Misc cleanups
- Fix typo in cu bitmap parsing

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191101190607.3763-1-alexander.deucher@amd.com

show more ...

drm/radeon: remove assignment for return value

Remove unnecessary assignment for return value and have the
function return the required value directly.
Issue found by coccinelle:
@@
local idexpressi

drm/radeon: remove assignment for return value

Remove unnecessary assignment for return value and have the
function return the required value directly.
Issue found by coccinelle:
@@
local idexpression ret;
expression e;
@@

-ret =
+return
e;
-return ret;

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Wambui Karuga <wambui@karuga.xyz>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

show more ...

Merge tag 'v5.4-rc5' into next

Sync up with mainline.

Merge tag 'v5.4-rc3' into spi-5.4

Linux 5.4-rc3

Merge tag 'fix-missing-panels' into fixes

Merge drm/drm-fixes into drm-misc-fixes

We haven't backmerged for a while, let's start the -rc period by pulling
rc1.

Signed-off-by: Maxime Ripard <mripard@kernel.org>