[PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[Takashi Iwai]

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

[PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup

[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

[PATCH 2/2] net: Add missing TST_CFG_WRITE bits around sky2_pci_write

[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

Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[David Miller]

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.

Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[Stephen Hemminger]

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.


-- 

Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[Takashi Iwai]

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... :)

Re: [PATCH 1/2] net: Fix Yukon-2 Optima TCP offload setup

[David Miller]

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.

Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[Stephen Hemminger]

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

-- 

Re: [PATCH 0/2] Small fixes for sky2 Yukon-2 Optima chip

[David Miller]

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!