Skip to contentSkip to conversation

zaurus c3000 aka spitz: fix resume

PATCH In review Pavel Machek 4 participants 10 messages Sep 9, 2009 – Sep 15, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zaurus c3000 aka spitz: fix resume

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

Do you think you could take it?
Pavel

---

sharpsl_pm.c code tries to read battery state very early during resume, but those battery meters are connected on SPI and that's only resumed way later.

Replace the check with simple checking of battery fatal signal, that actually works at this stage.

arch/arm/mach-pxa/sharpsl_pm.c renamed from arch/arm.ofic/mach-pxa/sharpsl_pm.c +2 -2
@@ -678,8 +678,8 @@
 		dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n");
 	}
 
-	if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) )
-	{
+	if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || 
+	    (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL)))	{
 		dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n");
 		corgi_goto_sleep(alarm_time, alarm_enable, state);
 		return 1;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#1 lore raw
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

#7 lore raw
In reply to Pavel Machek
Quoted 8 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

Do you think you could take it?

One checkpatch error here..

ERROR: trailing whitespace
#77: FILE: arch/arm/mach-pxa/sharpsl_pm.c:681:
+^Iif ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || $

total: 1 errors, 0 warnings, 10 lines checked

Daniel

#2 lore raw
In reply to Eric Miao
Quoted 11 lines · Eric Miao
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

It's just Pavel being his obnoxious impatient self...

#8 lore raw
In reply to Daniel Walker
Quoted 10 lines · Daniel Walker
Quoted 8 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

Do you think you could take it?

Quoted 8 lines

One checkpatch error here..

ERROR: trailing whitespace
#77: FILE: arch/arm/mach-pxa/sharpsl_pm.c:681:
+^Iif ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || $

total: 1 errors, 0 warnings, 10 lines checked

This has been fixed in the version I sent to Russell.

#9 lore raw
Quoted 13 lines · Eric Miao
Quoted 12 lines · Daniel Walker
Quoted 8 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

Do you think you could take it?

One checkpatch error here..

Quoted 8 lines
Quoted 6 lines

ERROR: trailing whitespace
#77: FILE: arch/arm/mach-pxa/sharpsl_pm.c:681:
+^Iif ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || $

total: 1 errors, 0 warnings, 10 lines checked

This has been fixed in the version I sent to Russell.

Thanks and sorry for the noise.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#3 lore raw
In reply to Russell King - ARM Linux
Quoted 10 lines · Russell King - ARM Linux
Quoted 9 lines · Eric Miao
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

Quoted 4 lines
Quoted 2 lines

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

It's just Pavel being his obnoxious impatient self...

Aha, Russell, being polite and helpful, as usual.

Only that, you know, you missed the deadline, so... perhaps I had reason to be impatient?
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#4 lore raw
Quoted 14 lines · Pavel Machek
Quoted 13 lines · Russell King - ARM Linux
Quoted 11 lines · Eric Miao
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

Quoted 6 lines
Quoted 1 line

It's just Pavel being his obnoxious impatient self...

Aha, Russell, being polite and helpful, as usual.

Only that, you know, you missed the deadline, so... perhaps I had reason to be impatient?

I missed the deadline because I was waiting on others to sort out telling me whether a bugfix patch was actually correct, and then it took several days and mails to get an attributation line out of them. I finally got that yesterday, and since I'm not doing kernel work (in fact, I'm hardly in front of the computer at the moment) these things are going to _HAVE_ to wait until this weekend.

By agreement with Linus, I do not send pull requests more often than once a week, absolute maximum. So if I've something pending in the queue, I hold off sending the queue until that issue is resolved.

Don't like it? Tough. This is the workflow that I've been forced into by other flame wars. It would be my personal preference to ensure that fixes make their way in a timely manner into mainline, but due to that, it's just not possible.

#5 lore raw
Quoted 29 lines · Russell King - ARM Linux
Quoted 14 lines · Pavel Machek
Quoted 13 lines · Russell King - ARM Linux
Quoted 11 lines · Eric Miao
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

Quoted 6 lines
Quoted 1 line

It's just Pavel being his obnoxious impatient self...

Aha, Russell, being polite and helpful, as usual.

Only that, you know, you missed the deadline, so... perhaps I had reason to be impatient?

I missed the deadline because I was waiting on others to sort out telling me whether a bugfix patch was actually correct, and then it took several days and mails to get an attributation line out of them. ?I finally got that yesterday, and since I'm not doing kernel work (in fact, I'm hardly in front of the computer at the moment) these things are going to _HAVE_ to wait until this weekend.

Quoted 9 lines

By agreement with Linus, I do not send pull requests more often than once a week, absolute maximum. ?So if I've something pending in the queue, I hold off sending the queue until that issue is resolved.

Don't like it? ?Tough. ?This is the workflow that I've been forced into by other flame wars. ?It would be my personal preference to ensure that fixes make their way in a timely manner into mainline, but due to that, it's just not possible.

Pavel,

It is still possible to get this into the stable release so take easy.

#6 lore raw
Quoted 41 lines · Eric Miao
Quoted 29 lines · Russell King - ARM Linux
Quoted 14 lines · Pavel Machek
Quoted 13 lines · Russell King - ARM Linux
Quoted 11 lines · Eric Miao
Quoted 7 lines · Pavel Machek

Hi, Linus!

Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31 release. One liner is below, and it really can not harm. It already is in Eric's fix queue, so pulling that for .31 should work, too.

This should be sitting in rmk's git tree and I'm not sure if Russell has sent the pull request already.

Quoted 6 lines
Quoted 1 line

It's just Pavel being his obnoxious impatient self...

Aha, Russell, being polite and helpful, as usual.

Only that, you know, you missed the deadline, so... perhaps I had reason to be impatient?

I missed the deadline because I was waiting on others to sort out telling me whether a bugfix patch was actually correct, and then it took several days and mails to get an attributation line out of them. ??I finally got that yesterday, and since I'm not doing kernel work (in fact, I'm hardly in front of the computer at the moment) these things are going to _HAVE_ to wait until this weekend.

Quoted 9 lines

By agreement with Linus, I do not send pull requests more often than once a week, absolute maximum. ??So if I've something pending in the queue, I hold off sending the queue until that issue is resolved.

Don't like it? ??Tough. ??This is the workflow that I've been forced into by other flame wars. ??It would be my personal preference to ensure that fixes make their way in a timely manner into mainline, but due to that, it's just not possible.

Quoted 3 lines

Pavel,

It is still possible to get this into the stable release so take easy.

Ok, so can you (or Russell?) add cc: stable at kernel.org header so that stable is notified when patch is merged?
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html