From: Takashi Iwai <tiwai@suse.de>
To: netdev@vger.kernel.org
Cc: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write
Date: Thu, 3 Dec 2009 16:12:02 +0100 [thread overview]
Message-ID: <1259853122-21134-3-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1259853122-21134-2-git-send-email-tiwai@suse.de>
Add missing TST_CFG_WRITE bits around sky2_pci_write*() in Optima
setup routines. Without the cfg-write bits, the driver may spew endless
link-up messages through qlink irq.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/net/sky2.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 0718cdd..4c0a677 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2152,7 +2152,9 @@ static void sky2_qlink_intr(struct sky2_hw *hw)
/* reset PHY Link Detect */
phy = sky2_pci_read16(hw, PSM_CONFIG_REG4);
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1);
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
sky2_link_up(sky2);
}
@@ -3082,6 +3084,7 @@ static void sky2_reset(struct sky2_hw *hw)
reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE;
/* reset PHY Link Detect */
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
sky2_pci_write16(hw, PSM_CONFIG_REG4,
reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT);
sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);
@@ -3099,6 +3102,7 @@ static void sky2_reset(struct sky2_hw *hw)
/* restore the PCIe Link Control register */
sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
}
+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
/* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16));
--
1.6.5.3
next prev parent reply other threads:[~2009-12-03 15:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-03 15:12 [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip Takashi Iwai
2009-12-03 15:12 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup Takashi Iwai
2009-12-03 15:12 ` Takashi Iwai [this message]
2009-12-09 4:16 ` David Miller
2009-12-04 0:07 ` [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip David Miller
2009-12-04 0:35 ` Stephen Hemminger
2009-12-04 9:11 ` Takashi Iwai
2009-12-09 19:35 ` Stephen Hemminger
2009-12-11 22:54 ` David Miller
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=1259853122-21134-3-git-send-email-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).