Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
On Thu, Oct 01, 2015 at 06:22:22PM -0700, David Miller wrote: > From: Ben Hutchings > Date: Fri, 02 Oct 2015 01:47:23 +0100 > > > On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: > >> 4.1-stable review patch. If anyone has any objections, please let me > >> know. > >> > >> -- > >> > >> From: Florian Fainelli > >> > >> [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, > >> will be pushed to Linus very soon. ] > > [...] > > > > Patches 22-25 are all in 4.3-rc3, so perhaps you should change these > > comments to match the real status? > > Greg et al. can feel free to do this :-) Bah, that's too much work, I'll just leave it as-is for now :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
On Thu, Oct 01, 2015 at 06:22:22PM -0700, David Miller wrote: > From: Ben Hutchings> Date: Fri, 02 Oct 2015 01:47:23 +0100 > > > On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: > >> 4.1-stable review patch. If anyone has any objections, please let me > >> know. > >> > >> -- > >> > >> From: Florian Fainelli > >> > >> [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, > >> will be pushed to Linus very soon. ] > > [...] > > > > Patches 22-25 are all in 4.3-rc3, so perhaps you should change these > > comments to match the real status? > > Greg et al. can feel free to do this :-) Bah, that's too much work, I'll just leave it as-is for now :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
From: Ben Hutchings Date: Fri, 02 Oct 2015 01:47:23 +0100 > On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: >> 4.1-stable review patch. If anyone has any objections, please let me >> know. >> >> -- >> >> From: Florian Fainelli >> >> [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, >> will be pushed to Linus very soon. ] > [...] > > Patches 22-25 are all in 4.3-rc3, so perhaps you should change these > comments to match the real status? Greg et al. can feel free to do this :-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: > 4.1-stable review patch. If anyone has any objections, please let me > know. > > -- > > From: Florian Fainelli > > [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, > will be pushed to Linus very soon. ] [...] Patches 22-25 are all in 4.3-rc3, so perhaps you should change these comments to match the real status? Ben. -- Ben Hutchings When in doubt, use brute force. - Ken Thompson signature.asc Description: This is a digitally signed message part
[PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
4.1-stable review patch. If anyone has any objections, please let me know. -- From: Florian Fainelli [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, will be pushed to Linus very soon. ] The SF2 driver currently overrides speed settings for its port configured using a fixed PHY, this is both unnecessary and incorrect, because we keep feedback to the hardware parameters that we read from the PHY device, which in the case of a fixed PHY cannot possibly change speed. This is a required change to allow the fixed PHY code to allow registering a PHY with a link configured as DOWN by default and avoid some sort of circular dependency where we require the link_update callback to run to program the hardware, and we then utilize the fixed PHY parameters to program the hardware with the same settings. Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/bcm_sf2.c | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -893,15 +893,11 @@ static void bcm_sf2_sw_fixed_link_update struct fixed_phy_status *status) { struct bcm_sf2_priv *priv = ds_to_priv(ds); - u32 duplex, pause, speed; + u32 duplex, pause; u32 reg; duplex = core_readl(priv, CORE_DUPSTS); pause = core_readl(priv, CORE_PAUSESTS); - speed = core_readl(priv, CORE_SPDSTS); - - speed >>= (port * SPDSTS_SHIFT); - speed &= SPDSTS_MASK; status->link = 0; @@ -929,18 +925,6 @@ static void bcm_sf2_sw_fixed_link_update reg &= ~LINK_STS; core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); - switch (speed) { - case SPDSTS_10: - status->speed = SPEED_10; - break; - case SPDSTS_100: - status->speed = SPEED_100; - break; - case SPDSTS_1000: - status->speed = SPEED_1000; - break; - } - if ((pause & (1 << port)) && (pause & (1 << (port + PAUSESTS_TX_PAUSE_SHIFT { status->asym_pause = 1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: > 4.1-stable review patch. If anyone has any objections, please let me > know. > > -- > > From: Florian Fainelli> > [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, > will be pushed to Linus very soon. ] [...] Patches 22-25 are all in 4.3-rc3, so perhaps you should change these comments to match the real status? Ben. -- Ben Hutchings When in doubt, use brute force. - Ken Thompson signature.asc Description: This is a digitally signed message part
Re: [PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
From: Ben HutchingsDate: Fri, 02 Oct 2015 01:47:23 +0100 > On Thu, 2015-10-01 at 11:31 +0200, Greg Kroah-Hartman wrote: >> 4.1-stable review patch. If anyone has any objections, please let me >> know. >> >> -- >> >> From: Florian Fainelli >> >> [ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, >> will be pushed to Linus very soon. ] > [...] > > Patches 22-25 are all in 4.3-rc3, so perhaps you should change these > comments to match the real status? Greg et al. can feel free to do this :-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 4.1 22/29] net: dsa: bcm_sf2: Do not override speed settings
4.1-stable review patch. If anyone has any objections, please let me know. -- From: Florian Fainelli[ Upstream d2eac98f7d1b950b762a7eca05a9ce0ea1d878d2 in net-next tree, will be pushed to Linus very soon. ] The SF2 driver currently overrides speed settings for its port configured using a fixed PHY, this is both unnecessary and incorrect, because we keep feedback to the hardware parameters that we read from the PHY device, which in the case of a fixed PHY cannot possibly change speed. This is a required change to allow the fixed PHY code to allow registering a PHY with a link configured as DOWN by default and avoid some sort of circular dependency where we require the link_update callback to run to program the hardware, and we then utilize the fixed PHY parameters to program the hardware with the same settings. Fixes: 246d7f773c13 ("net: dsa: add Broadcom SF2 switch driver") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/bcm_sf2.c | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -893,15 +893,11 @@ static void bcm_sf2_sw_fixed_link_update struct fixed_phy_status *status) { struct bcm_sf2_priv *priv = ds_to_priv(ds); - u32 duplex, pause, speed; + u32 duplex, pause; u32 reg; duplex = core_readl(priv, CORE_DUPSTS); pause = core_readl(priv, CORE_PAUSESTS); - speed = core_readl(priv, CORE_SPDSTS); - - speed >>= (port * SPDSTS_SHIFT); - speed &= SPDSTS_MASK; status->link = 0; @@ -929,18 +925,6 @@ static void bcm_sf2_sw_fixed_link_update reg &= ~LINK_STS; core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); - switch (speed) { - case SPDSTS_10: - status->speed = SPEED_10; - break; - case SPDSTS_100: - status->speed = SPEED_100; - break; - case SPDSTS_1000: - status->speed = SPEED_1000; - break; - } - if ((pause & (1 << port)) && (pause & (1 << (port + PAUSESTS_TX_PAUSE_SHIFT { status->asym_pause = 1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/