1. 25 Apr, 2013 1 commit
    • James Hogan's avatar
      metag: defconfigs: increase log buffer 8KiB => 128KiB · 164c0138
      James Hogan authored
      The Meta defconfigs set the log buffer size to just 8KiB, but with the
      fairly recent conversion of the kernel log buffer into a structured
      binary format, log messages appear to consume more space in the buffer,
      and in some cases it's not big enough to store the entire boot log.
      
      Therefore switch all the defconfigs to use the default size of 128KiB.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      164c0138
  2. 22 Apr, 2013 1 commit
    • James Hogan's avatar
      metag: avoid unnecessary builtin dtb rebuilds · 0b4184c2
      James Hogan authored
      The builtin .dtb.S intermediate file needs to be marked with .SECONDARY
      so that it isn't automatically deleted (which causes it to be
      regenerated on every build). Also add *.dtb.S to clean-files so it gets
      cleaned up by make clean.
      
      Similarly, if the specified builtin dtb isn't already in dtb-y (e.g.
      imported into the tree and specified in CONFIG_METAG_BUILTIN_DTB_NAME)
      it too will be treated as an intermediate and deleted automatically
      (again causing it to be regenerated on every build), so add it to dtb-y
      so it gets added to targets and the dtbs target.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Vineet Gupta <Vineet.Gupta1@synopsys.com>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
      0b4184c2
  3. 27 Mar, 2013 3 commits
  4. 20 Mar, 2013 1 commit
  5. 15 Mar, 2013 12 commits
    • James Hogan's avatar
      metag: cachepart: fix get_global_dcache_size() typo · b7fb9e6a
      James Hogan authored
      Compilation is broken when the kernel is destined to live in the global
      part of the virtual address space:
      
      arch/metag/kernel/cachepart.c In function 'get_thread_cache_size':
      arch/metag/kernel/cachepart.c +71 : error: implicit declaration of function 'get_global_dache_size'
      
      Fix the typo.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      b7fb9e6a
    • James Hogan's avatar
      metag: cachepart: take into account small cache bits · 4d8edbfe
      James Hogan authored
      The CORE_CONFIG2 register has bits to indicate that the data or code
      cache is small, i.e. that the size described in the field should be
      divided by 64. Take this into account in get_icache_size() and
      get_dcache_size().
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      4d8edbfe
    • James Hogan's avatar
      metag: smp: copy cache partition and enable GCOn · 9e712963
      James Hogan authored
      When starting an SMP hardware thread, copy the cache partition
      configuration so that the threads share the same cache partitions. Also
      enable the GCOn bit if running in the local half of the virtual address
      space to enable coherency of shared local cache partitions. An atomic
      unlock system event is executed by the new cpu before any memory is read
      to ensure that any writes made by the boot cpu prior to full coherency
      taking effect are visible to the new cpu.
      
      This is to allow SMP to work even when the bootloader hasn't configured
      the caches for coherency. A log message is printed to describe the cache
      partition changes so that the user is aware of potential unintentional
      cache wastage if they've configured the cache partitions in the wrong
      way.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      9e712963
    • James Hogan's avatar
      metag: OProfile support · 00e6c923
      James Hogan authored
      Add OProfile support for metag, using the perf backend, and falling back
      to generic timer based sampling if perf counter interrupt support is
      disabled.
      
      The oprofile code prepends "metag/" to the perf pmu name to give
      "metag/meta2" which is more consistent with other oprofile arch names.
      
      The backtrace code makes use of <asm/stacktrace.h> for kernel
      backtracing, and a simple frame pointer walk for userland backtracing.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Robert Richter <rric@kernel.org>
      Cc: oprofile-list@lists.sf.net
      00e6c923
    • James Hogan's avatar
      metag: perf: prepare for use by oprofile · f27086f5
      James Hogan authored
      To allow our perf_events code to work with oprofile the PERF_TYPE_RAW
      event type attribute is implemented, which allows the internal encoding
      of events to be used externally (this requires some tweaks so that it
      handles invalid event types more gracefully), and perf_pmu_name() is
      adjusted to return metag_pmu->name instead of metag_pmu->pmu.name (which
      is changed to "meta2").
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      Cc: Robert Richter <rric@kernel.org>
      Cc: oprofile-list@lists.sf.net
      f27086f5
    • James Hogan's avatar
      metag: perf: don't reset TXTACTCYC · 1fb4dc5c
      James Hogan authored
      The thread active cycle counter TXTACTCYC is used in __delay so it
      shouldn't really be reset to zero by perf. Fix perf to just read the
      value, and instead of clearing it, record the prev_count value in
      enable_counter so that the delta calculations know about the previous
      value.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      1fb4dc5c
    • James Hogan's avatar
      metag: perf: use hard_processor_id() to get thread · 9344de1b
      James Hogan authored
      Use hard_processor_id() to get the current thread number rather than
      get_cpu() and the hardware thread mapping. There was no matching
      put_cpu(), and in any case this should be slightly more efficient.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      9344de1b
    • James Hogan's avatar
      metag: perf: fix frequency sampling (dynamic period) · 2033dc54
      James Hogan authored
      Frequency sampling mode dynamically adjusts the sample period so as to
      hit a particular frequency of samples. The sample period starts at just
      1 and then gets increased if the interrupt rate is too high. This
      changed sample period needs handling in metag_pmu_event_set_period to
      update period_left (as the ARM equivalent does). The calculated delta
      also needs subtracting from period_left in metag_pmu_event_update in
      order to hit the conditional blocks in metag_pmu_event_set_period which
      update last_period (which is used in the dynamic sampling period
      calculation).
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      2033dc54
    • James Hogan's avatar
      metag: perf: add missing prev_count updates · c6ac1e6e
      James Hogan authored
      The prev_count needs setting when changing the counter value, otherwise
      the calculated delta will be wrong, which for frequency sampling
      (dynamic period sampling) results in sampling at too high a frequency.
      
      For non-interrupting performance counters it should also be cleared when
      enabling the counter since the write to the PERF_COUNT register will
      clear the perf counter.
      
      This also includes a minor change to remove the u64 cast from the
      metag_pmu->write() call as metag_pmu->write() takes a u32 anyway, and in
      any case GCC is smart enough to optimise away the cast.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      c6ac1e6e
    • James Hogan's avatar
      metag: perf: fixes for interrupting perf counters · db59932f
      James Hogan authored
      The overflow handler needs to read modify write when re-enabling the
      counter so as not to change the counter value as it may have been
      changed to ready the next interrupt on overflow. Similarly for
      interrupting counters metag_pmu_enable_counter needs to leave the
      counter value unchanged rather than resetting it to zero.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      db59932f
    • James Hogan's avatar
      metag: perf: fix wrap handling in delta calculation · c43ca04b
      James Hogan authored
      When calculating the delta, mask with MAX_PERIOD (24 bits) to handle
      wrapping, which particularly happens with periodic sampling since the
      value is intentionally set so that it will overflow soon.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      c43ca04b
    • James Hogan's avatar
      metag: perf: fix core internal / perf channel mux · 3424dabb
      James Hogan authored
      The value written to the PERF_ICOREx or PERF_CHANx register to select
      the performance events for the core internal and perf channel events was
      (tmp & 0x0f), but tmp was set to (config & 0xf0) so it would always be
      0. Correct it to use config instead of tmp.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
      3424dabb
  6. 10 Mar, 2013 2 commits
    • Linus Torvalds's avatar
      Linux 3.9-rc2 · f6161aa1
      Linus Torvalds authored
      f6161aa1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 72932611
      Linus Torvalds authored
      Pull namespace bugfixes from Eric Biederman:
       "This is three simple fixes against 3.9-rc1.  I have tested each of
        these fixes and verified they work correctly.
      
        The userns oops in key_change_session_keyring and the BUG_ON triggered
        by proc_ns_follow_link were found by Dave Jones.
      
        I am including the enhancement for mount to only trigger requests of
        filesystem modules here instead of delaying this for the 3.10 merge
        window because it is both trivial and the kind of change that tends to
        bit-rot if left untouched for two months."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        proc: Use nd_jump_link in proc_ns_follow_link
        fs: Limit sys_mount to only request filesystem modules (Part 2).
        fs: Limit sys_mount to only request filesystem modules.
        userns: Stop oopsing in key_change_session_keyring
      72932611
  7. 09 Mar, 2013 5 commits
    • Linus Torvalds's avatar
      Atmel MXT touchscreen: increase reset timeouts · 8343bce1
      Linus Torvalds authored
      There is a more complete atmel patch-series out by Nick Dyer that fixes
      this and other things, but in the meantime this is the minimal thing to
      get the touchscreen going on (at least my) Pixel Chromebook.
      
      Not that I want my dirty fingers near that beautiful screen, but it
      seems that a non-initialized touchscreen will also end up being a
      constant wakeup source, so you have to disable it to go to sleep.  And
      it's easier to just fix the initialization sequence.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8343bce1
    • Eric W. Biederman's avatar
      proc: Use nd_jump_link in proc_ns_follow_link · db04dc67
      Eric W. Biederman authored
      Update proc_ns_follow_link to use nd_jump_link instead of just
      manually updating nd.path.dentry.
      
      This fixes the BUG_ON(nd->inode != parent->d_inode) reported by Dave
      Jones and reproduced trivially with mkdir /proc/self/ns/uts/a.
      
      Sigh it looks like the VFS change to require use of nd_jump_link
      happend while proc_ns_follow_link was baking and since the common case
      of proc_ns_follow_link continued to work without problems the need for
      making this change was overlooked.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      db04dc67
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 0aefda3e
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "These are scattered fixes and one performance improvement.  The
        biggest functional change is in how we throttle metadata changes.  The
        new code bumps our average file creation rate up by ~13% in fs_mark,
        and lowers CPU usage.
      
        Stefan bisected out a regression in our allocation code that made
        balance loop on extents larger than 256MB."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: improve the delayed inode throttling
        Btrfs: fix a mismerge in btrfs_balance()
        Btrfs: enforce min_bytes parameter during extent allocation
        Btrfs: allow running defrag in parallel to administrative tasks
        Btrfs: avoid deadlock on transaction waiting list
        Btrfs: do not BUG_ON on aborted situation
        Btrfs: do not BUG_ON in prepare_to_reloc
        Btrfs: free all recorded tree blocks on error
        Btrfs: build up error handling for merge_reloc_roots
        Btrfs: check for NULL pointer in updating reloc roots
        Btrfs: fix unclosed transaction handler when the async transaction commitment fails
        Btrfs: fix wrong handle at error path of create_snapshot() when the commit fails
        Btrfs: use set_nlink if our i_nlink is 0
      0aefda3e
    • Benson Leung's avatar
      Platform: x86: chromeos_laptop : Add basic platform data for atmel devices · 2ef39204
      Benson Leung authored
      Add basic platform data to get the current upstream driver working
      with the 224s touchpad and 1664s touchscreen.
      We will be using NULL config so we will use the settings from the
      devices' NVRAMs.
      Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
      Tested-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2ef39204
    • Daniel Kurtz's avatar
      Input: atmel_mxt_ts - Support for touchpad variant · 22dfab7f
      Daniel Kurtz authored
      This same driver can be used by atmel based touchscreens and touchpads
      (buttonpads). Platform data may specify a device is a touchpad
      using the is_tp flag.
      
      This will cause the driver to perform some touchpad specific
      initializations, such as:
        * register input device name "Atmel maXTouch Touchpad" instead of
        Touchscreen.
        * register BTN_LEFT & BTN_TOOL_* event types.
        * register axis resolution (as a fixed constant, for now)
        * register BUTTONPAD property
        * process GPIO buttons using reportid T19
      
      Input event GPIO mapping is done by the platform data key_map array.
      
      key_map[x] should contain the KEY or BTN code to send when processing
      GPIOx from T19. To specify a GPIO as not an input source, populate
      with KEY_RESERVED, or 0.
      Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
      Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
      Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
      Tested-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      22dfab7f
  8. 08 Mar, 2013 15 commits