Message ID | 20090130034810.GC15266@solarflare.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Ben Hutchings <bhutchings@solarflare.com> Date: Fri, 30 Jan 2009 03:48:10 +0000 > From: Steve Hodgson <shodgson@solarflare.com> > > Enable a firmware option that appears to be necessary for reliable > operation. > > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> I applied all of these patches but: 1) When you get changes written by other people, such as Steve Hodgson here and in the next few patches, you need to get Signed-off-by lines from them too. 2) Outside of the merge window I do not want to see totally irrelevant stuff like PHY loopback fixes. Those kinds of fixes are totally inappropriate at this time. You have been warned :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Ben Hutchings <bhutchings@solarflare.com> Date: Sat, 31 Jan 2009 00:04:15 +0000 > On Fri, 2009-01-30 at 14:09 -0800, David Miller wrote: > > From: Ben Hutchings <bhutchings@solarflare.com> > > Date: Fri, 30 Jan 2009 03:48:10 +0000 > > > > > From: Steve Hodgson <shodgson@solarflare.com> > > > > > > Enable a firmware option that appears to be necessary for reliable > > > operation. > > > > > > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> > > > > I applied all of these patches but: > > > > 1) When you get changes written by other people, such as > > Steve Hodgson here and in the next few patches, you need > > to get Signed-off-by lines from them too. > > I have been attributing changes to my colleagues for some time and never > heard this. In any case the copyright lies with my employer and I am > authorised to release these changes; isn't that what my initial sign- > off means? Sure, but it is even more meaningful if the person who actually wrote the changes signs off on it too. > > 2) Outside of the merge window I do not want to see totally > > irrelevant stuff like PHY loopback fixes. > > > > Those kinds of fixes are totally inappropriate at this time. > > Are you saying that a spurious self-test failure is not a serious bug? Normal users will not run the self-test giblet, and it has not been reported as a 2.6.29 regression on lkml. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2009-01-30 at 14:09 -0800, David Miller wrote: > From: Ben Hutchings <bhutchings@solarflare.com> > Date: Fri, 30 Jan 2009 03:48:10 +0000 > > > From: Steve Hodgson <shodgson@solarflare.com> > > > > Enable a firmware option that appears to be necessary for reliable > > operation. > > > > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> > > I applied all of these patches but: > > 1) When you get changes written by other people, such as > Steve Hodgson here and in the next few patches, you need > to get Signed-off-by lines from them too. I have been attributing changes to my colleagues for some time and never heard this. In any case the copyright lies with my employer and I am authorised to release these changes; isn't that what my initial sign- off means? > 2) Outside of the merge window I do not want to see totally > irrelevant stuff like PHY loopback fixes. > > Those kinds of fixes are totally inappropriate at this time. Are you saying that a spurious self-test failure is not a serious bug? > You have been warned :-) Ben.
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index 9ecb77d..19cfc31 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c @@ -67,6 +67,8 @@ #define PMA_PMD_EXT_CLK312_WIDTH 1 #define PMA_PMD_EXT_LPOWER_LBN 12 #define PMA_PMD_EXT_LPOWER_WIDTH 1 +#define PMA_PMD_EXT_ROBUST_LBN 14 +#define PMA_PMD_EXT_ROBUST_WIDTH 1 #define PMA_PMD_EXT_SSR_LBN 15 #define PMA_PMD_EXT_SSR_WIDTH 1 @@ -284,7 +286,9 @@ static int tenxpress_init(struct efx_nic *efx) PMA_PMD_XCONTROL_REG); reg |= ((1 << PMA_PMD_EXT_GMII_EN_LBN) | (1 << PMA_PMD_EXT_CLK_OUT_LBN) | - (1 << PMA_PMD_EXT_CLK312_LBN)); + (1 << PMA_PMD_EXT_CLK312_LBN) | + (1 << PMA_PMD_EXT_ROBUST_LBN)); + mdio_clause45_write(efx, phy_id, MDIO_MMD_PMAPMD, PMA_PMD_XCONTROL_REG, reg); mdio_clause45_set_flag(efx, phy_id, MDIO_MMD_C22EXT,