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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D421BC433F5 for ; Sat, 4 Dec 2021 10:54:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384712AbhLDK5d (ORCPT ); Sat, 4 Dec 2021 05:57:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238880AbhLDK5d (ORCPT ); Sat, 4 Dec 2021 05:57:33 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D38ECC061354 for ; Sat, 4 Dec 2021 02:54:07 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5AB3960DEC for ; Sat, 4 Dec 2021 10:54:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1D53C341C0; Sat, 4 Dec 2021 10:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638615246; bh=IdHIIMZIrARq5ZvZ7qCqwvmLeU8g1JP/cDqTaonDbNw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=VNJ3V2VU9gpZ7SZvX/SachPq1wn8gYHCOVQlMqbJbHh0BnD7XkcAV4m2kzrOmbMYa S99Amp1jPwddwKc68OT80NM2VerLKyhwTX6g/mryMc6bKg0G0/RFapchBB2NYhRMFX b8CUjm6Bs2xyFR2oVFvCy08BNWzK9sAyMhgk93HDUljpTceByIFZ2/+aRsh6kO1av7 irSh8LcJRad8x0s16SlnmzaJOr1U3AlkT+Ghp6bzs3bwhMXBR+iX7NZO9zK1dYVi19 AO9/BzyDQjftI2QpHBAgwsvkmJUimJehh0Ehh2RYovfU0hLBCwwLVaFIdqa/EPuI25 1R6ilA7rE7fYg== Date: Sat, 4 Dec 2021 11:54:02 +0100 From: Marek =?UTF-8?B?QmVow7pu?= To: Cc: davem@davemloft.net, Subject: Re: FAILED: patch "[PATCH] net: dsa: mv88e6xxx: Save power by disabling SerDes" failed to apply to 5.15-stable tree Message-ID: <20211204115402.4d197c42@thinkpad> In-Reply-To: <16386137159777@kroah.com> References: <16386137159777@kroah.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Hi Greg, the patch depends on 8c3318b4874e2dee867f5ae8f6d38f78e044bf71 net: dsa: mv88e6xxx: Drop unnecessary check in mv88e6393x_serdes_erratum_4_6() Marek On Sat, 04 Dec 2021 11:28:35 +0100 wrote: > The patch below does not apply to the 5.15-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . >=20 > thanks, >=20 > greg k-h >=20 > ------------------ original commit in Linus's tree ------------------ >=20 > From 7527d66260ac0c603c6baca5146748061fcddbd6 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Marek=3D20Beh=3DC3=3DBAn?=3D > Date: Tue, 30 Nov 2021 18:01:48 +0100 > Subject: [PATCH] net: dsa: mv88e6xxx: Save power by disabling SerDes > trasmitter and receiver > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit >=20 > Save power on 88E6393X by disabling SerDes receiver and transmitter > after SerDes is SerDes is disabled. >=20 > Signed-off-by: Marek Beh=C3=BAn > Cc: stable@vger.kernel.org # de776d0d316f ("net: dsa: mv88e6xxx: add supp= ort for mv88e6393x family") > Signed-off-by: David S. Miller >=20 > diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6x= xx/serdes.c > index 3a6244596a67..ceb63d7f1f97 100644 > --- a/drivers/net/dsa/mv88e6xxx/serdes.c > +++ b/drivers/net/dsa/mv88e6xxx/serdes.c > @@ -1271,6 +1271,28 @@ void mv88e6390_serdes_get_regs(struct mv88e6xxx_ch= ip *chip, int port, void *_p) > } > } > =20 > +static int mv88e6393x_serdes_power_lane(struct mv88e6xxx_chip *chip, int= lane, > + bool on) > +{ > + u16 reg; > + int err; > + > + err =3D mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS, > + MV88E6393X_SERDES_CTRL1, ®); > + if (err) > + return err; > + > + if (on) > + reg &=3D ~(MV88E6393X_SERDES_CTRL1_TX_PDOWN | > + MV88E6393X_SERDES_CTRL1_RX_PDOWN); > + else > + reg |=3D MV88E6393X_SERDES_CTRL1_TX_PDOWN | > + MV88E6393X_SERDES_CTRL1_RX_PDOWN; > + > + return mv88e6390_serdes_write(chip, lane, MDIO_MMD_PHYXS, > + MV88E6393X_SERDES_CTRL1, reg); > +} > + > static int mv88e6393x_serdes_erratum_4_6(struct mv88e6xxx_chip *chip, in= t lane) > { > u16 reg; > @@ -1297,7 +1319,11 @@ static int mv88e6393x_serdes_erratum_4_6(struct mv= 88e6xxx_chip *chip, int lane) > if (err) > return err; > =20 > - return mv88e6390_serdes_power_sgmii(chip, lane, false); > + err =3D mv88e6390_serdes_power_sgmii(chip, lane, false); > + if (err) > + return err; > + > + return mv88e6393x_serdes_power_lane(chip, lane, false); > } > =20 > int mv88e6393x_serdes_setup_errata(struct mv88e6xxx_chip *chip) > @@ -1362,17 +1388,29 @@ int mv88e6393x_serdes_power(struct mv88e6xxx_chip= *chip, int port, int lane, > err =3D mv88e6393x_serdes_erratum_4_8(chip, lane); > if (err) > return err; > + > + err =3D mv88e6393x_serdes_power_lane(chip, lane, true); > + if (err) > + return err; > } > =20 > switch (cmode) { > case MV88E6XXX_PORT_STS_CMODE_SGMII: > case MV88E6XXX_PORT_STS_CMODE_1000BASEX: > case MV88E6XXX_PORT_STS_CMODE_2500BASEX: > - return mv88e6390_serdes_power_sgmii(chip, lane, on); > + err =3D mv88e6390_serdes_power_sgmii(chip, lane, on); > + break; > case MV88E6393X_PORT_STS_CMODE_5GBASER: > case MV88E6393X_PORT_STS_CMODE_10GBASER: > - return mv88e6390_serdes_power_10g(chip, lane, on); > + err =3D mv88e6390_serdes_power_10g(chip, lane, on); > + break; > } > =20 > - return 0; > + if (err) > + return err; > + > + if (!on) > + err =3D mv88e6393x_serdes_power_lane(chip, lane, false); > + > + return err; > } > diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6x= xx/serdes.h > index cbb3ba30caea..e9292c8beee4 100644 > --- a/drivers/net/dsa/mv88e6xxx/serdes.h > +++ b/drivers/net/dsa/mv88e6xxx/serdes.h > @@ -93,6 +93,9 @@ > #define MV88E6393X_SERDES_POC_PCS_MASK 0x0007 > #define MV88E6393X_SERDES_POC_RESET BIT(15) > #define MV88E6393X_SERDES_POC_PDOWN BIT(5) > +#define MV88E6393X_SERDES_CTRL1 0xf003 > +#define MV88E6393X_SERDES_CTRL1_TX_PDOWN BIT(9) > +#define MV88E6393X_SERDES_CTRL1_RX_PDOWN BIT(8) > =20 > #define MV88E6393X_ERRATA_4_8_REG 0xF074 > #define MV88E6393X_ERRATA_4_8_BIT BIT(14) >=20