1. 27 May, 2013 4 commits
    • Thomas Petazzoni's avatar
      pci: mvebu: fix the emulation of the status register · 6eb237c4
      Thomas Petazzoni authored
      The status register of the PCI configuration space of PCI-to-PCI
      bridges contain some read-only bits, and so write-1-to-clear bits. So,
      the Linux PCI core sometimes writes 0xffff to this status register,
      and in the current PCI-to-PCI bridge emulation code of the Marvell
      driver, we do take all those 1s being written. Even the read-only bits
      are being overwritten.
      
      For now, all the read-only bits should be emulated to have the zero
      value.
      
      The other bits, that are write-1-to-clear bits are used to report
      various kind of errors, and are never set by the emulated bridge, so
      there is no need to support this write-1-to-clear bits mechanism.
      
      As a conclusion, the easiest solution is to simply emulate this status
      register by returning zero when read, and ignore the writes to it.
      
      This has two visible effects:
      
       * The devsel is no longer 'unknown' in, i.e
      
         Flags: bus master, 66MHz, user-definable features, ?? devsel, latency 0
      
         becomes:
      
         Flags: bus master, 66MHz, user-definable features, fast devsel, latency 0
      
         in lspci -v.
      
         This was caused by a value of 11b being read for devsel, which is
         an invalid value. This 11b value being read was due to a previous
         write of 0xffff into the status register.
      
       * The capability list is no longer broken, because we indicate to the
         Linux PCI core that we don't have a Capabilities Pointer in the PCI
         configuration space of this bridge. The following message is
         therefore no longer visible in lspci -v:
      
         Capabilities: [fc] <chain broken>
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      6eb237c4
    • Thomas Petazzoni's avatar
      pci: mvebu: allow the enumeration of devices beyond physical bridges · 197fc226
      Thomas Petazzoni authored
      Until now, the Marvell PCIe driver was only allowing the enumeration
      of the devices in the secondary bus of the emulated PCI-to-PCI
      bridge. This works fine when a PCIe device is directly connected into
      a PCIe slot of the Marvell board.
      
      However, when the device connected in the PCIe slot is a physical PCIe
      bridge, beyond which a real PCIe device is connected, it no longer
      worked, as the driver was preventing the Linux PCI core from seeing
      such devices.
      
      This commit fixes that by ensuring that configuration transactions on
      subordinate busses are properly forwarded on the right PCIe interface.
      
      Thanks to this patch, a PCIe card beyond a PCIe bridge, itself beyond
      the emulated PCI-to-PCI bridge is properly detected, with the
      following layout:
      
      -[0000:00]-+-01.0-[01]----00.0
                 +-09.0-[02-07]----00.0-[03-07]--+-01.0-[04]--
                 |                               +-05.0-[05]--
                 |                               +-07.0-[06]--
                 |                               \-09.0-[07]----00.0
                 \-0a.0-[08]----00.0
      
      Where the PCIe interface that sits beyond the emulated PCI-to-PCI
      bridge at 09.0 allows to access the secondary bus 02, on which there
      is a PCIe bridge that allows to access the 3 to 7 busses, that are
      subordinates to this bridge. And on one of this bus (bus 7), there is
      one real PCIe device connected.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      197fc226
    • Thomas Petazzoni's avatar
      pci: mvebu: no longer fake the slot location of downstream devices · f4ac9901
      Thomas Petazzoni authored
      By default, the Marvell hardware, for each PCIe interface, exhibits
      the following devices:
      
       * On slot 0, a "Marvell Memory controller", identical on all PCIe
         interfaces, and which isn't useful when the Marvell SoC is the PCIe
         root complex (i.e, the normal case when we run Linux on the Marvell
         SoC).
      
       * On slot 1, the real PCIe card connected into the PCIe slot of the
         board.
      
      So, what the Marvell PCIe driver was doing in its PCI-to-PCI bridge
      emulation is that when the Linux PCI core was trying to access the
      device in slot 0, we were in fact forwarding the configuration
      transaction to the device in slot 1. For all other slots, we were
      telling the Linux PCI core that there was no device connected.
      
      However, new versions of bootloaders from Marvell change the default
      PCIe configuration, and make the real device appear in slot 0, and the
      "Marvell Memory controller" in slot 1.
      
      Therefore, this commit modifies the Marvell PCIe driver to adjust the
      PCIe hardware configuration to make sure that this behavior (real
      device in slot 0, "Marvell Memory controller" in slot 1) is the one
      we'll see regardless of what the bootloader has done. It allows to
      remove the little hack that was forwarding configuration transactions
      on slot 0 to slot 1, which is nice.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      f4ac9901
    • Wei Yongjun's avatar
      pci: mvebu: fix return value check in mvebu_pcie_probe() · 3d9939c9
      Wei Yongjun authored
      In case of error, function of_clk_get_by_name() returns
      ERR_PTR() never returns NULL. The NULL test in the return
      value check should be replaced with IS_ERR().
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      3d9939c9
  2. 20 May, 2013 4 commits
  3. 19 May, 2013 3 commits
  4. 12 May, 2013 2 commits
    • Linus Torvalds's avatar
      Linux 3.10-rc1 · f722406f
      Linus Torvalds authored
      f722406f
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 26b840ae
      Linus Torvalds authored
      Pull tracing/kprobes update from Steven Rostedt:
       "The majority of these changes are from Masami Hiramatsu bringing
        kprobes up to par with the latest changes to ftrace (multi buffering
        and the new function probes).
      
        He also discovered and fixed some bugs in doing so.  When pulling in
        his patches, I also found a few minor bugs as well and fixed them.
      
        This also includes a compile fix for some archs that select the ring
        buffer but not tracing.
      
        I based this off of the last patch you took from me that fixed the
        merge conflict error, as that was the commit that had all the changes
        I needed for this set of changes."
      
      * tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/kprobes: Support soft-mode disabling
        tracing/kprobes: Support ftrace_event_file base multibuffer
        tracing/kprobes: Pass trace_probe directly from dispatcher
        tracing/kprobes: Increment probe hit-count even if it is used by perf
        tracing/kprobes: Use bool for retprobe checker
        ftrace: Fix function probe when more than one probe is added
        ftrace: Fix the output of enabled_functions debug file
        ftrace: Fix locking in register_ftrace_function_probe()
        tracing: Add helper function trace_create_new_event() to remove duplicate code
        tracing: Modify soft-mode only if there's no other referrer
        tracing: Indicate enabled soft-mode in enable file
        tracing/kprobes: Fix to increment return event probe hit-count
        ftrace: Cleanup regex_lock and ftrace_lock around hash updating
        ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
        ftrace: Have ftrace_regex_write() return either read or error
        tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
        tracing: Don't succeed if event_enable_func did not register anything
        ring-buffer: Select IRQ_WORK
      26b840ae
  5. 11 May, 2013 4 commits
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.10-rc0-tag-two' of... · 607eeb0b
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       - More fixes in the vCPU PVHVM hotplug path.
       - Add more documentation.
       - Fix various ARM related issues in the Xen generic drivers.
       - Updates in the xen-pciback driver per Bjorn's updates.
       - Mask the x2APIC feature for PV guests.
      
      * tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/pci: Used cached MSI-X capability offset
        xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
        xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
        xen: mask x2APIC feature in PV
        xen: SWIOTLB is only used on x86
        xen/spinlock: Fix check from greater than to be also be greater or equal to.
        xen/smp/pvhvm: Don't point per_cpu(xen_vpcu, 33 and larger) to shared_info
        xen/vcpu: Document the xen_vcpu_info and xen_vcpu
        xen/vcpu/pvhvm: Fix vcpu hotplugging hanging.
      607eeb0b
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 4c444501
      Linus Torvalds authored
      Pull second SCSI update from James "Jaj B" Bottomley:
       "This is the final round of SCSI patches for the merge window.  It
        consists mostly of driver updates (bnx2fc, ibmfc, fnic, lpfc,
        be2iscsi, pm80xx, qla4x and ipr).
      
        There's also the power management updates that complete the patches in
        Jens' tree, an iscsi refcounting problem fix from the last pull, some
        dif handling in scsi_debug fixes, a few nice code cleanups and an
        error handling busy bug fix."
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (92 commits)
        [SCSI] qla2xxx: Update firmware link in Kconfig file.
        [SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
        [SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
        [SCSI] pm80xx: thermal, sas controller config and error handling update
        [SCSI] pm80xx: NCQ error handling changes
        [SCSI] pm80xx: WWN Modification for PM8081/88/89 controllers
        [SCSI] pm80xx: Changed module name and debug messages update
        [SCSI] pm80xx: Firmware flash memory free fix, with addition of new memory region for it
        [SCSI] pm80xx: SPC new firmware changes for device id 0x8081 alone
        [SCSI] pm80xx: Added SPCv/ve specific hardware functionalities and relevant changes in common files
        [SCSI] pm80xx: MSI-X implementation for using 64 interrupts
        [SCSI] pm80xx: Updated common functions common for SPC and SPCv/ve
        [SCSI] pm80xx: Multiple inbound/outbound queue configuration
        [SCSI] pm80xx: Added SPCv/ve specific ids, variables and modify for SPC
        [SCSI] lpfc: fix up Kconfig dependencies
        [SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd
        [SCSI] sd: change to auto suspend mode
        [SCSI] sd: use REQ_PM in sd's runtime suspend operation
        [SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()
        [SCSI] ufs: Correct the expected data transfersize
        ...
      4c444501
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux · ac4e0109
      Linus Torvalds authored
      Pull idle update from Len Brown:
       "Add support for new Haswell-ULT CPU idle power states"
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
        intel_idle: initial C8, C9, C10 support
        tools/power turbostat: display C8, C9, C10 residency
      ac4e0109
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/users/eparis/audit · c4cc75c3
      Linus Torvalds authored
      Pull audit changes from Eric Paris:
       "Al used to send pull requests every couple of years but he told me to
        just start pushing them to you directly.
      
        Our touching outside of core audit code is pretty straight forward.  A
        couple of interface changes which hit net/.  A simple argument bug
        calling audit functions in namei.c and the removal of some assembly
        branch prediction code on ppc"
      
      * git://git.infradead.org/users/eparis/audit: (31 commits)
        audit: fix message spacing printing auid
        Revert "audit: move kaudit thread start from auditd registration to kaudit init"
        audit: vfs: fix audit_inode call in O_CREAT case of do_last
        audit: Make testing for a valid loginuid explicit.
        audit: fix event coverage of AUDIT_ANOM_LINK
        audit: use spin_lock in audit_receive_msg to process tty logging
        audit: do not needlessly take a lock in tty_audit_exit
        audit: do not needlessly take a spinlock in copy_signal
        audit: add an option to control logging of passwords with pam_tty_audit
        audit: use spin_lock_irqsave/restore in audit tty code
        helper for some session id stuff
        audit: use a consistent audit helper to log lsm information
        audit: push loginuid and sessionid processing down
        audit: stop pushing loginid, uid, sessionid as arguments
        audit: remove the old depricated kernel interface
        audit: make validity checking generic
        audit: allow checking the type of audit message in the user filter
        audit: fix build break when AUDIT_DEBUG == 2
        audit: remove duplicate export of audit_enabled
        Audit: do not print error when LSMs disabled
        ...
      c4cc75c3
  6. 10 May, 2013 23 commits