1. 04 Apr, 2013 2 commits
    • John Stultz's avatar
      ntp: Move do_adjtimex() and hardpps() functions to timekeeping.c · aa6f9c59
      John Stultz authored
      In preparation for changing the ntp locking rules, move
      do_adjtimex and hardpps accessor functions to timekeeping.c,
      but keep the code logic in ntp.c.
      
      This patch also introduces a ntp_internal.h file so timekeeping
      specific interfaces of ntp.c can be more limitedly shared with
      timekeeping.c.
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      aa6f9c59
    • John Stultz's avatar
      ntp: Split out timex validation from do_adjtimex · ad460967
      John Stultz authored
      Split out the timex validation done in do_adjtimex into a separate
      function. This will help simplify logic in following patches.
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Richard Cochran <richardcochran@gmail.com>
      Cc: Prarit Bhargava <prarit@redhat.com>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      ad460967
  2. 03 Apr, 2013 1 commit
  3. 28 Mar, 2013 1 commit
    • Christian Daudt's avatar
      ARM: bcm281xx: Add timer driver (driver portion) · 8011657b
      Christian Daudt authored
      This adds support for the Broadcom timer, used in the following SoCs:
      BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
      
      Updates from V6:
      - Split DT portion into a separate patch
      
      Updates from V5:
      - Rebase to latest arm-soc/for-next
      
      Updates from V4:
      - Switch code to use CLOCKSOURCE_OF_DECLARE
      
      Updates from V3:
      - Migrate to 3.9 timer framework updates
      
      Updates from V2:
      - prepend static fns + fields with kona_
      
      Updates from V1:
      - Rename bcm_timer.c to bcm_kona_timer.c
      - Pull .h into bcm_kona_timer.c
      - Make timers static
      - Clean up comment block
      - Switched to using clockevents_config_and_register
      - Added an error to the get_timer loop if it repeats too much
      - Added to Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
      - Added missing readl to timer_disable_and_clear
      
      Note: bcm,kona-timer was kept as the 'compatible' field to make it
      specific enough for when there are multiple bcm timers (bcm,timer is
      too generic).
      Signed-off-by: default avatarChristian Daudt <csd@broadcom.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
      Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      8011657b
  4. 25 Mar, 2013 3 commits
  5. 22 Mar, 2013 8 commits
  6. 15 Mar, 2013 7 commits
    • Feng Tang's avatar
      timekeeping: utilize the suspend-nonstop clocksource to count suspended time · e445cf1c
      Feng Tang authored
      There are some new processors whose TSC clocksource won't stop during
      suspend. Currently, after system resumes, kernel will use persistent
      clock or RTC to compensate the sleep time, but with these nonstop
      clocksources, we could skip the special compensation from external
      sources, and just use current clocksource for time recounting.
      
      This can solve some time drift bugs caused by some not-so-accurate or
      error-prone RTC devices.
      
      The current way to count suspended time is first try to use the persistent
      clock, and then try the RTC if persistent clock can't be used. This
      patch will change the trying order to:
      	suspend-nonstop clocksource -> persistent clock -> RTC
      
      When counting the sleep time with nonstop clocksource, use an accurate way
      suggested by Jason Gunthorpe to cover very large delta cycles.
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      [jstultz: Small optimization, avoiding re-reading the clocksource]
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      e445cf1c
    • Feng Tang's avatar
      x86: tsc: Add support for new S3_NONSTOP feature · 82f9c080
      Feng Tang authored
      Add support for new S3_NONSTOP feature
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      82f9c080
    • Feng Tang's avatar
      clocksource: Add new feature flag CLOCK_SOURCE_SUSPEND_NONSTOP · 5caf4636
      Feng Tang authored
      Some x86 processors have a TSC clocksource, which continues to run
      even when system is suspended. Also most OMAP platforms have a
      32 KHz timer which has similar capability. Add a feature flag so that
      it could be utilized.
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      5caf4636
    • Feng Tang's avatar
      x86: Add cpu capability flag X86_FEATURE_NONSTOP_TSC_S3 · c54fdbb2
      Feng Tang authored
      On some new Intel Atom processors (Penwell and Cloverview), there is
      a feature that the TSC won't stop in S3 state, say the TSC value
      won't be reset to 0 after resume. This feature makes TSC a more reliable
      clocksource and could benefit the timekeeping code during system
      suspend/resume cycle, so add a flag for it.
      Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
      [jstultz: Fix checkpatch warning]
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      c54fdbb2
    • Prarit Bhargava's avatar
      x86: Do full rtc synchronization with ntp · 3195ef59
      Prarit Bhargava authored
      Every 11 minutes ntp attempts to update the x86 rtc with the current
      system time.  Currently, the x86 code only updates the rtc if the system
      time is within +/-15 minutes of the current value of the rtc. This
      was done originally to avoid setting the RTC if the RTC was in localtime
      mode (common with Windows dualbooting).  Other architectures do a full
      synchronization and now that we have better infrastructure to detect
      when the RTC is in localtime, there is no reason that x86 should be
      software limited to a 30 minute window.
      
      This patch changes the behavior of the kernel to do a full synchronization
      (year, month, day, hour, minute, and second) of the rtc when ntp requests
      a synchronization between the system time and the rtc.
      
      I've used the RTC library functions in this patchset as they do all the
      required bounds checking.
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: x86@kernel.org
      Cc: Matt Fleming <matt.fleming@intel.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: linux-efi@vger.kernel.org
      Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
      [jstultz: Tweak commit message, fold in build fix found by fengguang
      Also add select RTC_LIB to X86, per new dependency, as found by prarit]
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      3195ef59
    • John Stultz's avatar
      timekeeping: Use inject_offset in warp_clock · 7859e404
      John Stultz authored
      When warping the clock (from a local time RTC), use
      timekeeping_inject_offset() to atomically add the offset.
      
      This avoids any minor time error caused by the delay between
      reading the time, and then setting the adjusted time.
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      7859e404
    • Dong Zhu's avatar
      timekeeping: Avoid adjust kernel time once hwclock kept in UTC time · c30bd099
      Dong Zhu authored
      If the Hardware Clock kept in local time,kernel will adjust the time
      to be UTC time.But if Hardware Clock kept in UTC time,system will make
      a dummy settimeofday call first (sys_tz.tz_minuteswest = 0) to make sure
      the time is not shifted,so at this point I think maybe it is not necessary
      to set the kernel time once the sys_tz.tz_minuteswest is zero.
      Signed-off-by: default avatarDong Zhu <bluezhudong@gmail.com>
      [jstultz: Updated to merge with conflicting changes ]
      Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
      c30bd099
  7. 13 Mar, 2013 6 commits
  8. 11 Mar, 2013 12 commits
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7c6baa30
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc minor fixes mostly related to tracing"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        s390: Fix a header dependencies related build error
        tracing: update documentation of snapshot utility
        tracing: Do not return EINVAL in snapshot when not allocated
        tracing: Add help of snapshot feature when snapshot is empty
        ftrace: Update the kconfig for DYNAMIC_FTRACE
      7c6baa30
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0cb77508
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Missing cancel of work items in mac80211 MLME, from Ben Greear.
      
       2) Fix DMA mapping handling in iwlwifi by using coherent DMA for
          command headers, from Johannes Berg.
      
       3) Decrease the amount of pressure on the page allocator by using order
          1 pages less in iwlwifi, from Emmanuel Grumbach.
      
       4) Fix mesh PS broadcast OOPS in mac80211, from Marco Porsch.
      
       5) Don't forget to recalculate idle state in mac80211 monitor
          interface, from Felix Fietkau.
      
       6) Fix varargs in netfilter conntrack handler, from Joe Perches.
      
       7) Need to reset entire chip when command queue fills up in iwlwifi,
          from Emmanuel Grumbach.
      
       8) The TX antenna value must be valid when calibrations are performed
          in iwlwifi, fix from Dor Shaish.
      
       9) Don't generate netfilter audit log entries when audit is disabled,
          from Gao Feng.
      
      10) Deal with DMA unit hang on e1000e during power state transitions,
          from Bruce Allan.
      
      11) Remove BUILD_BUG_ON check from igb driver, from Alexander Duyck.
      
      12) Fix lockdep warning on i2c handling of igb driver, from Carolyn
          Wyborny.
      
      13) Fix several TTY handling issues in IRDA ircomm tty driver, from
          Peter Hurley.
      
      14) Several QFQ packet scheduler fixes from Paolo Valente.
      
      15) When VXLAN encapsulates on transmit, we have to reset the netfilter
          state.  From Zang MingJie.
      
      16) Fix jiffie check in net_rx_action() so that we really cap the
          processing at 2HZ.  From Eric Dumazet.
      
      17) Fix erroneous trigger of IP option space exhaustion, when routers
          are pre-specified and we are looking to see if we can insert a
          timestamp, we will have the space.  From David Ward.
      
      18) Fix various issues in benet driver wrt waiting for firmware to
          finish POST after resets or errors.  From Gavin Shan and Sathya
          Perla.
      
      19) Fix TX locking in SFC driver, from Ben Hutchings.
      
      20) Like the VXLAN fix above, when we encap in a TUN device we have to
          reset the netfilter state.  This should fix several strange crashes
          reported by Dave Jones and others.  From Eric Dumazet.
      
      21) Don't forget to clean up MAC address resources when shutting down a
          port in mlx4 driver, from Yan Burman.
      
      22) Fix divide by zero in vmxnet3 driver, from Bhavesh Davda.
      
      23) Fix device statistic regression in tg3 when the driver is using
          phylib, from Nithin Sujir.
      
      24) Fix info leak in several netlink handlers, from Mathias Krause.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (79 commits)
        6lowpan: Fix endianness issue in is_addr_link_local().
        rrunner.c: fix possible memory leak in rr_init_one()
        dcbnl: fix various netlink info leaks
        rtnl: fix info leak on RTM_GETLINK request for VF devices
        bridge: fix mdb info leaks
        tg3: Update link_up flag for phylib devices
        ipv6: stop multicast forwarding to process interface scoped addresses
        bridging: fix rx_handlers return code
        netlabel: fix build problems when CONFIG_IPV6=n
        drivers/isdn: checkng length to be sure not memory overflow
        net/rds: zero last byte for strncpy
        bnx2x: Fix SFP+ misconfiguration in iSCSI boot scenario
        bnx2x: Fix intermittent long KR2 link up time
        macvlan: Set IFF_UNICAST_FLT flag to prevent unnecessary promisc mode.
        team: unsyc the devices addresses when port is removed
        bridge: add missing vid to br_mdb_get()
        Fix: sparse warning in inet_csk_prepare_forced_close
        afkey: fix a typo
        MAINTAINERS: Update qlcnic maintainers list
        netlabel: correctly list all the static label mappings
        ...
      0cb77508
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · ffb6a445
      Linus Torvalds authored
      Pull UML fixes from Richard Weinberger:
       "This update brings various fixes.
        Nothing special...
      
        In my local queue I have some more fixes which will be sent later to
        you.  3.9 uncovered strange UML issues.  :("
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Use tty_port in SIGWINCH handler
        um: Use tty_port_operations->destruct
        um: fix build failure due to mess-up of sig_info protorype
        um: add missing declaration of 'getrlimit()' and friends
        net : enable tx time stamping in the vde driver.
        hostfs: fix a not needed double check
      ffb6a445
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 152fcb27
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Except for the largish change to the ALPS driver adding "Dolphin V1"
        support and Wacom getting a new signature of yet another device, the
        rest are straightforward driver fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: mms114 - Fix regulator enable and disable paths
        Input: ads7864 - check return value of regulator enable
        Input: tc3589x-keypad - fix keymap size
        Input: wacom - add support for 0x10d
        Input: ALPS - update documentation for recent touchpad driver mods
        Input: ALPS - add "Dolphin V1" touchpad support
        Input: ALPS - remove unused argument to alps_enter_command_mode()
        Input: cypress_ps2 - fix trackpadi found in Dell XPS12
      152fcb27
    • Li Zefan's avatar
      s390: Fix a header dependencies related build error · cb16b91a
      Li Zefan authored
      Commit 877c6856
      ("perf: Remove include of cgroup.h from perf_event.h") caused
      this build failure if PERF_EVENTS is enabled:
      
         In file included from arch/s390/include/asm/perf_event.h:9:0,
                          from include/linux/perf_event.h:24,
                          from kernel/events/ring_buffer.c:12:
         arch/s390/include/asm/cpu_mf.h: In function 'qctri':
         arch/s390/include/asm/cpu_mf.h:61:12: error: 'EINVAL' undeclared (first use in this function)
      
      cpu_mf.h had an implicit errno.h dependency, which was added
      indirectly via cgroups.h but not anymore. Add it explicitly.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Link: http://lkml.kernel.org/r/51385F79.7000106@huawei.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      cb16b91a
    • Richard Weinberger's avatar
      um: Use tty_port in SIGWINCH handler · 2116bda6
      Richard Weinberger authored
      The tty below tty_port might get destroyed by the tty layer
      while we hold a reference to it.
      So we have to carry tty_port around...
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      2116bda6
    • Richard Weinberger's avatar
      um: Use tty_port_operations->destruct · cc4f0248
      Richard Weinberger authored
      As we setup the SIGWINCH handler in tty_port_operations->activate
      it makes sense to tear down it in ->destruct.
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      cc4f0248
    • Sergei Trofimovich's avatar
      um: fix build failure due to mess-up of sig_info protorype · 72383d43
      Sergei Trofimovich authored
      arch/um/os-Linux/signal.c:18:8: error: conflicting types for 'sig_info'
      In file included from /home/slyfox/linux-2.6/arch/um/os-Linux/signal.c:12:0:
      arch/um/include/shared/as-layout.h:64:15: note: previous declaration of 'sig_info' was here
      Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
      CC: Jeff Dike <jdike@addtoit.com>
      CC: Richard Weinberger <richard@nod.at>
      CC: "Martin Pärtel" <martin.partel@gmail.com>
      CC: Al Viro <viro@zeniv.linux.org.uk>
      CC: user-mode-linux-devel@lists.sourceforge.net
      CC: user-mode-linux-user@lists.sourceforge.net
      CC: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      72383d43
    • Sergei Trofimovich's avatar
      um: add missing declaration of 'getrlimit()' and friends · fdfa4c95
      Sergei Trofimovich authored
      arch/um/os-Linux/start_up.c: In function 'check_coredump_limit':
      arch/um/os-Linux/start_up.c:338:16: error: storage size of 'lim' isn't known
      arch/um/os-Linux/start_up.c:339:2: error: implicit declaration of function 'getrlimit' [-Werror=implicit-function-declaration]
      Signed-off-by: default avatarSergei Trofimovich <slyfox@gentoo.org>
      CC: Jeff Dike <jdike@addtoit.com>
      CC: Richard Weinberger <richard@nod.at>
      CC: Al Viro <viro@zeniv.linux.org.uk>
      CC: user-mode-linux-devel@lists.sourceforge.net
      CC: user-mode-linux-user@lists.sourceforge.net
      CC: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      fdfa4c95
    • Paul Chavent's avatar
      net : enable tx time stamping in the vde driver. · 55ea1cfa
      Paul Chavent authored
      This new version moves the skb_tx_timestamp in the main uml
      driver. This should avoid the need to call this function in each
      transport (vde, slirp, tuntap, ...). It also add support for ethtool
      get_ts_info.
      Signed-off-by: default avatarPaul Chavent <paul.chavent@onera.fr>
      Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      55ea1cfa
    • Marco Stornelli's avatar
      hostfs: fix a not needed double check · bc077320
      Marco Stornelli authored
      With the commit 3be2be0a we removed vmtruncate,
      but actaully there is no need to call inode_newsize_ok() because the checks are
      already done in inode_change_ok() at the begin of the function.
      Signed-off-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      bc077320
    • Mark Brown's avatar
      Input: mms114 - Fix regulator enable and disable paths · 4b7d293c
      Mark Brown authored
      When it uses regulators the mms114 driver checks to see if it managed to
      acquire regulators and ignores errors. This is not the intended usage and
      not great style in general.
      
      Since the driver already refuses to probe if it fails to allocate the
      regulators simply make the enable and disable calls unconditional and
      add appropriate error handling, including adding cleanup of the
      regulators if setup_reg() fails.
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Acked-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      4b7d293c