From: David S. Miller <davem@davemloft.net>
Date: Wed, 14 Apr 2021 19:56:44 +0000 (-0700)
Subject: Merge branch 'marvell-88x2222-improvements'
X-Git-Tag: v5.13-rc1~94^2~155
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=945c6ff851d8cc41571a8bb5735fb40a925a7aa2;p=linux-2.6-block.git

Merge branch 'marvell-88x2222-improvements'

Ivan Bornyakov says:

====================
net: phy: marvell-88x2222: a couple of improvements

First, there are some SFP modules that only uses RX_LOS for link
indication. Add check that link is operational before actual read of
line-side status.

Second, it is invalid to set 10G speed without autonegotiation,
according to phy_ethtool_ksettings_set(). Implement switching between
10GBase-R and 1000Base-X/SGMII if autonegotiation can't complete but
there is signal in line.

Changelog:
  v1 -> v2:
    * make checking that link is operational more friendly for
      trancievers without SFP cages.
    * split swapping 1G/10G modes into non-functional and functional
      commits for the sake of easier review.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

945c6ff851d8cc41571a8bb5735fb40a925a7aa2