1. 02 Aug, 2016 9 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · c8d0267e
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Highlights:
      
         - ARM64 support for ACPI host bridges
      
         - new drivers for Axis ARTPEC-6 and Marvell Aardvark
      
         - new pci_alloc_irq_vectors() interface for MSI-X, MSI, legacy INTx
      
         - pci_resource_to_user() cleanup (more to come)
      
        Detailed summary:
      
        Enumeration:
         - Move ecam.h to linux/include/pci-ecam.h (Jayachandran C)
         - Add parent device field to ECAM struct pci_config_window (Jayachandran C)
         - Add generic MCFG table handling (Tomasz Nowicki)
         - Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC (Tomasz Nowicki)
         - Factor DT-specific pci_bus_find_domain_nr() code out (Tomasz Nowicki)
      
        Resource management:
         - Add devm_request_pci_bus_resources() (Bjorn Helgaas)
         - Unify pci_resource_to_user() declarations (Bjorn Helgaas)
         - Implement pci_resource_to_user() with pcibios_resource_to_bus() (microblaze, powerpc, sparc) (Bjorn Helgaas)
         - Request host bridge window resources (designware, iproc, rcar, xgene, xilinx, xilinx-nwl) (Bjorn Helgaas)
         - Make PCI I/O space optional on ARM32 (Bjorn Helgaas)
         - Ignore write combining when mapping I/O port space (Bjorn Helgaas)
         - Claim bus resources on MIPS PCI_PROBE_ONLY set-ups (Bjorn Helgaas)
         - Remove unicore32 pci=firmware command line parameter handling (Bjorn Helgaas)
         - Support I/O resources when parsing host bridge resources (Jayachandran C)
         - Add helpers to request/release memory and I/O regions (Johannes Thumshirn)
         - Use pci_(request|release)_mem_regions (NVMe, lpfc, GenWQE, ethernet/intel, alx) (Johannes Thumshirn)
         - Extend pci=resource_alignment to specify device/vendor IDs (Koehrer Mathias (ETAS/ESW5))
         - Add generic pci_bus_claim_resources() (Lorenzo Pieralisi)
         - Claim bus resources on ARM32 PCI_PROBE_ONLY set-ups (Lorenzo Pieralisi)
         - Remove ARM32 and ARM64 arch-specific pcibios_enable_device() (Lorenzo Pieralisi)
         - Add pci_unmap_iospace() to unmap I/O resources (Sinan Kaya)
         - Remove powerpc __pci_mmap_set_pgprot() (Yinghai Lu)
      
        PCI device hotplug:
         - Allow additional bus numbers for hotplug bridges (Keith Busch)
         - Ignore interrupts during D3cold (Lukas Wunner)
      
        Power management:
         - Enforce type casting for pci_power_t (Andy Shevchenko)
         - Don't clear d3cold_allowed for PCIe ports (Mika Westerberg)
         - Put PCIe ports into D3 during suspend (Mika Westerberg)
         - Power on bridges before scanning new devices (Mika Westerberg)
         - Runtime resume bridge before rescan (Mika Westerberg)
         - Add runtime PM support for PCIe ports (Mika Westerberg)
         - Remove redundant check of pcie_set_clkpm (Shawn Lin)
      
        Virtualization:
         - Add function 1 DMA alias quirk for Marvell 88SE9182 (Aaron Sierra)
         - Add DMA alias quirk for Adaptec 3805 (Alex Williamson)
         - Mark Atheros AR9485 and QCA9882 to avoid bus reset (Chris Blake)
         - Add ACS quirk for Solarflare SFC9220 (Edward Cree)
      
        MSI:
         - Fix PCI_MSI dependencies (Arnd Bergmann)
         - Add pci_msix_desc_addr() helper (Christoph Hellwig)
         - Switch msix_program_entries() to use pci_msix_desc_addr() (Christoph Hellwig)
         - Make the "entries" argument to pci_enable_msix() optional (Christoph Hellwig)
         - Provide sensible IRQ vector alloc/free routines (Christoph Hellwig)
         - Spread interrupt vectors in pci_alloc_irq_vectors() (Christoph Hellwig)
      
        Error Handling:
         - Bind DPC to Root Ports as well as Downstream Ports (Keith Busch)
         - Remove DPC tristate module option (Keith Busch)
         - Convert Downstream Port Containment driver to use devm_* functions (Mika Westerberg)
      
        Generic host bridge driver:
         - Select IRQ_DOMAIN (Arnd Bergmann)
         - Claim bus resources on PCI_PROBE_ONLY set-ups (Lorenzo Pieralisi)
      
        ACPI host bridge driver:
         - Add ARM64 acpi_pci_bus_find_domain_nr() (Tomasz Nowicki)
         - Add ARM64 ACPI support for legacy IRQs parsing and consolidation with DT code (Tomasz Nowicki)
         - Implement ARM64 AML accessors for PCI_Config region (Tomasz Nowicki)
         - Support ARM64 ACPI-based PCI host controller (Tomasz Nowicki)
      
        Altera host bridge driver:
         - Check link status before retrain link (Ley Foon Tan)
         - Poll for link up status after retraining the link (Ley Foon Tan)
      
        Axis ARTPEC-6 host bridge driver:
         - Add PCI_MSI_IRQ_DOMAIN dependency (Arnd Bergmann)
         - Add DT binding for Axis ARTPEC-6 PCIe controller (Niklas Cassel)
         - Add Axis ARTPEC-6 PCIe controller driver (Niklas Cassel)
      
        Intel VMD host bridge driver:
         - Use lock save/restore in interrupt enable path (Jon Derrick)
         - Select device dma ops to override (Keith Busch)
         - Initialize list item in IRQ disable (Keith Busch)
         - Use x86_vector_domain as parent domain (Keith Busch)
         - Separate MSI and MSI-X vector sharing (Keith Busch)
      
        Marvell Aardvark host bridge driver:
         - Add DT binding for the Aardvark PCIe controller (Thomas Petazzoni)
         - Add Aardvark PCI host controller driver (Thomas Petazzoni)
         - Add Aardvark PCIe support for Armada 3700 (Thomas Petazzoni)
      
        Microsoft Hyper-V host bridge driver:
         - Fix interrupt cleanup path (Cathy Avery)
         - Don't leak buffer in hv_pci_onchannelcallback() (Vitaly Kuznetsov)
         - Handle all pending messages in hv_pci_onchannelcallback() (Vitaly Kuznetsov)
      
        NVIDIA Tegra host bridge driver:
         - Program PADS_REFCLK_CFG* always, not just on legacy SoCs (Stephen Warren)
         - Program PADS_REFCLK_CFG* registers with per-SoC values (Stephen Warren)
         - Use lower-case hex consistently for register definitions (Thierry Reding)
         - Use generic pci_remap_iospace() rather than ARM32-specific one (Thierry Reding)
         - Stop setting pcibios_min_mem (Thierry Reding)
      
        Renesas R-Car host bridge driver:
         - Drop gen2 dummy I/O port region (Bjorn Helgaas)
      
        TI DRA7xx host bridge driver:
         - Fix return value in case of error (Christophe JAILLET)
      
        Xilinx AXI host bridge driver:
         - Fix return value in case of error (Christophe JAILLET)
      
        Miscellaneous:
         - Make bus_attr_resource_alignment static (Ben Dooks)
         - Include <asm/dma.h> for isa_dma_bridge_buggy (Ben Dooks)
         - MAINTAINERS: Add file patterns for PCI device tree bindings (Geert Uytterhoeven)
         - Make host bridge drivers explicitly non-modular (Paul Gortmaker)"
      
      * tag 'pci-v4.8-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (125 commits)
        PCI: xgene: Make explicitly non-modular
        PCI: thunder-pem: Make explicitly non-modular
        PCI: thunder-ecam: Make explicitly non-modular
        PCI: tegra: Make explicitly non-modular
        PCI: rcar-gen2: Make explicitly non-modular
        PCI: rcar: Make explicitly non-modular
        PCI: mvebu: Make explicitly non-modular
        PCI: layerscape: Make explicitly non-modular
        PCI: keystone: Make explicitly non-modular
        PCI: hisi: Make explicitly non-modular
        PCI: generic: Make explicitly non-modular
        PCI: designware-plat: Make it explicitly non-modular
        PCI: artpec6: Make explicitly non-modular
        PCI: armada8k: Make explicitly non-modular
        PCI: artpec: Add PCI_MSI_IRQ_DOMAIN dependency
        PCI: Add ACS quirk for Solarflare SFC9220
        arm64: dts: marvell: Add Aardvark PCIe support for Armada 3700
        PCI: aardvark: Add Aardvark PCI host controller driver
        dt-bindings: add DT binding for the Aardvark PCIe controller
        PCI: tegra: Program PADS_REFCLK_CFG* registers with per-SoC values
        ...
      c8d0267e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20160801' of git://git.infradead.org/linux-mtd · affe8a2a
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "NAND:
      
          Quoting Boris:
           'This pull request contains only one notable change:
             - Addition of the MTK NAND controller driver
      
            And a bunch of specific NAND driver improvements/fixes. Here are the
            changes that are worth mentioning:
             - A few fixes/improvements for the xway NAND controller driver
             - A few fixes for the sunxi NAND controller driver
             - Support for DMA in the sunxi NAND driver
             - Support for the sunxi NAND controller IP embedded in A23/A33 SoCs
             - Addition for bitflips detection in erased pages to the brcmnand driver
             - Support for new brcmnand IPs
             - Update of the OMAP-GPMC binding to support DMA channel description'
      
          In addition, some small fixes around error handling, etc., as well
          as one long-standing corner case issue (2.6.20, I think?) with
          writing 1 byte less than a page.
      
        NOR:
      
         - rework some error handling on reads and writes, so we can better
           handle (for instance) SPI controllers which have limitations on
           their maximum transfer size
      
         - add new Cadence Quad SPI flash controller driver
      
         - add new Atmel QSPI flash controller driver
      
         - add new Hisilicon SPI flash controller driver
      
         - support a few new flash, and update supported features on others
      
         - fix the logic used for detecting a fully-unlocked flash
      
        And other miscellaneous small fixes"
      
      * tag 'for-linus-20160801' of git://git.infradead.org/linux-mtd: (60 commits)
        mtd: spi-nor: don't build Cadence QuadSPI on non-ARM
        mtd: mtk-nor: remove duplicated include from mtk-quadspi.c
        mtd: nand: fix bug writing 1 byte less than page size
        mtd: update description of MTD_BCM47XXSFLASH symbol
        mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller
        mtd: spi-nor: Bindings for Cadence Quad SPI Flash Controller driver
        mtd: nand: brcmnand: Change BUG_ON in brcmnand_send_cmd
        mtd: pmcmsp-flash: Allocating too much in init_msp_flash()
        mtd: maps: sa1100-flash: potential NULL dereference
        mtd: atmel-quadspi: add driver for Atmel QSPI controller
        mtd: nand: omap2: fix return value check in omap_nand_probe()
        Documentation: atmel-quadspi: add binding file for Atmel QSPI driver
        mtd: spi-nor: add hisilicon spi-nor flash controller driver
        mtd: spi-nor: support dual, quad, and WP for Gigadevice
        mtd: spi-nor: Added support for n25q00a.
        memory: Update dependency of IFC for Layerscape
        mtd: nand: jz4780: Update MODULE_AUTHOR email address
        mtd: nand: sunxi: prevent a small memory leak
        mtd: nand: sunxi: add reset line support
        mtd: nand: sunxi: update DT bindings
        ...
      affe8a2a
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 44cee85a
      Linus Torvalds authored
      Pull misc kbuild updates from Michal Marek:
      
       - coccicheck script improvements by Luis Rodriguez and Deepa Dinamani
      
       - new coccinelle patches by Yann Droneaud and Vaishali Thakkar
      
       - debian packaging fixes by Wilfried Klaebe, Henning Schild and Marcin
         Mielniczuk
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Fix the Debian packaging script on systems with no codename
        builddeb: fix file permissions before packaging
        scripts/coccinelle: require coccinelle >= 1.0.4 on device_node_continue.cocci
        coccicheck: refer to Documentation/coccinelle.txt and wiki
        coccicheck: add support for requring a coccinelle version
        scripts: add Linux .cocciconfig for coccinelle
        coccicheck: replace --very-quiet with --quiet when debugging
        coccicheck: add support for DEBUG_FILE
        coccicheck: enable parmap support
        coccicheck: make SPFLAGS more useful
        coccicheck: move spatch binary check up
        builddeb: really include objtool binary in headers package
        coccinelle: catch krealloc() on devm_*() allocated memory
        coccinelle: recognize more devm_* memory allocation functions
        coccinelle: also catch kzfree() issues
        coccicheck: Allow for overriding spatch flags
        Coccinelle: noderef: Add new rules and correct the old rule
      44cee85a
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · f716a85c
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
      
       - GCC plugin support by Emese Revfy from grsecurity, with a fixup from
         Kees Cook.  The plugins are meant to be used for static analysis of
         the kernel code.  Two plugins are provided already.
      
       - reduction of the gcc commandline by Arnd Bergmann.
      
       - IS_ENABLED / IS_REACHABLE macro enhancements by Masahiro Yamada
      
       - bin2c fix by Michael Tautschnig
      
       - setlocalversion fix by Wolfram Sang
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        gcc-plugins: disable under COMPILE_TEST
        kbuild: Abort build on bad stack protector flag
        scripts: Fix size mismatch of kexec_purgatory_size
        kbuild: make samples depend on headers_install
        Kbuild: don't add obj tree in additional includes
        Kbuild: arch: look for generated headers in obtree
        Kbuild: always prefix objtree in LINUXINCLUDE
        Kbuild: avoid duplicate include path
        Kbuild: don't add ../../ to include path
        vmlinux.lds.h: replace config_enabled() with IS_ENABLED()
        kconfig.h: allow to use IS_{ENABLE,REACHABLE} in macro expansion
        kconfig.h: use already defined macros for IS_REACHABLE() define
        export.h: use __is_defined() to check if __KSYM_* is defined
        kconfig.h: use __is_defined() to check if MODULE is defined
        kbuild: setlocalversion: print error to STDERR
        Add sancov plugin
        Add Cyclomatic complexity GCC plugin
        GCC plugin infrastructure
        Shared library support
      f716a85c
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 221bb8a4
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
      
       - ARM: GICv3 ITS emulation and various fixes.  Removal of the
         old VGIC implementation.
      
       - s390: support for trapping software breakpoints, nested
         virtualization (vSIE), the STHYI opcode, initial extensions
         for CPU model support.
      
       - MIPS: support for MIPS64 hosts (32-bit guests only) and lots
         of cleanups, preliminary to this and the upcoming support for
         hardware virtualization extensions.
      
       - x86: support for execute-only mappings in nested EPT; reduced
         vmexit latency for TSC deadline timer (by about 30%) on Intel
         hosts; support for more than 255 vCPUs.
      
       - PPC: bugfixes.
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (302 commits)
        KVM: PPC: Introduce KVM_CAP_PPC_HTM
        MIPS: Select HAVE_KVM for MIPS64_R{2,6}
        MIPS: KVM: Reset CP0_PageMask during host TLB flush
        MIPS: KVM: Fix ptr->int cast via KVM_GUEST_KSEGX()
        MIPS: KVM: Sign extend MFC0/RDHWR results
        MIPS: KVM: Fix 64-bit big endian dynamic translation
        MIPS: KVM: Fail if ebase doesn't fit in CP0_EBase
        MIPS: KVM: Use 64-bit CP0_EBase when appropriate
        MIPS: KVM: Set CP0_Status.KX on MIPS64
        MIPS: KVM: Make entry code MIPS64 friendly
        MIPS: KVM: Use kmap instead of CKSEG0ADDR()
        MIPS: KVM: Use virt_to_phys() to get commpage PFN
        MIPS: Fix definition of KSEGX() for 64-bit
        KVM: VMX: Add VMCS to CPU's loaded VMCSs before VMPTRLD
        kvm: x86: nVMX: maintain internal copy of current VMCS
        KVM: PPC: Book3S HV: Save/restore TM state in H_CEDE
        KVM: PPC: Book3S HV: Pull out TM state save/restore into separate procedures
        KVM: arm64: vgic-its: Simplify MAPI error handling
        KVM: arm64: vgic-its: Make vgic_its_cmd_handle_mapi similar to other handlers
        KVM: arm64: vgic-its: Turn device_id validation into generic ID validation
        ...
      221bb8a4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · f7b32e4c
      Linus Torvalds authored
      Pull more s390 updates from Martin Schwidefsky:
      
       - some cleanup for the hugetlbfs pte/pmd conversion functions
      
       - the code to check for the minimum CPU type is converted from
         assembler to C and an informational message is added in case the CPU
         is not new enough to run the kernel
      
       - bug fixes
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/ftrace/jprobes: Fix conflict between jprobes and function graph tracing
        s390: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO
        s390/zcrypt: fix possible memory leak in ap_module_init()
        s390/numa: only set possible nodes within node_possible_map
        s390/als: fix compile with gcov enabled
        s390/facilities: do not generate DWORDS define anymore
        s390/als: print missing facilities on facility mismatch
        s390/als: print machine type on facility mismatch
        s390/als: convert architecture level set code to C
        s390/sclp: move uninitialized data to data section
        s390/zcrypt: Fix zcrypt suspend/resume behavior
        s390/cio: fix premature wakeup during chp configure
        s390/cio: convert cfg_lock mutex to spinlock
        s390/mm: clean up pte/pmd encoding
      f7b32e4c
    • Linus Torvalds's avatar
      Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux · 731c7d3a
      Linus Torvalds authored
      Merge drm updates from Dave Airlie:
       "This is the main drm pull request for 4.8.
      
        I'm down with a cold at the moment so hopefully this isn't in too bad
        a state, I finished pulling stuff last week mostly (nouveau fixes just
        went in today), so only this message should be influenced by illness.
        Apologies to anyone who's major feature I missed :-)
      
        Core:
              Lockless GEM BO freeing
              Non-blocking atomic work
              Documentation changes (rst/sphinx)
              Prep for new fencing changes
              Simple display helpers
              Master/auth changes
              Register/unregister rework
              Loads of trivial patches/fixes.
      
        New stuff:
              ARM Mali display driver (not the 3D chip)
              sii902x RGB->HDMI bridge
      
        Panel:
              Support for new panels
              Improved backlight support
      
        Bridge:
              Convert ADV7511 to bridge driver
              ADV7533 support
              TC358767 (DSI/DPI to eDP) encoder chip support
      
        i915:
              BXT support enabled by default
              GVT-g infrastructure
              GuC command submission and fixes
              BXT workarounds
              SKL/BKL workarounds
              Demidlayering device registration
              Thundering herd fixes
              Missing pci ids
              Atomic updates
      
        amdgpu/radeon:
              ATPX improvements for better dGPU power control on PX systems
              New power features for CZ/BR/ST
              Pipelined BO moves and evictions in TTM
              GPU scheduler improvements
              GPU reset improvements
              Overclocking on dGPUs with amdgpu
              Polaris powermanagement enabled
      
        nouveau:
              GK20A/GM20B volt and clock improvements.
              Initial support for GP100/GP104 GPUs, GP104 will not yet support
              acceleration due to NVIDIA having not released firmware for them as of yet.
      
        exynos:
              Exynos5433 SoC with IOMMU support.
      
        vc4:
              Shader validation for branching
      
        imx-drm:
              Atomic mode setting conversion
              Reworked DMFC FIFO allocation
              External bridge support
      
        analogix-dp:
              RK3399 eDP support
              Lots of fixes.
      
        rockchip:
              Lots of small fixes.
      
        msm:
              DT bindings cleanups
              Shrinker and madvise support
              ASoC HDMI codec support
      
        tegra:
              Host1x driver cleanups
              SOR reworking for DP support
              Runtime PM support
      
        omapdrm:
              PLL enhancements
              Header refactoring
              Gamma table support
      
        arcgpu:
              Simulator support
      
        virtio-gpu:
              Atomic modesetting fixes.
      
        rcar-du:
              Misc fixes.
      
        mediatek:
              MT8173 HDMI support
      
        sti:
              ASOC HDMI codec support
              Minor fixes
      
        fsl-dcu:
              Suspend/resume support
              Bridge support
      
        amdkfd:
              Minor fixes.
      
        etnaviv:
              Enable GPU clock gating
      
        hisilicon:
              Vblank and other fixes"
      
      * tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux: (1575 commits)
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
        drm/amd/powerplay: remove enable_clock_power_gatings_tasks from initialize and resume events
        drm/amd/powerplay: move clockgating to after ungating power in pp for uvd/vce
        drm/amdgpu: add query device id and revision id into system info entry at CGS
        drm/amdgpu: add new definition in bif header
        drm/amd/powerplay: rename smum header guards
        drm/amdgpu: enable UVD context buffer for older HW
        drm/amdgpu: fix default UVD context size
        drm/amdgpu: fix incorrect type of info_id
        drm/amdgpu: make amdgpu_cgs_call_acpi_method as static
        drm/amdgpu: comment out unused defaults_staturn_pro static const structure to fix the build
        drm/amdgpu: enable UVD VM only on polaris
        drm/amdgpu: increase timeout of IB test
        drm/amdgpu: add destroy session when generate VCE destroy msg.
        drm/amd: fix deadlock of job_list_lock V2
        ...
      731c7d3a
    • Stephen Rothwell's avatar
      clocksource/drivers/clps_711x: fixup for "ARM: clps711x: · 77a87824
      Stephen Rothwell authored
       Switch to MULTIPLATFORM"
      
      Missed conflict between commit c86f5173 ("ARM: clps711x: Switch to
      MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
      ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
      clockevents tree.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      77a87824
    • Dave Airlie's avatar
      Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-next · 753e7c8c
      Dave Airlie authored
      Runtime PM fixes, fbcon and nv30 fix.
      * 'linux-4.8' of git://github.com/skeggsb/linux:
        drm/nouveau/gr/nv3x: fix instobj write offsets in gr setup
        drm/nouveau/acpi: fix lockup with PCIe runtime PM
        drm/nouveau/acpi: check for function 0x1B before using it
        drm/nouveau/acpi: return supported DSM functions
        drm/nouveau/acpi: ensure matching ACPI handle and supported functions
        drm/nouveau/fbcon: fix font width not divisible by 8
      753e7c8c
  2. 01 Aug, 2016 31 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · e48af7aa
      Linus Torvalds authored
      Pull ia64 updates from Tony Luck:
       "Miscellaneous ia64 cleanups"
      
      * tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: salinfo: use a waitqueue instead a sema down/up combo
        ia64: efi: use timespec64 for persistent clock
      e48af7aa
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ed780686
      Linus Torvalds authored
      Pull 64-bit ARM DT updates from Olof Johansson:
       "Just as the 32-bit contents, the 64-bit device tree branch also
        contains a number of additions this release cycle.
      
        New platforms:
         - LG LG1313
         - Mediatek MT6755
         - Renesas r8a7796
         - Broadcom 2837
      
        Other platforms with larger updates are:
         - Nvidia X1 platforms (USB 3.0, regulators, display subsystem)
         - Mediatek MT8173 (display subsystem added)
         - Rockchip RK3399 (a lot of new peripherals)
         - ARM Juno reference implementation (SCPI power domains, coresight,
           thermal)"
      
      * tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
        arm64: tegra: Enable HDMI on Jetson TX1
        arm64: tegra: Add sor1_src clock
        arm64: tegra: Add XUSB powergates on Tegra210
        arm64: tegra: Add DPAUX pinctrl bindings
        arm64: tegra: Add ACONNECT bus node for Tegra210
        arm64: tegra: Add audio powergate node for Tegra210
        arm64: tegra: Add regulators for Tegra210 Smaug
        arm64: tegra: Correct Tegra210 XUSB mailbox interrupt
        arm64: tegra: Enable XUSB controller on Jetson TX1
        arm64: tegra: Enable debug serial on Jetson TX1
        arm64: tegra: Add Tegra210 XUSB controller
        arm64: tegra: Add Tegra210 XUSB pad controller
        arm64: tegra: Add DSI panel on Jetson TX1
        arm64: tegra: p2597: Add SDMMC power supplies
        arm64: tegra: Add PMIC support on Jetson TX1
        Revert "ARM64: DTS: meson-gxbb: switch ethernet to real clock"
        arm64: dts: hi6220: Add pl031 RTC support
        arm64: dts: r8a7796/salvator-x: Enable watchdog timer
        arm64: dts: r8a7796: Add RWDT node
        arm64: dts: r8a7796: Use SYSC "always-on" PM Domain
        ...
      ed780686
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 043248cd
      Linus Torvalds authored
      Pull ARM DT updates from Olof Johansson:
       "Device tree contents continue to be the largest branches we submit.
        This time around, some of the contents worth pointing out is:
      
        New SoC platforms:
         - Freescale i.MX 7Solo
         - Broadcom BCM23550
         - Cirrus Logic EP7209 and EP7211 (clps711x platforms)_
         - Hisilicon HI3519
         - Renesas R8A7792
      
        Some of the other delta that is sticking out, line-count wise:
         - Exynos moves of IP blocks under an SoC bus, which causes a large
           delta due to indentation changes
         - a new Tegra K1 board: Apalis
         - a bunch of small updates to many Allwinner platforms; new hardware
           support, some cleanup, etc"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (426 commits)
        ARM: dts: sun8i: Add dts file for inet86dz board
        ARM: dts: sun8i: Add dts file for Polaroid MID2407PXE03 tablet
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for ga10h dts
        ARM: dts: sun8i: Use sun8i-reference-design-tablet for polaroid mid2809pxe04
        ARM: dts: sun8i: reference-design-tablet: Add drivevbus-supply
        ARM: dts: Copy sun8i-q8-common.dtsi sun8i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for utoo p66 dts
        ARM: dts: sun5i: Use sun5i-reference-design-tablet.dtsi for dit4350 dts
        ARM: dts: sun5i: reference-design-tablet: Remove mention of q8
        ARM: dts: sun5i: reference-design-tablet: Set lradc vref to avcc
        ARM: dts: sun5i: Rename sun5i-q8-common.dtsi sun5i-reference-design-tablet.dtsi
        ARM: dts: sun5i: Move q8 display bits to sun5i-a13-q8-tablet.dts
        ARM: dts: sunxi: Rename sunxi-q8-common.dtsi sunxi-reference-design-tablet.dtsi
        ARM: dts: at91: Don't build unnecessary dtbs
        ARM: dts: at91: sama5d3x: separate motherboard gmac and emac definitions
        ARM: dts: at91: at91sam9g25ek: fix isi endpoint node
        ARM: dts: at91: move isi definition to at91sam9g25ek
        ARM: dts: at91: fix i2c-gpio node name
        ARM: dts: at91: vinco: fix regulator name
        ARM: dts: at91: ariag25 : fix onewire node
        ...
      043248cd
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 43a0a98a
      Linus Torvalds authored
      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for ARM SoCs.
      
        A slew of changes this release cycle.  The reset driver tree, that we
        merge through arm-soc for historical reasons, is also sizable this
        time around.
      
        Among the changes:
      
         - clps711x: Treewide changes to compatible strings, merged here for simplicity.
         - Qualcomm: SCM firmware driver cleanups, move to platform driver
         - ux500: Major cleanups, removal of old mach-specific infrastructure.
         - Atmel external bus memory driver
         - Move of brcmstb platform to the rest of bcm
         - PMC driver updates for tegra, various fixes and improvements
         - Samsung platform driver updates to support 64-bit Exynos platforms
         - Reset controller cleanups moving to devm_reset_controller_register() APIs
         - Reset controller driver for Amlogic Meson
         - Reset controller driver for Hisilicon hi6220
         - ARM SCPI power domain support"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits)
        ARM: ux500: consolidate base platform files
        ARM: ux500: move soc_id driver to drivers/soc
        ARM: ux500: call ux500_setup_id later
        ARM: ux500: consolidate soc_device code in id.c
        ARM: ux500: remove cpu_is_u* helpers
        ARM: ux500: use CLK_OF_DECLARE()
        ARM: ux500: move l2x0 init to .init_irq
        mfd: db8500 stop passing around platform data
        ASoC: ab8500-codec: remove platform data based probe
        ARM: ux500: move ab8500_regulator_plat_data into driver
        ARM: ux500: remove unused regulator data
        soc: raspberrypi-power: add CONFIG_OF dependency
        firmware: scpi: add CONFIG_OF dependency
        video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip
        input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip
        pwm: clps711x: Changing the compatibility string to match with the smallest supported chip
        serial: clps711x: Changing the compatibility string to match with the smallest supported chip
        irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip
        clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip
        clk: clps711x: Changing the compatibility string to match with the smallest supported chip
        ...
      43a0a98a
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6911a528
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "Defconfig additions, removals, etc.
      
        Most of these are small changes adding the options for newly
        upstreamed drivers, or drivers needed for new board support.
      
        - removed Broadcom bcm_defconfig, targets are all covered in
          multi_v7_defconfig
      
        - new defconfig: multi_v4t_defconfig"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
        ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
        ARM: omap2plus_defconfig: Fix USB selection to keep Ethernet working
        ARM: configs: lpc18xx: enable adc and dac iio drivers
        ARM: config: Add a multi_v4t_defconfig
        ARM: multi_v7_defconfig: add ACT8945A
        ARM: at91/defconfig: Add ACT8945A driver
        ARM: imx_v6_v7_defconfig: Select ADS7846 support
        ARM: configs: qualcomm: Add MDM9615 missing defconfigs
        ARM: multi_v7_defconfig: Enable vivid driver as a module
        ARM: exynos_defconfig: Enable vivid driver as a module
        ARM: defconfig: enable the MSM8660 pin controller
        ARM: imx_v6_v7_defconfig: enable USB FFS gadget
        ARM: socfpga: enable PL330 DMA in socfpga_defconfig
        ARM: socfpga: add PCIe to socfpga_defconfig
        ARM: multi_v7_defconfig: defconfig: Enable r8a7792 SoC
        ARM: shmobile: defconfig: Enable r8a7792 SoC
        ARM: Remove bcm_defconfig
        ARM: multi_v7_defconfig: Enable Broadcom Kona watchdog
        ARM: multi_v7_defconfig: Enable Broadcom STB PWM
        ...
      6911a528
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3fbff9c8
      Linus Torvalds authored
      Pull 64-bit ARM SoC updates from Olof Johansson:
       "Changes to platform code for 64-bit ARM platforms.
      
        Nearly all of these are defconfig updates to enable new drivers or old
        drivers still used on these 64-bit platforms.
      
        Added platforms for this release are:
      
         - Broadcom BCM2837
         - Renesas R8A7796"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
        arm64: remove duplicate PWM entry in defconfig
        arm64: Update default configuration
        arm64: defconfig: Enable more IP blocks for Exynos7 and Exynos5433
        arm64: amlogic: select gxbb clk driver
        arm64: defconfig: Enable S2MPS11 clock and S3C RTC driver
        arm64: marvell: enable Armada 3700 clock drivers
        arm64: defconfig: enable msm8996 pinctrl support
        arm64: defconfig: Enable qcom msm8996 clk drivers
        arm: defconfig: Enable PM8941 pwr key
        arm64: defconfig: enable stmmac and realtek PHY as modules
        arm64: Kconfig: select PM{,_GENERIC_DOMAINS} for ARCH_VEXPRESS
        arm64: defconfig: enable SENSORS_ARM_SCPI
        arm64: defconfig: enable Generic on-chip SRAM driver
        arm64: configs: enable PCIe driver for Armada 7K/8K
        arm64: Add platform selection for BCM2835.
        arm64: defconfig: disable plain NEON implementation of AES
        arm64: Allow for different DMA and CPU bus offsets
        arm64: defconfig: enable Renesas R8A7796 SoC
        arm64: defconfig: Enable Cadence MACB/GEM support
        ARM64: Kconfig: Select the Amlogic Meson pin controller driver
        ...
      3fbff9c8
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · fbae5cbb
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "Improved and new platform support for various SoCs:
      
        New SoC support:
         - Broadcom BCM23550
         - Freescale i.MX7Solo
         - Qualcomm MDM9615
         - Renesas r8a7792
      
        Improvements:
         - convert clps711x to multiplatform
         - debug uart improvements for Atmel platforms
         - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
         - OMAP tweaks and improvements to hwmod
         - OMAP support for kexec on SMP"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
        ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
        ARM: s3c64xx: smartq: Avoid sparse warnings
        ARM: sti: Implement dummy L2 cache's write_sec
        ARM: STi: Update machine _namestr to be more generic.
        arm: meson: explicitly select clk drivers
        ARM: tango: add Suspend-to-RAM support
        ARM: hisi: consolidate the hisilicon machine entries
        ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
        MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
        MAINTAINERS: Update BCM63XX entry
        MAINTAINERS: Add NS2 entry
        MAINTAINERS: Fix nsp false-positives
        MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
        ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
        ARM: clps711x: Switch to MULTIPLATFORM
        ARM: clps711x: Remove boards support
        ARM: clps711x: Add basic DT support
        ARM: clps711x: Reduce static map size
        ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
        ARM: oxnas: Change OX810SE default driver config
        ...
      fbae5cbb
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 6f888fe3
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "The cleanup branch keeps going down in size as we've completed a lot
        of the major legacy platform removals and conversions.
      
        A handful of changes this time around, some of the themes or larger
        sets are:
      
         - A bunch of i.MX cleanups around platform detection, init call cleanups
         - Misc fixes of missing/implicit includes
         - Removal of ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (40 commits)
        ARM: mps2: fix typo
        ARM: s3c64xx: avoid warning about 'struct device_node'
        bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
        bus: mvebu-mbus: fix __iomem on register pointers
        ARM: tegra: Remove board_init_funcs array
        ARM: iop: Fix indentation
        ARM: imx: remove cpu_is_mx*()
        ARM: imx: remove last call to cpu_is_mx5*
        ARM: imx: rework mx27_pm_init() call
        ARM: imx: deconstruct mx3_idle
        ARM: imx: deconstruct mxc_rnga initialization
        ARM: imx: remove cpu_is_mx1 check
        ARM: i.MX: Do not explicitly call l2x0_of_init()
        ARM: i.MX: system.c: Tweak prefetch settings for performance
        ARM: i.MX: system.c: Replace magic numbers
        ARM: i.MX: system.c: Remove redundant errata 752271 code
        ARM: i.MX: system.c: Convert goto to if statement
        ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
        ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
        ARM: orion5x: make orion5x_legacy_handle_irq static
        ...
      6f888fe3
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.8-rc1-update' of... · 5dd0bf62
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This contains new tests and fixes:
      
         - a few fixes to existing tests
      
         - new media tests for testing driver unbind, and device removal paths
           while an user application is actively making system calls and
           ioctls"
      
      * tag 'linux-kselftest-4.8-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: media_tests add a new video device test
        selftests: media_tests - Add media_device_open to .gitignore
        selftests: add media controller regression test scripts and document
        selftests: add media_device_open test
        selftests: media_device_test change it to randomize loop count
        selftests/vm: Don't mlockall MCL_CURRENT in on-fault-limit test
        selftests/vm: write strlen length instead of sizeof to nr_hugepages
        selftests/lib: set printf.sh executable
      5dd0bf62
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of... · 1571a03d
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest fixes from Shuah Khan:
      
       - Add a new timer set-tz test case
      
       - Fix a bug in exec test Makefile dependency list
      
      * tag 'linux-kselftest-4.8-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/exec: Makefile is a run-time dependency, add it to the install list
        kselftests: timers: Add set-tz test case
      1571a03d
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus-v4.8-2' of... · 2790aed0
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull more hwmon updates from Guenter Roeck:
      
       - Improved error handling in tmp102, lm75, and lm90 drivers
      
       - Bug fixes in sht3x, ftsteutates, iio_hwmon, and adt7411 drivers
      
      * tag 'hwmon-for-linus-v4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (adt7411) set sane values for CFG1 and CFG3
        hwmon: (iio_hwmon) fix memory leak in name attribute
        hwmon: (ftsteutates) Fix potential memory access error
        hwmon: (tmp102) Improve error handling
        hwmon: (lm75) Improve error handling
        hwmon: (lm90) Improve error handling
        hwmon: (lm90) Add missing assignment
        hwmon: (sht3x) set initial jiffies to last_update
      2790aed0
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · f38d2e53
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes a number of regressions in the marvell cesa driver caused
        by the chaining work, and a regression in lib/mpi that leads to a
        GFP_KERNEL allocation with preemption disabled"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: marvell - Don't copy IV vectors from the _process op for ciphers
        lib/mpi: Fix SG miter leak
        crypto: marvell - Update cache with input sg only when it is unmapped
        crypto: marvell - Don't chain at DMA level when backlog is disabled
        crypto: marvell - Fix memory leaks in TDMA chain for cipher requests
      f38d2e53
    • Linus Torvalds's avatar
      Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aeb35d6b
      Linus Torvalds authored
      Pull x86 header cleanups from Ingo Molnar:
       "This tree is a cleanup of the x86 tree reducing spurious uses of
        module.h - which should improve build performance a bit"
      
      * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, crypto: Restore MODULE_LICENSE() to glue_helper.c so it loads
        x86/apic: Remove duplicated include from probe_64.c
        x86/ce4100: Remove duplicated include from ce4100.c
        x86/headers: Include spinlock_types.h in x8664_ksyms_64.c for missing spinlock_t
        x86/platform: Delete extraneous MODULE_* tags fromm ts5500
        x86: Audit and remove any remaining unnecessary uses of module.h
        x86/kvm: Audit and remove any unnecessary uses of module.h
        x86/xen: Audit and remove any unnecessary uses of module.h
        x86/platform: Audit and remove any unnecessary uses of module.h
        x86/lib: Audit and remove any unnecessary uses of module.h
        x86/kernel: Audit and remove any unnecessary uses of module.h
        x86/mm: Audit and remove any unnecessary uses of module.h
        x86: Don't use module.h just for AUTHOR / LICENSE tags
      aeb35d6b
    • Sam Bobroff's avatar
      KVM: PPC: Introduce KVM_CAP_PPC_HTM · 23528bb2
      Sam Bobroff authored
      Introduce a new KVM capability, KVM_CAP_PPC_HTM, that can be queried to
      determine if a PowerPC KVM guest should use HTM (Hardware Transactional
      Memory).
      
      This will be used by QEMU to populate the pa-features bits in the
      guest's device tree.
      Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
      Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      23528bb2
    • Bjorn Helgaas's avatar
      Merge branch 'pci/msi-affinity' into next · 9454c238
      Bjorn Helgaas authored
      Conflicts:
      	drivers/nvme/host/pci.c
      9454c238
    • Bjorn Helgaas's avatar
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-dra7xx',... · a04bee82
      Bjorn Helgaas authored
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-dra7xx', 'pci/host-hv', 'pci/host-vmd' and 'pci/host-xilinx' into next
      
      * pci/host-aardvark:
        arm64: dts: marvell: Add Aardvark PCIe support for Armada 3700
        PCI: aardvark: Add Aardvark PCI host controller driver
        dt-bindings: add DT binding for the Aardvark PCIe controller
      
      * pci/host-altera:
        PCI: altera: Poll for link up status after retraining the link
        PCI: altera: Check link status before retrain link
        PCI: altera: Reorder read/write functions
      
      * pci/host-dra7xx:
        PCI: dra7xx: Fix return value in case of error
      
      * pci/host-hv:
        PCI: hv: Fix interrupt cleanup path
        PCI: hv: Handle all pending messages in hv_pci_onchannelcallback()
        PCI: hv: Don't leak buffer in hv_pci_onchannelcallback()
      
      * pci/host-vmd:
        x86/PCI: VMD: Separate MSI and MSI-X vector sharing
        x86/PCI: VMD: Use x86_vector_domain as parent domain
        x86/PCI: VMD: Use lock save/restore in interrupt enable path
        x86/PCI: VMD: Initialize list item in IRQ disable
        x86/PCI: VMD: Select device dma ops to override
      
      * pci/host-xilinx:
        PCI: xilinx: Fix return value in case of error
      
      Manually apply changes from pci/demodularize-hosts and
      pci/host-request-windows to drivers/pci/host/pci-aardvark.c
      a04bee82
    • Bjorn Helgaas's avatar
      Merge branch 'pci/host-tegra' into next · ea1f4e9d
      Bjorn Helgaas authored
      * pci/host-tegra:
        PCI: tegra: Program PADS_REFCLK_CFG* registers with per-SoC values
        PCI: tegra: Program PADS_REFCLK_CFG* always, not just on legacy SoCs
        PCI: tegra: Stop setting pcibios_min_mem
        PCI: tegra: Use generic pci_remap_iospace() rather than ARM32-specific one
        PCI: tegra: Use lower-case hex consistently for register definitions
      
      Conflicts:
      	drivers/pci/host/pci-tegra.c
      
      Drop stray pci_ioremap_io() per Thierry Reding <treding@nvidia.com>;
      removal tested by Jon Hunter <jonathanh@nvidia.com>.
      ea1f4e9d
    • Bjorn Helgaas's avatar
      Merge branches 'pci/demodularize-hosts' and 'pci/host-request-windows' into next · 79dd9934
      Bjorn Helgaas authored
      * pci/demodularize-hosts:
        PCI: xgene: Make explicitly non-modular
        PCI: thunder-pem: Make explicitly non-modular
        PCI: thunder-ecam: Make explicitly non-modular
        PCI: tegra: Make explicitly non-modular
        PCI: rcar-gen2: Make explicitly non-modular
        PCI: rcar: Make explicitly non-modular
        PCI: mvebu: Make explicitly non-modular
        PCI: layerscape: Make explicitly non-modular
        PCI: keystone: Make explicitly non-modular
        PCI: hisi: Make explicitly non-modular
        PCI: generic: Make explicitly non-modular
        PCI: designware-plat: Make it explicitly non-modular
        PCI: artpec6: Make explicitly non-modular
        PCI: armada8k: Make explicitly non-modular
        PCI: artpec: Add PCI_MSI_IRQ_DOMAIN dependency
        PCI: artpec: Add Axis ARTPEC-6 PCIe controller driver
        PCI: Add DT binding for Axis ARTPEC-6 PCIe controller
        PCI: generic: Select IRQ_DOMAIN
      
      * pci/host-request-windows:
        PCI: versatile: Simplify host bridge window iteration
        PCI: versatile: Request host bridge window resources with core function
        PCI: tegra: Request host bridge window resources with core function
        PCI: tegra: Remove top-level resource from hierarchy
        PCI: rcar: Simplify host bridge window iteration
        PCI: rcar: Request host bridge window resources with core function
        PCI: rcar Gen2: Request host bridge window resources
        PCI: rcar: Drop gen2 dummy I/O port region
        ARM: Make PCI I/O space optional
        PCI: mvebu: Request host bridge window resources with core function
        PCI: generic: Simplify host bridge window iteration
        PCI: generic: Request host bridge window resources with core function
        PCI: altera: Simplify host bridge window iteration
        PCI: altera: Request host bridge window resources with core function
        PCI: xilinx-nwl: Use dev_printk() when possible
        PCI: xilinx-nwl: Request host bridge window resources
        PCI: xilinx-nwl: Free bridge resource list on failure
        PCI: xilinx: Request host bridge window resources
        PCI: xilinx: Free bridge resource list on failure
        PCI: xgene: Request host bridge window resources
        PCI: xgene: Free bridge resource list on failure
        PCI: iproc: Request host bridge window resources
        PCI: designware: Simplify host bridge window iteration
        PCI: designware: Request host bridge window resources
        PCI: designware: Free bridge resource list on failure
        PCI: Add devm_request_pci_bus_resources()
      79dd9934
    • Bjorn Helgaas's avatar
      Merge branch 'pci/resource' into next · 3efc7023
      Bjorn Helgaas authored
      * pci/resource:
        unicore32/PCI: Remove pci=firmware command line parameter handling
        ARM/PCI: Remove arch-specific pcibios_enable_device()
        ARM64/PCI: Remove arch-specific pcibios_enable_device()
        MIPS/PCI: Claim bus resources on PCI_PROBE_ONLY set-ups
        ARM/PCI: Claim bus resources on PCI_PROBE_ONLY set-ups
        PCI: generic: Claim bus resources on PCI_PROBE_ONLY set-ups
        PCI: Add generic pci_bus_claim_resources()
        alx: Use pci_(request|release)_mem_regions
        ethernet/intel: Use pci_(request|release)_mem_regions
        GenWQE: Use pci_(request|release)_mem_regions
        lpfc: Use pci_(request|release)_mem_regions
        NVMe: Use pci_(request|release)_mem_regions
        PCI: Add helpers to request/release memory and I/O regions
        PCI: Extending pci=resource_alignment to specify device/vendor IDs
        sparc/PCI: Implement pci_resource_to_user() with pcibios_resource_to_bus()
        powerpc/pci: Implement pci_resource_to_user() with pcibios_resource_to_bus()
        microblaze/PCI: Implement pci_resource_to_user() with pcibios_resource_to_bus()
        PCI: Unify pci_resource_to_user() declarations
        microblaze/PCI: Remove useless __pci_mmap_set_pgprot()
        powerpc/pci: Remove __pci_mmap_set_pgprot()
        PCI: Ignore write combining when mapping I/O port space
      3efc7023
    • Bjorn Helgaas's avatar
      Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi',... · a00c74c1
      Bjorn Helgaas authored
      Merge branches 'pci/aspm', 'pci/dpc', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/pm' and 'pci/virtualization' into next
      
      * pci/aspm:
        PCI/ASPM: Remove redundant check of pcie_set_clkpm
      
      * pci/dpc:
        PCI: Remove DPC tristate module option
        PCI: Bind DPC to Root Ports as well as Downstream Ports
        PCI: Fix whitespace in struct dpc_dev
        PCI: Convert Downstream Port Containment driver to use devm_* functions
      
      * pci/hotplug:
        PCI: Allow additional bus numbers for hotplug bridges
      
      * pci/misc:
        PCI: Include <asm/dma.h> for isa_dma_bridge_buggy
        PCI: Make bus_attr_resource_alignment static
        MAINTAINERS: Add file patterns for PCI device tree bindings
        PCI: Fix comment typo
      
      * pci/msi:
        PCI/MSI: irqchip: Fix PCI_MSI dependencies
      
      * pci/pm:
        PCI: pciehp: Ignore interrupts during D3cold
        PCI: Document connection between pci_power_t and hardware PM capability
        PCI: Add runtime PM support for PCIe ports
        ACPI / hotplug / PCI: Runtime resume bridge before rescan
        PCI: Power on bridges before scanning new devices
        PCI: Put PCIe ports into D3 during suspend
        PCI: Don't clear d3cold_allowed for PCIe ports
        PCI / PM: Enforce type casting for pci_power_t
      
      * pci/virtualization:
        PCI: Add ACS quirk for Solarflare SFC9220
        PCI: Add DMA alias quirk for Adaptec 3805
        PCI: Mark Atheros AR9485 and QCA9882 to avoid bus reset
        PCI: Add function 1 DMA alias quirk for Marvell 88SE9182
      a00c74c1
    • Bjorn Helgaas's avatar
      Merge branch 'pci/arm64-acpi' into next · c5cb85b2
      Bjorn Helgaas authored
      * pci/arm64-acpi:
        ARM64: PCI: Support ACPI-based PCI host controller
        ARM64: PCI: Implement AML accessors for PCI_Config region
        ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code
        ARM64: PCI: Add acpi_pci_bus_find_domain_nr()
        PCI: Factor DT-specific pci_bus_find_domain_nr() code out
        PCI: Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC
        PCI/ACPI: Add generic MCFG table handling
        PCI/ACPI: Support I/O resources when parsing host bridge resources
        PCI: Add pci_unmap_iospace() to unmap I/O resources
        PCI: Add parent device field to ECAM struct pci_config_window
        PCI: Move ecam.h to linux/include/pci-ecam.h
      c5cb85b2
    • Paul Gortmaker's avatar
      PCI: xgene: Make explicitly non-modular · 50dcd290
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_XGENE
        drivers/pci/host/Kconfig:       bool "X-Gene PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: Tanmay Inamdar <tinamdar@apm.com>
      50dcd290
    • Paul Gortmaker's avatar
      PCI: thunder-pem: Make explicitly non-modular · 0b3cd164
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_HOST_THUNDER_PEM
        drivers/pci/host/Kconfig:       bool "Cavium Thunder PCIe controller to off-chip devices"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: David Daney <david.daney@cavium.com>
      0b3cd164
    • Paul Gortmaker's avatar
      PCI: thunder-ecam: Make explicitly non-modular · d0c6fd76
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_HOST_THUNDER_ECAM
        drivers/pci/host/Kconfig:       bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: David Daney <david.daney@cavium.com>
      d0c6fd76
    • Paul Gortmaker's avatar
      PCI: tegra: Make explicitly non-modular · ad183271
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_TEGRA
        drivers/pci/host/Kconfig:       bool "NVIDIA Tegra PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: Thierry Reding <thierry.reding@gmail.com>
      CC: Stephen Warren <swarren@wwwdotorg.org>
      CC: Alexandre Courbot <gnurou@gmail.com>
      CC: linux-tegra@vger.kernel.org
      ad183271
    • Paul Gortmaker's avatar
      PCI: rcar-gen2: Make explicitly non-modular · 0b9c1589
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_RCAR_GEN2
        drivers/pci/host/Kconfig:       bool "Renesas R-Car Gen2 Internal PCI controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog, remove "Module" from author comment]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Acked-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
      CC: Valentine Barshak <valentine.barshak@cogentembedded.com>
      0b9c1589
    • Paul Gortmaker's avatar
      PCI: rcar: Make explicitly non-modular · 42d10719
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_RCAR_GEN2_PCIE
        drivers/pci/host/Kconfig:       bool "Renesas R-Car PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog, remove "Module" from author comment]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Acked-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
      42d10719
    • Paul Gortmaker's avatar
      PCI: mvebu: Make explicitly non-modular · 82641d9b
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_MVEBU
        drivers/pci/host/Kconfig:       bool "Marvell EBU PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog, remove "Module" from author comment]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      CC: Jason Cooper <jason@lakedaemon.net>
      82641d9b
    • Paul Gortmaker's avatar
      PCI: layerscape: Make explicitly non-modular · 154fb600
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_LAYERSCAPE
        drivers/pci/host/Kconfig:       bool "Freescale Layerscape PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: Minghuan Lian <minghuan.Lian@freescale.com>
      CC: Mingkai Hu <mingkai.hu@freescale.com>
      CC: Roy Zang <tie-fei.zang@freescale.com>
      154fb600
    • Paul Gortmaker's avatar
      PCI: keystone: Make explicitly non-modular · 1481bf21
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        drivers/pci/host/Kconfig:config PCI_KEYSTONE
        drivers/pci/host/Kconfig:       bool "TI Keystone PCIe controller"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Tested-By: default avatarMurali Karicheri <m-karicheri2@ti.com>
      1481bf21
    • Paul Gortmaker's avatar
      PCI: hisi: Make explicitly non-modular · fb38118d
      Paul Gortmaker authored
      This code is not being built as a module by anyone:
      
        host/Kconfig:config PCI_HISI
        host/Kconfig:    bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
      
      Remove uses of MODULE_DESCRIPTION(), MODULE_AUTHOR(), MODULE_LICENSE(),
      etc., so that when reading the driver there is no doubt it is builtin-only.
      The information is preserved in comments at the top of the file.
      
      Replace module_platform_driver() with builtin_platform_driver(), which uses
      the same init level priority, so init ordering is unchanged.
      
      Note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
      
      [bhelgaas: changelog]
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      CC: Zhou Wang <wangzhou1@hisilicon.com>
      CC: Dacai Zhu <zhudacai@hisilicon.com>
      CC: Gabriele Paoloni <gabriele.paoloni@huawei.com>
      fb38118d