* [PATCH] fix for recently added firewire patch that breaks things on ppc [not found] ` <1155201211.17187.128.camel@localhost.localdomain> @ 2006-08-18 5:21 ` danny 2006-08-18 6:04 ` Stefan Richter 0 siblings, 1 reply; 3+ messages in thread From: danny @ 2006-08-18 5:21 UTC (permalink / raw) To: linux-kernel; +Cc: Benjamin Herrenschmidt, Andrew Morton, linux1394-devel Recently a patch was added for preliminary suspend/resume handling on !PPC_PMAC. However, this broke both suspend and firewire on powerpc because it saves the pci state after the device has already been disabled. This moves the save state to before the pmac specific code. Please apply before 2.6.18. Signed-off-by: Danny Tholen <obiwan at mailmij.org> --- linux-2.6.17.7/drivers/ieee1394/ohci1394.c~ 2006-08-09 09:00:32.556422070 -0400 +++ linux-2.6.17.7/drivers/ieee1394/ohci1394.c 2006-08-09 09:02:53.546090923 -0400 @@ -3548,6 +3548,8 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) { + pci_save_state(pdev); + #ifdef CONFIG_PPC_PMAC if (machine_is(powermac)) { struct device_node *of_node; @@ -3559,8 +3561,6 @@ } #endif - pci_save_state(pdev); - return 0; } ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix for recently added firewire patch that breaks things on ppc 2006-08-18 5:21 ` [PATCH] fix for recently added firewire patch that breaks things on ppc danny @ 2006-08-18 6:04 ` Stefan Richter 2006-08-18 6:18 ` danny 0 siblings, 1 reply; 3+ messages in thread From: Stefan Richter @ 2006-08-18 6:04 UTC (permalink / raw) To: stable, Adrian Bunk Cc: danny, linux-kernel, Andrew Morton, Benjamin Herrenschmidt, linux1394-devel Danny Tholen wrote: > Recently a patch was added for preliminary suspend/resume > handling on !PPC_PMAC. However, this broke both suspend and firewire > on powerpc because it saves the pci state after the device has already > been disabled. > > This moves the save state to before the pmac specific code. > Please apply before 2.6.18. > > Signed-off-by: Danny Tholen <obiwan at mailmij.org> This fix should go into 2.6.17.x and 2.6.16.yy too. (I sent the patch with the regression also to Adrian recently.) > --- linux-2.6.17.7/drivers/ieee1394/ohci1394.c~ 2006-08-09 09:00:32.556422070 -0400 > +++ linux-2.6.17.7/drivers/ieee1394/ohci1394.c 2006-08-09 09:02:53.546090923 -0400 > @@ -3548,6 +3548,8 @@ > > static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) > { > + pci_save_state(pdev); > + > #ifdef CONFIG_PPC_PMAC > if (machine_is(powermac)) { > struct device_node *of_node; > @@ -3559,8 +3561,6 @@ > } > #endif > > - pci_save_state(pdev); > - > return 0; > } > -- Stefan Richter -=====-=-==- =--- =--=- http://arcgraph.de/sr/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fix for recently added firewire patch that breaks things on ppc 2006-08-18 6:04 ` Stefan Richter @ 2006-08-18 6:18 ` danny 0 siblings, 0 replies; 3+ messages in thread From: danny @ 2006-08-18 6:18 UTC (permalink / raw) To: Stefan Richter Cc: stable, Adrian Bunk, danny, linux-kernel, Andrew Morton, Benjamin Herrenschmidt, linux1394-devel On Fri, Aug 18, 2006 at 08:04:55AM +0200, Stefan Richter wrote: > Danny Tholen wrote: > > Recently a patch was added for preliminary suspend/resume > > handling on !PPC_PMAC. However, this broke both suspend and firewire > > on powerpc because it saves the pci state after the device has already > > been disabled. > > > > This moves the save state to before the pmac specific code. > > Please apply before 2.6.18. > > > > Signed-off-by: Danny Tholen <obiwan at mailmij.org> > > This fix should go into 2.6.17.x and 2.6.16.yy too. (I sent the patch > with the regression also to Adrian recently.) > I'm sorry I should have mentioned that I already sent it to Greg KH. Danny ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-08-18 6:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20060805151050.B24484@luna.ellen.dexterslabs.com>
[not found] ` <1155118273.4040.81.camel@localhost.localdomain>
[not found] ` <20060809151226.A31391@luna.ellen.dexterslabs.com>
[not found] ` <1155201211.17187.128.camel@localhost.localdomain>
2006-08-18 5:21 ` [PATCH] fix for recently added firewire patch that breaks things on ppc danny
2006-08-18 6:04 ` Stefan Richter
2006-08-18 6:18 ` danny
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®