linux.git, branch v3.12.6

Linux 3.12.6

2013-12-20T15:51:33+00:00

ARM: OMAP2+: hwmod: Fix SOFTRESET logic

2013-12-20T15:49:10+00:00

commit 313a76ee11cda6700548afe68499ef174a240688 upstream.

In _ocp_softreset(), after _set_softreset() + write_sysconfig(),
the hwmod's sysc_cache will always contain SOFTRESET bit set
so all further writes to sysconfig using this cache will initiate
a repeated SOFTRESET e.g. enable_sysc(). This is true for OMAP3 like
platforms that have RESET_DONE status in the SYSSTATUS register and
so the the SOFTRESET bit in SYSCONFIG is not automatically cleared.
It is not a problem for OMAP4 like platforms that indicate RESET
completion by clearing the SOFTRESET bit in the SYSCONFIG register.

This repeated SOFTRESET is undesired and was the root cause of
USB host issues on OMAP3 platforms when hwmod was allowed to do the
SOFTRESET for the USB Host module.

To fix this we clear the SOFTRESET bit and update the sysconfig
register + sysc_cache using write_sysconfig().

Signed-off-by: Roger Quadros 
Tested-by: Tomi Valkeinen  # Panda, BeagleXM
[paul@pwsan.com: renamed _clr_softreset() to _clear_softreset()]
Signed-off-by: Paul Walmsley 
Signed-off-by: Greg Kroah-Hartman

drm/i915/vlv: fix up broken precision in vlv_crtc_clock_get

2013-12-20T15:49:10+00:00

commit 662c6ecbcdca1fe8a5402f6c83d98d242917a043 upstream.

With some divider values we end up with the wrong result.  So remove the
intermediates (like Ville suggested in the first place) to get the right
answer.

Signed-off-by: Chris Wilson 
Signed-off-by: Jesse Barnes 
Signed-off-by: Daniel Vetter 
Signed-off-by: Ville Syrjälä 
Signed-off-by: Greg Kroah-Hartman

drm/i915/vlv: add VLV specific clock_get function v3

2013-12-20T15:49:10+00:00

commit acbec814a27f233b5ddb88a1bcaa2ac20daf64e0 upstream.

Calculation is a little different than other platforms.

v2: update to use port_clock instead
    rebase on top of Ville's changes
v3: update to new port_clock semantics - don't divide by
    pixel_multiplier (Ville)

References: https://bugs.freedesktop.org/show_bug.cgi?id=67345
Signed-off-by: Jesse Barnes 
Reviewed-by: Ville Syrjälä 
Signed-off-by: Daniel Vetter 
Signed-off-by: Ville Syrjälä 
Signed-off-by: Greg Kroah-Hartman

i915/vlv: untangle integrated clock source handling v4

2013-12-20T15:49:10+00:00

commit f60711666bcab6df2c6c91d851e07ed54088453c upstream.

The global integrated clock source bit resides in DPLL B on VLV, but we
were treating it as a per-pipe resource.  It needs to be set whenever
any PLL is active, so pull setting the bit out of vlv_update_pll and
into vlv_enable_pll.  Also add a vlv_disable_pll to prevent disabling it
when pipe B shuts down.

I'm guessing on the references here, I expect this to bite any config
where multiple displays are active or displays are moved from pipe to
pipe.

v2: re-add bits in vlv_update_pll to keep from confusing the state checker
v3: use enum pipe checks (Daniel)
    set CRI clock source early (Ville)
    consistently set CRI clock source everywhere (Ville)
v4: drop unnecessary setting of bit in vlv enable pll (Ville)

References: https://bugs.freedesktop.org/show_bug.cgi?id=67245
References: https://bugs.freedesktop.org/show_bug.cgi?id=69693
Signed-off-by: Jesse Barnes 
Reviewed-by: Ville Syrjälä 
[danvet: s/1/PIPE_B/]
Signed-off-by: Daniel Vetter 
Signed-off-by: Ville Syrjälä 
Signed-off-by: Greg Kroah-Hartman

Btrfs: fix lockdep error in async commit

2013-12-20T15:49:09+00:00

commit b1a06a4b574996692b72b742bf6e6aa0c711a948 upstream.

Lockdep complains about btrfs's async commit:

[ 2372.462171] [ BUG: bad unlock balance detected! ]
[ 2372.462191] 3.12.0+ #32 Tainted: G        W
[ 2372.462209] -------------------------------------
[ 2372.462228] ceph-osd/14048 is trying to release lock (sb_internal) at:
[ 2372.462275] [] btrfs_commit_transaction_async+0x1b0/0x2a0 [btrfs]
[ 2372.462305] but there are no more locks to release!
[ 2372.462324]
[ 2372.462324] other info that might help us debug this:
[ 2372.462349] no locks held by ceph-osd/14048.
[ 2372.462367]
[ 2372.462367] stack backtrace:
[ 2372.462386] CPU: 2 PID: 14048 Comm: ceph-osd Tainted: G        W    3.12.0+ #32
[ 2372.462414] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./To be filled by O.E.M., BIOS 080015  11/09/2011
[ 2372.462455]  ffffffffa022cb10 ffff88007490fd28 ffffffff816f094a ffff8800378aa320
[ 2372.462491]  ffff88007490fd50 ffffffff810adf4c ffff8800378aa320 ffff88009af97650
[ 2372.462526]  ffffffffa022cb10 ffff88007490fd88 ffffffff810b01ee ffff8800898c0000
[ 2372.462562] Call Trace:
[ 2372.462584]  [] ? btrfs_commit_transaction_async+0x1b0/0x2a0 [btrfs]
[ 2372.462619]  [] dump_stack+0x45/0x56
[ 2372.462642]  [] print_unlock_imbalance_bug+0xec/0x100
[ 2372.462677]  [] ? btrfs_commit_transaction_async+0x1b0/0x2a0 [btrfs]
[ 2372.462710]  [] lock_release+0x18e/0x210
[ 2372.462742]  [] btrfs_commit_transaction_async+0x1d6/0x2a0 [btrfs]
[ 2372.462783]  [] btrfs_ioctl_start_sync+0x3e/0xc0 [btrfs]
[ 2372.462822]  [] btrfs_ioctl+0x4c3/0x1f70 [btrfs]
[ 2372.462849]  [] ? avc_has_perm+0x121/0x1b0
[ 2372.462873]  [] ? avc_has_perm+0x24/0x1b0
[ 2372.462897]  [] ? sched_clock_cpu+0xa8/0x100
[ 2372.462922]  [] do_vfs_ioctl+0x2e5/0x4e0
[ 2372.462946]  [] ? file_has_perm+0x86/0xa0
[ 2372.462969]  [] SyS_ioctl+0x81/0xa0
[ 2372.462991]  [] tracesys+0xdd/0xe2

====================================================

It's because that we don't do the right thing when checking if it's ok to
tell lockdep that we're trying to release the rwsem.

If the trans handle's type is TRANS_ATTACH, we won't acquire the freeze rwsem, but
as TRANS_ATTACH fits the check (trans < TRANS_JOIN_NOLOCK), we'll release the freeze
rwsem, which makes lockdep complains a lot.

Reported-by: Ma Jianpeng 
Signed-off-by: Liu Bo 
Signed-off-by: Miao Xie 
Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason 
Signed-off-by: Greg Kroah-Hartman

Btrfs: fix a crash when running balance and defrag concurrently

2013-12-20T15:49:09+00:00

commit 48ec47364b6d493f0a9cdc116977bf3f34e5c3ec upstream.

Running balance and defrag concurrently can end up with a crash:

kernel BUG at fs/btrfs/relocation.c:4528!
RIP: 0010:[]  [] btrfs_reloc_cow_block+ 0x1eb/0x230 [btrfs]
Call Trace:
  [] ? update_ref_for_cow+0x241/0x380 [btrfs]
  [] ? copy_extent_buffer+0xad/0x110 [btrfs]
  [] __btrfs_cow_block+0x3a1/0x520 [btrfs]
  [] btrfs_cow_block+0x116/0x1b0 [btrfs]
  [] btrfs_search_slot+0x43d/0x970 [btrfs]
  [] btrfs_lookup_file_extent+0x37/0x40 [btrfs]
  [] __btrfs_drop_extents+0x11e/0xae0 [btrfs]
  [] ? generic_bin_search.constprop.39+0x8d/0x1a0 [btrfs]
  [] ? kmem_cache_alloc+0x1da/0x200
  [] ? btrfs_alloc_path+0x1a/0x20 [btrfs]
  [] btrfs_drop_extents+0x60/0x90 [btrfs]
  [] relink_extent_backref+0x2ed/0x780 [btrfs]
  [] ? btrfs_submit_bio_hook+0x1e0/0x1e0 [btrfs]
  [] ? iterate_inodes_from_logical+0x87/0xa0 [btrfs]
  [] btrfs_finish_ordered_io+0x229/0xac0 [btrfs]
  [] finish_ordered_fn+0x15/0x20 [btrfs]
  [] worker_loop+0x125/0x4e0 [btrfs]
  [] ? btrfs_queue_worker+0x300/0x300 [btrfs]
  [] kthread+0xc0/0xd0
  [] ? insert_kthread_work+0x40/0x40
  [] ret_from_fork+0x7c/0xb0
  [] ? insert_kthread_work+0x40/0x40
----------------------------------------------------------------------

It turns out to be that balance operation will bump root's @last_snapshot,
which enables snapshot-aware defrag path, and backref walking stuff will
find data reloc tree as refs' parent, and hit the BUG_ON() during COW.

As data reloc tree's data is just for relocation purpose, and will be deleted right
after relocation is done, it's unnecessary to walk those refs belonged to data reloc
tree, it'd be better to skip them.

Signed-off-by: Liu Bo 
Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason 
Signed-off-by: Greg Kroah-Hartman

Btrfs: do not run snapshot-aware defragment on error

2013-12-20T15:49:09+00:00

commit 6f519564d7d978c00351d9ab6abac3deeac31621 upstream.

If something wrong happens in write endio, running snapshot-aware defragment
can end up with undefined results, maybe a crash, so we should avoid it.

In order to share similar code, this also adds a helper to free the struct for
snapshot-aware defrag.

Signed-off-by: Liu Bo 
Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason 
Signed-off-by: Greg Kroah-Hartman

Btrfs: take ordered root lock when removing ordered operations inode

2013-12-20T15:49:09+00:00

commit 93858769172c4e3678917810e9d5de360eb991cc upstream.

A user reported a list corruption warning from btrfs_remove_ordered_extent, it
is because we aren't taking the ordered_root_lock when we remove the inode from
the ordered operations list.  Thanks,

Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason 
Signed-off-by: Greg Kroah-Hartman

Btrfs: stop using vfs_read in send

2013-12-20T15:49:09+00:00

commit ed2590953bd06b892f0411fc94e19175d32f197a upstream.

Apparently we don't actually close the files until we return to userspace, so
stop using vfs_read in send.  This is actually better for us since we can avoid
all the extra logic of holding the file we're sending open and making sure to
clean it up.  This will fix people who have been hitting too many files open
errors when trying to send.  Thanks,

Signed-off-by: Josef Bacik 
Signed-off-by: Chris Mason 
Signed-off-by: Greg Kroah-Hartman