1. 07 11月, 2012 2 次提交
  2. 05 11月, 2012 1 次提交
  3. 04 11月, 2012 4 次提交
    • L
      Merge tag 'nfs-for-3.7-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · d4164973
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix a bunch of deadlock situations:
         * State recovery can deadlock if we fail to release sequence ids
           before scheduling the recovery thread.
         * Calling deactivate_super() from an RPC workqueue thread can
           deadlock because of the call to rpc_shutdown_client.
      
       - Display the device name correctly in /proc/*/mounts
      
       - Fix a number of incorrect error return values:
         * When NFSv3 mounts fail due to a timeout.
         * On NFSv4.1 backchannel setup failure
         * On NFSv4 open access checks
      
       - pnfs_find_alloc_layout() must check the layout pointer for NULL
      
       - Fix a regression in the legacy DNS resolved
      
      * tag 'nfs-for-3.7-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS4: nfs4_opendata_access should return errno
        NFSv4: Initialise the NFSv4.1 slot table highest_used_slotid correctly
        SUNRPC: return proper errno from backchannel_rqst
        NFS: add nfs_sb_deactive_async to avoid deadlock
        nfs: Show original device name verbatim in /proc/*/mount{s,info}
        nfsv3: Make v3 mounts fail with ETIMEDOUTs instead EIO on mountd timeouts
        nfs: Check whether a layout pointer is NULL before free it
        NFS: fix bug in legacy DNS resolver.
        NFSv4: nfs4_locku_done must release the sequence id
        NFSv4.1: We must release the sequence id when we fail to get a session slot
        NFS: Wait for session recovery to finish before returning
      d4164973
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 225ff868
      Linus Torvalds 提交于
      Pull thermal management & ACPI update from Zhang Rui,
      
      Ho humm.  Normally these things go through Len.  But it's just three
      small fixes, I guess I can pull directly too.
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
        ACPI video: Ignore errors after _DOD evaluation.
        thermal: solve compilation errors in rcar_thermal
      225ff868
    • L
      Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux · 209c510e
      Linus Torvalds 提交于
      Pull i2c embedded fixes from Wolfram Sang:
       "Two patches are usual stuff.
      
        The bigger patch is needed to correct a wrong decision made in this
        merge window.  We hoped to get the PIOQUEUE mode in the mxs driver
        working with DMA, but it turned out to be too broken (leading to data
        loss), so we now think it is best to remove it entirely and work only
        with DMA now.  The patch should be in 3.7.  IMO, so users never get
        the chance to use both modes in parallel."
      
      * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
        i2c: tegra: set irq name as device name
        i2c-nomadik: Fixup clock handling
        i2c: mxs: remove broken PIOQUEUE support
      209c510e
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 53f9313f
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Scattered selection of fixes:
      
         - radeon: load detect fixes from SuSE/AMD
         - intel: misc i830, sdvo regression, vesafb kickoff ums fix
         - exynos: maintainers entry update + fixes
         - udl: fix stride scanout issue
      
        it's slightly bigger than I'd probably like, but nothing looked
        dangerous enough to hold off on."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/udl: fix stride issues scanning out stride != width*bpp
        drm/radeon: add load detection support for ext DAC on R200 (v2)
        DRM/radeon: For single CRTC GPUs move handling of CRTC_CRT_ON to crtc_dpms().
        DRM/Radeon: Fix TV DAC Load Detection for single CRTC chips.
        DRM/Radeon: Clean up code in TV DAC load detection.
        drm/radeon: fix ATPX function documentation
        drivers/gpu/drm/radeon/evergreen_cs.c: Remove unnecessary semicolon
        DRM/Radeon: On DVI-I use Load Detection when EDID is bogus.
        DRM/Radeon: Fix primary DAC Load Detection for RV100 chips.
        DRM/Radeon: Fix Load Detection on legacy primary DAC.
        drm: exynos: removed warning due to missing typecast for mixer driver data
        drm/exynos: add support for ARCH_MULTIPLATFORM
        MAINTAINERS: Add git repository for Exynos DRM
        drm/exynos: fix display on issue
        drm/i915: Only kick out vesafb if we takeover the fbcon with KMS
        drm/i915: be less verbose about inability to provide vendor backlight
        drm/i915: clear the entire sdvo infoframe buffer
        drm/i915: VGA needs to be on pipe A on i830M
        drm/i915: fix overlay on i830M
      53f9313f
  4. 03 11月, 2012 26 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0f89a573
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "First post-Sandy pull request"
      
       1) Fix antenna gain handling and initialization of chan->max_reg_power
          in wireless, from Felix Fietkau.
      
       2) Fix nexthop handling in H.232 conntrack helper, from Julian
          Anastasov.
      
       3) Only process 80211 mesh config header in certain kinds of frames,
          from Javier Cardona.
      
       4) 80211 management frame header length needs to be validated, from
          Johannes Berg.
      
       5) Don't access free'd SKBs in ath9k driver, from Felix Fietkay.
      
       6) Test for permanent state correctly in VXLAN driver, from Stephen
          Hemminger.
      
       7) BNX2X bug fixes from Yaniv Rosner and Dmitry Kravkov.
      
       8) Fix off by one errors in bonding, from Nikolay ALeksandrov.
      
       9) Fix divide by zero in TCP-Illinois congestion control.  From Jesper
          Dangaard Brouer.
      
      10) TCP metrics code says "Yo dawg, I heard you like sizeof, so I did a
          sizeof of a sizeof, so you can size your size" Fix from Julian
          Anastasov.
      
      11) Several drivers do mdiobus_free without first doing an
          mdiobus_unregister leading to stray pointer references.  Fix from
          Peter Senna Tschudin.
      
      12) Fix OOPS in l2tp_eth_create() error path, it's another danling
          pointer kinda situation.  Fix from Tom Parkin.
      
      13) Hardware driven by the vmxnet driver can't handle larger than 16K
          fragments, so split them up when necessary.  From Eric Dumazet.
      
      14) Handle zero length data length in tcp_send_rcvq() properly.  Fix
          from Pavel Emelyanov.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
        tcp-repair: Handle zero-length data put in rcv queue
        vmxnet3: must split too big fragments
        l2tp: fix oops in l2tp_eth_create() error path
        cxgb4: Fix unable to get UP event from the LLD
        drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free
        drivers/net/ethernet/nxp/lpc_eth.c: Call mdiobus_unregister before mdiobus_free
        bnx2x: fix HW initialization using fw 7.8.x
        tcp: Fix double sizeof in new tcp_metrics code
        net: fix divide by zero in tcp algorithm illinois
        net: sctp: Fix typo in net/sctp
        bonding: fix second off-by-one error
        bonding: fix off-by-one error
        bnx2x: Disable FCoE for 57840 since not yet supported by FW
        bnx2x: Fix no link on 577xx 10G-baseT
        bnx2x: Fix unrecognized SFP+ module after driver is loaded
        bnx2x: Fix potential incorrect link speed provision
        bnx2x: Restore global registers back to default.
        bnx2x: Fix link down in 57712 following LFA
        bnx2x: Fix 57810 1G-KR link against certain switches.
        ixgbe: PTP get_ts_info missing software support
        ...
      0f89a573
    • P
      tcp-repair: Handle zero-length data put in rcv queue · c454e611
      Pavel Emelyanov 提交于
      When sending data into a tcp socket in repair state we should check
      for the amount of data being 0 explicitly. Otherwise we'll have an skb
      with seq == end_seq in rcv queue, but tcp doesn't expect this to happen
      (in particular a warn_on in tcp_recvmsg shoots).
      Signed-off-by: NPavel Emelyanov <xemul@parallels.com>
      Reported-by: NGiorgos Mavrikas <gmavrikas@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c454e611
    • E
      vmxnet3: must split too big fragments · a4d7e485
      Eric Dumazet 提交于
      vmxnet3 has a 16Kbytes limit per tx descriptor, that happened to work
      as long as we provided PAGE_SIZE fragments.
      
      Our stack can now build larger fragments, so we need to split them to
      the 16kbytes boundary.
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Reported-by: Njongman heo <jongman.heo@samsung.com>
      Tested-by: Njongman heo <jongman.heo@samsung.com>
      Cc: Shreyas Bhatewara <sbhatewara@vmware.com>
      Reviewed-by: NBhavesh Davda <bhavesh@vmware.com>
      Signed-off-by: NShreyas Bhatewara <sbhatewara@vmware.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a4d7e485
    • T
      l2tp: fix oops in l2tp_eth_create() error path · 78933636
      Tom Parkin 提交于
      When creating an L2TPv3 Ethernet session, if register_netdev() should fail for
      any reason (for example, automatic naming for "l2tpeth%d" interfaces hits the
      32k-interface limit), the netdev is freed in the error path.  However, the
      l2tp_eth_sess structure's dev pointer is left uncleared, and this results in
      l2tp_eth_delete() then attempting to unregister the same netdev later in the
      session teardown.  This results in an oops.
      
      To avoid this, clear the session dev pointer in the error path.
      Signed-off-by: NTom Parkin <tparkin@katalix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      78933636
    • J
    • I
      ACPI video: Ignore errors after _DOD evaluation. · fba4e087
      Igor Murzov 提交于
      There are systems where video module known to work fine regardless
      of broken _DOD and ignoring returned value here doesn't cause
      any issues later. This should fix brightness controls on some laptops.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47861Signed-off-by: NIgor Murzov <e-mail@date.by>
      Reviewed-by: NSergey V <sftp.mtuci@gmail.com>
      Signed-off-by: NZhang Rui <rui.zhang@intel.com>
      fba4e087
    • D
      thermal: solve compilation errors in rcar_thermal · 608f62b9
      Devendra Naga 提交于
      following were the errors reported
      
      drivers/thermal/rcar_thermal.c: In function ‘rcar_thermal_probe’:
      drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default]
      include/linux/thermal.h:166:29: note: expected ‘int’ but argument is of type ‘struct rcar_thermal_priv *’
      drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function ‘thermal_zone_device_register’
      include/linux/thermal.h:166:29: note: declared here
      make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
      make: *** [drivers/thermal/rcar_thermal.o] Error 2
      
      with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
      Signed-off-by: NDevendra Naga <develkernel412222@gmail.com>
      Signed-off-by: NKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Signed-off-by: NZhang Rui <rui.zhang@intel.com>
      608f62b9
    • V
      cxgb4: Fix unable to get UP event from the LLD · e3c98512
      Vipul Pandya 提交于
      If T4 configuration file gets loaded from the /lib/firmware/cxgb4/ directory
      then offload capabilities of the cards were getting disabled during
      initialization. Hence ULDs do not get an UP event from the LLD.
      Signed-off-by: NJay Hernandez <jay@chelsio.com>
      Signed-off-by: NVipul Pandya <vipul@chelsio.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e3c98512
    • P
      drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free · aa731872
      Peter Senna Tschudin 提交于
      Based on commit b27393ae
      
      Calling mdiobus_free without calling mdiobus_unregister causes
      BUG_ON(). This patch fixes the issue.
      
      The semantic patch that found this issue(http://coccinelle.lip6.fr/):
      // <smpl>
      @@
      expression E;
      @@
        ... when != mdiobus_unregister(E);
      
      + mdiobus_unregister(E);
        mdiobus_free(E);
      // </smpl>
      Signed-off-by: NPeter Senna Tschudin <peter.senna@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aa731872
    • P
      drivers/net/ethernet/nxp/lpc_eth.c: Call mdiobus_unregister before mdiobus_free · 57c10b61
      Peter Senna Tschudin 提交于
      Based on commit b27393ae
      
      Calling mdiobus_free without calling mdiobus_unregister causes
      BUG_ON(). This patch fixes the issue.
      
      The semantic patch that found this issue(http://coccinelle.lip6.fr/):
      // <smpl>
      @@
      expression E;
      @@
        ... when != mdiobus_unregister(E);
      
      + mdiobus_unregister(E);
        mdiobus_free(E);
      // </smpl>
      Signed-off-by: NPeter Senna Tschudin <peter.senna@gmail.com>
      Tested-by: NRoland Stigge <stigge@antcom.de>
      Tested-by: NAlexandre Pereira da Silva <aletes.xgr@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      57c10b61
    • D
      bnx2x: fix HW initialization using fw 7.8.x · 2b674047
      Dmitry Kravkov 提交于
      Since commit 96bed4b9 (use FW 7.8.2) BRB HW block needs to be
      initialized using fw values for all devices.
      Otherwise ETS on 57712/578xx will not work.
      Signed-off-by: NDmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: NAriel Elior <ariele@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2b674047
    • L
      Merge tag 'pm-for-3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a315b5a6
      Linus Torvalds 提交于
      Pull power management update from Rafael J. Wysocki:
       "Change the email address of the powernow-k8 maintainer."
      
      * tag 'pm-for-3.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq / powernow-k8: Change maintainer's email address
      a315b5a6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 74fb838c
      Linus Torvalds 提交于
      Pull input subsystem fixes from Dmitry Torokhov:
       "Just a few driver fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: tsc40 - remove wrong announcement of pressure support
        Input: lpc32xx-keys - select INPUT_MATRIXKMAP
        Input: pxa27x_keypad - clear pending interrupts on keypad config
        Input: wacom - correct bad Cintiq 24HD check
        Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD
        Input: egalax_ts - get gpio from devicetree
      74fb838c
    • W
      NFS4: nfs4_opendata_access should return errno · 998f40b5
      Weston Andros Adamson 提交于
      Return errno - not an NFS4ERR_. This worked because NFS4ERR_ACCESS == EACCES.
      Signed-off-by: NWeston Andros Adamson <dros@netapp.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      998f40b5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 23e44302
      Linus Torvalds 提交于
      Pull more scsi target fixes from Nicholas Bellinger:
       "This series is a second round of target fixes for v3.7-rc4 that have
        come into target-devel over the last days, and are important enough to
        be applied ASAP.
      
        All are being CC'ed to stable.  The most important two are:
      
         - target: Re-add explict zeroing of INQUIRY bounce buffer memory to
           fix a regression for handling zero-length payloads, a bug that went
           during v3.7-rc1, and hit >= v3.6.3 stable.  (nab + paolo)
      
         - iscsi-target: Fix a long-standing missed R2T wakeup race in TX
           thread processing when using a single queue slot.  (Roland)
      
        Thanks to Roland & PureStorage team for helping to track down this
        long standing race with iscsi-target single queue slot operation.
      
        Also, the tcm_fc(FCoE) regression bug that was observed recently with
        -rc2 code has also been resolved with the cancel_delayed_work() return
        bugfix (commit c0158ca6: "workqueue: cancel_delayed_work() should
        return %false if work item is idle") now in -rc3.  Thanks again to Yi
        Zou, MDR, Robert Love @ Intel for helping to track this down."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: Fix incorrect usage of nested IRQ spinlocks in ABORT_TASK path
        iscsi-target: Fix missed wakeup race in TX thread
        target: Avoid integer overflow in se_dev_align_max_sectors()
        target: Don't return success from module_init() if setup fails
        target: Re-add explict zeroing of INQUIRY bounce buffer memory
      23e44302
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · ae41fce3
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck:
       "An e-mail address update, and fix a compile error on SPARC"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: Only include of_match_table with CONFIG_OF_GPIO
        hwmon, fam15h_power: Change email address, MAINTAINERS entry
      ae41fce3
    • L
      Merge tag 'frv-fixes-20121102' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-frv · b987a834
      Linus Torvalds 提交于
      Pull FRV fixes from David Howells:
       "A collection of small fixes for the FRV architecture."
      
      * tag 'frv-fixes-20121102' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-frv:
        frv: fix the broken preempt
        frv: switch to saner kernel_execve() semantics
        FRV: Fix the new-style kernel_thread() stuff
        FRV: Fix the preemption handling
        FRV: gcc-4.1.2 also inlines weak functions
        FRV: Don't objcopy the GNU build_id note
        FRV: Add missing linux/export.h #inclusions
      b987a834
    • L
      Merge tag 'stable/for-linus-3.7-rc4-tag' of... · 66b6a0c9
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.7-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bugfixes from Konrad Rzeszutek Wilk:
       - Use appropriate macros instead of hand-rolling our own (ARM).
       - Fixes if FB/KBD closed unexpectedly.
       - Fix memory leak in /dev/gntdev ioctl calls.
       - Fix overflow check in xenbus_file_write.
       - Document cleanup.
       - Performance optimization when migrating guests.
      
      * tag 'stable/for-linus-3.7-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/mmu: Use Xen specific TLB flush instead of the generic one.
        xen/arm: use the __HVC macro
        xen/xenbus: fix overflow check in xenbus_file_write()
        xen-kbdfront: handle backend CLOSED without CLOSING
        xen-fbfront: handle backend CLOSED without CLOSING
        xen/gntdev: don't leak memory from IOCTL_GNTDEV_MAP_GRANT_REF
        x86: remove obsolete comment from asm/xen/hypervisor.h
      66b6a0c9
    • S
      hashtable: introduce a small and naive hashtable · d9b482c8
      Sasha Levin 提交于
      This hashtable implementation is using hlist buckets to provide a simple
      hashtable to prevent it from getting reimplemented all over the kernel.
      Signed-off-by: NSasha Levin <levinsasha928@gmail.com>
      [ Merging this now, so that subsystems can start applying Sasha's
        patches that use this   - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d9b482c8
    • J
      ARM: OMAP2+: Add device-tree support for 32kHz counter · 9883f7c8
      Jon Hunter 提交于
      For OMAP devices, the 32kHz counter is the default clock-source for the kernel.
      However, this is not the only possible clock-source the kernel can use for OMAP
      devices.
      
      When booting with device-tree, if the 32kHz counter is the desired clock-source
      for the kernel, then parse the device-tree blob to ensure that the counter is
      present and if so map memory for the counter using the device-tree of_iomap()
      function so we are no longer reliant on the OMAP HWMOD framework to do this for
      us.
      Signed-off-by: NJon Hunter <jon-hunter@ti.com>
      9883f7c8
    • J
      ARM: OMAP: Add DT support for timer driver · 9725f445
      Jon Hunter 提交于
      In order to add device-tree support to the timer driver the following changes
      were made ...
      
      1. Allocate system timers (used for clock-events and clock-source) based upon
         timer properties rather than using an hard-coded timer instance ID. To allow
         this a new helper function called omap_dmtimer_find_by_property() has been
         added for finding a timer with the particular properties in the device-tree
         blob. Please note that this is an internal helper function for system timers
         only to find a timer in the device-tree blob. This cannot be used by device
         drivers, another API has been added for that (see below). Timers that are
         allocated for system timers are dynamically disabled at boot time by adding
         a status property with the value "disabled" to the timer's device-tree node.
      
         Please note that when allocating system timers we now pass a timer ID and
         timer property. The timer ID is only be used for allocating a timer when
         booting without device-tree. Once device-tree migration is complete, all
         the timer ID references will be removed.
      
      2. System timer resources (memory and interrupts) are directly obtained from
         the device-tree timer node when booting with device-tree, so that system
         timers are no longer reliant upon the OMAP HWMOD framework to provide these
         resources.
      
      3. If DT blob is present, then let device-tree create the timer devices
         dynamically.
      
      4. When device-tree is present the "id" field in the platform_device structure
         (pdev->id) is initialised to -1 and hence cannot be used to identify a timer
         instance. Due to this the following changes were made ...
         a). The API omap_dm_timer_request_specific() is not supported when using
             device-tree, because it uses the device ID to request a specific timer.
             This function will return an error if called when device-tree is present.
             Users of this API should use omap_dm_timer_request_by_cap() instead.
         b). When removing the DMTIMER driver, the timer "id" was used to identify the
             timer instance. The remove function has been modified to use the device
             name instead of the "id".
      
      5. When device-tree is present the platform_data structure will be NULL and so
         check for this.
      
      6. The OMAP timer device tree binding has the following optional parameters ...
         a). ti,timer-alwon  --> Timer is in an always-on power domain
         b). ti,timer-dsp    --> Timer can generate an interrupt to the on-chip DSP
         c). ti,timer-pwm    --> Timer can generate a PWM output
         d). ti,timer-secure --> Timer is reserved on a secure OMAP device
         Search for the above parameters and set the appropriate timer attribute
         flags.
      Signed-off-by: NJon Hunter <jon-hunter@ti.com>
      9725f445
    • J
      ARM: OMAP3: Add generic machine descriptor for boards with OMAP3 GP devices · 7dd9d502
      Jon Hunter 提交于
      OMAP3 devices may or may not have security features enabled. Security enabled
      devices are known as high-secure (HS) and devices without security are known as
      general purpose (GP).
      
      Some OMAP3 boards, such as the OMAP3 beagle board, only use GP devices and for
      GP devices there is a 12th timer available on-chip that can operate at 32kHz.
      The clock for 12th timer is generated by an internal oscillator and is unique
      this timer. Boards such as the beagle board use this timer as a 32kHz based
      clock-events timer because early versions of the board had a hardware problem
      preventing them from using other on-chip timers clocked by a external 32kHz
      clock.
      
      When booting with device-tree all OMAP3 devices use timer 1 by default for
      the clock-events timer. Therefore, add a generic machine descriptor for boards
      with OMAP3 GP devices so that they can use the 12th timer as the clock-events
      timer instead of the default.
      Signed-off-by: NJon Hunter <jon-hunter@ti.com>
      7dd9d502
    • J
      ARM: OMAP: Add function to request a timer by capability · 373fe0bd
      Jon Hunter 提交于
      Currently OMAP timers can be requested by requesting any available or by a
      numerical device ID. If a specific timer is required because it has a particular
      capability, such as can interrupt the on-chip DSP in addition to the ARM CPU,
      then the user needs to know the device ID of the timer with this feature.
      Therefore, add a new API called omap_dm_timer_request_by_cap() that allows
      drivers to request a timer by capability.
      Signed-off-by: NJon Hunter <jon-hunter@ti.com>
      373fe0bd
    • J
      ARM: OMAP3: Dynamically disable secure timer nodes for secure devices · ad24bde8
      Jon Hunter 提交于
      OMAP3 devices may or may not have security features enabled. Security enabled
      devices are known as high-secure (HS) and devices without security are known as
      general purpose (GP).
      
      For OMAP3 devices there are 12 general purpose timers available. On secure
      devices the 12th timer is reserved for secure usage and so cannot be used by
      the kernel, where as for a GP device it is available. We can detect the OMAP
      device type, secure or GP, at runtime via an on-chip register. Today, when not
      using DT, we do not register the 12th timer as a linux device if the device is
      secure.
      
      When using device tree, device tree is going to register all the timer devices
      it finds in the device tree blob. To prevent device tree from registering 12th
      timer on a secure OMAP3 device we can add a status property to the timer
      binding with the value "disabled" at boot time. Note that timer 12 on a OMAP3
      device has a property "ti,timer-secure" to indicate that it will not be
      available on a secure device and so for secure OMAP3 devices, we search for
      timers with this property and then disable them. Using the prom_add_property()
      function to dynamically add a property was a recommended approach suggested by
      Rob Herring [1].
      
      I have tested this on an OMAP3 GP device and faking it to pretend to be a
      secure device to ensure that any timers marked with "ti,timer-secure" are not
      registered on boot. I have also made sure that all timers are registered as
      expected on a GP device by default.
      
      [1] http://comments.gmane.org/gmane.linux.ports.arm.omap/79203Signed-off-by: NJon Hunter <jon-hunter@ti.com>
      ad24bde8
    • A
      frv: fix the broken preempt · 1d72d9f8
      Al Viro 提交于
      Just get %icc2 into the state we would have after local_irq_disable()
      and physical IRQ having happened since then.  Then we can simply
      use preempt_schedule_irq() and be done with the whole mess.
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      1d72d9f8
    • A
      frv: switch to saner kernel_execve() semantics · 7b7ade11
      Al Viro 提交于
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      7b7ade11
  5. 02 11月, 2012 7 次提交