* Software suspend and RTL 8139too in 2.6.0-test1
@ 2003-07-14 12:37 Peter Osterlund
2003-07-20 20:10 ` Pavel Machek
0 siblings, 1 reply; 3+ messages in thread
From: Peter Osterlund @ 2003-07-14 12:37 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Kernel Mailing List
Hi!
This patch is needed to make software suspend work with the 8139too
driver loaded.
--- linux/drivers/net/8139too.c.old Mon Jul 14 14:28:27 2003
+++ linux/drivers/net/8139too.c Mon Jul 14 13:23:07 2003
@@ -110,6 +110,7 @@
#include <linux/mii.h>
#include <linux/completion.h>
#include <linux/crc32.h>
+#include <linux/suspend.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -1597,6 +1598,9 @@
timeout = next_tick;
do {
timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
+ /* make swsusp happy with our thread */
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_IOTHREAD);
} while (!signal_pending (current) && (timeout > 0));
if (signal_pending (current)) {
--
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Software suspend and RTL 8139too in 2.6.0-test1
2003-07-14 12:37 Software suspend and RTL 8139too in 2.6.0-test1 Peter Osterlund
@ 2003-07-20 20:10 ` Pavel Machek
2003-07-20 22:03 ` Peter Osterlund
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2003-07-20 20:10 UTC (permalink / raw)
To: Peter Osterlund; +Cc: Jeff Garzik, Kernel Mailing List
Hi!
> This patch is needed to make software suspend work with the 8139too
> driver loaded.
There's more complicated patch at
http://mrohne.home.cern.ch/mrohne/P2120/P2120_Linux_S3.html. Could you
test it, perhaps?
Pavel
diff -Nru -X dontdiff linux-2.5.64bk11/drivers/net/8139too.c linux-2.5.64bk11-p2120/drivers/net/8139too.c
--- linux-2.5.64bk11/drivers/net/8139too.c 2003-03-07 10:23:38.000000000 +0100
+++ linux-2.5.64bk11-p2120/drivers/net/8139too.c 2003-03-17 13:04:19.000000000 +0100
@@ -109,6 +109,7 @@
#include <linux/ethtool.h>
#include <linux/mii.h>
#include <linux/completion.h>
+#include <linux/suspend.h>
#include <linux/crc32.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -565,6 +566,7 @@
void *mmio_addr;
int drv_flags;
struct pci_dev *pci_dev;
+ u32 pci_state[16];
struct net_device_stats stats;
unsigned char *rx_ring;
unsigned int cur_rx; /* Index into the Rx buffer of next Rx pkt. */
@@ -1595,6 +1597,8 @@
timeout = next_tick;
do {
timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_IOTHREAD);
} while (!signal_pending (current) && (timeout > 0));
if (signal_pending (current)) {
@@ -2562,6 +2566,9 @@
tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
RTL_W32 (RxMissed, 0);
+ pci_save_state (pdev, tp->pci_state);
+ pci_set_power_state (pdev, 3);
+
spin_unlock_irqrestore (&tp->lock, flags);
return 0;
}
@@ -2570,11 +2577,15 @@
static int rtl8139_resume (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata (pdev);
+ struct rtl8139_private *tp = dev->priv;
if (!netif_running (dev))
return 0;
- netif_device_attach (dev);
+ pci_set_power_state (pdev, 0);
+ pci_restore_state (pdev, tp->pci_state);
+ rtl8139_init_ring (dev);
rtl8139_hw_start (dev);
+ netif_device_attach (dev);
return 0;
}
diff -Nru -X dontdiff linux-2.5.64bk11/drivers/pci/pci-driver.c linux-2.5.64bk11-p2120/drivers/pci/pci-driver.c
--- linux-2.5.64bk11/drivers/pci/pci-driver.c 2003-03-05 04:29:31.000000000 +0100
+++ linux-2.5.64bk11-p2120/drivers/pci/pci-driver.c 2003-03-17 13:04:19.000000000 +0100
@@ -91,11 +91,9 @@
struct pci_dev * pci_dev = to_pci_dev(dev);
if (pci_dev->driver) {
- /* We may not call PCI drivers resume at
- RESUME_POWER_ON because interrupts are not yet
- working at that point. Calling resume at
- RESUME_RESTORE_STATE seems like solution. */
- if (level == RESUME_RESTORE_STATE && pci_dev->driver->resume)
+ if (level == RESUME_POWER_ON && pci_dev->driver->power_on)
+ pci_dev->driver->power_on(pci_dev);
+ else if (level == RESUME_RESTORE_STATE && pci_dev->driver->resume)
pci_dev->driver->resume(pci_dev);
}
return 0;
diff -Nru -X dontdiff linux-2.5.64bk11/drivers/video/radeonfb.c linux-2.5.64bk11-p2120/drivers/video/radeonfb.c
--- linux-2.5.64bk11/drivers/video/radeonfb.c 2003-03-05 04:29:53.000000000 +0100
+++ linux-2.5.64bk11-p2120/drivers/video/radeonfb.c 2003-03-17 13:59:04.000000000 +0100
@@ -402,7 +402,11 @@
u32 mdll, mdll2;
#endif /* CONFIG_PMAC_PBOOK */
int asleep;
-
+
+#ifdef CONFIG_PM
+ u8 pci_state[64];
+#endif /* CONFIG_PM */
+
struct radeonfb_info *next;
};
@@ -2925,7 +2929,7 @@
switch (pdev->device) {
case PCI_DEVICE_ID_ATI_RADEON_LY:
case PCI_DEVICE_ID_ATI_RADEON_LZ:
- rinfo->video_ram = 8192;
+ rinfo->video_ram = 8192*1024;
break;
default:
break;
@@ -3104,16 +3108,65 @@
pci_resource_len(pdev, 2));
release_mem_region (rinfo->fb_base_phys,
pci_resource_len(pdev, 0));
+
+ pci_set_drvdata (pdev, NULL);
kfree (rinfo);
}
+#ifdef CONFIG_PM
+static int radeonfb_save_state (struct pci_dev *pdev, u32 state)
+{
+ struct radeonfb_info *rinfo = pci_get_drvdata (pdev);
+
+ printk ("radeonfb_save_state\n");
+ rinfo->asleep++;
+ return 0;
+}
+
+static int radeonfb_suspend (struct pci_dev *pdev, u32 state)
+{
+ struct radeonfb_info *rinfo = pci_get_drvdata (pdev);
+
+ printk ("radeonfb_suspend\n");
+ pci_save_state (pdev, (u32 *)rinfo->pci_state);
+ mdelay (10);
+ rinfo->asleep++;
+ return 0;
+}
+
+static int radeonfb_power_on (struct pci_dev *pdev)
+{
+ struct radeonfb_info *rinfo = pci_get_drvdata (pdev);
+
+ printk ("radeonfb_power_on\n");
+ pci_restore_state (pdev, (u32 *)rinfo->pci_state);
+ mdelay (10);
+ rinfo->asleep--;
+ return 0;
+}
+
+static int radeonfb_resume (struct pci_dev *pdev)
+{
+ struct radeonfb_info *rinfo = pci_get_drvdata (pdev);
+
+ printk ("radeonfb_resume\n");
+ rinfo->asleep--;
+ return 0;
+}
+#endif /* CONFIG_PM */
static struct pci_driver radeonfb_driver = {
name: "radeonfb",
id_table: radeonfb_pci_table,
probe: radeonfb_pci_register,
remove: __devexit_p(radeonfb_pci_unregister),
+#ifdef CONFIG_PM
+ .save_state = radeonfb_save_state,
+ .suspend = radeonfb_suspend,
+ .power_on = radeonfb_power_on,
+ .resume = radeonfb_resume,
+#endif /* CONFIG_PM */
};
diff -Nru -X dontdiff linux-2.5.64bk11/include/linux/pci.h linux-2.5.64bk11-p2120/include/linux/pci.h
--- linux-2.5.64bk11/include/linux/pci.h 2003-03-17 11:48:10.000000000 +0100
+++ linux-2.5.64bk11-p2120/include/linux/pci.h 2003-03-17 13:04:19.000000000 +0100
@@ -500,6 +500,7 @@
void (*remove) (struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */
int (*save_state) (struct pci_dev *dev, u32 state); /* Save Device Context */
int (*suspend) (struct pci_dev *dev, u32 state); /* Device suspended */
+ int (*power_on) (struct pci_dev *dev); /* Device power on */
int (*resume) (struct pci_dev *dev); /* Device woken up */
int (*enable_wake) (struct pci_dev *dev, u32 state, int enable); /* Enable wake event */
--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Software suspend and RTL 8139too in 2.6.0-test1
2003-07-20 20:10 ` Pavel Machek
@ 2003-07-20 22:03 ` Peter Osterlund
0 siblings, 0 replies; 3+ messages in thread
From: Peter Osterlund @ 2003-07-20 22:03 UTC (permalink / raw)
To: Pavel Machek; +Cc: Jeff Garzik, Kernel Mailing List
Pavel Machek <pavel@ucw.cz> writes:
> Hi!
>
> > This patch is needed to make software suspend work with the 8139too
> > driver loaded.
>
> There's more complicated patch at
> http://mrohne.home.cern.ch/mrohne/P2120/P2120_Linux_S3.html. Could you
> test it, perhaps?
It works even better than my patch. With my patch the NIC would not
work for a few seconds after resume, until the driver realized
something was wrong and reinitialized the card. With this patch I
don't see that problem.
Here is the patch for 2.6.0-test1 with only the 8139too changes.
--- linux/drivers/net/8139too.c.old Sun Jul 20 23:56:19 2003
+++ linux/drivers/net/8139too.c Sun Jul 20 22:54:37 2003
@@ -109,6 +109,7 @@
#include <linux/ethtool.h>
#include <linux/mii.h>
#include <linux/completion.h>
+#include <linux/suspend.h>
#include <linux/crc32.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -565,6 +566,7 @@
void *mmio_addr;
int drv_flags;
struct pci_dev *pci_dev;
+ u32 pci_state[16];
struct net_device_stats stats;
unsigned char *rx_ring;
unsigned int cur_rx; /* Index into the Rx buffer of next Rx pkt. */
@@ -1597,6 +1599,8 @@
timeout = next_tick;
do {
timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
+ if (current->flags & PF_FREEZE)
+ refrigerator(PF_IOTHREAD);
} while (!signal_pending (current) && (timeout > 0));
if (signal_pending (current)) {
@@ -2566,6 +2570,9 @@
tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
RTL_W32 (RxMissed, 0);
+ pci_save_state (pdev, tp->pci_state);
+ pci_set_power_state (pdev, 3);
+
spin_unlock_irqrestore (&tp->lock, flags);
return 0;
}
@@ -2574,11 +2581,15 @@
static int rtl8139_resume (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata (pdev);
+ struct rtl8139_private *tp = dev->priv;
if (!netif_running (dev))
return 0;
- netif_device_attach (dev);
+ pci_set_power_state (pdev, 0);
+ pci_restore_state (pdev, tp->pci_state);
+ rtl8139_init_ring (dev);
rtl8139_hw_start (dev);
+ netif_device_attach (dev);
return 0;
}
--
Peter Osterlund - petero2@telia.com
http://w1.894.telia.com/~u89404340
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-07-20 23:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-14 12:37 Software suspend and RTL 8139too in 2.6.0-test1 Peter Osterlund
2003-07-20 20:10 ` Pavel Machek
2003-07-20 22:03 ` Peter Osterlund
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).