From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755548AbcJZVur (ORCPT ); Wed, 26 Oct 2016 17:50:47 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33543 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755365AbcJZVun (ORCPT ); Wed, 26 Oct 2016 17:50:43 -0400 Subject: Re: [PATCH 4/5] net: ethernet: bgmac: add NS2 support To: Jon Mason , David Miller , Rob Herring , Mark Rutland References: <1477510561-17035-1-git-send-email-jon.mason@broadcom.com> <1477510561-17035-5-git-send-email-jon.mason@broadcom.com> Cc: rafal@milecki.pl, bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org From: Florian Fainelli Message-ID: Date: Wed, 26 Oct 2016 14:50:39 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1477510561-17035-5-git-send-email-jon.mason@broadcom.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/26/2016 12:36 PM, Jon Mason wrote: > Add support for the variant of amac hardware present in the Broadcom > Northstar2 based SoCs. Northstar2 requires an additional register to be > configured with the port speed/duplexity (NICPM). This can be added to > the link callback to hide it from the instances that do not use this. > Also, the bgmac_chip_reset() was intentionally removed to prevent the > resetting of the chip to the default values on open. Finally, clearing > of the pending interrupts on init is required due to observed issues on > some platforms. > > Signed-off-by: Jon Mason > --- > +static void bgmac_nicpm_speed_set(struct net_device *net_dev) > +{ > + struct bgmac *bgmac = netdev_priv(net_dev); > + u32 val; > + > + if (!bgmac->plat.nicpm_base) > + return; > + > + val = NICPM_IOMUX_CTRL_INIT_VAL; > + switch (bgmac->net_dev->phydev->speed) { > + default: > + pr_err("Unsupported speed. Defaulting to 1000Mb\n"); > + case SPEED_1000: > + val |= NICPM_IOMUX_CTRL_SPD_1000M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_100: > + val |= NICPM_IOMUX_CTRL_SPD_100M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_10: > + val |= NICPM_IOMUX_CTRL_SPD_10M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + } > + > + writel(val, bgmac->plat.nicpm_base + NICPM_IOMUX_CTRL); > + > + usleep_range(10, 100); Does not seem like a good idea, do you need that sleep? > + > + bgmac_adjust_link(bgmac->net_dev); > +} > + > static int platform_phy_connect(struct bgmac *bgmac) > { > struct phy_device *phy_dev; > > - phy_dev = of_phy_get_and_connect(bgmac->net_dev, bgmac->dev->of_node, > - bgmac_adjust_link); > + if (bgmac->plat.nicpm_base) > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_nicpm_speed_set); > + else > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_adjust_link); > if (!phy_dev) { > dev_err(bgmac->dev, "Phy connect failed\n"); > return -ENODEV; > } > > + if (bgmac->feature_flags & BGMAC_FEAT_LANE_SWAP) > + phy_dev->dev_flags |= PHY_BRCM_EXP_LANE_SWAP; > + > return 0; > } > > @@ -140,6 +188,9 @@ static int bgmac_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, bgmac); > > + if (of_property_read_bool(np, "brcm,enet-phy-lane-swap")) > + bgmac->feature_flags |= BGMAC_FEAT_LANE_SWAP; > + > /* Set the features of the 4707 family */ > bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; > bgmac->feature_flags |= BGMAC_FEAT_NO_RESET; > @@ -182,6 +233,14 @@ static int bgmac_probe(struct platform_device *pdev) > if (IS_ERR(bgmac->plat.idm_base)) > return PTR_ERR(bgmac->plat.idm_base); > > + regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base"); > + if (regs) { > + bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev, > + regs); > + if (IS_ERR(bgmac->plat.nicpm_base)) > + return PTR_ERR(bgmac->plat.nicpm_base); > + } > + > bgmac->read = platform_bgmac_read; > bgmac->write = platform_bgmac_write; > bgmac->idm_read = platform_bgmac_idm_read; > @@ -213,6 +272,7 @@ static int bgmac_remove(struct platform_device *pdev) > static const struct of_device_id bgmac_of_enet_match[] = { > {.compatible = "brcm,amac",}, > {.compatible = "brcm,nsp-amac",}, > + {.compatible = "brcm,ns2-amac",}, > {}, > }; > > diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c > index 38876ec..1796208 100644 > --- a/drivers/net/ethernet/broadcom/bgmac.c > +++ b/drivers/net/ethernet/broadcom/bgmac.c > @@ -1082,6 +1082,9 @@ static void bgmac_enable(struct bgmac *bgmac) > /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */ > static void bgmac_chip_init(struct bgmac *bgmac) > { > + /* Clear any erroneously pending interrupts */ > + bgmac_write(bgmac, BGMAC_INT_STATUS, ~0); > + > /* 1 interrupt per received frame */ > bgmac_write(bgmac, BGMAC_INT_RECV_LAZY, 1 << BGMAC_IRL_FC_SHIFT); > > @@ -1158,8 +1161,6 @@ static int bgmac_open(struct net_device *net_dev) > struct bgmac *bgmac = netdev_priv(net_dev); > int err = 0; > > - bgmac_chip_reset(bgmac); > - Is this removal intentional? Maybe it should be special cased with checking for a NS2 BGMAC instance and not do it in that case? -- Florian From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: Re: [PATCH 4/5] net: ethernet: bgmac: add NS2 support Date: Wed, 26 Oct 2016 14:50:39 -0700 Message-ID: References: <1477510561-17035-1-git-send-email-jon.mason@broadcom.com> <1477510561-17035-5-git-send-email-jon.mason@broadcom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: rafal-g1n6cQUeyibVItvQsEIGlw@public.gmane.org, bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jon Mason , David Miller , Rob Herring , Mark Rutland Return-path: In-Reply-To: <1477510561-17035-5-git-send-email-jon.mason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org On 10/26/2016 12:36 PM, Jon Mason wrote: > Add support for the variant of amac hardware present in the Broadcom > Northstar2 based SoCs. Northstar2 requires an additional register to be > configured with the port speed/duplexity (NICPM). This can be added to > the link callback to hide it from the instances that do not use this. > Also, the bgmac_chip_reset() was intentionally removed to prevent the > resetting of the chip to the default values on open. Finally, clearing > of the pending interrupts on init is required due to observed issues on > some platforms. > > Signed-off-by: Jon Mason > --- > +static void bgmac_nicpm_speed_set(struct net_device *net_dev) > +{ > + struct bgmac *bgmac = netdev_priv(net_dev); > + u32 val; > + > + if (!bgmac->plat.nicpm_base) > + return; > + > + val = NICPM_IOMUX_CTRL_INIT_VAL; > + switch (bgmac->net_dev->phydev->speed) { > + default: > + pr_err("Unsupported speed. Defaulting to 1000Mb\n"); > + case SPEED_1000: > + val |= NICPM_IOMUX_CTRL_SPD_1000M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_100: > + val |= NICPM_IOMUX_CTRL_SPD_100M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_10: > + val |= NICPM_IOMUX_CTRL_SPD_10M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + } > + > + writel(val, bgmac->plat.nicpm_base + NICPM_IOMUX_CTRL); > + > + usleep_range(10, 100); Does not seem like a good idea, do you need that sleep? > + > + bgmac_adjust_link(bgmac->net_dev); > +} > + > static int platform_phy_connect(struct bgmac *bgmac) > { > struct phy_device *phy_dev; > > - phy_dev = of_phy_get_and_connect(bgmac->net_dev, bgmac->dev->of_node, > - bgmac_adjust_link); > + if (bgmac->plat.nicpm_base) > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_nicpm_speed_set); > + else > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_adjust_link); > if (!phy_dev) { > dev_err(bgmac->dev, "Phy connect failed\n"); > return -ENODEV; > } > > + if (bgmac->feature_flags & BGMAC_FEAT_LANE_SWAP) > + phy_dev->dev_flags |= PHY_BRCM_EXP_LANE_SWAP; > + > return 0; > } > > @@ -140,6 +188,9 @@ static int bgmac_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, bgmac); > > + if (of_property_read_bool(np, "brcm,enet-phy-lane-swap")) > + bgmac->feature_flags |= BGMAC_FEAT_LANE_SWAP; > + > /* Set the features of the 4707 family */ > bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; > bgmac->feature_flags |= BGMAC_FEAT_NO_RESET; > @@ -182,6 +233,14 @@ static int bgmac_probe(struct platform_device *pdev) > if (IS_ERR(bgmac->plat.idm_base)) > return PTR_ERR(bgmac->plat.idm_base); > > + regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base"); > + if (regs) { > + bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev, > + regs); > + if (IS_ERR(bgmac->plat.nicpm_base)) > + return PTR_ERR(bgmac->plat.nicpm_base); > + } > + > bgmac->read = platform_bgmac_read; > bgmac->write = platform_bgmac_write; > bgmac->idm_read = platform_bgmac_idm_read; > @@ -213,6 +272,7 @@ static int bgmac_remove(struct platform_device *pdev) > static const struct of_device_id bgmac_of_enet_match[] = { > {.compatible = "brcm,amac",}, > {.compatible = "brcm,nsp-amac",}, > + {.compatible = "brcm,ns2-amac",}, > {}, > }; > > diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c > index 38876ec..1796208 100644 > --- a/drivers/net/ethernet/broadcom/bgmac.c > +++ b/drivers/net/ethernet/broadcom/bgmac.c > @@ -1082,6 +1082,9 @@ static void bgmac_enable(struct bgmac *bgmac) > /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */ > static void bgmac_chip_init(struct bgmac *bgmac) > { > + /* Clear any erroneously pending interrupts */ > + bgmac_write(bgmac, BGMAC_INT_STATUS, ~0); > + > /* 1 interrupt per received frame */ > bgmac_write(bgmac, BGMAC_INT_RECV_LAZY, 1 << BGMAC_IRL_FC_SHIFT); > > @@ -1158,8 +1161,6 @@ static int bgmac_open(struct net_device *net_dev) > struct bgmac *bgmac = netdev_priv(net_dev); > int err = 0; > > - bgmac_chip_reset(bgmac); > - Is this removal intentional? Maybe it should be special cased with checking for a NS2 BGMAC instance and not do it in that case? -- Florian -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: f.fainelli@gmail.com (Florian Fainelli) Date: Wed, 26 Oct 2016 14:50:39 -0700 Subject: [PATCH 4/5] net: ethernet: bgmac: add NS2 support In-Reply-To: <1477510561-17035-5-git-send-email-jon.mason@broadcom.com> References: <1477510561-17035-1-git-send-email-jon.mason@broadcom.com> <1477510561-17035-5-git-send-email-jon.mason@broadcom.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 10/26/2016 12:36 PM, Jon Mason wrote: > Add support for the variant of amac hardware present in the Broadcom > Northstar2 based SoCs. Northstar2 requires an additional register to be > configured with the port speed/duplexity (NICPM). This can be added to > the link callback to hide it from the instances that do not use this. > Also, the bgmac_chip_reset() was intentionally removed to prevent the > resetting of the chip to the default values on open. Finally, clearing > of the pending interrupts on init is required due to observed issues on > some platforms. > > Signed-off-by: Jon Mason > --- > +static void bgmac_nicpm_speed_set(struct net_device *net_dev) > +{ > + struct bgmac *bgmac = netdev_priv(net_dev); > + u32 val; > + > + if (!bgmac->plat.nicpm_base) > + return; > + > + val = NICPM_IOMUX_CTRL_INIT_VAL; > + switch (bgmac->net_dev->phydev->speed) { > + default: > + pr_err("Unsupported speed. Defaulting to 1000Mb\n"); > + case SPEED_1000: > + val |= NICPM_IOMUX_CTRL_SPD_1000M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_100: > + val |= NICPM_IOMUX_CTRL_SPD_100M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + case SPEED_10: > + val |= NICPM_IOMUX_CTRL_SPD_10M << NICPM_IOMUX_CTRL_SPD_SHIFT; > + break; > + } > + > + writel(val, bgmac->plat.nicpm_base + NICPM_IOMUX_CTRL); > + > + usleep_range(10, 100); Does not seem like a good idea, do you need that sleep? > + > + bgmac_adjust_link(bgmac->net_dev); > +} > + > static int platform_phy_connect(struct bgmac *bgmac) > { > struct phy_device *phy_dev; > > - phy_dev = of_phy_get_and_connect(bgmac->net_dev, bgmac->dev->of_node, > - bgmac_adjust_link); > + if (bgmac->plat.nicpm_base) > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_nicpm_speed_set); > + else > + phy_dev = of_phy_get_and_connect(bgmac->net_dev, > + bgmac->dev->of_node, > + bgmac_adjust_link); > if (!phy_dev) { > dev_err(bgmac->dev, "Phy connect failed\n"); > return -ENODEV; > } > > + if (bgmac->feature_flags & BGMAC_FEAT_LANE_SWAP) > + phy_dev->dev_flags |= PHY_BRCM_EXP_LANE_SWAP; > + > return 0; > } > > @@ -140,6 +188,9 @@ static int bgmac_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, bgmac); > > + if (of_property_read_bool(np, "brcm,enet-phy-lane-swap")) > + bgmac->feature_flags |= BGMAC_FEAT_LANE_SWAP; > + > /* Set the features of the 4707 family */ > bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; > bgmac->feature_flags |= BGMAC_FEAT_NO_RESET; > @@ -182,6 +233,14 @@ static int bgmac_probe(struct platform_device *pdev) > if (IS_ERR(bgmac->plat.idm_base)) > return PTR_ERR(bgmac->plat.idm_base); > > + regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base"); > + if (regs) { > + bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev, > + regs); > + if (IS_ERR(bgmac->plat.nicpm_base)) > + return PTR_ERR(bgmac->plat.nicpm_base); > + } > + > bgmac->read = platform_bgmac_read; > bgmac->write = platform_bgmac_write; > bgmac->idm_read = platform_bgmac_idm_read; > @@ -213,6 +272,7 @@ static int bgmac_remove(struct platform_device *pdev) > static const struct of_device_id bgmac_of_enet_match[] = { > {.compatible = "brcm,amac",}, > {.compatible = "brcm,nsp-amac",}, > + {.compatible = "brcm,ns2-amac",}, > {}, > }; > > diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c > index 38876ec..1796208 100644 > --- a/drivers/net/ethernet/broadcom/bgmac.c > +++ b/drivers/net/ethernet/broadcom/bgmac.c > @@ -1082,6 +1082,9 @@ static void bgmac_enable(struct bgmac *bgmac) > /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipinit */ > static void bgmac_chip_init(struct bgmac *bgmac) > { > + /* Clear any erroneously pending interrupts */ > + bgmac_write(bgmac, BGMAC_INT_STATUS, ~0); > + > /* 1 interrupt per received frame */ > bgmac_write(bgmac, BGMAC_INT_RECV_LAZY, 1 << BGMAC_IRL_FC_SHIFT); > > @@ -1158,8 +1161,6 @@ static int bgmac_open(struct net_device *net_dev) > struct bgmac *bgmac = netdev_priv(net_dev); > int err = 0; > > - bgmac_chip_reset(bgmac); > - Is this removal intentional? Maybe it should be special cased with checking for a NS2 BGMAC instance and not do it in that case? -- Florian