From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 513E7C34026 for ; Tue, 18 Feb 2020 10:34:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26ADD206E2 for ; Tue, 18 Feb 2020 10:34:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="k4BCVAkw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbgBRKeI (ORCPT ); Tue, 18 Feb 2020 05:34:08 -0500 Received: from pandora.armlinux.org.uk ([78.32.30.218]:51546 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726193AbgBRKeI (ORCPT ); Tue, 18 Feb 2020 05:34:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=OPbVEYgyF0rq1HakgIj5T2TdUNlUSGacKTY0m4Nkpww=; b=k4BCVAkwPbiRh0N/YFFZ66kst HJalHNVmdWPbfakXw0NHy9X4d2HuGnkyh7YevxBHLTihVX61p2lvPuSPCfoe6C+y6vlL+NejtJk7i iizWXE8UYNm0W1itMP1KwcqXbaS9D3wIkDIctqOJFP5RZ03KeKv15XynZToqKLN3lah0g53rvoutn NZaWHVwcLJLfsjy/RKL9Nea0yMKevvydgwRGwZa84Mcpik8ID6q0YlpjEPBr4qZqOk3ZVvl34eN5v G0pfSq3NJFlVZGPx/+fdkLpvY3spKJ6LjhgY024mdPv8JYPZq6ykOpnIfe4CiGWObDI4GRWym/hth gBiNm8Z7Q==; Received: from shell.armlinux.org.uk ([2002:4e20:1eda:1:5054:ff:fe00:4ec]:49456) by pandora.armlinux.org.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1j40CY-0006d8-94; Tue, 18 Feb 2020 10:34:02 +0000 Received: from linux by shell.armlinux.org.uk with local (Exim 4.92) (envelope-from ) id 1j40CW-0000MA-Bf; Tue, 18 Feb 2020 10:34:00 +0000 Date: Tue, 18 Feb 2020 10:34:00 +0000 From: Russell King - ARM Linux admin To: Ioana Ciornei Cc: "David S. Miller" , netdev@vger.kernel.org, Andrew Lunn , Florian Fainelli , Heiner Kallweit Subject: Re: [CFT 5/8] net: dpaa2-mac: use resolved link config in mac_link_up() Message-ID: <20200218103400.GF25745@shell.armlinux.org.uk> References: <20200217172242.GZ25745@shell.armlinux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It would really help if MAINTAINERS were updated with the correct information for this driver: DPAA2 ETHERNET DRIVER M: Ioana Radulescu This address bounces. Given what I find in the git history, is the correct person is now: Ioana Ciornei Please submit a patch updating MAINTAINERS. Thanks. On Mon, Feb 17, 2020 at 05:24:16PM +0000, Russell King wrote: > Convert the DPAA2 ethernet driver to use the finalised link parameters > in mac_link_up() rather than the parameters in mac_config(), which are > more suited to the needs of the DPAA2 MC firmware than those available > via mac_config(). > > Signed-off-by: Russell King > --- > .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 54 +++++++++++-------- > .../net/ethernet/freescale/dpaa2/dpaa2-mac.h | 1 + > 2 files changed, 33 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c > index 3a75c5b58f95..3ee236c5fc37 100644 > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c > @@ -123,35 +123,16 @@ static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode, > struct dpmac_link_state *dpmac_state = &mac->state; > int err; > > - if (state->speed != SPEED_UNKNOWN) > - dpmac_state->rate = state->speed; > - > - if (state->duplex != DUPLEX_UNKNOWN) { > - if (!state->duplex) > - dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX; > - else > - dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX; > - } > - > if (state->an_enabled) > dpmac_state->options |= DPMAC_LINK_OPT_AUTONEG; > else > dpmac_state->options &= ~DPMAC_LINK_OPT_AUTONEG; > > - if (state->pause & MLO_PAUSE_RX) > - dpmac_state->options |= DPMAC_LINK_OPT_PAUSE; > - else > - dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE; > - > - if (!!(state->pause & MLO_PAUSE_RX) ^ !!(state->pause & MLO_PAUSE_TX)) > - dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE; > - else > - dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE; > - > err = dpmac_set_link_state(mac->mc_io, 0, > mac->mc_dev->mc_handle, dpmac_state); > if (err) > - netdev_err(mac->net_dev, "dpmac_set_link_state() = %d\n", err); > + netdev_err(mac->net_dev, "%s: dpmac_set_link_state() = %d\n", > + __func__, err); > } > > static void dpaa2_mac_link_up(struct phylink_config *config, > @@ -165,10 +146,37 @@ static void dpaa2_mac_link_up(struct phylink_config *config, > int err; > > dpmac_state->up = 1; > + > + if (mac->if_link_type == DPMAC_LINK_TYPE_PHY) { > + /* If the DPMAC is configured for PHY mode, we need > + * to pass the link parameters to the MC firmware. > + */ > + dpmac_state->rate = speed; > + > + if (duplex == DUPLEX_HALF) > + dpmac_state->options |= DPMAC_LINK_OPT_HALF_DUPLEX; > + else if (duplex == DUPLEX_FULL) > + dpmac_state->options &= ~DPMAC_LINK_OPT_HALF_DUPLEX; > + > + /* This is lossy; the firmware really should take the pause > + * enablement status rather than pause/asym pause status. > + */ > + if (rx_pause) > + dpmac_state->options |= DPMAC_LINK_OPT_PAUSE; > + else > + dpmac_state->options &= ~DPMAC_LINK_OPT_PAUSE; > + > + if (rx_pause ^ tx_pause) > + dpmac_state->options |= DPMAC_LINK_OPT_ASYM_PAUSE; > + else > + dpmac_state->options &= ~DPMAC_LINK_OPT_ASYM_PAUSE; > + } > + > err = dpmac_set_link_state(mac->mc_io, 0, > mac->mc_dev->mc_handle, dpmac_state); > if (err) > - netdev_err(mac->net_dev, "dpmac_set_link_state() = %d\n", err); > + netdev_err(mac->net_dev, "%s: dpmac_set_link_state() = %d\n", > + __func__, err); > } > > static void dpaa2_mac_link_down(struct phylink_config *config, > @@ -241,6 +249,8 @@ int dpaa2_mac_connect(struct dpaa2_mac *mac) > goto err_close_dpmac; > } > > + mac->if_link_type = attr.link_type; > + > dpmac_node = dpaa2_mac_get_node(attr.id); > if (!dpmac_node) { > netdev_err(net_dev, "No dpmac@%d node found.\n", attr.id); > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h > index 4da8079b9155..2130d9c7d40e 100644 > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h > @@ -20,6 +20,7 @@ struct dpaa2_mac { > struct phylink_config phylink_config; > struct phylink *phylink; > phy_interface_t if_mode; > + enum dpmac_link_type if_link_type; > }; > > bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev, > -- > 2.20.1 > > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up