1. 20 Jun, 2013 1 commit
    • Linus Walleij's avatar
      clk: nomadik: implement the Nomadik clocks properly · ef6eb322
      Linus Walleij authored
      The Nomadik clock implementation was a stub just using
      fixed clocks.
      
      This implements the clocks properly instead of relying
      on them all being on at boot and leaving them all on.
      
      The PLLs are on the top locking to the main chrystal
      oscillator, then the HCLK for the peripherals are
      below PLL2.
      
      The gated clocks are implemented with zero cells and
      given the clock ID as a property of each node, so every
      gate need to have its own node in the device tree.
      This is because the gate registers contain both HCLK
      gates and PCLK gates, where the latter has HCLK as
      parent. As can be seen from the register layout, this
      is a complete mixup, which means all these gates need
      their own node to properly model parent/child relations
      for PCLKs apart from the HCLKs.
      
      This driver also adds a helpful debugfs file to inspect
      the hardware state of the clock gates.
      
      This is the end result in <debugfs>/clk/clk_summary
      after applying a proper device tree:
      
      ulpiclk                0   0    60000000
      mxtal                  3   3    19200000
         pll2                1   1    864000000
            clk48            3   3    48000000
               rngcclk       1   1    48000000
               usbmclk       0   0    48000000
               mshcclk       0   0    48000000
               mspclk3       0   0    48000000
               x3dclk        0   0    48000000
               skeclk        0   0    48000000
               owmclk        0   0    48000000
               mspclk2       0   0    48000000
               mspclk1       0   0    48000000
               uart2clk      0   0    48000000
               ipbmcclk      0   0    48000000
               ipi2cclk      0   0    48000000
               usbclk        0   0    48000000
               mspclk0       0   0    48000000
               uart1clk      1   2    48000000
               i2c1clk       0   0    48000000
               i2c0clk       0   0    48000000
               sdiclk        1   1    48000000
               uart0clk      0   0    48000000
               sspiclk       0   0    48000000
               irdaclk       0   0    48000000
            clk72            0   0    72000000
               difclk        0   0    72000000
               clcdclk       0   0    72000000
            clk216           0   0    216000000
               hsiclkrx      0   0    216000000
               clk108        0   0    108000000
                  hsiclktx   0   0    108000000
                  clk27      0   0    27000000
         pll1                1   1    264000000
            hclk             3   3    264000000
               hclkrng       1   1    264000000
               hclkusbm      0   0    264000000
               hclkcryp      0   0    264000000
               hclkhash      0   0    264000000
               hclk3d        0   0    264000000
               hclkhpi       0   0    264000000
               hclksva       0   0    264000000
               hclksaa       0   0    264000000
               hclkdif       0   0    264000000
               hclkusb       0   0    264000000
               hclkclcd      0   0    264000000
               hclkdma1      0   0    264000000
               hclksdram     0   0    264000000
               hclksmc       1   1    264000000
               hclkdma0      0   0    264000000
               pclk          7   9    264000000
                  pclkmsp3   0   0    264000000
                  pclkmshc   0   0    264000000
                  pclkhsem   0   0    264000000
                  pclkske    0   0    264000000
                  pclkowm    0   0    264000000
                  pclkmsp2   0   0    264000000
                  pclkmsp1   0   0    264000000
                  pclkuart2  0   0    264000000
                  pclkxti    0   0    264000000
                  pclkhsi    0   0    264000000
                  pclkmsp0   0   0    264000000
                  pclkuart1  1   1    264000000
                  pclki2c1   0   0    264000000
                  pclki2c0   0   0    264000000
                  pclksdi    1   1    264000000
                  pclkuart0  1   1    264000000
                  pclkssp    0   0    264000000
                  pclkirda   0   0    264000000
         timclk              1   1    2400000
      Acked-by: default avatarMike Turquette <mturquette@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      ef6eb322
  2. 28 May, 2013 2 commits
  3. 26 May, 2013 2 commits
  4. 12 May, 2013 5 commits
    • Linus Walleij's avatar
      ARM: nomadik: register clocksource from device tree · 7690fbb2
      Linus Walleij authored
      This switches the Nomadik platform to also registering its
      clocksource from the device tree, removing unused support
      code as we go along.
      Acked-by: default avatarMike Turquette <mturquette@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      7690fbb2
    • Linus Walleij's avatar
      ARM: nomadik: convert all clocks except timer to dt · 6e2b07a1
      Linus Walleij authored
      This moves all Nomadik clocks except the one used for the
      timer/clocksource over to the device tree.
      Acked-by: default avatarMike Turquette <mturquette@linaro.org>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      6e2b07a1
    • Rabin Vincent's avatar
      clocksource: nomadik-mtu: support of probe · c7785ea0
      Rabin Vincent authored
      Support device tree probe of the nomadik-mtu clocksource.
      Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
      c7785ea0
    • 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 26 commits