* 8390too, radeonfb support
@ 2003-07-20 21:30 Pavel Machek
2003-07-21 18:44 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2003-07-20 21:30 UTC (permalink / raw)
To: ole.rohne, kernel list
Hi!
Ole put some patches on his webpage. I ported them to
2.6.0-test1. Could someone who has hardware test them/push them to
linus?
Pavel
--- /usr/src/tmp/linux/arch/i386/kernel/acpi/wakeup.S 2003-03-06 23:25:13.000000000 +0100
+++ /usr/src/linux/arch/i386/kernel/acpi/wakeup.S 2003-07-20 23:18:10.000000000 +0200
@@ -43,6 +43,11 @@
testl $1, video_flags - wakeup_code
jz 1f
+ /* It is miracle that this works:
+ * PCI may or may not be initialized at this point
+ * I'm told we should pass device ID to video bios
+ However it works on some real machines...
+ */
lcall $0xc000,$3
movw %cs, %ax
movw %ax, %ds # Bios might have played with that
--- /usr/src/tmp/linux/drivers/net/8139too.c 2003-07-11 21:38:37.000000000 +0200
+++ /usr/src/linux/drivers/net/8139too.c 2003-07-20 22:42:26.000000000 +0200
@@ -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;
}
--- /usr/src/tmp/linux/drivers/pci/pci-driver.c 2003-07-06 20:07:38.000000000 +0200
+++ /usr/src/linux/drivers/pci/pci-driver.c 2003-07-20 22:42:26.000000000 +0200
@@ -179,11 +179,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;
--- /usr/src/tmp/linux/drivers/video/radeonfb.c 2003-06-15 22:43:26.000000000 +0200
+++ /usr/src/linux/drivers/video/radeonfb.c 2003-07-20 22:55:13.000000000 +0200
@@ -405,7 +405,11 @@
u32 mdll, mdll2;
#endif /* CONFIG_PMAC_PBOOK */
int asleep;
-
+
+#ifdef CONFIG_PM
+ u8 pci_state[64];
+#endif /* CONFIG_PM */
+
struct radeonfb_info *next;
};
@@ -3113,16 +3117,64 @@
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 */
};
--- /usr/src/tmp/linux/include/linux/pci.h 2003-07-11 21:38:47.000000000 +0200
+++ /usr/src/linux/include/linux/pci.h 2003-07-20 22:42:26.000000000 +0200
@@ -512,6 +512,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: 8390too, radeonfb support
2003-07-20 21:30 8390too, radeonfb support Pavel Machek
@ 2003-07-21 18:44 ` Jeff Garzik
2003-07-22 11:10 ` Peter Osterlund
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2003-07-21 18:44 UTC (permalink / raw)
To: Pavel Machek; +Cc: ole.rohne, kernel list
On Sun, Jul 20, 2003 at 11:30:14PM +0200, Pavel Machek wrote:
> Hi!
>
> Ole put some patches on his webpage. I ported them to
> 2.6.0-test1. Could someone who has hardware test them/push them to
> linus?
Please push net driver patches to the net driver maintainer, who has
already applied the simple 8139too-refrigerator patch.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 8390too, radeonfb support
2003-07-21 18:44 ` Jeff Garzik
@ 2003-07-22 11:10 ` Peter Osterlund
0 siblings, 0 replies; 3+ messages in thread
From: Peter Osterlund @ 2003-07-22 11:10 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Pavel Machek, ole.rohne, kernel list
Jeff Garzik <jgarzik@pobox.com> writes:
> On Sun, Jul 20, 2003 at 11:30:14PM +0200, Pavel Machek wrote:
> > Hi!
> >
> > Ole put some patches on his webpage. I ported them to
> > 2.6.0-test1. Could someone who has hardware test them/push them to
> > linus?
>
> Please push net driver patches to the net driver maintainer, who has
> already applied the simple 8139too-refrigerator patch.
Here is an incremental patch.
Correctly initialize the NIC in 8139too.c after software
suspend/resume, so that we don't get Tx/Rx DMA timeouts.
Tested and works fine on my computer. This patch originates from Ole
Myren Rohne's web page:
http://mrohne.home.cern.ch/mrohne/P2120/P2120_Linux_S3.html
drivers/net/8139too.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletion(-)
diff -puN drivers/net/8139too.c~rtl8139-suspend-2 drivers/net/8139too.c
--- linux/drivers/net/8139too.c~rtl8139-suspend-2 Tue Jul 22 12:50:36 2003
+++ linux-petero/drivers/net/8139too.c Tue Jul 22 12:50:36 2003
@@ -566,6 +566,7 @@ struct rtl8139_private {
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. */
@@ -2570,6 +2571,9 @@ static int rtl8139_suspend (struct pci_d
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;
}
@@ -2578,11 +2582,15 @@ static int rtl8139_suspend (struct pci_d
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-22 10:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-20 21:30 8390too, radeonfb support Pavel Machek
2003-07-21 18:44 ` Jeff Garzik
2003-07-22 11:10 ` Peter Osterlund
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.