From: Mark Einon <mark.einon@gmail.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
o.hartmann@telovital.com, alan@linux.intel.com,
Mark Einon <mark.einon@gmail.com>
Subject: [PATCH 8/8] staging: et131x: Fix indefinite low power sleep
Date: Sat, 1 Oct 2011 11:14:17 +0100 [thread overview]
Message-ID: <1317464057-18231-8-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <1317464057-18231-1-git-send-email-mark.einon@gmail.com>
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>
---
drivers/staging/et131x/et1310_pm.c | 5 +++--
drivers/staging/et131x/et131x_initpci.c | 12 +++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
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 @@ void et1310_enable_phy_coma(struct et131x_adapter *adapter)
/* 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 @@ void et1310_disable_phy_coma(struct et131x_adapter *adapter)
/* 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 @@ void et131x_error_timer_handler(unsigned long data)
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 @@ static void et131x_adjust_link(struct net_device *netdev)
} 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
--
1.7.6.4
prev parent reply other threads:[~2011-10-01 10:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-01 10:14 [PATCH 1/8] staging: et131x: Remove TODO entry 'alloc_etherdev initilising memory with zero' Mark Einon
2011-10-01 10:14 ` [PATCH 2/8] staging: et131x: Introduce et1310_in_phy_coma() call Mark Einon
2011-10-01 10:14 ` [PATCH 3/8] staging: et131x: Remove adapter->bmsr, replace with phydev equivalents Mark Einon
2011-10-01 10:14 ` [PATCH 4/8] staging: et131x: Add pci suspend & resume functions Mark Einon
2011-10-01 11:03 ` Francois Romieu
2011-10-01 14:02 ` Mark Einon
2011-10-01 19:36 ` Francois Romieu
2011-10-01 10:14 ` [PATCH 5/8] staging: et131x: Fix add_timer() from et131x_open Mark Einon
2011-10-01 10:14 ` [PATCH 6/8] staging: et131x: Update TODO file for kernel parameters Mark Einon
2011-10-01 10:14 ` [PATCH 7/8] staging: et131x: Updating copyright statements and module authors Mark Einon
2011-10-01 19:58 ` Dan Carpenter
2011-10-02 18:54 ` Mark Einon
2011-10-01 10:14 ` Mark Einon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1317464057-18231-8-git-send-email-mark.einon@gmail.com \
--to=mark.einon@gmail.com \
--cc=alan@linux.intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=o.hartmann@telovital.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome