| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 20 Mar 2019 15:35:34 -0700
From: Scott Branden <scott.branden@...adcom.com>
To: Florian Fainelli <f.fainelli@...il.com>, netdev@...r.kernel.org
Cc: Andrew Lunn <andrew@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
open list <linux-kernel@...r.kernel.org>, hkallweit1@...il.com,
bcm-kernel-feedback-list@...adcom.com,
murali.policharla@...adcom.com, arun.parameswaran@...adcom.com
Subject: Re: [PATCH net-next 2/2] net: phy: Move Omega PHY entry to Cygnus PHY
driver
Thanks Florian.
On 2019-03-20 12:53 p.m., Florian Fainelli wrote:
> Cygnus and Omega are part of the same business unit and product line, it
> makes sense to group PHY entries by products such that a platform can
> select only the drivers that it needs. Bring all the functionality that
> the BCM7XXX_28NM_GPHY() macro hides for us and remove the Omega PHY
> entry from bcm7xxx.c.
>
> As an added bonus, we now have a proper mdio_device_id entry to permit
> auto-loading.
>
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
Reviewed-by: Scott Branden <scott.branden@...adcom.com>
> ---
> drivers/net/phy/Kconfig | 5 +-
> drivers/net/phy/bcm-cygnus.c | 147 ++++++++++++++++++++++++++++++++++-
> drivers/net/phy/bcm7xxx.c | 1 -
> 3 files changed, 149 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
> index 071869db44cf..0973f0b81ce4 100644
> --- a/drivers/net/phy/Kconfig
> +++ b/drivers/net/phy/Kconfig
> @@ -271,12 +271,13 @@ config BCM87XX_PHY
>
> config BCM_CYGNUS_PHY
> tristate "Broadcom Cygnus SoC internal PHY"
> - depends on ARCH_BCM_CYGNUS || COMPILE_TEST
> + depends on ARCH_BCM_IPROC || COMPILE_TEST
> depends on MDIO_BCM_IPROC
> + tristate "Broadcom Cygnus/Omega SoC internal PHY"
> select BCM_NET_PHYLIB
> ---help---
> This PHY driver is for the 1G internal PHYs of the Broadcom
> - Cygnus Family SoC.
> + Cygnus and Omega Family SoC.
>
> Currently supports internal PHY's used in the BCM11300,
> BCM11320, BCM11350, BCM11360, BCM58300, BCM58302,
> diff --git a/drivers/net/phy/bcm-cygnus.c b/drivers/net/phy/bcm-cygnus.c
> index ab8e12922bf9..625b7cb76285 100644
> --- a/drivers/net/phy/bcm-cygnus.c
> +++ b/drivers/net/phy/bcm-cygnus.c
> @@ -10,6 +10,10 @@
> #include <linux/netdevice.h>
> #include <linux/phy.h>
>
> +struct bcm_omega_phy_priv {
> + u64 *stats;
> +};
> +
> /* Broadcom Cygnus Phy specific registers */
> #define MII_BCM_CYGNUS_AFE_VDAC_ICTRL_0 0x91E5 /* VDAL Control register */
>
> @@ -121,6 +125,130 @@ static int bcm_cygnus_resume(struct phy_device *phydev)
> return genphy_config_aneg(phydev);
> }
>
> +static int bcm_omega_config_init(struct phy_device *phydev)
> +{
> + u8 count, rev;
> + int ret = 0;
> +
> + rev = phydev->phy_id & ~phydev->drv->phy_id_mask;
> +
> + pr_info_once("%s: %s PHY revision: 0x%02x\n",
> + phydev_name(phydev), phydev->drv->name, rev);
> +
> + /* Dummy read to a register to workaround an issue upon reset where the
> + * internal inverter may not allow the first MDIO transaction to pass
> + * the MDIO management controller and make us return 0xffff for such
> + * reads.
> + */
> + phy_read(phydev, MII_BMSR);
> +
> + switch (rev) {
> + case 0x00:
> + ret = bcm_phy_28nm_a0b0_afe_config_init(phydev);
> + break;
> + default:
> + break;
> + }
> +
> + if (ret)
> + return ret;
> +
> + ret = bcm_phy_downshift_get(phydev, &count);
> + if (ret)
> + return ret;
> +
> + /* Only enable EEE if Wirespeed/downshift is disabled */
> + ret = bcm_phy_set_eee(phydev, count == DOWNSHIFT_DEV_DISABLE);
> + if (ret)
> + return ret;
> +
> + return bcm_phy_enable_apd(phydev, true);
> +}
> +
> +static int bcm_omega_resume(struct phy_device *phydev)
> +{
> + int ret;
> +
> + /* Re-apply workarounds coming out suspend/resume */
> + ret = bcm_omega_config_init(phydev);
> + if (ret)
> + return ret;
> +
> + /* 28nm Gigabit PHYs come out of reset without any half-duplex
> + * or "hub" compliant advertised mode, fix that. This does not
> + * cause any problems with the PHY library since genphy_config_aneg()
> + * gracefully handles auto-negotiated and forced modes.
> + */
> + return genphy_config_aneg(phydev);
> +}
> +
> +static int bcm_omega_get_tunable(struct phy_device *phydev,
> + struct ethtool_tunable *tuna, void *data)
> +{
> + switch (tuna->id) {
> + case ETHTOOL_PHY_DOWNSHIFT:
> + return bcm_phy_downshift_get(phydev, (u8 *)data);
> + default:
> + return -EOPNOTSUPP;
> + }
> +}
> +
> +static int bcm_omega_set_tunable(struct phy_device *phydev,
> + struct ethtool_tunable *tuna,
> + const void *data)
> +{
> + u8 count = *(u8 *)data;
> + int ret;
> +
> + switch (tuna->id) {
> + case ETHTOOL_PHY_DOWNSHIFT:
> + ret = bcm_phy_downshift_set(phydev, count);
> + break;
> + default:
> + return -EOPNOTSUPP;
> + }
> +
> + if (ret)
> + return ret;
> +
> + /* Disable EEE advertisement since this prevents the PHY
> + * from successfully linking up, trigger auto-negotiation restart
> + * to let the MAC decide what to do.
> + */
> + ret = bcm_phy_set_eee(phydev, count == DOWNSHIFT_DEV_DISABLE);
> + if (ret)
> + return ret;
> +
> + return genphy_restart_aneg(phydev);
> +}
> +
> +static void bcm_omega_get_phy_stats(struct phy_device *phydev,
> + struct ethtool_stats *stats, u64 *data)
> +{
> + struct bcm_omega_phy_priv *priv = phydev->priv;
> +
> + bcm_phy_get_stats(phydev, priv->stats, stats, data);
> +}
> +
> +static int bcm_omega_probe(struct phy_device *phydev)
> +{
> + struct bcm_omega_phy_priv *priv;
> +
> + priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + phydev->priv = priv;
> +
> + priv->stats = devm_kcalloc(&phydev->mdio.dev,
> + bcm_phy_get_sset_count(phydev), sizeof(u64),
> + GFP_KERNEL);
> + if (!priv->stats)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> static struct phy_driver bcm_cygnus_phy_driver[] = {
> {
> .phy_id = PHY_ID_BCM_CYGNUS,
> @@ -132,10 +260,27 @@ static struct phy_driver bcm_cygnus_phy_driver[] = {
> .config_intr = bcm_phy_config_intr,
> .suspend = genphy_suspend,
> .resume = bcm_cygnus_resume,
> -} };
> +}, {
> + .phy_id = PHY_ID_BCM_OMEGA,
> + .phy_id_mask = 0xfffffff0,
> + .name = "Broadcom Omega Combo GPHY",
> + .features = PHY_GBIT_FEATURES,
> + .flags = PHY_IS_INTERNAL,
> + .config_init = bcm_omega_config_init,
> + .suspend = genphy_suspend,
> + .resume = bcm_omega_resume,
> + .get_tunable = bcm_omega_get_tunable,
> + .set_tunable = bcm_omega_set_tunable,
> + .get_sset_count = bcm_phy_get_sset_count,
> + .get_strings = bcm_phy_get_strings,
> + .get_stats = bcm_omega_get_phy_stats,
> + .probe = bcm_omega_probe,
> +}
> +};
>
> static struct mdio_device_id __maybe_unused bcm_cygnus_phy_tbl[] = {
> { PHY_ID_BCM_CYGNUS, 0xfffffff0, },
> + { PHY_ID_BCM_OMEGA, 0xfffffff0, },
> { }
> };
> MODULE_DEVICE_TABLE(mdio, bcm_cygnus_phy_tbl);
> diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
> index dddeffa23aa1..a75e1b283541 100644
> --- a/drivers/net/phy/bcm7xxx.c
> +++ b/drivers/net/phy/bcm7xxx.c
> @@ -590,7 +590,6 @@ static struct phy_driver bcm7xxx_driver[] = {
> BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
> BCM7XXX_28NM_GPHY(PHY_ID_BCM7439_2, "Broadcom BCM7439 (2)"),
> BCM7XXX_28NM_GPHY(PHY_ID_BCM7445, "Broadcom BCM7445"),
> - BCM7XXX_28NM_GPHY(PHY_ID_BCM_OMEGA, "Broadcom Omega Combo GPHY"),
> BCM7XXX_40NM_EPHY(PHY_ID_BCM7346, "Broadcom BCM7346"),
> BCM7XXX_40NM_EPHY(PHY_ID_BCM7362, "Broadcom BCM7362"),
> BCM7XXX_40NM_EPHY(PHY_ID_BCM7425, "Broadcom BCM7425"),
Powered by blists - more mailing lists