linux-toradex.git/drivers/base, branch v3.5.7

PM / Sleep: use resume event when call dpm_resume_early

2012-10-12T20:46:56+00:00

commit 997a031107ec962967ce36db9bc500f1fad491c1 upstream.

When dpm_suspend_noirq fail, state is PMSG_SUSPEND,
should change to PMSG_RESUME when dpm_resume_early is called

Signed-off-by: Feng Hong 
Signed-off-by: Raul Xiong 
Signed-off-by: Neil Zhang 
Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Greg Kroah-Hartman

Revert dyndbg: fix for SOH in logging messages

2012-10-12T20:46:51+00:00

This reverts commit 3d822616ca81881d8c19d0b473e79ba241c700de, which is
ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream, as it's not needed in
the 3.5.y tree.

Reported-by: Wouter M. Koolen 
Cc: Markus Trippelsdorf 
Cc: Jim Cromie 
Cc: Linus Torvalds 
Cc: Andrew Morton 
Cc: Jason Baron 
Signed-off-by: Greg Kroah-Hartman

PM / Runtime: Check device PM QoS setting before "no callbacks" check

2012-10-02T17:39:39+00:00

commit 55d7ec4520e86d735d178c15d7df33d507bd43c6 upstream.

If __dev_pm_qos_read_value(dev) returns a negative value,
rpm_suspend() should return -EPERM for dev even if its
power.no_callbacks flag is set.  For this to happen, the device's
power.no_callbacks flag has to be checked after the PM QoS check,
so move the PM QoS check to rpm_check_suspend_allowed() (this will
make it cover idle notifications as well as runtime suspend too).

Signed-off-by: Rafael J. Wysocki 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

PM / Runtime: Clear power.deferred_resume on success in rpm_suspend()

2012-10-02T17:39:39+00:00

commit 58a34de7b1a920d287d17d2ca08bc9aaf7e6d35b upstream.

The power.deferred_resume can only be set if the runtime PM status
of device is RPM_SUSPENDING and it should be cleared after its
status has been changed, regardless of whether or not the runtime
suspend has been successful.  However, it only is cleared on
suspend failure, while it may remain set on successful suspend and
is happily leaked to rpm_resume() executed in that case.

That shouldn't happen, so if power.deferred_resume is set in
rpm_suspend() after the status has been changed to RPM_SUSPENDED,
clear it before calling rpm_resume().  Then, it doesn't need to be
cleared before changing the status to RPM_SUSPENDING any more,
because it's always cleared after the status has been changed to
either RPM_SUSPENDED (on success) or RPM_ACTIVE (on failure).

Signed-off-by: Rafael J. Wysocki 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set

2012-10-02T17:39:39+00:00

commit 7f321c26c04807834fef4c524d2b21573423fc74 upstream.

For devices whose power.no_callbacks flag is set, rpm_resume()
should return 1 if the device's parent is already active, so that
the callers of pm_runtime_get() don't think that they have to wait
for the device to resume (asynchronously) in that case (the core
won't queue up an asynchronous resume in that case, so there's
nothing to wait for anyway).

Modify the code accordingly (and make sure that an idle notification
will be queued up on success, even if 1 is to be returned).

Signed-off-by: Rafael J. Wysocki 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

dyndbg: fix for SOH in logging messages

2012-10-02T17:39:10+00:00

commit ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream.

commit af7f2158fde was done against master, and clashed with structured
logging's change of KERN_LEVEL to SOH.

Bisected and fixed by Markus Trippelsdorf.

Reported-by: Markus Trippelsdorf 
Signed-off-by: Jim Cromie 
Cc: Linus Torvalds 
Cc: Andrew Morton 
Cc: Jason Baron 
Signed-off-by: Greg Kroah-Hartman

drivers-core: make structured logging play nice with dynamic-debug

2012-08-26T02:31:43+00:00

commit af7f2158fdee9d7f55b793b09f8170a3391f889a upstream.

commit c4e00daaa96d3a0786f1f4fe6456281c60ef9a16 changed __dev_printk
in a way that broke dynamic-debug's ability to control the dynamic
prefix of dev_dbg(dev,..), but not dev_dbg(NULL,..) or pr_debug(..),
which is why it wasnt noticed sooner.

When dev==NULL, __dev_printk() just calls printk(), which just works.
But otherwise, it assumed that level was always a string like ""
and just plucked out the 'L', ignoring the rest.  However,
dynamic_emit_prefix() adds "[tid] module:func:line:" to the string,
those additions all got lost.

Signed-off-by: Jim Cromie 
Acked-by: Jason Baron 
Cc: Kay Sievers 
Signed-off-by: Greg Kroah-Hartman

PM / Sleep: call early resume handlers when suspend_noirq fails

2012-08-09T15:22:51+00:00

commit 064b021fbe470ecc9ca10f9f87af48c0fc0865fb upstream.

Commit cf579dfb82550e34de7ccf3ef090d8b834ccd3a9 (PM / Sleep: Introduce
"late suspend" and "early resume" of devices) introduced a bug where
suspend_late handlers would be called, but if dpm_suspend_noirq returned
an error the early_resume handlers would never be called.  All devices
would end up on the dpm_late_early_list, and would never be resumed
again.

Fix it by calling dpm_resume_early when dpm_suspend_noirq returns
an error.

Signed-off-by: Colin Cross 
Signed-off-by: Rafael J. Wysocki 
Signed-off-by: Greg Kroah-Hartman

Make wait_for_device_probe() also do scsi_complete_async_scans()

2012-07-19T01:15:46+00:00

Commit a7a20d103994 ("sd: limit the scope of the async probe domain")
make the SCSI device probing run device discovery in it's own async
domain.

However, as a result, the partition detection was no longer synchronized
by async_synchronize_full() (which, despite the name, only synchronizes
the global async space, not all of them).  Which in turn meant that
"wait_for_device_probe()" would not wait for the SCSI partitions to be
parsed.

And "wait_for_device_probe()" was what the boot time init code relied on
for mounting the root filesystem.

Now, most people never noticed this, because not only is it
timing-dependent, but modern distributions all use initrd.  So the root
filesystem isn't actually on a disk at all.  And then before they
actually mount the final disk filesystem, they will have loaded the
scsi-wait-scan module, which not only does the expected
wait_for_device_probe(), but also does scsi_complete_async_scans().

[ Side note: scsi_complete_async_scans() had also been partially broken,
  but that was fixed in commit 43a8d39d0137 ("fix async probe
  regression"), so that same commit a7a20d103994 had actually broken
  setups even if you used scsi-wait-scan explicitly ]

Solve this problem by just moving the scsi_complete_async_scans() call
into wait_for_device_probe().  Everybody who wants to wait for device
probing to finish really wants the SCSI probing to complete, so there's
no reason not to do this.

So now "wait_for_device_probe()" really does what the name implies, and
properly waits for device probing to finish.  This also removes the now
unnecessary extra calls to scsi_complete_async_scans().

Reported-and-tested-by: Artem S. Tashkinov 
Cc: Dan Williams 
Cc: Alan Stern 
Cc: James Bottomley 
Cc: Borislav Petkov 
Cc: linux-scsi 
Signed-off-by: Linus Torvalds

PM / Sleep: Prevent waiting forever on asynchronous suspend after abort

2012-06-24T21:31:09+00:00

__device_suspend() must always send a completion. Otherwise, parent
devices will wait forever.

Commit 1e2ef05b, "PM: Limit race conditions between runtime PM and
system sleep (v2)", introduced a regression by short-circuiting the
complete_all() for certain error cases.

This patch fixes the bug by always signalling a completion.

Addresses http://crosbug.com/31972

Tested by injecting an abort.

Signed-off-by: Mandeep Singh Baines 
Cc: stable@vger.kernel.org
Signed-off-by: Rafael J. Wysocki