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 375F8C19F2A for ; Thu, 11 Aug 2022 16:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236216AbiHKQQx (ORCPT ); Thu, 11 Aug 2022 12:16:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237592AbiHKQO7 (ORCPT ); Thu, 11 Aug 2022 12:14:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C021AA4DA; Thu, 11 Aug 2022 08:58:53 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id A1392B82177; Thu, 11 Aug 2022 15:58:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8626C433C1; Thu, 11 Aug 2022 15:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660233530; bh=Q/b5sdn+npo2ooep5nrSplnZeiz1t01Fl6+3JDl+qtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKR91esSlUIBKqSr/sgO9cuwbO7NAY3OV8fD/Nigrca3zhKacRlGuwgDuSOXHOL4e nc5wM6/LqSbwnlBzmE5zoWdLsPu+Q8HkgW2vUUW7+fXnUN+xMI7eELdjwzPWXaKthO W0KDD5wNMiSSz1o1vEBgO7NLbPUoRyfs1uwFfGMWQ+yl4OzG2uSfjMG+JkzxfE0kzV MwYXAx9SDLLJaQbouBP7MnZSGGvfs7Lox/U3fsAcewHTTY4S1Jb8ENvsn3saqPnMQz EImc+0OFsv7pFqo9mHx5YGGttQ0LlmlYLq8e9XiXxWo7X7twtKiiOBuHND4feyT3Ev 23rDfMPjzEC7w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ivan Bornyakov , "David S . Miller" , Sasha Levin , andrew@lunn.ch, hkallweit1@gmail.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 21/69] net: phy: marvell-88x2222: set proper phydev->port Date: Thu, 11 Aug 2022 11:55:30 -0400 Message-Id: <20220811155632.1536867-21-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811155632.1536867-1-sashal@kernel.org> References: <20220811155632.1536867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ivan Bornyakov [ Upstream commit 9794ef5a68430946da2dfe7342be53b50bce9a41 ] phydev->port was not set and always reported as PORT_TP. Set phydev->port according to inserted SFP module. Signed-off-by: Ivan Bornyakov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/marvell-88x2222.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/phy/marvell-88x2222.c b/drivers/net/phy/marvell-88x2222.c index d8b31d4d2a73..f070776ca904 100644 --- a/drivers/net/phy/marvell-88x2222.c +++ b/drivers/net/phy/marvell-88x2222.c @@ -490,6 +490,7 @@ static int mv2222_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) dev = &phydev->mdio.dev; sfp_parse_support(phydev->sfp_bus, id, sfp_supported); + phydev->port = sfp_parse_port(phydev->sfp_bus, id, sfp_supported); sfp_interface = sfp_select_interface(phydev->sfp_bus, sfp_supported); dev_info(dev, "%s SFP module inserted\n", phy_modes(sfp_interface)); @@ -526,6 +527,7 @@ static void mv2222_sfp_remove(void *upstream) priv->line_interface = PHY_INTERFACE_MODE_NA; linkmode_zero(priv->supported); + phydev->port = PORT_NONE; } static void mv2222_sfp_link_up(void *upstream) -- 2.35.1