1. 12 10月, 2016 2 次提交
  2. 06 10月, 2016 2 次提交
    • B
      Merge branch 'pci/host-vmd' into next · bdf53098
      Bjorn Helgaas 提交于
      * pci/host-vmd:
        x86/PCI: VMD: Move VMD driver to drivers/pci/host
        x86/PCI: VMD: Synchronize with RCU freeing MSI IRQ descs
        x86/PCI: VMD: Eliminate index member from IRQ list
        x86/PCI: VMD: Eliminate vmd_vector member from list type
        x86/PCI: VMD: Convert to use pci_alloc_irq_vectors() API
        x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count
        PCI: Use positive flags in pci_alloc_irq_vectors()
        PCI: Update "pci=resource_alignment" documentation
      
      Conflicts:
      	drivers/pci/host/Kconfig
      	drivers/pci/host/Makefile
      bdf53098
    • B
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec',... · 69a06e49
      Bjorn Helgaas 提交于
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec', 'pci/host-designware', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar', 'pci/host-rockchip', 'pci/host-tegra' and 'pci/host-xilinx' into next
      
      * pci/host-aardvark:
        PCI: aardvark: Remove redundant dev_err call in advk_pcie_probe()
      
      * pci/host-altera:
        PCI: altera: Remove redundant platform_get_resource() return value check
        PCI: altera: Move retrain from fixup to altera_pcie_host_init()
        PCI: altera: Rework config accessors for use without a struct pci_bus
        PCI: altera: Poll for link training status after retraining the link
      
      * pci/host-artpec:
        PCI: artpec6: Drop __init from artpec6_add_pcie_port()
      
      * pci/host-designware:
        PCI: designware: Remove redundant platform_get_resource() return value check
        PCI: designware: Exchange viewport of `MEMORYs' and `CFGs/IOs'
        PCI: designware: Keep viewport fixed for IO transaction if num_viewport > 2
        PCI: designware: Check LTSSM training bit before deciding link is up
        PCI: designware: Add iATU Unroll feature
        PCI: designware: Wait for iATU enable
        PCI: designware: Move link wait definitions to .c file
        PCI: designware: Return data directly from dw_pcie_readl_rc()
      
      * pci/host-hv:
        PCI: hv: Handle hv_pci_generic_compl() error case
        PCI: hv: Handle vmbus_sendpacket() failure in hv_compose_msi_msg()
        PCI: hv: Remove the unused 'wrk' in struct hv_pcibus_device
        PCI: hv: Use pci_function_description[0] in struct definitions
        PCI: hv: Use zero-length array in struct pci_packet
        PCI: hv: Use list_move_tail() instead of list_del() + list_add_tail()
      
      * pci/host-keystone:
        PCI: keystone: Propagate request_irq() failure
      
      * pci/host-rcar:
        PCI: rcar: Try increasing PCIe link speed to 5 GT/s at boot
        PCI: rcar: Fix some checkpatch warnings
        PCI: rcar: Add multi-MSI support
        PCI: rcar: Don't disable/unprepare clocks on prepare/enable failure
        PCI: rcar: Consolidate register space lookup and ioremap
      
      * pci/host-rockchip:
        PCI: rockchip: Fix wrong transmitted FTS count
        PCI: rockchip: Improve the deassert sequence of four reset pins
        PCI: rockchip: Increase the Max Credit update interval
        PCI: rockchip: Add Rockchip PCIe controller support
        dt-bindings: PCI: rockchip: Add DT bindings for Rockchip PCIe controller
      
      * pci/host-tegra:
        PCI: tegra: Use of_device_get_match_data()
        PCI: tegra: Remove redundant _data suffix
      
      * pci/host-xilinx:
        microblaze/PCI: Add multidomain support for procfs
        PCI: xilinx: Dispose of MSI virtual IRQ
        PCI: xilinx: Clear correct MSI set bit
        PCI: xilinx: Clear interrupt register for invalid interrupt
        PCI: xilinx: Keep both legacy and MSI interrupt domain references
        PCI: xilinx-nwl: Enable all MSI interrupts using MSI mask
        PCI: xilinx-nwl: Expand error logging
      
      Conflicts:
      	drivers/pci/host/pcie-xilinx.c
      69a06e49
  3. 05 10月, 2016 5 次提交
  4. 03 10月, 2016 8 次提交
    • B
      Merge branch 'pci/virtualization' into next · 930ffc03
      Bjorn Helgaas 提交于
      * pci/virtualization:
        PCI: xilinx: Relax device number checking to allow SR-IOV
        PCI: designware: Relax device number checking to allow SR-IOV
        PCI: altera: Relax device number checking to allow SR-IOV
        PCI: Check for pci_setup_device() failure in pci_iov_add_virtfn()
        PCI: Mark Atheros AR9580 to avoid bus reset
      930ffc03
    • B
      Merge branch 'pci/resource' into next · e15194d2
      Bjorn Helgaas 提交于
      * pci/resource:
        PCI: Ignore requested alignment for VF BARs
        PCI: Ignore requested alignment for PROBE_ONLY and fixed resources
      e15194d2
    • B
      Merge branch 'pci/pm' into next · 3f4f3567
      Bjorn Helgaas 提交于
      * pci/pm:
        PCI: Avoid unnecessary resume after direct-complete
        PCI: Recognize D3cold in pci_update_current_state()
        PCI: Query platform firmware for device power state
        PCI: Afford direct-complete to devices with non-standard PM
      3f4f3567
    • B
      Merge branch 'pci/msi' into next · 6c6cba49
      Bjorn Helgaas 提交于
      * pci/msi:
        PCI/MSI: Enable PCI_MSI_IRQ_DOMAIN support for ARC
      6c6cba49
    • B
      Merge branch 'pci/misc' into next · 5485e49f
      Bjorn Helgaas 提交于
      * pci/misc:
        PCI: Drop CONFIG_KEXEC_CORE ifdeffery
      5485e49f
    • B
      Merge branch 'pci/hotplug' into next · 64ea3b99
      Bjorn Helgaas 提交于
      * pci/hotplug:
        x86/PCI: VMD: Request userspace control of PCIe hotplug indicators
        PCI: pciehp: Allow exclusive userspace control of indicators
        PCI: pciehp: Remove useless pciehp_get_latch_status() calls
        PCI: pciehp: Clean up dmesg "Slot(%s)" messages
        PCI: pciehp: Remove unnecessary guard
        PCI: pciehp: Don't re-read Slot Status when handling surprise event
        PCI: pciehp: Don't re-read Slot Status when queuing hotplug event
        PCI: pciehp: Process all hotplug events before looking for new ones
        PCI: pciehp: Return IRQ_NONE when we can't read interrupt status
        PCI: pciehp: Rename pcie_isr() locals for clarity
        PCI: pciehp: Clear attention LED on device add
      64ea3b99
    • B
      Merge branch 'pci/enumeration' into next · fb6b6cc4
      Bjorn Helgaas 提交于
      * pci/enumeration:
        PCI: tegra: Fix pci_remap_iospace() failure path
        PCI: generic: Fix pci_remap_iospace() failure path
        PCI: rcar: Fix pci_remap_iospace() failure path
        PCI: versatile: Fix pci_remap_iospace() failure path
        PCI: designware: Fix pci_remap_iospace() failure path
        PCI: aardvark: Fix pci_remap_iospace() failure path
      fb6b6cc4
    • B
      Merge branch 'pci/aer' into next · 4dc2db09
      Bjorn Helgaas 提交于
      * pci/aer:
        PCI/AER: Fix aer_probe() kernel-doc comment
        PCI/AER: Cache capability position
        PCI/AER: Avoid memory allocation in interrupt handling path
        ACPI / APEI: Send correct severity to calculate AER severity
        PCI/AER: Remove duplicate AER severity translation
        PCI/AER: Remove aerdriver.forceload kernel parameter
        PCI/AER: Remove aerdriver.nosourceid kernel parameter
        x86/PCI: VMD: Add quirk for AER to ignore source ID
        PCI/AER: Add bus flag to skip source ID matching
      
      Conflicts:
      	drivers/pci/probe.c
      4dc2db09
  5. 30 9月, 2016 1 次提交
  6. 29 9月, 2016 6 次提交
    • Y
      PCI: Ignore requested alignment for VF BARs · 62d9a78f
      Yongji Xie 提交于
      Resource allocation for VFs is done via the VF BARx registers in the PF's
      SR-IOV Capability, and the BARs in the VFs themselves are read-only zeros
      (see SR-IOV spec r1.1, secs 3.3.14 and 3.4.1.11).
      
      Even though the actual VF BARs are read-only zeros, the VF dev->resource[]
      structs describe the space allocated for the VF (this is a piece of the
      space described by the VF BARx register in the PF's SR-IOV capability).
      
      It's meaningless to request additional alignment for a VF: the VF BAR
      alignment is completely determined by the alignment of the VF BARx in the
      PF and the size of the VF BAR.
      
      Ignore the user's alignment requests for VF devices.
      Signed-off-by: NYongji Xie <xyjxie@linux.vnet.ibm.com>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      62d9a78f
    • Y
      PCI: Ignore requested alignment for PROBE_ONLY and fixed resources · f0b99f70
      Yongji Xie 提交于
      Users may request additional alignment of PCI resources, e.g., to align
      BARs on page boundaries so they can be shared with guests via VFIO.  This
      of course may require reallocation if firmware has already assigned the
      BARs with smaller alignments.
      
      If the platform has requested PCI_PROBE_ONLY, we should never change any
      PCI BARs, so we can't provide any additional alignment.  Also, if a BAR is
      marked as IORESOURCE_PCI_FIXED, e.g., for PCI Enhanced Allocation or if the
      firmware depends on the current BAR value, we can't change the alignment.
      
      In these cases, log a message and ignore the user's alignment requests.
      
      [bhelgaas: changelog, use goto to simplify PCI_PROBE_ONLY check]
      Signed-off-by: NYongji Xie <xyjxie@linux.vnet.ibm.com>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      f0b99f70
    • L
      PCI: Avoid unnecessary resume after direct-complete · a0d2a959
      Lukas Wunner 提交于
      Commit 58a1fbbb ("PM / PCI / ACPI: Kick devices that might have been
      reset by firmware") added a runtime resume for devices that were runtime
      suspended when the system entered sleep.
      
      The motivation was that devices might be in a reset-power-on state after
      waking from system sleep, so their power state as perceived by Linux
      (stored in pci_dev->current_state) would no longer reflect reality.  By
      resuming such devices, we allow them to return to a low-power state via
      autosuspend and also bring their current_state in sync with reality.
      
      However for devices that are *not* in a reset-power-on state, doing an
      unconditional resume wastes energy.  A more refined approach is called for
      which issues a runtime resume only if the power state after direct-complete
      is shallower than it was before. To achieve this, update the device's
      current_state and compare it to its pre-sleep value.
      Signed-off-by: NLukas Wunner <lukas@wunner.de>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      a0d2a959
    • L
      PCI: Recognize D3cold in pci_update_current_state() · a6a64026
      Lukas Wunner 提交于
      Whenever a device is resumed or its power state is changed using the
      platform, its new power state is read from the PM Control & Status Register
      and cached in pci_dev->current_state by calling pci_update_current_state().
      
      If the device is in D3cold, reading from config space typically results in
      a fabricated "all ones" response.  But if it's in D3hot, the two bits
      representing the power state in the PMCSR are *also* set to 1.  Thus D3hot
      and D3cold are not discernible by just reading the PMCSR.
      
      To account for this, pci_update_current_state() uses two workarounds:
      
      - When transitioning to D3cold using pci_platform_power_transition(), the
        new power state is set blindly by pci_update_current_state(), i.e.
        without verifying that the device actually *is* in D3cold.  This is
        achieved by setting the "state" argument to PCI_D3cold.  The "state"
        argument was originally intended to convey the new state in case the
        device doesn't have the PM capability.  It is *also* used to convey the
        device state if the PM capability is present and the new state is D3cold,
        but this was never explained in the kerneldoc.
      
      - Once the current_state is set to D3cold, further invocations of
        pci_update_current_state() will blindly assume that the device is still
        in D3cold and leave the current_state unmodified.  To get out of this
        impasse, the current_state has to be set directly, typically by calling
        pci_raw_set_power_state() or pci_enable_device().
      
      It would be desirable if pci_update_current_state() could reliably detect
      D3cold by itself.  That would allow us to do away with these workarounds,
      and it would allow for a smarter, more energy conserving runtime resume
      strategy after system sleep:  Currently devices which utilize
      direct_complete are mandatorily runtime resumed in their ->complete stage.
      This can be avoided if their power state after system sleep is the same as
      before, but it requires a mechanism to detect the power state reliably.
      
      We've just gained the ability to query the platform firmware for its
      opinion on the device's power state.  On platforms conforming to ACPI 4.0
      or newer, this allows recognition of D3cold.  Pre-4.0 platforms lack _PR3
      and therefore the deepest power state that will ever be reported is D3hot,
      even though the device may actually be in D3cold.  To detect D3cold in
      those cases, accessibility of the vendor ID in config space is probed using
      pci_device_is_present().  This also works for devices which are not
      platform-power-manageable at all, but can be suspended to D3cold using a
      nonstandard mechanism (e.g. some hybrid graphics laptops or Thunderbolt on
      the Mac).
      Signed-off-by: NLukas Wunner <lukas@wunner.de>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      a6a64026
    • L
      PCI: Query platform firmware for device power state · cc7cc02b
      Lukas Wunner 提交于
      Usually the most accurate way to determine a PCI device's power state is to
      read its PM Control & Status Register.  There are two cases however when
      this is not an option:  If the device doesn't have the PM capability at
      all, or if it is in D3cold (in which case its config space is
      inaccessible).
      
      In both cases, we can alternatively query the platform firmware for its
      opinion on the device's power state.  To facilitate this, augment struct
      pci_platform_pm_ops with a ->get_power callback and implement it for
      acpi_pci_platform_pm (the only pci_platform_pm_ops existing so far).
      
      It is used by a forthcoming commit to let pci_update_current_state()
      recognize D3cold.
      Signed-off-by: NLukas Wunner <lukas@wunner.de>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      cc7cc02b
    • L
      PCI: Afford direct-complete to devices with non-standard PM · 4132a577
      Lukas Wunner 提交于
      There are devices not power-manageable by the platform, but still able to
      runtime suspend to D3cold with a non-standard mechanism.  One example is
      laptop hybrid graphics where the discrete GPU and its built-in HDA
      controller are power-managed either with a _DSM (AMD PowerXpress, Nvidia
      Optimus) or a separate gmux controller (MacBook Pro).  Another example is
      Thunderbolt on Macs which is power-managed with custom ACPI methods.
      
      When putting the system to sleep, we currently handle such devices
      improperly by transitioning them from D3cold to D3hot (the default power
      state defined at the top of pci_target_state()).  This wastes energy and
      prolongs the suspend sequence (powering up the Thunderbolt controller takes
      2 seconds).
      
      Avoid that by assuming that a non-standard PM mechanism is at work if the
      device is not platform-power-manageable but currently in D3cold.
      
      If the device is wakeup enabled, we might still have to wake it up from
      D3cold if PME cannot be signaled from that power state.
      
      The check for devices without PM capability comes before the check for
      D3cold since such devices could in theory also be powered down by
      non-standard means and should then be afforded direct-complete as well.
      Signed-off-by: NLukas Wunner <lukas@wunner.de>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      Acked-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      4132a577
  7. 28 9月, 2016 2 次提交
  8. 23 9月, 2016 2 次提交
    • K
      x86/PCI: VMD: Request userspace control of PCIe hotplug indicators · 3161832d
      Keith Busch 提交于
      Add set_dev_domain_options() to set PCI domain-specific options as devices
      are added.  The first usage is to request exclusive userspace control of
      PCIe hotplug indicators in VMD domains.
      
      Devices in a VMD domain use PCIe hotplug Attention and Power Indicators in
      a non-standard way; tell pciehp to ignore the indicators so userspace can
      control them via the sysfs "attention" file.
      
      To determine whether a bus is within a VMD domain, add a bool to the
      pci_sysdata structure that the VMD driver sets during initialization.
      
      [bhelgaas: changelog]
      Requested-by: NKapil Karkra <kapil.karkra@intel.com>
      Tested-by: NArtur Paszkiewicz <artur.paszkiewicz@intel.com>
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      3161832d
    • K
      PCI: pciehp: Allow exclusive userspace control of indicators · 576243b3
      Keith Busch 提交于
      PCIe hotplug supports optional Attention and Power Indicators, which are
      used internally by pciehp.  Users can't control the Power Indicator, but
      they can control the Attention Indicator by writing to a sysfs "attention"
      file.
      
      The Slot Control register has two bits for each indicator, and the PCIe
      spec defines the encodings for each as (Reserved/On/Blinking/Off).  For
      sysfs "attention" writes, pciehp_set_attention_status() maps into these
      encodings, so the only useful write values are 0 (Off), 1 (On), and 2
      (Blinking).
      
      However, some platforms use all four bits for platform-specific indicators,
      and they need to allow direct user control of them while preventing pciehp
      from using them at all.
      
      Add a "hotplug_user_indicators" flag to the pci_dev structure.  When set,
      pciehp does not use either the Attention Indicator or the Power Indicator,
      and the low four bits (values 0x0 - 0xf) of sysfs "attention" write values
      are written directly to the Attention Indicator Control and Power Indicator
      Control fields.
      
      [bhelgaas: changelog, rename flag and accessors to s/attention/indicator/]
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      576243b3
  9. 21 9月, 2016 2 次提交
  10. 20 9月, 2016 5 次提交
  11. 15 9月, 2016 5 次提交