* [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip @ 2009-12-03 15:12 Takashi Iwai 2009-12-03 15:12 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup Takashi Iwai 2009-12-04 0:07 ` [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip David Miller 0 siblings, 2 replies; 9+ messages in thread From: Takashi Iwai @ 2009-12-03 15:12 UTC (permalink / raw) To: netdev Hi, here are two small patches to fix the bugs found on sky2 Yukon-2 Optima chip. These are for the latest net-next kernel. Would be nice if they come in for 2.6.33. thanks, Takashi ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup 2009-12-03 15:12 [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip Takashi Iwai @ 2009-12-03 15:12 ` Takashi Iwai 2009-12-03 15:12 ` [PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write Takashi Iwai 2009-12-09 4:16 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup David Miller 2009-12-04 0:07 ` [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip David Miller 1 sibling, 2 replies; 9+ messages in thread From: Takashi Iwai @ 2009-12-03 15:12 UTC (permalink / raw) To: netdev; +Cc: Takashi Iwai Fix the TCP offload setup for Yukon-2 Optima. It requires SKY2_HW_NE_LE flag unlike Ultra 2. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/net/sky2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a3d9991..0718cdd 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -2968,8 +2968,13 @@ static int __devinit sky2_init(struct sky2_hw *hw) break; case CHIP_ID_YUKON_UL_2: + hw->flags = SKY2_HW_GIGABIT + | SKY2_HW_ADV_POWER_CTL; + break; + case CHIP_ID_YUKON_OPT: hw->flags = SKY2_HW_GIGABIT + | SKY2_HW_NEW_LE | SKY2_HW_ADV_POWER_CTL; break; -- 1.6.5.3 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write 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 2009-12-09 4:16 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup David Miller 1 sibling, 0 replies; 9+ messages in thread From: Takashi Iwai @ 2009-12-03 15:12 UTC (permalink / raw) To: netdev; +Cc: Takashi Iwai 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 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup 2009-12-03 15:12 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup Takashi Iwai 2009-12-03 15:12 ` [PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write Takashi Iwai @ 2009-12-09 4:16 ` David Miller 1 sibling, 0 replies; 9+ messages in thread From: David Miller @ 2009-12-09 4:16 UTC (permalink / raw) To: tiwai; +Cc: netdev From: Takashi Iwai <tiwai@suse.de> Date: Thu, 3 Dec 2009 16:12:01 +0100 > Fix the TCP offload setup for Yukon-2 Optima. > It requires SKY2_HW_NE_LE flag unlike Ultra 2. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> Stephen, you said last week you were going to stick this card type into one of your systems and give these patches a test. How's that coming along? These two patches are just rotting at the bottom of patchwork. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip 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-04 0:07 ` David Miller 2009-12-04 0:35 ` Stephen Hemminger 2009-12-09 19:35 ` Stephen Hemminger 1 sibling, 2 replies; 9+ messages in thread From: David Miller @ 2009-12-04 0:07 UTC (permalink / raw) To: tiwai; +Cc: netdev, shemminger From: Takashi Iwai <tiwai@suse.de> Date: Thu, 3 Dec 2009 16:12:00 +0100 > here are two small patches to fix the bugs found on sky2 Yukon-2 > Optima chip. These are for the latest net-next kernel. Would be > nice if they come in for 2.6.33. Please always CC: the driver maintainer when submitting changes to a driver. Stephen, please have a look at these, thanks. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip 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 1 sibling, 1 reply; 9+ messages in thread From: Stephen Hemminger @ 2009-12-04 0:35 UTC (permalink / raw) To: David Miller; +Cc: tiwai, netdev On Thu, 03 Dec 2009 16:07:19 -0800 (PST) David Miller <davem@davemloft.net> wrote: > From: Takashi Iwai <tiwai@suse.de> > Date: Thu, 3 Dec 2009 16:12:00 +0100 > > > here are two small patches to fix the bugs found on sky2 Yukon-2 > > Optima chip. These are for the latest net-next kernel. Would be > > nice if they come in for 2.6.33. > > Please always CC: the driver maintainer when submitting changes > to a driver. > > Stephen, please have a look at these, thanks. I have hardware in a box, that I plan to test these on tonight. -- ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip 2009-12-04 0:35 ` Stephen Hemminger @ 2009-12-04 9:11 ` Takashi Iwai 0 siblings, 0 replies; 9+ messages in thread From: Takashi Iwai @ 2009-12-04 9:11 UTC (permalink / raw) To: Stephen Hemminger; +Cc: David Miller, netdev At Thu, 3 Dec 2009 16:35:14 -0800, Stephen Hemminger wrote: > > On Thu, 03 Dec 2009 16:07:19 -0800 (PST) > David Miller <davem@davemloft.net> wrote: > > > From: Takashi Iwai <tiwai@suse.de> > > Date: Thu, 3 Dec 2009 16:12:00 +0100 > > > > > here are two small patches to fix the bugs found on sky2 Yukon-2 > > > Optima chip. These are for the latest net-next kernel. Would be > > > nice if they come in for 2.6.33. > > > > Please always CC: the driver maintainer when submitting changes > > to a driver. > > > > Stephen, please have a look at these, thanks. > > I have hardware in a box, that I plan to test these on tonight. Thanks. Let me know if you need any tests. Takashi (who still needs to get used to git send-email... :) ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip 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-09 19:35 ` Stephen Hemminger 2009-12-11 22:54 ` David Miller 1 sibling, 1 reply; 9+ messages in thread From: Stephen Hemminger @ 2009-12-09 19:35 UTC (permalink / raw) To: David Miller; +Cc: tiwai, netdev On Thu, 03 Dec 2009 16:07:19 -0800 (PST) David Miller <davem@davemloft.net> wrote: > From: Takashi Iwai <tiwai@suse.de> > Date: Thu, 3 Dec 2009 16:12:00 +0100 > > > here are two small patches to fix the bugs found on sky2 Yukon-2 > > Optima chip. These are for the latest net-next kernel. Would be > > nice if they come in for 2.6.33. > > Please always CC: the driver maintainer when submitting changes > to a driver. > > Stephen, please have a look at these, thanks. Apply them, if anything comes up the fix can go on top of these -- ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip 2009-12-09 19:35 ` Stephen Hemminger @ 2009-12-11 22:54 ` David Miller 0 siblings, 0 replies; 9+ messages in thread From: David Miller @ 2009-12-11 22:54 UTC (permalink / raw) To: shemminger; +Cc: tiwai, netdev From: Stephen Hemminger <shemminger@vyatta.com> Date: Wed, 9 Dec 2009 11:35:22 -0800 > On Thu, 03 Dec 2009 16:07:19 -0800 (PST) > David Miller <davem@davemloft.net> wrote: > >> From: Takashi Iwai <tiwai@suse.de> >> Date: Thu, 3 Dec 2009 16:12:00 +0100 >> >> > here are two small patches to fix the bugs found on sky2 Yukon-2 >> > Optima chip. These are for the latest net-next kernel. Would be >> > nice if they come in for 2.6.33. >> >> Please always CC: the driver maintainer when submitting changes >> to a driver. >> >> Stephen, please have a look at these, thanks. > > Apply them, if anything comes up the fix can go on top of these Ok, done. Thanks! ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-12-11 22:54 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 ` [PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write Takashi Iwai 2009-12-09 4:16 ` [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup 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
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).