From nobody Sun Nov 24 05:46:33 2024 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEAFA217F59; Thu, 7 Nov 2024 17:03:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730998991; cv=none; b=DcCNq5jlLHmpCEPKtfkcfyEl4WAVK0erBkZdA94HRNoVzck4u/IcAWp52vnJXq6NAnmbNvbzBxi8E2Cvfau/7EvHkun7JcAHju1rBIyDBkp/uuoSL3b8VrX/ME7duWn7301VgjxUxUkgp9TXVvh0iNRriBC+u7AEWlo1D4leMCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730998991; c=relaxed/simple; bh=TGSgG8gr771S5yQR36PuqiSZvpyrD5H+zrJl8lWCzSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NC7dze6GPoXhmndFetVz8u8wwydl2esYD6knJ2YJspVtIWQ4kkL7RcPuHNZjU4CAcjLRaVgVKSMxNYh3eb195fgbm9meX3INxwZo/rpgNn7+AxBRfDoVs9BffplotxQ41LvVQ2miENMgVOz2g9tf31VHOxU8Eu2SW/w+VIHnzl0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=bCqqahRH; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="bCqqahRH" Received: by mail.gandi.net (Postfix) with ESMTPSA id 7389124000C; Thu, 7 Nov 2024 17:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730998986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/OIHtLMZkxEV/Oyp2/QAah8NX9N1TbK+edYr1szDhOY=; b=bCqqahRHO3JrBHh0x5HoXxqlYj//i5bNSpDBjfSKwzFm+tGGoyHFpGD4EYGZSvuVL0ZFdv YIZHrOBOznb7CJfampH2O+YsYz9n4o8YJPiN7JzEf3xEOo9TqPyRBGvkSfkIkbCLaOL75y PoQYwQ/sql87eqggXFPV1XPkWqEnK5PQaF1J5EpGmbTkLSk/crJxLzHnNemtB4WREsIRMa K+tJdyXshnzHykX3CmGE+kYYJUw8PkCNzjuOFGyPi3mtgpH9G/hGzbSxespwJKDf7Wocjj mFl9MZ4n0C2cAWxAzNsrXYav0IP0+0YTGqRoyHBMpA54hpx9r8YSC3k29S4gBg== From: Maxime Chevallier To: davem@davemloft.net, Andrew Lunn , Jakub Kicinski , Eric Dumazet , Paolo Abeni , Russell King , Christophe Leroy , Heiner Kallweit Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Herve Codina , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linuxppc-dev@lists.ozlabs.org Subject: [PATCH net-next 2/7] net: freescale: ucc_geth: split adjust_link for phylink conversion Date: Thu, 7 Nov 2024 18:02:49 +0100 Message-ID: <20241107170255.1058124-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241107170255.1058124-1-maxime.chevallier@bootlin.com> References: <20241107170255.1058124-1-maxime.chevallier@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: maxime.chevallier@bootlin.com Content-Type: text/plain; charset="utf-8" Preparing the phylink conversion, split the adjust_link callbaclk, by clearly separating the mac configuration, link_up and link_down phases. Signed-off-by: Maxime Chevallier Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/ucc_geth.c | 180 +++++++++++----------- 1 file changed, 93 insertions(+), 87 deletions(-) diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethern= et/freescale/ucc_geth.c index 80540c817c4e..6286cd185a35 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c @@ -1548,105 +1548,111 @@ static void ugeth_activate(struct ucc_geth_privat= e *ugeth) __netdev_watchdog_up(ugeth->ndev); } =20 -/* Called every time the controller might need to be made - * aware of new link state. The PHY code conveys this - * information through variables in the ugeth structure, and this - * function converts those variables into the appropriate - * register values, and can bring down the device if needed. - */ - -static void adjust_link(struct net_device *dev) +static void ugeth_link_up(struct ucc_geth_private *ugeth, + struct phy_device *phy, + phy_interface_t interface, int speed, int duplex) { - struct ucc_geth_private *ugeth =3D netdev_priv(dev); - struct ucc_geth __iomem *ug_regs; - struct ucc_fast __iomem *uf_regs; - struct phy_device *phydev =3D ugeth->phydev; + struct ucc_geth __iomem *ug_regs =3D ugeth->ug_regs; + struct ucc_fast __iomem *uf_regs =3D ugeth->uccf->uf_regs; + u32 tempval =3D in_be32(&ug_regs->maccfg2); + u32 upsmr =3D in_be32(&uf_regs->upsmr); int new_state =3D 0; =20 - ug_regs =3D ugeth->ug_regs; - uf_regs =3D ugeth->uccf->uf_regs; - - if (phydev->link) { - u32 tempval =3D in_be32(&ug_regs->maccfg2); - u32 upsmr =3D in_be32(&uf_regs->upsmr); - /* Now we make sure that we can be in full duplex mode. - * If not, we operate in half-duplex mode. */ - if (phydev->duplex !=3D ugeth->oldduplex) { - new_state =3D 1; - if (!(phydev->duplex)) - tempval &=3D ~(MACCFG2_FDX); - else - tempval |=3D MACCFG2_FDX; - ugeth->oldduplex =3D phydev->duplex; - } + /* Now we make sure that we can be in full duplex mode. + * If not, we operate in half-duplex mode. + */ + if (duplex !=3D ugeth->oldduplex) { + new_state =3D 1; + if (duplex =3D=3D DUPLEX_HALF) + tempval &=3D ~(MACCFG2_FDX); + else + tempval |=3D MACCFG2_FDX; + ugeth->oldduplex =3D duplex; + } =20 - if (phydev->speed !=3D ugeth->oldspeed) { - new_state =3D 1; - switch (phydev->speed) { - case SPEED_1000: - tempval =3D ((tempval & - ~(MACCFG2_INTERFACE_MODE_MASK)) | - MACCFG2_INTERFACE_MODE_BYTE); - break; - case SPEED_100: - case SPEED_10: - tempval =3D ((tempval & - ~(MACCFG2_INTERFACE_MODE_MASK)) | - MACCFG2_INTERFACE_MODE_NIBBLE); - /* if reduced mode, re-set UPSMR.R10M */ - if ((ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RMII) || - (ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RGMII) || - (ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RGMII_ID) || - (ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RGMII_RXID) || - (ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RGMII_TXID) || - (ugeth->phy_interface =3D=3D PHY_INTERFACE_MODE_RTBI)) { - if (phydev->speed =3D=3D SPEED_10) - upsmr |=3D UCC_GETH_UPSMR_R10M; - else - upsmr &=3D ~UCC_GETH_UPSMR_R10M; - } - break; - default: - if (netif_msg_link(ugeth)) - pr_warn( - "%s: Ack! Speed (%d) is not 10/100/1000!", - dev->name, phydev->speed); - break; + if (speed !=3D ugeth->oldspeed) { + new_state =3D 1; + switch (speed) { + case SPEED_1000: + tempval =3D ((tempval & + ~(MACCFG2_INTERFACE_MODE_MASK)) | + MACCFG2_INTERFACE_MODE_BYTE); + break; + case SPEED_100: + case SPEED_10: + tempval =3D ((tempval & + ~(MACCFG2_INTERFACE_MODE_MASK)) | + MACCFG2_INTERFACE_MODE_NIBBLE); + /* if reduced mode, re-set UPSMR.R10M */ + if (interface =3D=3D PHY_INTERFACE_MODE_RMII || + phy_interface_mode_is_rgmii(interface) || + interface =3D=3D PHY_INTERFACE_MODE_RTBI) { + if (speed =3D=3D SPEED_10) + upsmr |=3D UCC_GETH_UPSMR_R10M; + else + upsmr &=3D ~UCC_GETH_UPSMR_R10M; } - ugeth->oldspeed =3D phydev->speed; + break; + default: + if (netif_msg_link(ugeth)) + pr_warn("%s: Speed (%d) is not 10/100/1000!", + netdev_name(ugeth->ndev), speed); + break; } + ugeth->oldspeed =3D speed; + } =20 - if (!ugeth->oldlink) { - new_state =3D 1; - ugeth->oldlink =3D 1; - } + if (!ugeth->oldlink) { + new_state =3D 1; + ugeth->oldlink =3D 1; + } =20 - if (new_state) { - /* - * To change the MAC configuration we need to disable - * the controller. To do so, we have to either grab - * ugeth->lock, which is a bad idea since 'graceful - * stop' commands might take quite a while, or we can - * quiesce driver's activity. - */ - ugeth_quiesce(ugeth); - ugeth_disable(ugeth, COMM_DIR_RX_AND_TX); + if (new_state) { + /* + * To change the MAC configuration we need to disable + * the controller. To do so, we have to either grab + * ugeth->lock, which is a bad idea since 'graceful + * stop' commands might take quite a while, or we can + * quiesce driver's activity. + */ + ugeth_quiesce(ugeth); + ugeth_disable(ugeth, COMM_DIR_RX_AND_TX); =20 - out_be32(&ug_regs->maccfg2, tempval); - out_be32(&uf_regs->upsmr, upsmr); + out_be32(&ug_regs->maccfg2, tempval); + out_be32(&uf_regs->upsmr, upsmr); =20 - ugeth_enable(ugeth, COMM_DIR_RX_AND_TX); - ugeth_activate(ugeth); - } - } else if (ugeth->oldlink) { - new_state =3D 1; - ugeth->oldlink =3D 0; - ugeth->oldspeed =3D 0; - ugeth->oldduplex =3D -1; + ugeth_enable(ugeth, COMM_DIR_RX_AND_TX); + ugeth_activate(ugeth); } =20 - if (new_state && netif_msg_link(ugeth)) - phy_print_status(phydev); + if (netif_msg_link(ugeth)) + phy_print_status(phy); +} + +static void ugeth_link_down(struct ucc_geth_private *ugeth) +{ + ugeth->oldlink =3D 0; + ugeth->oldspeed =3D 0; + ugeth->oldduplex =3D -1; +} + +/* Called every time the controller might need to be made + * aware of new link state. The PHY code conveys this + * information through variables in the ugeth structure, and this + * function converts those variables into the appropriate + * register values, and can bring down the device if needed. + */ + +static void adjust_link(struct net_device *dev) +{ + struct ucc_geth_private *ugeth =3D netdev_priv(dev); + struct phy_device *phydev =3D ugeth->phydev; + + if (phydev->link) + ugeth_link_up(ugeth, phydev, phydev->interface, + phydev->speed, phydev->duplex); + else + ugeth_link_down(ugeth); } =20 /* Initialize TBI PHY interface for communicating with the --=20 2.47.0