Hi, Changes since version 3: - added Andrew's reviewed-bys - fixed kernel-doc for dwmac_pcs_isr() - updated patch 11 commit message - fixed build error reported by Jakub - add Sneh Shah to Cc list (for testing 2.5G modes) Bartosz - I know you've given your tested-by this morning, I will be adding that after posting this series, so please don't think it's been lost! Previous cover messages from earlier posts below: This is version 3 of the series switching stmmac to use phylink PCS isntead of going behind phylink's back. Changes since version 2: - Adopted some of Serge's feedback. - New patch: adding ethqos_pcs_set_inband() for qcom-ethqos so we have one place to modify for AN control rather than many. - New patch: pass the stmmac_priv structure into the pcs_set_ane() method. - New patch: remove pcs_get_adv_lp() early, as this is only for TBI and RTBI, support for which we dropped in an already merged patch. - Provide stmmac_pcs structure to encapsulate the pointer to stmmac_priv, PCS MMIO address pointer and phylink_pcs structure. - Restructure dwmac_pcs_config() so we can eventually share code with dwmac_ctrl_ane(). - New patch: move dwmac_ctrl_ane() into stmmac_pcs.c, and share code. - New patch: pass the stmmac_pcs structure into dwmac_pcs_isr(). - New patch: similar to Serge's patch, rename the PCS registers, but use STMMAC_PCS_ as the prefix rather than just PCS_ which is too generic. - New patch: incorporate "net: stmmac: Activate Inband/PCS flag based on the selected iface" from Serge. On the subject of whether we should have two PCS instances, I experimented with that and have now decided against it. Instead, dwmac_pcs_config() now tests whether we need to fiddle with the PCS control register or not. Note that I prefer not to have multiple layers of indirection, but instead prefer a library-style approach, which is why I haven't turned the PCS support into something that's self contained with a method in the MAC driver to grab the RGSMII status. ----- This is version 2 of the series switching stmmac to use phylink PCS instead of going behind phylink's back. Changes since version 1: - Addition of patches from Serge Semin to allow RGMII to use the "PCS" code even if priv->dma_cap.pcs is not set (including tweaks by me.) - Restructuring of the patch set to be a more logical split. - Leave the pcs_ctrl_ane methods until we've worked out what to do with the qcom-ethqos driver (this series may still end up breaking it, but at least we will now successfully compile.) A reminder that what I want to hear from this patch set are the results of testing - and thanks to Serge, the RGMII paths were exercised, but I have not had any results for the SGMII side of this. There are still a bunch of outstanding questions: - whether we should be using two separate PCS instances, one for RGMII and another for SGMII. If the PCS hardware is not present, but are using RGMII mode, then we probably don't want to be accessing the registers that would've been there for SGMII. - what the three interrupts associated with the PCS code actually mean when they fire. - which block's status we're reading in the pcs_get_state() method, and whether we should be reading that for both RGMII and SGMII. - whether we need to activate phylink's inband mode in more cases (so that the PCS/MAC status gets read and used for the link.) There's probably more questions to be asked... but really the critical thing is to shake out any breakage from making this conversion. Bear in mind that I have little knowledge of this hardware, so this conversion has been done somewhat blind using only what I can observe from the current driver. ------ As I noted recently in a thread (and was ignored) stmmac sucks. (I won't hide my distain for drivers that make my life as phylink maintainer more difficult!) One of the contract conditions for using phylink is that the driver will _not_ mess with the netif carrier. stmmac developers/maintainers clearly didn't read that, because stmmac messes with the netif carrier, which destroys phylink's guarantee that it'll make certain calls in a particular order (e.g. it won't call mac_link_up() twice in a row without an intervening mac_link_down().) This is clearly stated in the phylink documentation. Thus, this patch set attempts to fix this. Why does it mess with the netif carrier? It has its own independent PCS implementation that completely bypasses phylink _while_ phylink is still being used. This is not acceptable. Either the driver uses phylink, or it doesn't use phylink. There is no half-way house about this. Therefore, this driver needs to either be fixed, or needs to stop using phylink. Since I was ignored when I brought this up, I've hacked together the following patch set - and it is hacky at the moment. It's also broken because of recentl changes involving dwmac-qcom-ethqos.c - but there isn't sufficient information in the driver for me to fix this. The driver appears to use SGMII at 2500Mbps, which simply does not exist. What interface mode (and neg_mode) does phylink pass to pcs_config() in each of the speeds that dwmac-qcom-ethqos.c is interested in. Without this information, I can't do that conversion. So for the purposes of this, I've just ignored dwmac-qcom-ethqos.c (which means it will fail to build.) The patch splitup is not ideal, but that's not what I'm interested in here. What I want to hear is the results of testing - does this switch of the RGMII/SGMII "pcs" stuff to a phylink_pcs work for this driver? Please don't review the patches, but you are welcome to send fixes to them. Once we know that the overall implementation works, then I'll look at how best to split the patches. In the mean time, the present form is more convenient for making changes and fixing things. There is still more improvement that's needed here. Thanks. drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/common.h | 25 ++-- .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 13 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 13 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 110 +++++++------- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 13 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 99 +++++++------ drivers/net/ethernet/stmicro/stmmac/hwif.h | 24 ++-- .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 111 +------------- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 30 +--- drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c | 63 ++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 160 ++++++++++----------- 12 files changed, 306 insertions(+), 357 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
