staging: et131x: Fix indefinite low power sleep
The mechanism by which the device is put into low power sleep is broken
in that the device can never come back out of low power mode afterwards.
Temorary fix to bring the device back out of sleep almost immediately,
until a suitable wake trigger can be found.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c
index fd1eb6f..a1b72bf 100644
--- a/drivers/staging/et131x/et1310_pm.c
+++ b/drivers/staging/et131x/et1310_pm.c
@@ -147,6 +147,8 @@
/* Wait for outstanding Receive packets */
+ et131x_disable_txrx(adapter->netdev);
+
/* Gate off JAGCore 3 clock domains */
pmcsr &= ~ET_PMCSR_INIT;
writel(pmcsr, &adapter->regs->global.pm_csr);
@@ -198,7 +200,6 @@
/* Allow Tx to restart */
adapter->flags &= ~fMP_ADAPTER_LOWER_POWER;
- /* Need to re-enable Rx. */
- et131x_rx_dma_enable(adapter);
+ et131x_enable_txrx(adapter->netdev);
}
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index ed22615..9795310 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -243,10 +243,15 @@
struct et131x_adapter *adapter = (struct et131x_adapter *) data;
struct phy_device *phydev = adapter->phydev;
- if (!et1310_in_phy_coma(adapter))
+ if (et1310_in_phy_coma(adapter)) {
+ /* Bring the device immediately out of coma, to
+ * prevent it from sleeping indefinitely, this
+ * mechanism could be improved! */
+ et1310_disable_phy_coma(adapter);
+ adapter->boot_coma = 20;
+ } else {
et1310_update_macstat_host_counters(adapter);
- else
- dev_err(&adapter->pdev->dev, "No interrupts, in PHY coma\n");
+ }
if (!phydev->link && adapter->boot_coma < 11)
adapter->boot_coma++;
@@ -495,6 +500,7 @@
} else {
dev_warn(&adapter->pdev->dev,
"Link down - cable problem ?\n");
+ adapter->boot_coma = 0;
if (phydev && phydev->speed == SPEED_10) {
/* NOTE - Is there a way to query this without