From: Andrew Lunn <andrew@lunn.ch>
To: Vladimir Oltean <olteanv@gmail.com>
Cc: jakub.kicinski@netronome.com, davem@davemloft.net,
alexandre.belloni@bootlin.com, f.fainelli@gmail.com,
vivien.didelot@gmail.com, joergen.andreasen@microchip.com,
allan.nielsen@microchip.com, horatiu.vultur@microchip.com,
claudiu.manoil@nxp.com, netdev@vger.kernel.org,
Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: Re: [PATCH net-next 03/12] net: mscc: ocelot: move invariant configs out of adjust_link
Date: Tue, 12 Nov 2019 14:35:44 +0100 [thread overview]
Message-ID: <20191112133544.GE5090@lunn.ch> (raw)
In-Reply-To: <20191112124420.6225-4-olteanv@gmail.com>
On Tue, Nov 12, 2019 at 02:44:11PM +0200, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> It doesn't make sense to rewrite all these registers every time the PHY
> library notifies us about a link state change.
>
> In a future patch we will customize the MTU for the CPU port, and since
> the MTU was previously configured from adjust_link, if we don't make
> this change, its value would have got overridden.
This is also a good change in preparation of PHYLINK. When you do
that conversion, ocelot_adjust_link() is likely to become
ocelot_mac_config(). It should only change hardware state when there
actually is a change in link state. This is something drivers often
get wrong.
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
> ---
> drivers/net/ethernet/mscc/ocelot.c | 85 +++++++++++++++---------------
> 1 file changed, 43 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
> index 2b6792ab0eda..4558c09e2e8a 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -408,7 +408,7 @@ static void ocelot_adjust_link(struct ocelot *ocelot, int port,
> struct phy_device *phydev)
> {
> struct ocelot_port *ocelot_port = ocelot->ports[port];
> - int speed, atop_wm, mode = 0;
> + int speed, mode = 0;
>
> switch (phydev->speed) {
> case SPEED_10:
> @@ -440,32 +440,9 @@ static void ocelot_adjust_link(struct ocelot *ocelot, int port,
> ocelot_port_writel(ocelot_port, DEV_MAC_MODE_CFG_FDX_ENA |
> mode, DEV_MAC_MODE_CFG);
>
> - /* Set MAC IFG Gaps
> - * FDX: TX_IFG = 5, RX_IFG1 = RX_IFG2 = 0
> - * !FDX: TX_IFG = 5, RX_IFG1 = RX_IFG2 = 5
> - */
> - ocelot_port_writel(ocelot_port, DEV_MAC_IFG_CFG_TX_IFG(5),
> - DEV_MAC_IFG_CFG);
> -
> - /* Load seed (0) and set MAC HDX late collision */
> - ocelot_port_writel(ocelot_port, DEV_MAC_HDX_CFG_LATE_COL_POS(67) |
> - DEV_MAC_HDX_CFG_SEED_LOAD,
> - DEV_MAC_HDX_CFG);
> - mdelay(1);
> - ocelot_port_writel(ocelot_port, DEV_MAC_HDX_CFG_LATE_COL_POS(67),
> - DEV_MAC_HDX_CFG);
> -
> if (ocelot->ops->pcs_init)
> ocelot->ops->pcs_init(ocelot, port);
>
> - /* Set Max Length and maximum tags allowed */
> - ocelot_port_writel(ocelot_port, VLAN_ETH_FRAME_LEN,
> - DEV_MAC_MAXLEN_CFG);
> - ocelot_port_writel(ocelot_port, DEV_MAC_TAGS_CFG_TAG_ID(ETH_P_8021AD) |
> - DEV_MAC_TAGS_CFG_VLAN_AWR_ENA |
> - DEV_MAC_TAGS_CFG_VLAN_LEN_AWR_ENA,
> - DEV_MAC_TAGS_CFG);
> -
> /* Enable MAC module */
> ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |
> DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);
> @@ -475,22 +452,10 @@ static void ocelot_adjust_link(struct ocelot *ocelot, int port,
> ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
> DEV_CLOCK_CFG);
>
> - /* Set SMAC of Pause frame (00:00:00:00:00:00) */
> - ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_HIGH_CFG);
> - ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_LOW_CFG);
> -
> /* No PFC */
> ocelot_write_gix(ocelot, ANA_PFC_PFC_CFG_FC_LINK_SPEED(speed),
> ANA_PFC_PFC_CFG, port);
>
> - /* Set Pause WM hysteresis
> - * 152 = 6 * VLAN_ETH_FRAME_LEN / OCELOT_BUFFER_CELL_SZ
> - * 101 = 4 * VLAN_ETH_FRAME_LEN / OCELOT_BUFFER_CELL_SZ
> - */
> - ocelot_write_rix(ocelot, SYS_PAUSE_CFG_PAUSE_ENA |
> - SYS_PAUSE_CFG_PAUSE_STOP(101) |
> - SYS_PAUSE_CFG_PAUSE_START(152), SYS_PAUSE_CFG, port);
> -
> /* Core: Enable port for frame transfer */
> ocelot_write_rix(ocelot, QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE |
> QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG(1) |
> @@ -505,12 +470,6 @@ static void ocelot_adjust_link(struct ocelot *ocelot, int port,
> SYS_MAC_FC_CFG_FC_LINK_SPEED(speed),
> SYS_MAC_FC_CFG, port);
> ocelot_write_rix(ocelot, 0, ANA_POL_FLOWC, port);
> -
> - /* Tail dropping watermark */
> - atop_wm = (ocelot->shared_queue_sz - 9 * VLAN_ETH_FRAME_LEN) / OCELOT_BUFFER_CELL_SZ;
> - ocelot_write_rix(ocelot, ocelot_wm_enc(9 * VLAN_ETH_FRAME_LEN),
> - SYS_ATOP, port);
> - ocelot_write(ocelot, ocelot_wm_enc(atop_wm), SYS_ATOP_TOT_CFG);
> }
>
> static void ocelot_port_adjust_link(struct net_device *dev)
> @@ -2141,11 +2100,53 @@ static int ocelot_init_timestamp(struct ocelot *ocelot)
> static void ocelot_init_port(struct ocelot *ocelot, int port)
> {
> struct ocelot_port *ocelot_port = ocelot->ports[port];
> + int atop_wm;
>
> INIT_LIST_HEAD(&ocelot_port->skbs);
>
> /* Basic L2 initialization */
>
> + /* Set MAC IFG Gaps
> + * FDX: TX_IFG = 5, RX_IFG1 = RX_IFG2 = 0
> + * !FDX: TX_IFG = 5, RX_IFG1 = RX_IFG2 = 5
> + */
> + ocelot_port_writel(ocelot_port, DEV_MAC_IFG_CFG_TX_IFG(5),
> + DEV_MAC_IFG_CFG);
> +
> + /* Load seed (0) and set MAC HDX late collision */
> + ocelot_port_writel(ocelot_port, DEV_MAC_HDX_CFG_LATE_COL_POS(67) |
> + DEV_MAC_HDX_CFG_SEED_LOAD,
> + DEV_MAC_HDX_CFG);
> + mdelay(1);
> + ocelot_port_writel(ocelot_port, DEV_MAC_HDX_CFG_LATE_COL_POS(67),
> + DEV_MAC_HDX_CFG);
> +
> + /* Set Max Length and maximum tags allowed */
> + ocelot_port_writel(ocelot_port, VLAN_ETH_FRAME_LEN,
> + DEV_MAC_MAXLEN_CFG);
> + ocelot_port_writel(ocelot_port, DEV_MAC_TAGS_CFG_TAG_ID(ETH_P_8021AD) |
> + DEV_MAC_TAGS_CFG_VLAN_AWR_ENA |
> + DEV_MAC_TAGS_CFG_VLAN_LEN_AWR_ENA,
> + DEV_MAC_TAGS_CFG);
> +
> + /* Set SMAC of Pause frame (00:00:00:00:00:00) */
> + ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_HIGH_CFG);
> + ocelot_port_writel(ocelot_port, 0, DEV_MAC_FC_MAC_LOW_CFG);
> +
> + /* Set Pause WM hysteresis
> + * 152 = 6 * VLAN_ETH_FRAME_LEN / OCELOT_BUFFER_CELL_SZ
> + * 101 = 4 * VLAN_ETH_FRAME_LEN / OCELOT_BUFFER_CELL_SZ
> + */
> + ocelot_write_rix(ocelot, SYS_PAUSE_CFG_PAUSE_ENA |
> + SYS_PAUSE_CFG_PAUSE_STOP(101) |
> + SYS_PAUSE_CFG_PAUSE_START(152), SYS_PAUSE_CFG, port);
> +
> + /* Tail dropping watermark */
> + atop_wm = (ocelot->shared_queue_sz - 9 * VLAN_ETH_FRAME_LEN) / OCELOT_BUFFER_CELL_SZ;
> + ocelot_write_rix(ocelot, ocelot_wm_enc(9 * VLAN_ETH_FRAME_LEN),
> + SYS_ATOP, port);
> + ocelot_write(ocelot, ocelot_wm_enc(atop_wm), SYS_ATOP_TOT_CFG);
> +
> /* Drop frames with multicast source address */
> ocelot_rmw_gix(ocelot, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
> ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-11-12 13:35 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 12:44 [PATCH net-next 00/12] DSA driver for Vitesse Felix switch Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 01/12] net: mscc: ocelot: move resource ioremap and regmap init to common code Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 02/12] net: mscc: ocelot: filter out ocelot SoC specific PCS config from common path Vladimir Oltean
2019-11-12 13:31 ` Andrew Lunn
2019-11-12 21:28 ` Florian Fainelli
2019-11-13 9:40 ` kbuild test robot
2019-11-12 12:44 ` [PATCH net-next 03/12] net: mscc: ocelot: move invariant configs out of adjust_link Vladimir Oltean
2019-11-12 13:35 ` Andrew Lunn [this message]
2019-11-12 13:38 ` Vladimir Oltean
2019-11-12 21:30 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 04/12] net: mscc: ocelot: create a helper for changing the port MTU Vladimir Oltean
2019-11-12 13:39 ` Andrew Lunn
2019-11-12 13:41 ` Vladimir Oltean
2019-11-12 21:31 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 05/12] net: mscc: ocelot: export a constant for the tag length in bytes Vladimir Oltean
2019-11-12 13:44 ` Andrew Lunn
2019-11-12 21:32 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 06/12] net: mscc: ocelot: adjust MTU on the CPU port in NPI mode Vladimir Oltean
2019-11-12 13:51 ` Andrew Lunn
2019-11-12 13:52 ` Vladimir Oltean
2019-11-12 13:57 ` Andrew Lunn
2019-11-12 21:32 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 07/12] net: mscc: ocelot: separate the implementation of switch reset Vladimir Oltean
2019-11-12 13:55 ` Andrew Lunn
2019-11-12 13:59 ` Vladimir Oltean
2019-11-13 8:57 ` Alexandre Belloni
2019-11-12 21:34 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 08/12] net: mscc: ocelot: publish structure definitions to include/soc/mscc/ocelot.h Vladimir Oltean
2019-11-12 14:42 ` Andrew Lunn
2019-11-12 16:18 ` Vladimir Oltean
2019-11-12 21:36 ` Florian Fainelli
2019-11-13 12:48 ` kbuild test robot
2019-11-12 12:44 ` [PATCH net-next 09/12] net: mscc: ocelot: publish ocelot_sys.h to include/soc/mscc Vladimir Oltean
2019-11-12 21:38 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 10/12] net: dsa: vitesse: move vsc73xx driver to a separate folder Vladimir Oltean
2019-11-12 13:09 ` Alexandre Belloni
2019-11-12 13:40 ` Vladimir Oltean
2019-11-12 14:33 ` Allan W. Nielsen
2019-11-12 14:50 ` Andrew Lunn
2019-11-12 14:57 ` Allan W. Nielsen
2019-11-12 15:26 ` Vladimir Oltean
2019-11-12 19:09 ` Allan W. Nielsen
2019-11-12 19:26 ` Vladimir Oltean
2019-11-12 19:48 ` Allan W. Nielsen
2019-11-12 20:01 ` Vladimir Oltean
2019-11-13 7:38 ` Allan W. Nielsen
2019-11-13 8:47 ` Alexandre Belloni
2019-11-12 21:49 ` Florian Fainelli
2019-11-12 12:44 ` [PATCH net-next 11/12] net: dsa: vitesse: add basic Felix switch driver Vladimir Oltean
2019-11-12 12:44 ` [PATCH net-next 12/12] net: dsa: vitesse: add tagger for Ocelot/Felix switches Vladimir Oltean
2019-11-12 21:48 ` Florian Fainelli
2019-11-13 2:14 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112133544.GE5090@lunn.ch \
--to=andrew@lunn.ch \
--cc=alexandre.belloni@bootlin.com \
--cc=allan.nielsen@microchip.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=horatiu.vultur@microchip.com \
--cc=jakub.kicinski@netronome.com \
--cc=joergen.andreasen@microchip.com \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).