From: David S. Miller Date: Thu, 3 Sep 2020 21:52:33 +0000 (-0700) Subject: Merge branch 'Convert-mvpp2-to-split-PCS-support' X-Git-Tag: io_uring-5.10-2020-10-20~32^2~382 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cc50bb3d3a0c0b8110a9629f7763067d57583709;p=linux-block.git Merge branch 'Convert-mvpp2-to-split-PCS-support' Russell King says: ==================== Convert mvpp2 to split PCS support This series converts the mvpp2 driver to use the split PCS support that has been merged into phylink last time around. I've been running this for some time here and, apart from the recent bug fix sent to net-next, have not seen any issues on DT based systems. I have not tested ACPI setups, although I've tried to preserve the workaround. Patch 1 formalises the ACPI workaround. Patch 2 moves some of mac_config() to the mac_prepare() and mac_finish() callbacks so we can keep the ordering when we split the PCS bits out. Patch 3 ensures that the port is forced down while changing the interface mode - when in in-band mode, doing this in mac_prepare() and mac_finish(). Patch 4 moves the reset handling to mac_prepare() and mac_finish() Patch 5 does a straight conversion to use PCS operations. Patch 6 splits the PCS operations into a GMAC PCS operations and XLG PCS operations, selecting the appropriate set during mac_prepare(). This eliminates a bunch of conditionals from the code. ==================== Signed-off-by: David S. Miller --- cc50bb3d3a0c0b8110a9629f7763067d57583709