1. 17 9月, 2013 8 次提交
    • F
      ARM: mach-imx: clk-imx51-imx53: Fix 'spdif1_pred' clock registration · 5d5248a6
      Fabio Estevam 提交于
      Since commit beb2d1c1 (ARM i.MX5: Add S/PDIF clocks), the following clock
      error appears on mx51:
      
      TrustZone Interrupt Controller (TZIC) initialized
      i.MX51 clk 180: register failed with -17
      i.MX5 clk 180: register failed with -17
      sched_clock: 32 bits at 24MHz, resolution 41ns, wraps every 178956ms
      CPU identified as i.MX51, silicon rev 3.0
      ...
      
      Clock 180 corresponds to 'spdif1_podf' and this clock is getting registered
      twice.
      
      Fix it, by properly registering the 'spdif1_pred' clock, which should not
      reference 'spdif1_podf'.
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      5d5248a6
    • S
      ARM: imx: initialize clk_init_data.flags for clk-fixup-mux · bdb1b5f2
      Shawn Guo 提交于
      The clk_init_data.flags of clk-fixup-mux is left there without
      initialization.  It may hold some random data and cause clock framework
      interpret the clock in an unexpected way.  At least on imx6sl, the
      following division by zero error with sched_clock is seen because of it.
      
      Division by zero in kernel.
      CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.11.0-rc3+ #19
      Backtrace:
      [<80011af0>] (dump_backtrace+0x0/0x10c) from [<80011c90>] (show_stack+0x18/0x1c)
       r6:3b9aca00 r5:00000020 r4:00000000 r3:00000000
      [<80011c78>] (show_stack+0x0/0x1c) from [<8055e02c>] (dump_stack+0x78/0x94)
      [<8055dfb4>] (dump_stack+0x0/0x94) from [<80011924>] (__div0+0x18/0x20)
       r4:00000000 r3:00000000
      [<8001190c>] (__div0+0x0/0x20) from [<8026c408>] (Ldiv0_64+0x8/0x18)
      [<8006330c>] (clocks_calc_mult_shift+0x0/0xf8) from [<8072f604>] (setup_sched_clock+0x88/0x1f0)
      [<8072f57c>] (setup_sched_clock+0x0/0x1f0) from [<8071ad48>] (mxc_timer_init+0xe8/0x17c)
      [<8071ac60>] (mxc_timer_init+0x0/0x17c) from [<807290b0>] (imx6sl_clocks_init+0x1db8/0x1dc0)
       r8:807a9ca4 r7:00000000 r6:80777564 r5:8100c1f4 r4:c0820000
      [<807272f8>] (imx6sl_clocks_init+0x0/0x1dc0) from [<807420ac>] (of_clk_init+0x40/0x6c)
      [<8074206c>] (of_clk_init+0x0/0x6c) from [<807290cc>] (imx6sl_timer_init+0x14/0x18)
       r5:807a8e80 r4:ffffffff
      [<807290b8>] (imx6sl_timer_init+0x0/0x18) from [<80716e1c>] (time_init+0x24/0x34)
      [<80716df8>] (time_init+0x0/0x34) from [<80713738>] (start_kernel+0x1b0/0x310)
      [<80713588>] (start_kernel+0x0/0x310) from [<80008074>] (0x80008074)
       r7:80770b08 r6:80754cd4 r5:8076c8c4 r4:10c53c7d
      sched_clock: 32 bits at 0 Hz, resolution 0ns, wraps every 0ms
      
      Fix the bug by initializing init.flags as zero.
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      bdb1b5f2
    • G
      ARM: imx27.dtsi: fix CSPI PER clock id · 7c37b617
      Gwenhael Goavec-Merou 提交于
      CSPI PER clock is per2clk (per2_gate id 60) instead of cspiX_ipg_gate.
      Signed-off-by: NGwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com>
      Acked-by: NSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: NShawn Guo <shawn.guo@linaro.org>
      7c37b617
    • L
      Linux 3.12-rc1 · 272b98c6
      Linus Torvalds 提交于
      272b98c6
    • L
      Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4ae54f9
      Linus Torvalds 提交于
      Pull timer code update from Thomas Gleixner:
       - armada SoC clocksource overhaul with a trivial merge conflict
       - Minor improvements to various SoC clocksource drivers
      
      * 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding
        clocksource: armada-370-xp: Get reference fixed-clock by name
        clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
        clocksource: armada-370-xp: Fix device-tree binding
        clocksource: armada-370-xp: Introduce new compatibles
        clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
        clocksource: armada-370-xp: Simplify TIMER_CTRL register access
        clocksource: armada-370-xp: Use BIT()
        ARM: timer-sp: Set dynamic irq affinity
        ARM: nomadik: add dynamic irq flag to the timer
        clocksource: sh_cmt: 32-bit control register support
        clocksource: em_sti: Convert to devm_* managed helpers
      a4ae54f9
    • L
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 3369d116
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update cifs.txt and remove some outdated infos
        cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
        cifs: Do not take a reference to the page in cifs_readpage_worker()
      3369d116
    • L
      Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi · f1da3458
      Linus Torvalds 提交于
      Pull UBI fixes from Artem Bityutskiy:
       "Just a single fastmap fix plus a regression fix"
      
      * tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubi:
        UBI: Fix invalidate_fastmap()
        UBI: Fix PEB leak in wear_leveling_worker()
      f1da3458
    • L
      Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs · 098e7f16
      Linus Torvalds 提交于
      Pull ubifs fix from Artem Bityutskiy:
       "Just one patch which fixes the power-cut recovery testing mode.
      
        I'll start using a single UBI/UBIFS tree instead of 2 trees from now
        on.  So in the future you'll get 1 small pull request instead of 2
        tiny ones"
      
      * tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: remove invalid warn msg with tst_recovery enabled
      098e7f16
  2. 16 9月, 2013 3 次提交
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d8efd82e
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "These are four patches for three construction sites:
      
         - Fix register decoding for the combination of multi-core processors
           and multi-threading.
      
         - Two more fixes that are part of the ongoing DECstation resurrection
           work.  One of these touches a DECstation-only network driver.
      
         - Finally Markos' trivial build fix for the AP/SP support.
      
        (With this applied now all MIPS defconfigs are building again)"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: kernel: vpe: Make vpe_attrs an array of pointers.
        MIPS: Fix SMP core calculations when using MT support.
        MIPS: DECstation I/O ASIC DMA interrupt handling fix
        MIPS: DECstation HRT initialization rearrangement
      d8efd82e
    • L
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · cd619e21
      Linus Torvalds 提交于
      Pull x86 platform updates from Matthew Garrett:
       "Nothing amazing here, almost entirely cleanups and minor bugfixes and
        one bit of hardware enablement in the amilo-rfkill driver"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
        platform/x86: panasonic-laptop: reuse module_acpi_driver
        samsung-laptop: fix config build error
        platform: x86: remove unnecessary platform_set_drvdata()
        amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.
        wmi: parse_wdg() should return kernel error codes
        hp_wmi: Fix unregister order in hp_wmi_rfkill_setup()
        platform: replace strict_strto*() with kstrto*()
        x86: irst: use module_acpi_driver to simplify the code
        x86: smartconnect: use module_acpi_driver to simplify the code
        platform samsung-q10: use ACPI instead of direct EC calls
        thinkpad_acpi: add the ability setting TPACPI_LED_NONE by quirk
        thinkpad_acpi: return -NODEV while operating uninitialized LEDs
      cd619e21
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 0375ec58
      Linus Torvalds 提交于
      Pull misc SCSI driver updates from James Bottomley:
       "This patch set is a set of driver updates (megaraid_sas, fnic, lpfc,
        ufs, hpsa) we also have a couple of bug fixes (sd out of bounds and
        ibmvfc error handling) and the first round of esas2r checker fixes and
        finally the much anticipated big endian additions for megaraid_sas"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (47 commits)
        [SCSI] fnic: fnic Driver Tuneables Exposed through CLI
        [SCSI] fnic: Kernel panic while running sh/nosh with max lun cfg
        [SCSI] fnic: Hitting BUG_ON(io_req->abts_done) in fnic_rport_exch_reset
        [SCSI] fnic: Remove QUEUE_FULL handling code
        [SCSI] fnic: On system with >1.1TB RAM, VIC fails multipath after boot up
        [SCSI] fnic: FC stat param seconds_since_last_reset not getting updated
        [SCSI] sd: Fix potential out-of-bounds access
        [SCSI] lpfc 8.3.42: Update lpfc version to driver version 8.3.42
        [SCSI] lpfc 8.3.42: Fixed issue of task management commands having a fixed timeout
        [SCSI] lpfc 8.3.42: Fixed inconsistent spin lock usage.
        [SCSI] lpfc 8.3.42: Fix driver's abort loop functionality to skip IOs already getting aborted
        [SCSI] lpfc 8.3.42: Fixed failure to allocate SCSI buffer on PPC64 platform for SLI4 devices
        [SCSI] lpfc 8.3.42: Fix WARN_ON when driver unloads
        [SCSI] lpfc 8.3.42: Avoided making pci bar ioremap call during dual-chute WQ/RQ pci bar selection
        [SCSI] lpfc 8.3.42: Fixed driver iocbq structure's iocb_flag field running out of space
        [SCSI] lpfc 8.3.42: Fix crash on driver load due to cpu affinity logic
        [SCSI] lpfc 8.3.42: Fixed logging format of setting driver sysfs attributes hard to interpret
        [SCSI] lpfc 8.3.42: Fixed back to back RSCNs discovery failure.
        [SCSI] lpfc 8.3.42: Fixed race condition between BSG I/O dispatch and timeout handling
        [SCSI] lpfc 8.3.42: Fixed function mode field defined too small for not recognizing dual-chute mode
        ...
      0375ec58
  3. 15 9月, 2013 4 次提交
  4. 14 9月, 2013 8 次提交
  5. 13 9月, 2013 17 次提交