]> www.infradead.org Git - users/jedix/linux-maple.git/commit
net: stmmac: remove redundant fixup to support fixed-link mode
authorMichael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Thu, 30 Mar 2023 09:14:04 +0000 (17:14 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Apr 2023 14:55:20 +0000 (16:55 +0200)
commitc951c392a9d8fe46a52e637b963a58a57543dd3e
treead13bd22f291676350b92818e50c7c985b8111c5
parent1aca718e1a840f65b60488433a1f1dd56f37dd73
net: stmmac: remove redundant fixup to support fixed-link mode

[ Upstream commit 6fc21a6ed5953b1dd3a41ce7be1ea57f5ef8c081 ]

Currently, intel_speed_mode_2500() will fix-up xpcs_an_inband
to 1 if the underlying controller has a max speed of 1000Mbps.
The value has been initialized and modified if it is
a fixed-linked setup earlier.

This patch removes the fix-up to allow for fixed-linked setup
support. In stmmac_phy_setup(), ovr_an_inband is set based on
the value of xpcs_an_inband. Which in turn will return an
error in phylink_parse_mode() where MLO_AN_FIXED and
ovr_an_inband are both set.

Fixes: c82386310d95 ("stmmac: intel: prepare to support 1000BASE-X phy interface setting")
Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c