| Message ID | 20210324165023.32352-6-kabel@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phy: marvell10g updates | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: linux@armlinux.org.uk |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 25 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Mar 24, 2021 at 05:50:21PM +0100, Marek Behún wrote: > Save MACTYPE instead of rate_matching boolean. We will need this for > other configurations. This could lead us to having to test for multiple different mactype values depending on the PHY type in mv3310_update_interface() which is something I wanted to avoid.
On Wed, 24 Mar 2021 16:59:46 +0000 Russell King - ARM Linux admin <linux@armlinux.org.uk> wrote: > On Wed, Mar 24, 2021 at 05:50:21PM +0100, Marek Behún wrote: > > Save MACTYPE instead of rate_matching boolean. We will need this for > > other configurations. > > This could lead us to having to test for multiple different mactype > values depending on the PHY type in mv3310_update_interface() which > is something I wanted to avoid. > This is currently done in patches 6/7 and 7/7... Either we do this this way, or we save both members bool rate_matching; phy_interface_t interface10g; in order not to do this always in mv3310_update_interface(). I guess I am going to change it. Marek
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 46e853f2d41b..b4f9831b4db6 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -100,7 +100,7 @@ enum { struct mv3310_priv { u32 firmware_ver; - bool rate_match; + u8 mactype; struct device *hwmon_dev; char *hwmon_name; @@ -486,8 +486,7 @@ static int mv3310_config_init(struct phy_device *phydev) val = phy_read_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL); if (val < 0) return val; - priv->rate_match = ((val & MV_V2_PORT_CTRL_MACTYPE_MASK) == - MV_V2_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH); + priv->mactype = val & MV_V2_PORT_CTRL_MACTYPE_MASK; /* Enable EDPD mode - saving 600mW */ return mv3310_set_edpd(phydev, ETHTOOL_PHY_EDPD_DFLT_TX_MSECS); @@ -601,7 +600,7 @@ static void mv3310_update_interface(struct phy_device *phydev) * 10Gb. The PHY adapts the rate to actual wire speed with help of * internal 16KB buffer. */ - if (priv->rate_match) { + if (priv->mactype == MV_V2_PORT_CTRL_MACTYPE_10GBASER_RATE_MATCH) { phydev->interface = PHY_INTERFACE_MODE_10GBASER; return; }
Save MACTYPE instead of rate_matching boolean. We will need this for other configurations. Signed-off-by: Marek Behún <kabel@kernel.org> --- drivers/net/phy/marvell10g.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)