net: pcs: Introduce support for fwnode PCS
Subsystems (8)
v20 cover net: pcs: Introduce support for fwnode PCS
This series introduce a most awaited feature that is correctly provide PCS with fwnode without having to use specific export symbol and additional handling of PCS in phylink.
At times there were 2 different implementation (this and the one from Sean) but Sean agreed that this can be picked and used in favor of his implementation as long as his case with race condition is correctly handled.
---
First the PCS fwnode:
The concept is to implement a producer-consumer API similar to other subsystem like clock or PHY.
That seems to be the best solution to the problem as PCS driver needs to be detached from phylink and implement a simple way to provide a PCS while maintaining support for probe defer or driver removal.
To keep the implementation simple, the PCS driver devs needs some collaboration to correctly implement this. This is O.K. as helper to correctly implement this are provided hence it's really a matter of following a pattern to correct follow removal of a PCS driver.
A PCS provider have to implement and call fwnode_pcs_add_provider() in probe function and define an xlate function to define how the PCS should be provided based on the requested interface and phandle spec defined in fwnode (based on the #pcs-cells)
fwnode_pcs_get() is provided to provide a specific PCS declared in fwnode at index.
A simple xlate function is provided for simple single PCS implementation, fwnode_pcs_simple_xlate.
A PCS provider on driver removal must call fwnode_pcs_del_provider() to delete itself as a provider.
---
Second PCS handling in phylink:
We have the PCS problem for the only reason that in initial implementation, we permitted way too much flexibility to MAC driver and things started to deviate. At times we couldn't think SoC would start to put PCS outside the MAC hence it was OK to assume they would live in the same driver. With the introduction of 10g in more consumer devices, we are observing a rapid growth of this pattern with multiple PCS external to MAC.
To put a stop on this, the only solution is to give back to phylink control on PCS handling and enforce more robust supported interface definition from both MAC and PCS side.
It's suggested to read patch 0003 of this series for more info, here a brief explaination of the idea:
This series introduce handling of PCS in phylink and try to deprecate .mac_select_pcs.
Phylink now might contain a linked list of available PCS and those will be used for PCS selection on phylink_major_config.
MAC driver needs to define pcs_interfaces mask in phylink_config for every interface that needs a dedicated PCS.
These PCS needs to be provided to phylink at phylink_create time by setting the .fill_available_pcs and .num_possible_pcs in phylink_config. Helpers to parse PCS from fwnode are provided fwnode_phylink_pcs_count() that will return the count of PCS entries described in the firmware node and fwnode_phylink_pcs_parse() that will fill a preallocated array of PCS pointer with the actual available PCS (ignoring the one that still needs to be probed).
phylink_create() will fill the internal PCS list with the passed array of PCS. phylink_major_config and other user of .mac_select_pcs are adapted to make use of this new PCS list.
The supported interface value is also moved internally to phylink struct. This is to handle late removal and addition of PCS. (the bonus effect to this is giving phylink a clear idea of what is actually supported by the MAC and his constraint with PCS)
The supported interface mask in phylink is done by OR the supported_interfaces in phylink_config with every PCS in PCS list.
PCS removal is supported by forcing a mac_config, refresh the supported interfaces and run a phy_resolve().
PCS late addition is supported by introducing a global notifier for PCS provider. If a phylink have the pcs_interfaces mask not zero, it's registered to this notifier.
PCS provider will emit a global PCS add event to signal any interface that a new PCS might be available.
The function will then check if the PCS is related to the MAC fwnode and add it accordingly.
A user for this new implementation is provided as an Airoha PCS driver. This was also tested downstream with the IPQ95xx QCOM SoC and with the help of Daniel also on the various Mediatek MT7988 SoC with both SFP cage implementation and DSA attached.
Lots of tests were done with driver unbind/bind and with interface up/down also by adding print to make sure major_config_fail gets correctly triggered and reset once the PCS comes back.
The dedicated commits have longer description on the implementation so it's suggested to also check there for additional info.
It's worth to mention that OpenWrt is currently using this on Mediatek SoC and QCOM ipq807x/ipq60xx/ipq50xx and Airoha are already ported in staging tree for testing.
Also realtek is using this and proved to correctly work.
---
Changes v20:
- Fix double declaration error in Documentation
- Drop mutex from patch 8 for validate_mac_and_pcs
- Correctly use non lock version in __phylink_validate
Changes v19:
- Rebase on top of net-next
- RCU protect phylink from pcs struct
- Fix dead-lock on phylink_validate
- Handle possible PCS provider returning NULL (protective coding)
- Improve capabilities handling refresh
Changes v18:
- Improve handling on late PCS addition
- Fix wrong comment on airoha PCS driver
- Rebase on top of net-next
Changes v17:
- Rebase on top of net-next
- Add Review tag for DT patch
- Recalculate capabilities on late removal/attach
Changes v16:
- Rebase on top of net-next
- Add Tested-by tag
- Add ACK for airoha ethernet patch + nit fix
Changes v15:
- Rebase on top of net-next
- Fix Coccicheck warning
Changes v14:
- Fix deadlock when fill_available_pcs fails
- Move notifier and fill down after resolve disable bit is set
- Fix kconfig description
Changes v13:
- Fix regression in fwnode_pcs_get_from_pcsspec from v12
- Fix reverse lock for phy_lock and state_mutex
- Better handle lock in phylink_validate_mac_and_pcs and inband
- Fix wrong pointer to fwnode_pcs_add_provider notifier
- Fix compilation error for new C type in pcs_provider_notify Changes v12:
- Fix kdoc for function
- Rework PCS provider add and delete to be provider driven (instead of relaying on scan of fwnode every time) (this also handle multi PCS scenario)
- Even further rework state mutex locking for concurrent pcs list
- Restore MAC supported_interfaces validation in phylink_create() wrongly dropped.
- Use get/put for fwnode reference
- Fix possible unment depndency for FWNODE_PCS
- Fix almost impossible problem for PCS calibration
- Hold rtnl with PCS deletion
Changes v11:
- Rework PCS release to notifier way (fix race as pointed out by bot)
- Add Ack from Lorenzo for Airoha Ethernet driver
- Introduce devm variant for pcs_provider_add
- Better support firmware node reference for PCS late attach
- Better protect list iteration with state mutex
- Minor fixup to airoha pcs driver (flow control fixup)
- Rebase on top of net-next
Changes v10:
- Minor code cleanup and fixes as suggested by bot
- Drop devlink patch
- Add reviewed by tag
- Configure old_link_state on PCS release
- Unlink PCS on error in phylink_create()
- Use list_add_tail
- Fix typo in Airoha PCS driver
- Update phylink migration guide
- Better handle late PCS attach (idempotent function and
add unser state_mutex)
- Use dedicated lock in Airoha ethernet driver
Changes v9:
- Rebase on top of net-next/main
- Drop early verification of supported_interface
(it can also be provided by get_capabilites MAC OP)
Changes v8:
- Back to RFC (net-next closed)
- Address additional bug reported by Sashiko bot
- Better handle priv interface for Airoha PCS driver
- Better handle locking for modifying the PCS list in phylink code
- Improve fwnode_phylink_pcs_parse() parsing on -ENOENT
- Better handle error condition in phylink_create()
- Turn down the link when current PCS is released
- Fix compilation warning caused by copy paste error
Changes v7:
- Address all the bug from the Sashiko bot
- Rename .num_available_pcs to .num_possible_pcs
- Link PCS in phylink_create()
- Correctly unregister the notifier on phylink_destroy()
- Introduce fwnode_phylink_pcs_count()
- Better handle locking in phylink for PCS handling
- Better handle unavailable PCS at phylink_create() time
- Improve Documentation file
- Other minor fixes to address suggestion from bot
- Rebase on top of net-next
Changes v6:
- Rebase on top of net-next
- Add Documentation files
- Add fw_devlink patch
- Fix some comments typo
- Rework the airoha_eth.c implementation with new multi serdes code
- Extend PCS code with PCIe and USB support
- Align schema to new property
Changes v5:
- Rebase on top of net-next
- Use the new force_major_config
- Reword some comments and commit description
- Return -ENODEV instead of -EPROBE_DEFER to perevent race condition
- Drop phy_interface_copy patch (Russell pushed an equivalent version) Changes v4:
- Move patch 0002 phy_interface_copy to 0002 (fix bisectability problem)
- Address review from Lorenzo for Airoha ethernet driver
- Fix kdoc error with missing Return (actually missing : before Return)
- Fix UNMET dependency reported error for CONFIG_FWNODE_PCS
- Revert to pcs.c instead of core.c (due to name conflict with other kmod)
- Fix clang compilation error for Airoha PCS driver
- Add missing inline function to pcs.h function
Changes v3:
- Out of RFC
- Fix various spelling mistake
- Drop circular dependency patch
- Complete Airoha Ethernet phylink integration
- Introduce .pcs_link_down PCS OP
Changes v2:
- Switch to fwnode
- Implement PCS provider notifier
- Better split changes
- Move supported_interfaces to phylink
- Add circular dependency patch
- Rework handling with indirect addition/removal and
trigger of phylink_resolve()
Christian Marangi (15):
net: phylink: keep and use MAC supported_interfaces in phylink struct
net: phylink: make PCS phylink instance access RCU protected
net: phylink: introduce internal phylink PCS handling
net: pcs: implement Firmware node support for PCS driver
net: phylink: save phylink instance fwnode on phylink_create
net: phylink: make phylink_validate state locked
net: phylink: add capabilities helper and track modified advertising
net: phylink: support PCS provider release
net: phylink: support late PCS provider attach
net: Document PCS subsystem
MAINTAINERS: add myself as PCS subsystem maintainer
net: phylink: add .pcs_link_down PCS OP
dt-bindings: net: pcs: Document support for Airoha Ethernet PCS
net: pcs: airoha: add PCS driver for Airoha AN7581 SoC
net: airoha: add phylink support
.../bindings/net/pcs/airoha,pcs.yaml | 261 ++ Documentation/networking/index.rst | 1 + Documentation/networking/pcs.rst | 231 ++ Documentation/networking/sfp-phylink.rst | 35 +- MAINTAINERS | 9 + drivers/net/ethernet/airoha/Kconfig | 2 + drivers/net/ethernet/airoha/airoha_eth.c | 197 +- drivers/net/ethernet/airoha/airoha_eth.h | 5 + drivers/net/ethernet/airoha/airoha_regs.h | 12 + drivers/net/pcs/Kconfig | 8 + drivers/net/pcs/Makefile | 3 + drivers/net/pcs/airoha/Kconfig | 13 + drivers/net/pcs/airoha/Makefile | 7 + drivers/net/pcs/airoha/pcs-airoha-common.c | 1306 ++++++++++ drivers/net/pcs/airoha/pcs-airoha.h | 1311 ++++++++++ drivers/net/pcs/airoha/pcs-an7581.c | 2100 +++++++++++++++++ drivers/net/pcs/pcs.c | 314 +++ drivers/net/phy/phylink.c | 493 +++- include/linux/linkmode.h | 6 + include/linux/pcs/pcs-provider.h | 70 + include/linux/pcs/pcs.h | 174 ++ include/linux/phylink.h | 30 +- 22 files changed, 6519 insertions(+), 69 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml create mode 100644 Documentation/networking/pcs.rst create mode 100644 drivers/net/pcs/airoha/Kconfig create mode 100644 drivers/net/pcs/airoha/Makefile create mode 100644 drivers/net/pcs/airoha/pcs-airoha-common.c create mode 100644 drivers/net/pcs/airoha/pcs-airoha.h create mode 100644 drivers/net/pcs/airoha/pcs-an7581.c create mode 100644 drivers/net/pcs/pcs.c create mode 100644 include/linux/pcs/pcs-provider.h create mode 100644 include/linux/pcs/pcs.h
Signature · 1 line
2.55.0
PATCH v20 1/15 net: phylink: keep and use MAC supported_interfaces in phylink struct
Add in phylink struct a copy of supported_interfaces from phylink_config and make use of that instead of relying on phylink_config value.
This in preparation for support of PCS handling internally to phylink where a PCS can be removed or added after the phylink is created and we need both a reference of the supported_interfaces value from phylink_config and an internal value that can be updated with the new PCS info.
--- drivers/net/phy/phylink.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/net/phy/phylink.c +15 -7
@@ -62,6 +62,11 @@ struct phylink {/* The link configuration settings */ struct phylink_link_state link_config; +/* What interface are supported by the current link. +* Can change on removal or addition of new PCS. +*/ +DECLARE_PHY_INTERFACE_MASK (supported_interfaces); +/* The current settings */ phy_interface_t cur_interface;
@@ -632,7 +637,7 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,static int phylink_validate (struct phylink *pl,unsigned long *supported,struct phylink_link_state *state) { -const unsigned long *interfaces = pl->config->supported_interfaces; +const unsigned long *interfaces = pl->supported_interfaces;if (state->interface ==PHY_INTERFACE_MODE_NA ) return phylink_validate_mask(pl, NULL, supported, state,
@@ -2090,6 +2095,9 @@ struct phylink *phylink_create(struct phylink_config *config,__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);timer_setup (&pl->link_poll, phylink_fixed_poll,0 ); +phy_interface_copy (pl->supported_interfaces, + pl->config->supported_interfaces); +linkmode_fill (pl->supported);linkmode_copy (pl->link_config.advertising, pl->supported);phylink_validate (pl, pl->supported, &pl->link_config);
@@ -2212,7 +2220,7 @@ static int phylink_validate_phy(struct phylink *pl, struct phy_device *phy,* those which the host supports. */ phy_interface_and (interfaces, phy->possible_interfaces, - pl->config->supported_interfaces); + pl->supported_interfaces);if (phy_interface_empty (interfaces)) {phylink_err (pl,"PHY has no common interfaces\n" );
@@ -3026,12 +3034,12 @@ static phy_interface_t phylink_sfp_select_interface(struct phylink *pl,return interface; } -if (!test_bit (interface, pl->config->supported_interfaces)) { +if (!test_bit (interface, pl->supported_interfaces)) {phylink_err (pl,"selection of interface failed, SFP selected %s (%u) but MAC supports %*pbl\n" ,phy_modes (interface), interface, (int )PHY_INTERFACE_MODE_MAX , - pl->config->supported_interfaces); + pl->supported_interfaces);return PHY_INTERFACE_MODE_NA ; }
@@ -3910,14 +3918,14 @@ static int phylink_sfp_config_optical(struct phylink *pl)phylink_dbg (pl,"optical SFP: interfaces=[mac=%*pbl, sfp=%*pbl]\n" , (int )PHY_INTERFACE_MODE_MAX , - pl->config->supported_interfaces, + pl->supported_interfaces, (int )PHY_INTERFACE_MODE_MAX , pl->sfp_interfaces);/* Find the union of the supported interfaces by the PCS/MAC and * the SFP module. */ -phy_interface_and (pl->sfp_interfaces, pl->config->supported_interfaces, +phy_interface_and (pl->sfp_interfaces, pl->supported_interfaces, pl->sfp_interfaces);if (phy_interface_empty (pl->sfp_interfaces)) {phylink_err (pl,"unsupported SFP module: no common interface modes\n" );
@@ -4155,7 +4163,7 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)/* Set the PHY's host supported interfaces */ phy_interface_and (phy->host_interfaces, phylink_sfp_interfaces, - pl->config->supported_interfaces); + pl->supported_interfaces);phy_set_upstream_port (phy, pl->sfp_cage_port);
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 01/15] net: phylink: keep and use MAC supported_interfaces in phylink struct
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Low] net: phylink: use pl->supported_interfaces in phylink_create_sfp_cage_port() --
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Low] net: phylink: use pl->supported_interfaces in phylink_create_sfp_cage_port()
--
commit 93205d49f980ea49e825ec43738fa0a2070e098a
Author: Christian Marangi <[email protected]>
net: phylink: keep and use MAC supported_interfaces in phylink struct
This commit copies supported_interfaces from phylink_config into struct phylink and updates phylink to read from the internal copy in preparation for dynamic PCS handling.
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
drivers/net/phy/phylink.c static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy) · line 4169
Quoted 9 lines
drivers/net/phy/phylink.c +1
-1@@ -4155,7 +4163,7 @@ static int phylink_sfp_connect_phy(void *upstream, struct phy_device *phy)/* Set the PHY's host supported interfaces */ phy_interface_and (phy->host_interfaces, phylink_sfp_interfaces, - pl->config->supported_interfaces); + pl->supported_interfaces);phy_set_upstream_port (phy, pl->sfp_cage_port);
[Severity: Low]
Should phylink_create_sfp_cage_port() also use pl->supported_interfaces when populating pl->sfp_cage_port->interfaces?
drivers/net/phy/phylink.c:phylink_create_sfp_cage_port() {
...
phy_interface_and(port->interfaces, pl->config->supported_interfaces,
phylink_sfp_interfaces);
phy_port_update_supported(port);
...
}When pl->supported_interfaces is later updated from attached PCS instances, leaving phylink_create_sfp_cage_port() on pl->config->supported_interfaces causes pl->sfp_cage_port->interfaces and the downstream SFP module phy_port supported link modes in phylink_add_sfp_mod_port() to omit PCS-supported SFP interfaces.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
PATCH v20 2/15 net: phylink: make PCS phylink instance access RCU protected
In reply to Christian MarangiIn the context of phylink_pcs_change(), phylink instance is dereferenced from the pcs pointer present in the phylink_pcs struct.
There is currently a fragility where this pcs pointer is never set NULL in phylink_destroy() and would reference invalid memory after phylink instance is freed.
In this scenario, if a PCS driver calls phylink_pcs_change(), invalid memory can be dereferenced and phylink_link_changed() is called on freed memory.
To address this, make the phylink instance saved in phylink_pcs struct RCU protected and access it under RCU lock.
Also correctly reset the phylink instance pointer on phylink_destroy() and syncronyze RCU to catch an execution of phylink_pcs_change().
--- drivers/net/phy/phylink.c | 17 ++++++++++++++--- include/linux/phylink.h | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-)
drivers/net/phy/phylink.c +14 -3
@@ -17,6 +17,7 @@#include <linux/phy_link_topology.h> #include <linux/phy_port.h> #include <linux/phylink.h> +#include <linux/rcupdate.h> #include <linux/rtnetlink.h> #include <linux/spinlock.h> #include <linux/timer.h>
@@ -1300,10 +1301,10 @@ static void phylink_major_config(struct phylink *pl, bool restart,phylink_pcs_disable (pl->pcs);if (pl->pcs) - pl->pcs->phylink =NULL ; +rcu_assign_pointer (pcs->phylink,NULL );if (pcs) - pcs->phylink = pl; +rcu_assign_pointer (pcs->phylink, pl); pl->pcs = pcs; }
@@ -2145,6 +2146,11 @@ void phylink_destroy(struct phylink *pl)if (pl->link_gpio)gpiod_put (pl->link_gpio); +if (pl->pcs) { +rcu_assign_pointer (pl->pcs->phylink,NULL ); +synchronize_rcu (); + } +cancel_work_sync (&pl->resolve);kfree (pl); }
@@ -2609,10 +2615,15 @@ EXPORT_SYMBOL_GPL(phylink_mac_change);*/ void phylink_pcs_change (struct phylink_pcs *pcs,bool up) { -struct phylink *pl = pcs->phylink; +struct phylink *pl; + +rcu_read_lock (); + pl =rcu_dereference (pcs->phylink);if (pl)phylink_link_changed (pl, up,"pcs" ); + +rcu_read_unlock (); }EXPORT_SYMBOL_GPL (phylink_pcs_change);
include/linux/phylink.h +1 -1
@@ -494,7 +494,7 @@ struct phylink_pcs_ops;struct phylink_pcs {DECLARE_PHY_INTERFACE_MASK (supported_interfaces);const struct phylink_pcs_ops *ops; -struct phylink *phylink; +struct phylink __rcu *phylink;bool poll;bool rxc_always_on; };
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 02/15] net: phylink: make PCS phylink instance access RCU protected
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [High] net: phylink: NULL deref and stale pointer in phylink_major_config() - [Low] net: phylink: missing…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [High] net: phylink: NULL deref and stale pointer in phylink_major_config()
- [Low] net: phylink: missing Fixes trailer for commit 24699cc1ff3e --
commit 85080154c47d10a2333a2099ea90e555d71ad4e7
Author: Christian Marangi <[email protected]>
Quoted 13 lines
net: phylink: make PCS phylink instance access RCU protected
In the context of
phylink_pcs_change(), phylink instance is dereferenced from the pcs pointer present in thephylink_pcsstruct.There is currently a fragility where this pcs pointer is never set NULL in
phylink_destroy()and would reference invalid memory after phylink instance is freed.In this scenario, if a PCS driver calls
phylink_pcs_change(), invalid memory can be dereferenced andphylink_link_changed()is called on freed memory.
Quoted 7 lines
To address this, make the phylink instance saved in
phylink_pcsstruct RCU protected and access it under RCU lock.Also correctly reset the phylink instance pointer on
phylink_destroy()and syncronyze RCU to catch an execution ofphylink_pcs_change().Signed-off-by Christian Marangi <[email protected]>
[Severity: Low]
Since this fixes a use-after-free in phylink_pcs_change(), should it include a Fixes tag for 24699cc1ff3e ("net: phylink: add support for PCS link change notifications")?
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
drivers/net/phy/phylink.c static void phylink_major_config(struct phylink *pl, bool restart, · line 1310
Quoted 13 lines
drivers/net/phy/phylink.c +2
-2@@ -1300,10 +1301,10 @@ static void phylink_major_config(struct phylink *pl, bool restart,phylink_pcs_disable (pl->pcs);if (pl->pcs) - pl->pcs->phylink =NULL ; +rcu_assign_pointer (pcs->phylink,NULL );if (pcs) - pcs->phylink = pl; +rcu_assign_pointer (pcs->phylink, pl); pl->pcs = pcs; }
[Severity: High]
Should this clear pl->pcs->phylink instead of pcs->phylink?
When switching from an active PCS to an interface mode where pcs is NULL, dereferencing pcs->phylink causes a NULL pointer dereference, regressing 0e4d7df2f3b2 ("net: phylink: fix NULL pointer deref in phylink_major_config()"). When switching between two non-NULL PCS instances, the old pl->pcs->phylink is never cleared, leaving a dangling pointer to pl after phylink_destroy() frees it.
This regression is fixed later in the series by commit "net: phylink:
introduce internal phylink PCS handling".
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
PATCH v20 3/15 net: phylink: introduce internal phylink PCS handling
In reply to Christian MarangiIntroduce internal handling of PCS for phylink. This is an alternative way to .mac_select_pcs that moves the selection logic of the PCS entirely to phylink with the usage of the supported_interface value in the PCS struct.
MAC should now provide a callback to fill the available PCS in phylink_config in .fill_available_pcs and fill the .num_possible_pcs with the number of elements in the array. MAC should also define a new bitmap, pcs_interfaces, in phylink_config to define for what interface mode a dedicated PCS is required.
On phylink_create(), an array of PCS pointer is allocated of size .num_possible_pcs from phylink_config and .fill_available_pcs from phylink_config is called passing as args the just allocated array and the number of possible element in it.
MAC will fill this passed array with all the available PCS.
This array is then parsed and a linked list of PCS is created based on the allocated PCS array filled by MAC via .fill_available_pcs().
Every PCS in phylink PCS list gets then linked to the phylink instance by setting the phylink value in phylink_pcs struct to the phylink instance. Also the supported_interface value in phylink struct is updated with the new supported_interface from the provided PCS.
On phylink_destroy(), every PCS in phylink PCS list is unlinked from the phylink instance by setting the phylink value in phylink_pcs struct to NULL and removed from the PCS list.
phylink_validate_mac_and_pcs(), phylink_major_config() and phylink_inband_caps() are updated to support this new implementation with the PCS list stored in phylink.
They will make use of phylink_validate_pcs_interface() that will loop for every PCS in the phylink PCS available list and find one that supports the passed interface.
phylink_validate_pcs_interface() applies the same logic of .mac_select_pcs where if a supported_interface value is not set for the PCS struct, then it's assumed every interface is supported.
A MAC is required to implement either a .mac_select_pcs or make use of the PCS list implementation. Implementing both will result in a fail on phylink_create().
A MAC defining .num_possible_pcs in phylink_config MUST also define a .fill_available_pcs or phylink_create() will fail with an negative error.
phylink value in phylink_pcs struct with this implementation is used to track from PCS side when it's attached to a phylink instance. PCS driver will make use of this information to correctly detach from a phylink instance if needed.
phylink_pcs_change() is also changed to verify that the PCS that triggered a link change is the one that is currently used by the phylink instance.
The .mac_select_pcs implementation is not changed but it's expected that every MAC driver migrates to the new implementation to later deprecate and remove .mac_select_pcs.
--- drivers/net/phy/phylink.c | 201 ++++++++++++++++++++++++++++++++++---- include/linux/phylink.h | 16 +++ 2 files changed, 196 insertions(+), 21 deletions(-)
drivers/net/phy/phylink.c +180 -21
@@ -63,6 +63,9 @@ struct phylink {/* The link configuration settings */ struct phylink_link_state link_config; +/* List of available PCS */ +struct list_head pcs_list; +/* What interface are supported by the current link. * Can change on removal or addition of new PCS. */
@@ -522,6 +525,22 @@ static void phylink_validate_mask_caps(unsigned long *supported,linkmode_and (state->advertising, state->advertising, mask); } +static int phylink_validate_pcs_interface (struct phylink_pcs *pcs, +phy_interface_t interface) +{ +/* If PCS define an empty supported_interfaces value, assume +* all interface are supported. +*/ +if (phy_interface_empty (pcs->supported_interfaces)) +return 0 ; + +/* Ensure that this PCS supports the interface mode */ +if (!test_bit (interface, pcs->supported_interfaces)) +return -EINVAL ; + +return 0 ; +} +static int phylink_validate_mac_and_pcs (struct phylink *pl,unsigned long *supported,struct phylink_link_state *state)
@@ -535,6 +554,21 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, pcs = pl->mac_ops->mac_select_pcs (pl->config, state->interface);if (IS_ERR (pcs))return PTR_ERR (pcs); +/* +* Find a PCS in available PCS list for the requested interface. +* +* Skip searching if the MAC doesn't require a dedicated PCS for +* the requested interface. +*/ + }else if (test_bit (state->interface, pl->config->pcs_interfaces)) { +struct phylink_pcs *tmp; + +list_for_each_entry (tmp, &pl->pcs_list, list) { +if (!phylink_validate_pcs_interface (tmp, state->interface)) { + pcs = tmp; +break ; + } + } }if (pcs) {
@@ -549,13 +583,10 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,return -EINVAL ; } -/* Ensure that this PCS supports the interface which the MAC -* returned it for. It is an error for the MAC to return a PCS -* that does not support the interface mode. -*/ -if (!phy_interface_empty (pcs->supported_interfaces) && - !test_bit (state->interface, pcs->supported_interfaces)) { -phylink_err (pl,"MAC returned PCS which does not support %s\n" , +/* Recheck PCS to handle legacy way for .mac_select_pcs */ + ret =phylink_validate_pcs_interface (pcs, state->interface); +if (ret) { +phylink_err (pl,"selected PCS does not support %s\n" ,phy_modes (state->interface));return -EINVAL ; }
@@ -968,12 +999,22 @@ static void phylink_pcs_enable_eee(struct phylink_pcs *pcs)static unsigned int phylink_inband_caps (struct phylink *pl,phy_interface_t interface) { -struct phylink_pcs *pcs; +struct phylink_pcs *pcs =NULL ; -if (!pl->mac_ops->mac_select_pcs) -return 0 ; +if (pl->mac_ops->mac_select_pcs) { + pcs = pl->mac_ops->mac_select_pcs (pl->config, + interface); + }else if (test_bit (interface, pl->config->pcs_interfaces)) { +struct phylink_pcs *tmp; + +list_for_each_entry (tmp, &pl->pcs_list, list) { +if (!phylink_validate_pcs_interface (tmp, interface)) { + pcs = tmp; +break ; + } + } + } - pcs = pl->mac_ops->mac_select_pcs (pl->config, interface);if (IS_ERR_OR_NULL (pcs))return 0 ;
@@ -1270,10 +1311,36 @@ static void phylink_major_config(struct phylink *pl, bool restart, pl->major_config_failed = true;return ; } +/* Find a PCS in available PCS list for the requested interface. +* This doesn't overwrite the previous .mac_select_pcs as either +* .mac_select_pcs or PCS list implementation are permitted. +* +* Skip searching if the MAC doesn't require a dedicated PCS for +* the requested interface. +*/ + }else if (test_bit (state->interface, pl->config->pcs_interfaces)) { +struct phylink_pcs *tmp; + +list_for_each_entry (tmp, &pl->pcs_list, list) { +if (!phylink_validate_pcs_interface (tmp, + state->interface)) { + pcs = tmp; +break ; + } + } + +if (!pcs) { +phylink_err (pl, +"couldn't find a PCS for %s\n" , +phy_modes (state->interface)); - pcs_changed = pl->pcs != pcs; + pl->major_config_failed = true; +return ; + } } + pcs_changed = pl->pcs != pcs; +phylink_pcs_neg_mode (pl, pcs, state->interface, state->advertising); phylink_dbg(pl, "major config, active %s/%s/%s\n",
@@ -1300,13 +1367,15 @@ static void phylink_major_config(struct phylink *pl, bool restart,if (pcs_changed) {phylink_pcs_disable (pl->pcs); -if (pl->pcs) -rcu_assign_pointer (pcs->phylink,NULL ); +if (pl->mac_ops->mac_select_pcs) { +if (pl->pcs) +rcu_assign_pointer (pl->pcs->phylink,NULL ); -if (pcs) -rcu_assign_pointer (pcs->phylink, pl); +if (pcs) +rcu_assign_pointer (pcs->phylink, pl); + } - pl->pcs = pcs; +WRITE_ONCE (pl->pcs, pcs); }if (pl->pcs)
@@ -1901,6 +1970,49 @@ int phylink_set_fixed_link(struct phylink *pl, }EXPORT_SYMBOL_GPL (phylink_set_fixed_link); +static int phylink_fill_available_pcs (struct phylink *pl, +struct phylink_config *config) +{ +struct phylink_pcs **pcss; +int i, ret; + +if (!config->num_possible_pcs) +return 0 ; + +if (!config->fill_available_pcs) { +dev_err (config->dev, +"phylink: error: num_possible_pcs defined but no fill_available_pcs\n" ); +return -EINVAL ; + } + + pcss =kzalloc_objs (*pcss, config->num_possible_pcs); +if (!pcss) +return -ENOMEM ; + + ret = config->fill_available_pcs (config, pcss, config->num_possible_pcs); +if (ret <0 ) + goto out; + +for (i =0 ; i < config->num_possible_pcs; i++) { +struct phylink_pcs *pcs = pcss[i]; + +if (!pcs) +continue ; + +if (WARN (rcu_access_pointer (pcs->phylink), +"%s: PCS already attached to a phylink instance\n" , + __func__)) +continue ; + +list_add_tail (&pcs->list, &pl->pcs_list); + } + +out: +kfree (pcss); + +return ret; +} +/** * phylink_update_pause_state() - Update the phylink pause frame configuration * @pl: a pointer to a &struct phylink instance
@@ -2042,9 +2154,20 @@ struct phylink *phylink_create(struct phylink_config *config,phy_interface_t iface, const struct phylink_mac_ops *mac_ops) { + struct phylink_pcs *tmp, *pcs;struct phylink *pl;int ret; +/* +* Make sure either PCS internal validation or .mac_select_pcs +* is used. Return error if both are defined. +*/ +if (config->num_possible_pcs && mac_ops->mac_select_pcs) { +dev_err (config->dev, +"phylink: error: either phylink_config .num_possible_pcs or .mac_select_pcs must be used\n" ); +return ERR_PTR (-EINVAL ); + } +/* Validate the supplied configuration */ if (phy_interface_empty (config->supported_interfaces)) { dev_err(config->dev,
@@ -2059,6 +2182,7 @@ struct phylink *phylink_create(struct phylink_config *config,mutex_init (&pl->phydev_mutex);mutex_init (&pl->state_mutex);INIT_WORK (&pl->resolve, phylink_resolve); +INIT_LIST_HEAD (&pl->pcs_list); pl->config = config;if (config->type ==PHYLINK_NETDEV ) {
@@ -2096,16 +2220,31 @@ struct phylink *phylink_create(struct phylink_config *config,__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);timer_setup (&pl->link_poll, phylink_fixed_poll,0 ); +/* Fill the PCS list with available PCS from phylink config */ + ret =phylink_fill_available_pcs (pl, config); +if (ret <0 ) + goto free_pl; + +/* Link available PCS to phylink */ +list_for_each_entry (pcs, &pl->pcs_list, list) +rcu_assign_pointer (pcs->phylink, pl); +phy_interface_copy (pl->supported_interfaces, pl->config->supported_interfaces); +/* Update supported interfaces */ +list_for_each_entry (pcs, &pl->pcs_list, list) +phy_interface_or (pl->supported_interfaces, + pl->supported_interfaces, + pcs->supported_interfaces); +linkmode_fill (pl->supported);linkmode_copy (pl->link_config.advertising, pl->supported);phylink_validate (pl, pl->supported, &pl->link_config); ret =phylink_parse_mode (pl, fwnode);if (ret <0 ) - goto free_pl; + goto unlink_pcs_list;if (pl->cfg_link_an_mode ==MLO_AN_FIXED ) { ret =phylink_parse_fixedlink (pl, fwnode);
@@ -2124,6 +2263,14 @@ struct phylink *phylink_create(struct phylink_config *config, release_link_gpio:if (pl->link_gpio)gpiod_put (pl->link_gpio); +unlink_pcs_list: +list_for_each_entry (pcs, &pl->pcs_list, list) +rcu_assign_pointer (pcs->phylink,NULL ); + +synchronize_rcu (); + +list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list) +list_del (&pcs->list); free_pl:kfree (pl);return ERR_PTR (ret);
@@ -2141,17 +2288,29 @@ EXPORT_SYMBOL_GPL(phylink_create);*/ void phylink_destroy (struct phylink *pl) { +struct phylink_pcs *pcs, *tmp; +sfp_bus_del_upstream (pl->sfp_bus);phylink_destroy_sfp_cage_port (pl);if (pl->link_gpio)gpiod_put (pl->link_gpio); -if (pl->pcs) { +/* Remove phylink instance from every PCS */ +list_for_each_entry (pcs, &pl->pcs_list, list) +rcu_assign_pointer (pcs->phylink,NULL ); + +if (pl->pcs)rcu_assign_pointer (pl->pcs->phylink,NULL ); + +if (pl->pcs || !list_empty (&pl->pcs_list))synchronize_rcu (); - }cancel_work_sync (&pl->resolve); + +/* Remove every PCS from phylink PCS list */ +list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list) +list_del (&pcs->list); +kfree (pl); }EXPORT_SYMBOL_GPL (phylink_destroy);
@@ -2620,7 +2779,7 @@ void phylink_pcs_change(struct phylink_pcs *pcs, bool up)rcu_read_lock (); pl =rcu_dereference (pcs->phylink); -if (pl) +if (pl &&READ_ONCE (pl->pcs) == pcs)phylink_link_changed (pl, up,"pcs" );rcu_read_unlock ();
include/linux/phylink.h +16 -0
@@ -12,6 +12,7 @@ struct ethtool_cmd;struct fwnode_handle ;struct net_device ;struct phylink ; +struct phylink_pcs ;enum {MLO_PAUSE_NONE ,
@@ -151,6 +152,8 @@ enum phylink_op_type {* if MAC link is at %MLO_AN_FIXED mode. * @supported_interfaces: bitmap describing which PHY_INTERFACE_MODE_xxx * are supported by the MAC/PCS. +* @pcs_interfaces: bitmap describing for which PHY_INTERFACE_MODE_xxx a +* dedicated PCS is required. * @lpi_interfaces: bitmap describing which PHY interface modes can support * LPI signalling. * @mac_capabilities: MAC pause/speed/duplex capabilities.
@@ -160,6 +163,10 @@ enum phylink_op_type {* @wol_phy_legacy: Use Wake-on-Lan with PHY even if phy_can_wakeup() is false * @wol_phy_speed_ctrl: Use phy speed control on suspend/resume * @wol_mac_support: Bitmask of MAC supported %WAKE_* options +* @num_possible_pcs: num of possible phylink_pcs PCS +* @fill_available_pcs: callback to fill the available PCS in the passed +* array struct of phylink_pcs PCS available_pcs up to +* num_possible_pcs. */ struct phylink_config {struct device *dev;
@@ -172,6 +179,7 @@ struct phylink_config {void (*get_fixed_state)(struct phylink_config *config,struct phylink_link_state *state);DECLARE_PHY_INTERFACE_MASK (supported_interfaces); +DECLARE_PHY_INTERFACE_MASK (pcs_interfaces);DECLARE_PHY_INTERFACE_MASK (lpi_interfaces);unsigned long mac_capabilities;unsigned long lpi_capabilities;
@@ -182,6 +190,11 @@ struct phylink_config {bool wol_phy_legacy;bool wol_phy_speed_ctrl;u32 wol_mac_support; + +unsigned int num_possible_pcs; +int (*fill_available_pcs)(struct phylink_config *config, +struct phylink_pcs **available_pcs, +unsigned int num_possible_pcs); };void phylink_limit_mac_speed (struct phylink_config *config,u32 max_speed);
@@ -497,6 +510,9 @@ struct phylink_pcs {struct phylink __rcu *phylink;bool poll;bool rxc_always_on; + +/* private: */ +struct list_head list; };/**
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 03/15] net: phylink: introduce internal phylink PCS handling
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [Medium] net: phylink: missing error return in phylink_validate_mac_and_pcs() - [Medium] net: phylink…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [Medium] net: phylink: missing error return in phylink_validate_mac_and_pcs()
- [Medium] net: phylink: broken PCS interface filtering in phylink_create()
--
commit 68a6b41cb9652b8b9ee28ac370dd9685425db77b
Author: Christian Marangi <[email protected]>
net: phylink: introduce internal phylink PCS handling
This commit introduces internal PCS tracking and selection in phylink via a per-instance PCS list populated through .fill_available_pcs, as an alternative to the .mac_select_pcs callback.
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
Quoted 10 lines
drivers/net/phy/phylink.c +6
-0@@ -535,6 +554,21 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, pcs = pl->mac_ops->mac_select_pcs (pl->config, state->interface);if (IS_ERR (pcs))return PTR_ERR (pcs); +/* +* Find a PCS in available PCS list for the requested interface. +* +* Skip searching if the MAC doesn't require a dedicated PCS for +* the requested interface. +*/
drivers/net/phy/phylink.c static int phylink_validate_mac_and_pcs(struct phylink *pl, · line 572
Quoted 10 lines
drivers/net/phy/phylink.c +9
-0+ }else if (test_bit (state->interface, pl->config->pcs_interfaces)) { +struct phylink_pcs *tmp; + +list_for_each_entry (tmp, &pl->pcs_list, list) { +if (!phylink_validate_pcs_interface (tmp, state->interface)) { + pcs = tmp; +break ; + } + } }
[Severity: Medium]
Should phylink_validate_mac_and_pcs() return -EINVAL when state->interface is set in pl->config->pcs_interfaces but no matching PCS is found in pl->pcs_list?
When no PCS in pl->pcs_list supports state->interface, pcs remains NULL and phylink_validate_mac_and_pcs() skips the if (pcs) block, validating the mode against MAC capabilities alone and returning 0. Unsupported PCS-dependent interface modes then pass validation during phylink_create() or SFP/PHY setup, only to fail later in phylink_major_config() when !pcs sets pl->major_config_failed = true.
Also, this isn't a bug, but the pl->pcs_list lookup loop is duplicated across phylink_validate_mac_and_pcs(), phylink_inband_caps(), and phylink_major_config() and could be moved into a helper.
[ ... ]
Quoted 11 lines
drivers/net/phy/phylink.c +7
-0@@ -2096,16 +2220,31 @@ struct phylink *phylink_create(struct phylink_config *config,__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);timer_setup (&pl->link_poll, phylink_fixed_poll,0 ); +/* Fill the PCS list with available PCS from phylink config */ + ret =phylink_fill_available_pcs (pl, config); +if (ret <0 ) + goto free_pl; + +/* Link available PCS to phylink */ +list_for_each_entry (pcs, &pl->pcs_list, list)
drivers/net/phy/phylink.c struct phylink *phylink_create(struct phylink_config *config, · line 2239
Quoted 10 lines
drivers/net/phy/phylink.c +7
-0+rcu_assign_pointer (pcs->phylink, pl); +phy_interface_copy (pl->supported_interfaces, pl->config->supported_interfaces); +/* Update supported interfaces */ +list_for_each_entry (pcs, &pl->pcs_list, list) +phy_interface_or (pl->supported_interfaces, + pl->supported_interfaces, + pcs->supported_interfaces);
[Severity: Medium]
As reported by Maxime Chevallier on v7 [1], does ORing pcs->supported_interfaces into pl->supported_interfaces leave unsupported PCS modes enabled while adding modes the MAC itself does not support?
Any mode in config->pcs_interfaces that is also in config->supported_interfaces stays set in pl->supported_interfaces even when no PCS in pl->pcs_list supports it. Conversely, if a PCS advertises an interface mode in pcs->supported_interfaces that the MAC does not support in config->supported_interfaces or config->pcs_interfaces, phy_interface_or() adds it to pl->supported_interfaces, and phylink then treats it as a native MAC mode requiring no PCS. Callers inspecting pl->supported_interfaces such as phylink_validate_phy() and SFP interface selection will therefore see unsupported modes as valid.
[1] https://lore.kernel.org/r/[email protected]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
PATCH v20 4/15 net: pcs: implement Firmware node support for PCS driver
In reply to Christian MarangiImplement the foundation of Firmware node support for PCS driver.
To support this, implement a simple Provider API where a PCS driver can expose multiple PCS with an xlate .fwnode_xlate function.
PCS driver will have to call fwnode_pcs_add_provider() and pass the firmware node pointer and a xlate function to return the correct PCS for the passed #pcs-cells.
This will register the PCS in a global list of providers so that consumer can access it.
The consumer will then use fwnode_pcs_get() to get the actual PCS by passing the firmware node pointer and the index for #pcs-cells.
For a simple implementation where #pcs-cells is 0 and the PCS driver expose a single PCS, the xlate function fwnode_pcs_simple_xlate() is provided.
For an advanced implementation a custom xlate function is required.
On removal the PCS driver must delete itself from the provider list using fwnode_pcs_del_provider().
A devm variant devm_fwnode_pcs_add() is provided to automate the release procedure.
Generic functions fwnode_phylink_pcs_count() and fwnode_phylink_pcs_parse() are provided for MAC driver that will declare PCS in DT (or ACPI).
Function fwnode_phylink_pcs_count() will parse "pcs-handle" property and will return the number of PCS entries described in the passed firmware node.
Function fwnode_phylink_pcs_parse() will parse "pcs-handle" property and fill the passed available_pcs array with the available PCS found up to passed num_pcs value. It's worth to mention that this function will ignore PCS that still needs to be probed (returning -ENODEV) and such PCS won't be added to the available_pcs array.
--- drivers/net/pcs/Kconfig | 6 + drivers/net/pcs/Makefile | 1 + drivers/net/pcs/pcs.c | 245 +++++++++++++++++++++++++++++++ include/linux/pcs/pcs-provider.h | 70 +++++++++ include/linux/pcs/pcs.h | 74 ++++++++++ 5 files changed, 396 insertions(+) create mode 100644 drivers/net/pcs/pcs.c create mode 100644 include/linux/pcs/pcs-provider.h create mode 100644 include/linux/pcs/pcs.h
drivers/net/pcs/Kconfig +6 -0
@@ -5,6 +5,12 @@ menu "PCS device drivers" +config FWNODE_PCS + bool "PCS Firmware Node" + depends on ACPI || OF || COMPILE_TEST + help + Firmware node PCS accessors + config PCS_XPCS tristate "Synopsys DesignWare Ethernet XPCS" select PHYLINK
drivers/net/pcs/Makefile +1 -0
@@ -3,6 +3,7 @@ pcs_xpcs-$(CONFIG_PCS_XPCS) := pcs-xpcs.o pcs-xpcs-nxp.o pcs-xpcs-wx.o +obj-$(CONFIG_FWNODE_PCS) += pcs.o obj-$(CONFIG_PCS_XPCS) += pcs_xpcs.o obj-$(CONFIG_PCS_XPCS_PLATFORM) += pcs-xpcs-plat.o obj-$(CONFIG_PCS_XPCS_ROCKCHIP) += pcs-xpcs-rk.o
drivers/net/pcs/pcs.c new file +245 -0
245 lines not on this page · raw message
include/linux/pcs/pcs-provider.h new file +70 -0
70 lines not on this page · raw message
include/linux/pcs/pcs.h new file +74 -0
74 lines not on this page · raw message
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 04/15] net: pcs: implement Firmware node support for PCS driver
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [Medium] net: pcs: fwnode_pcs_get_from_pcsspec() clobbers fwnode_xlate() error codes - [Low] net: pcs: dead…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [Medium] net: pcs: fwnode_pcs_get_from_pcsspec() clobbers fwnode_xlate() error codes
- [Low] net: pcs: dead name lookup in fwnode_parse_pcsspec() uses pcs-names
--
commit 523a51dc25f7a5757d1f8012e38a5161ca8187b6
Author: Christian Marangi <[email protected]>
net: pcs: implement Firmware node support for PCS driver
This commit introduces firmware node provider and consumer helpers for PCS drivers, allowing MAC drivers to look up and parse PCS instances referenced by "pcs-handle" properties.
Quoted 5 lines
drivers/net/pcs/pcs.c new file +0
-0
[ ... ]
Quoted 8 lines
drivers/net/pcs/pcs.c new file +8
-0+static int fwnode_parse_pcsspec (const struct fwnode_handle *fwnode, +int index,const char *name, +struct fwnode_reference_args *out_args) +{ +if (!fwnode) +return -EINVAL ; + +if (name) {
drivers/net/pcs/pcs.c line 131
Quoted 10 lines
drivers/net/pcs/pcs.c new file +10
-0+ index =fwnode_property_match_string (fwnode,"pcs-names" , + name); +if (index <0 ) +return index; + } + +return fwnode_property_get_reference_args (fwnode,"pcs-handle" , +"#pcs-cells" ,0 , index, + out_args); +}
[Severity: Low]
Should this match "pcs-handle-names" (as defined in Documentation/devicetree/bindings/net/ethernet-controller.yaml) instead of "pcs-names", or can the name lookup be dropped since __fwnode_pcs_get() is only called with con_id set to NULL?
Quoted 20 lines
drivers/net/pcs/pcs.c new file +20
-0+ +static struct phylink_pcs * +__fwnode_pcs_get_from_pcsspec_provider (struct fwnode_reference_args *pcsspec, +struct fwnode_pcs_provider *provider) +{ +if (provider->fwnode != pcsspec->fwnode) +return ERR_PTR (-EINVAL ); + +return provider->fwnode_xlate (pcsspec, provider->data); +} + +static struct phylink_pcs * +fwnode_pcs_get_from_pcsspec (struct fwnode_reference_args *pcsspec) +{ +struct fwnode_pcs_provider *provider; +struct phylink_pcs *pcs =NULL ; + +if (!pcsspec) +return ERR_PTR (-EINVAL ); +
drivers/net/pcs/pcs.c line 161
Quoted 10 lines
drivers/net/pcs/pcs.c new file +10
-0+mutex_lock (&fwnode_pcs_mutex); +list_for_each_entry (provider, &fwnode_pcs_providers, link) { + pcs =__fwnode_pcs_get_from_pcsspec_provider (pcsspec, provider); +if (!IS_ERR (pcs)) +break ; + } +mutex_unlock (&fwnode_pcs_mutex); + +return !IS_ERR_OR_NULL (pcs) ? pcs :ERR_PTR (-ENODEV ); +}
[Severity: Medium]
Does fwnode_pcs_get_from_pcsspec() overwrite errors returned by provider->fwnode_xlate() with ERR_PTR(-ENODEV)?
When the matching provider's fwnode_xlate() returns an error pointer (for example ERR_PTR(-EINVAL) on invalid #pcs-cells arguments), !IS_ERR(pcs) is false so the loop keeps iterating, and the return statement turns any ERR_PTR(pcs) into ERR_PTR(-ENODEV). Because fwnode_phylink_pcs_parse() treats -ENODEV as an unprobed provider and skips it via continue, invalid PCS specifiers are silently ignored instead of failing parsing.
Checking provider->fwnode == pcsspec->fwnode directly in the loop and returning provider->fwnode_xlate(pcsspec, provider->data) (or ERR_PTR(-ENODEV) if no provider matched) would preserve the error code.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
PATCH v20 5/15 net: phylink: save phylink instance fwnode on phylink_create
In reply to Christian MarangiThe firmware node associated with the phylink instance might differ from the device firmware node passed in phylink_config as such device can reference the parent switch or other platform peripherals.
Some function might need to reference this firmware node after phylink_create so add a dedicated fwnode entry in phylink internal struct and save it on phylink_create().
--- drivers/net/phy/phylink.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/phy/phylink.c +5 -0
@@ -47,6 +47,7 @@ struct phylink {const struct phylink_mac_ops *mac_ops;struct phylink_config *config;struct phylink_pcs *pcs; +struct fwnode_handle *fwnode;struct device *dev; unsigned int old_link_state:1;
@@ -2185,6 +2186,7 @@ struct phylink *phylink_create(struct phylink_config *config,INIT_LIST_HEAD (&pl->pcs_list); pl->config = config; + pl->fwnode =fwnode_handle_get ((struct fwnode_handle *)fwnode);if (config->type ==PHYLINK_NETDEV ) { pl->netdev =to_net_dev (config->dev);netif_carrier_off (pl->netdev);
@@ -2272,6 +2274,7 @@ struct phylink *phylink_create(struct phylink_config *config,list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list)list_del (&pcs->list); free_pl: +fwnode_handle_put (pl->fwnode);kfree (pl);return ERR_PTR (ret); }
@@ -2311,6 +2314,8 @@ void phylink_destroy(struct phylink *pl)list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list)list_del (&pcs->list); +fwnode_handle_put (pl->fwnode); +kfree (pl); }EXPORT_SYMBOL_GPL (phylink_destroy);
Signature · 1 line
2.55.0
PATCH v20 6/15 net: phylink: make phylink_validate state locked
In reply to Christian MarangiIn preparation for support for PCS release/late attach, rework the phylink_validate functions to be locked under the state mutex.
With the introduction of a notifier that can be called concurrently while a phylink_create is called or an interface mode validation is being run, on recalculating the supported interface and capabilities, an inconsistency can be introduced with 2 validation run at the same time.
To handle this, make the phylink_validate lock under the phylink state mutex, add lockless variant for phylink_validate_mask and phylink_validate and add lockdep check to make sure the mutex is held in the inner validate functions.
Function that already run phylink_validate under state mutex, are updated to use the lockless variant.
--- drivers/net/phy/phylink.c | 53 ++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 9 deletions(-)
drivers/net/phy/phylink.c +44 -9
@@ -9,6 +9,7 @@#include <linux/ethtool.h> #include <linux/export.h> #include <linux/gpio/consumer.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/of.h> #include <linux/of_mdio.h>
@@ -550,6 +551,8 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,unsigned long capabilities;int ret; +lockdep_assert_held (&pl->state_mutex); +/* Get the PCS for this interface mode */ if (pl->mac_ops->mac_select_pcs) { pcs = pl->mac_ops->mac_select_pcs (pl->config, state->interface);
@@ -628,6 +631,8 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy,__ETHTOOL_DECLARE_LINK_MODE_MASK (tmp_supported);struct phylink_link_state tmp_state; +lockdep_assert_held (&pl->state_mutex); +linkmode_copy (tmp_supported, supported); tmp_state = *state;
@@ -648,15 +653,17 @@ static void phylink_validate_one(struct phylink *pl, struct phy_device *phy, } } -static int phylink_validate_mask (struct phylink *pl,struct phy_device *phy, -unsigned long *supported, -struct phylink_link_state *state, -const unsigned long *interfaces) +static int __phylink_validate_mask (struct phylink *pl,struct phy_device *phy, +unsigned long *supported, +struct phylink_link_state *state, +const unsigned long *interfaces) {__ETHTOOL_DECLARE_LINK_MODE_MASK (all_adv) = {0 , };__ETHTOOL_DECLARE_LINK_MODE_MASK (all_s) = {0 , };int interface; +lockdep_assert_held (&pl->state_mutex); +for_each_set_bit (interface, interfaces,PHY_INTERFACE_MODE_MAX )phylink_validate_one (pl, phy, supported, state, interface, all_s, all_adv);
@@ -667,14 +674,30 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,return phylink_is_empty_linkmode (supported) ? -EINVAL :0 ; } -static int phylink_validate (struct phylink *pl,unsigned long *supported, -struct phylink_link_state *state) +static int phylink_validate_mask (struct phylink *pl,struct phy_device *phy, +unsigned long *supported, +struct phylink_link_state *state, +const unsigned long *interfaces) +{ +int ret; + +mutex_lock (&pl->state_mutex); + ret =__phylink_validate_mask (pl, phy, supported, state, interfaces); +mutex_unlock (&pl->state_mutex); + +return ret; +} + +static int __phylink_validate (struct phylink *pl,unsigned long *supported, +struct phylink_link_state *state) {const unsigned long *interfaces = pl->supported_interfaces; +lockdep_assert_held (&pl->state_mutex); +if (state->interface ==PHY_INTERFACE_MODE_NA ) -return phylink_validate_mask (pl,NULL , supported, state, - interfaces); +return __phylink_validate_mask (pl,NULL , supported, state, + interfaces);if (!test_bit (state->interface, interfaces))return -EINVAL ;
@@ -682,6 +705,18 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,return phylink_validate_mac_and_pcs (pl, supported, state); } +static int phylink_validate (struct phylink *pl,unsigned long *supported, +struct phylink_link_state *state) +{ +int ret; + +mutex_lock (&pl->state_mutex); + ret =__phylink_validate (pl, supported, state); +mutex_unlock (&pl->state_mutex); + +return ret; +} +static void phylink_fill_fixedlink_supported (unsigned long *supported) {linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, supported);
@@ -2117,7 +2152,7 @@ void phylink_update_mac_pause_capabilities(struct phylink *pl, unsigned long macelse if (pl->sfp_bus)linkmode_and (pl->supported, pl->supported, pl->sfp_support); -phylink_validate (pl, pl->supported, config); +__phylink_validate (pl, pl->supported, config); pause_state = config->pause;
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 06/15] net: phylink: make phylink_validate state locked
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [High] net: phylink: lock order inversion between state_mutex and phy->lock in phylink_validate_mask() --
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [High] net: phylink: lock order inversion between state_mutex and phy->lock in phylink_validate_mask()
--
commit 15371468f04d0bb04d8068bf4c41584df2589e40
Author: Christian Marangi <[email protected]>
net: phylink: make phylink_validate state locked
This commit acquires pl->state_mutex in phylink_validate() and phylink_validate_mask(), adds unlocked __phylink_validate() and __phylink_validate_mask() helpers, and asserts that pl->state_mutex is held in the inner validation functions.
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
Quoted 9 lines
drivers/net/phy/phylink.c +3
-2@@ -667,14 +674,30 @@ static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy,return phylink_is_empty_linkmode (supported) ? -EINVAL :0 ; } -static int phylink_validate (struct phylink *pl,unsigned long *supported, -struct phylink_link_state *state) +static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, + unsigned long *supported, + struct phylink_link_state *state,
drivers/net/phy/phylink.c static int phylink_validate_mask(struct phylink *pl, struct phy_device *phy, · line 689
Quoted 10 lines
drivers/net/phy/phylink.c +10
-0+ const unsigned long *interfaces) +{ +int ret; + +mutex_lock (&pl->state_mutex); + ret =__phylink_validate_mask (pl, phy, supported, state, interfaces); +mutex_unlock (&pl->state_mutex); + +return ret; +}
[Severity: High]
Does taking pl->state_mutex in phylink_validate_mask() invert the lock order against phy->lock?
When phylink_bringup_phy() -> phylink_validate_phy() validates a PHY with non-empty phy->possible_interfaces, __phylink_validate_mask() -> phylink_validate_one() calls phy_get_rate_matching() under pl->state_mutex, which takes phy->lock if the PHY driver implements .get_rate_matching:
drivers/net/phy/phy.c:phy_get_rate_matching() {
...
if (phydev->drv->get_rate_matching) {
mutex_lock(&phydev->lock);
ret = phydev->drv->get_rate_matching(phydev, iface);
mutex_unlock(&phydev->lock);
}
...
}Elsewhere in phylink (including later in phylink_bringup_phy(), phylink_resolve(), and phylink_phy_change()), phy->lock is acquired before pl->state_mutex, creating an ABBA deadlock and lockdep splat:
CPU0 CPU1
---- ----lock(&pl->state_mutex)
lock(&phy->lock)
lock(&phy->lock)
lock(&pl->state_mutex)*** DEADLOCK ***
CPU0: phylink_bringup_phy() -> phylink_validate_phy() ->
phylink_validate_mask() -> __phylink_validate_mask() ->
phylink_validate_one() -> phy_get_rate_matching()CPU1: phy_state_machine() -> phylink_phy_change()
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
PATCH v20 7/15 net: phylink: add capabilities helper and track modified advertising
In reply to Christian MarangiIn preparation for PCS release/late attach, it's needed to introduce an helper to calculate the capabilities after a PCS is removed/added and it's needed to track the advertising in link_config changed by the user compared to the originally one calculated in phylink_create().
To archieve this, introduce a dedicated advertising in phylink struct and update it when the new phylink_calculate_capabilities() is called.
phylink_calculate_capabilities() will then compare the advertising saved in phylink instance with the one in link_config (that can be modified by the user to disable modes), compose the modes that are user-disabled, calculate the new supported modes and the new capabilities, update the full advertising in phylink and restore the user-disabled modes.
phylink_create() is also updated to init the phylink advertising and link_config advertising.
linkmode_xor() is added in addition to other logic operation to parse the user-disabled advertised modes.
--- drivers/net/phy/phylink.c | 28 +++++++++++++++++++++++++--- include/linux/linkmode.h | 6 ++++++ 2 files changed, 31 insertions(+), 3 deletions(-)
drivers/net/phy/phylink.c +25 -3
@@ -61,6 +61,7 @@ struct phylink {u8 link_port;/* The current non-phy ethtool port */ __ETHTOOL_DECLARE_LINK_MODE_MASK (supported);__ETHTOOL_DECLARE_LINK_MODE_MASK (supported_lpi); +__ETHTOOL_DECLARE_LINK_MODE_MASK (advertising);/* The link configuration settings */ struct phylink_link_state link_config;
@@ -717,6 +718,27 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,return ret; } +static void phylink_calculate_capabilities (struct phylink *pl) +{ +__ETHTOOL_DECLARE_LINK_MODE_MASK (disabled_advertising); + +/* Get user-disabled advertising modes */ +linkmode_xor (disabled_advertising, pl->advertising, + pl->link_config.advertising); + +/* Calculate the full supported advertisement */ +linkmode_fill (pl->supported); +linkmode_copy (pl->link_config.advertising, pl->supported); +phylink_validate (pl, pl->supported, &pl->link_config); + +/* Save the newly calculated full advertisement */ +linkmode_copy (pl->advertising, pl->link_config.advertising); + +/* Keep user-disabled modes out of the active advertisement. */ +linkmode_andnot (pl->link_config.advertising, + pl->link_config.advertising, disabled_advertising); +} +static void phylink_fill_fixedlink_supported (unsigned long *supported) {linkmode_set_bit (ETHTOOL_LINK_MODE_Pause_BIT, supported);
@@ -2252,6 +2274,8 @@ struct phylink *phylink_create(struct phylink_config *config, pl->link_config.pause =MLO_PAUSE_AN ; pl->link_config.speed =SPEED_UNKNOWN ; pl->link_config.duplex =DUPLEX_UNKNOWN ; +linkmode_fill (pl->advertising); +linkmode_fill (pl->link_config.advertising); pl->pcs_state =PCS_STATE_DOWN ; pl->mac_ops = mac_ops;__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);
@@ -2275,9 +2299,7 @@ struct phylink *phylink_create(struct phylink_config *config, pl->supported_interfaces, pcs->supported_interfaces); -linkmode_fill (pl->supported); -linkmode_copy (pl->link_config.advertising, pl->supported); -phylink_validate (pl, pl->supported, &pl->link_config); +phylink_calculate_capabilities (pl); ret =phylink_parse_mode (pl, fwnode);if (ret <0 )
include/linux/linkmode.h +6 -0
@@ -32,6 +32,12 @@ static inline void linkmode_or(unsigned long *dst, const unsigned long *a,bitmap_or (dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS); } +static inline void linkmode_xor (unsigned long *dst,const unsigned long *a, +const unsigned long *b) +{ +bitmap_xor (dst, a, b, __ETHTOOL_LINK_MODE_MASK_NBITS); +} +static inline bool linkmode_empty (const unsigned long *src) {return bitmap_empty (src, __ETHTOOL_LINK_MODE_MASK_NBITS);
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 07/15] net: phylink: add capabilities helper and track modified advertising
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [High] net: phylink: unchecked phylink_validate() in phylink_calculate_capabilities() - [High] net…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [High] net: phylink: unchecked phylink_validate() in phylink_calculate_capabilities()
- [High] net: phylink: broken advertising tracking in phylink_calculate_capabilities()
--
commit fb3c4a8238a09c214077ba885092205d6fc987a8
Author: Christian Marangi <[email protected]>
net: phylink: add capabilities helper and track modified advertising
This commit introduces phylink_calculate_capabilities() and a new advertising mask in struct phylink to recalculate supported and advertised link modes while preserving user-disabled advertisements.
Quoted 21 lines
drivers/net/phy/phylink.c +6
-0@@ -61,6 +61,7 @@ struct phylink {u8 link_port;/* The current non-phy ethtool port */ __ETHTOOL_DECLARE_LINK_MODE_MASK (supported);__ETHTOOL_DECLARE_LINK_MODE_MASK (supported_lpi); +__ETHTOOL_DECLARE_LINK_MODE_MASK (advertising);/* The link configuration settings */ struct phylink_link_state link_config;@@ -717,6 +718,27 @@ static int phylink_validate(struct phylink *pl, unsigned long *supported,return ret; } +static void phylink_calculate_capabilities (struct phylink *pl) +{ +__ETHTOOL_DECLARE_LINK_MODE_MASK (disabled_advertising); + +/* Get user-disabled advertising modes */
drivers/net/phy/phylink.c static int phylink_validate(struct phylink *pl, unsigned long *supported, · line 735
Quoted 10 lines
drivers/net/phy/phylink.c +10
-0+linkmode_xor (disabled_advertising, pl->advertising, + pl->link_config.advertising); + +/* Calculate the full supported advertisement */ +linkmode_fill (pl->supported); +linkmode_copy (pl->link_config.advertising, pl->supported); +phylink_validate (pl, pl->supported, &pl->link_config); + +/* Save the newly calculated full advertisement */ +linkmode_copy (pl->advertising, pl->link_config.advertising);
[Severity: High]
What happens to pl->supported, pl->advertising, and pl->link_config.advertising when phylink_validate() fails?
When the PCS supporting pl->link_config.interface has not attached yet or has just been released, __phylink_validate() fails the test_bit(state->interface, interfaces) check and returns -EINVAL before masking supported or state->advertising. Because the return value of phylink_validate() is ignored, pl->supported, pl->advertising, and pl->link_config.advertising remain filled with all ones, corrupting both the active capabilities and the pl->advertising baseline used by later phylink_calculate_capabilities() calls.
drivers/net/phy/phylink.c static int phylink_validate(struct phylink *pl, unsigned long *supported, · line 740
Quoted 5 lines
drivers/net/phy/phylink.c +5
-0+ +/* Keep user-disabled modes out of the active advertisement. */ +linkmode_andnot (pl->link_config.advertising, + pl->link_config.advertising, disabled_advertising); +}
[Severity: High]
Does phylink_calculate_capabilities() preserve user-disabled modes and mode-specific capabilities across PCS release and re-attach?
First, disabled_advertising is computed from pl->advertising and pl->link_config.advertising on each call, and then pl->advertising is overwritten with the new capabilities. When a PCS is removed, its modes are cleared from both masks; when it is later re-attached, linkmode_xor() sees 0 ^ 0 = 0 for those modes and re-enables any modes the user had disabled before removal.
Second, because linkmode_xor() is symmetric rather than linkmode_andnot(disabled_advertising, pl->advertising, pl->link_config.advertising), any bit present in pl->link_config.advertising but absent from pl->advertising (such as pause bits updated by phylink_update_pause_state()) is placed into disabled_advertising and stripped.
Third, phylink_create() calls phylink_calculate_capabilities() before phylink_parse_mode() and phylink_parse_fixedlink(), which (along with phylink_set_fixed_link(), phylink_bringup_phy(), and phylink_sfp_set_config()) overwrite pl->supported and pl->link_config.advertising without updating pl->advertising. A later phylink_calculate_capabilities() call then treats the difference between the stale initial pl->advertising and the mode-specific pl->link_config.advertising as user-disabled modes, while linkmode_fill(pl->supported) clobbers the mode-specific pl->supported mask.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
PATCH v20 8/15 net: phylink: support PCS provider release
In reply to Christian MarangiAdd support for release of fwnode PCS from a PCS provider. This works by creating a global notifier for the PCS provider and making each phylink instance that makes use of fwnode subscribe to this notifier.
The PCS notifier will emit the event FWNODE_PCS_PROVIDER_DEL every time a new PCS provider is released.
phylink will then react to this event and will call the new function fwnode_pcs_matches_provider() on each PCS of the phylink instance and will check if the PCS is provided by the PCS provider that is getting released.
If a related PCS is found, then such PCS is removed from the phylink instance PCS list and the supported_interfaces value is updated.
The flag force_major_config is set to make phylink resolve reconfigure the interface (even if it didn't change).
This is needed to handle the special case when the current PCS used by phylink is removed and a major_config is needed to propagae the configuration change. With this option enabled we also force mac_config even if the PHY link is not up for the in-band case.
Finally a phylink resolve is triggered to handle the PCS removal.
Protect every access of phylink pcs_list with state_mutex to handle async PCS provider release and capabilities recalculation.
--- drivers/net/pcs/pcs.c | 47 +++++++++++++ drivers/net/phy/phylink.c | 136 +++++++++++++++++++++++++++++++++++--- include/linux/pcs/pcs.h | 69 +++++++++++++++++++ 3 files changed, 244 insertions(+), 8 deletions(-)
drivers/net/pcs/pcs.c +47 -0
@@ -22,6 +22,19 @@ struct fwnode_pcs_provider {static LIST_HEAD (fwnode_pcs_providers);static DEFINE_MUTEX (fwnode_pcs_mutex); +static BLOCKING_NOTIFIER_HEAD (fwnode_pcs_notify_list); + +int register_fwnode_pcs_notifier (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&fwnode_pcs_notify_list, nb); +} +EXPORT_SYMBOL_GPL (register_fwnode_pcs_notifier); + +int unregister_fwnode_pcs_notifier (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&fwnode_pcs_notify_list, nb); +} +EXPORT_SYMBOL_GPL (unregister_fwnode_pcs_notifier);struct phylink_pcs *fwnode_pcs_simple_xlate (struct fwnode_reference_args *pcsspec,void *data)
@@ -74,6 +87,11 @@ void fwnode_pcs_del_provider(struct fwnode_pcs_provider *pp)mutex_unlock (&fwnode_pcs_mutex); +/* Signal phylink to release any PCS from this provider */ +blocking_notifier_call_chain (&fwnode_pcs_notify_list, +FWNODE_PCS_PROVIDER_DEL , + pp); +fwnode_handle_put (pp->fwnode);kfree (pp); }
@@ -183,6 +201,35 @@ struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwnode, unsigned }EXPORT_SYMBOL_GPL (fwnode_pcs_get); +bool fwnode_pcs_matches_provider (struct fwnode_pcs_provider *provider, +const struct fwnode_handle *fwnode, +struct phylink_pcs *pl_pcs) +{ +struct fwnode_reference_args pcsspec; +int index =0 ; +int ret; + +while (true) { +struct phylink_pcs *pcs; + + ret =fwnode_parse_pcsspec (fwnode, index,NULL , &pcsspec); +if (ret) +return false; + + pcs =__fwnode_pcs_get_from_pcsspec_provider (&pcsspec, provider); +if (!IS_ERR (pcs) && pcs == pl_pcs) { +fwnode_handle_put (pcsspec.fwnode); +return true; + } + +fwnode_handle_put (pcsspec.fwnode); + index++; + } + +return false; +} +EXPORT_SYMBOL_GPL (fwnode_pcs_matches_provider); +unsigned int fwnode_phylink_pcs_count (struct fwnode_handle *fwnode) {struct fwnode_reference_args out_args;
drivers/net/phy/phylink.c +128 -8
243 lines not on this page · raw message
include/linux/pcs/pcs.h +69 -0
94 lines not on this page · raw message
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 08/15] net: phylink: support PCS provider release
Thank you for your contribution! Sashiko AI review found 7 potential issues to consider: - [Medium] net: phylink: unchecked validation in phylink_calculate_capabilities() - [Medium] net: phylink…
Thank you for your contribution! Sashiko AI review found 7 potential issues to consider:
- [Medium] net: phylink: unchecked validation in phylink_calculate_capabilities()
- [Medium] net: phylink: pcs_provider_notify() clobbers mode and media linkmodes
- [Medium] net: phylink: duplicate phylink_pcs_disable() in phylink_del_pcs()
- [Medium] net: phylink: force_major_config in phylink_del_pcs() runs when disabled
- [Medium] net: phylink: race in phylink_create() after registering fwnode_pcs_nb
- [Medium] net: phylink: missing !pcs check in phylink_validate_mac_and_pcs()
- [Medium] net: phylink: UAF of phylink_pcs in phylink_destroy() and phylink_create()
--
commit 9f425957f6e59d4881b3a8c251eeacc60b88a666
Author: Christian Marangi <[email protected]>
net: phylink: support PCS provider release
This commit adds a blocking notifier chain for fwnode PCS provider removal so phylink instances can detach removed PCS instances, refresh supported interfaces and capabilities, and trigger link resolution.
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
Quoted 10 lines
drivers/net/phy/phylink.c +2
-0@@ -722,6 +725,8 @@ static void phylink_calculate_capabilities(struct phylink *pl) {__ETHTOOL_DECLARE_LINK_MODE_MASK (disabled_advertising); +lockdep_assert_held (&pl->state_mutex); +/* Get user-disabled advertising modes */ linkmode_xor (disabled_advertising, pl->advertising, pl->link_config.advertising);
drivers/net/phy/phylink.c static void phylink_calculate_capabilities(struct phylink *pl) · line 737
Quoted 5 lines
drivers/net/phy/phylink.c +1
-1@@ -729,7 +734,7 @@ static void phylink_calculate_capabilities(struct phylink *pl)/* Calculate the full supported advertisement */ linkmode_fill (pl->supported);linkmode_copy (pl->link_config.advertising, pl->supported); -phylink_validate (pl, pl->supported, &pl->link_config); +__phylink_validate (pl, pl->supported, &pl->link_config);
[Severity: Medium]
Does phylink_calculate_capabilities() leave pl->supported and pl->advertising filled with all ones when __phylink_validate() fails?
When pcs_provider_notify() removes the PCS that provided pl->link_config.interface and rebuilds pl->supported_interfaces, pl->link_config.interface still holds the removed interface mode. __phylink_validate() then returns -EINVAL at the test_bit() check before clearing or masking pl->supported or pl->link_config.advertising:
drivers/net/phy/phylink.c:__phylink_validate() {
...
if (!test_bit(state->interface, interfaces))
return -EINVAL;
}Because the return value is ignored after linkmode_fill(pl->supported), every ethtool linkmode bit remains set in pl->supported, pl->advertising, and (except for previously disabled bits) pl->link_config.advertising.
[ ... ]
Quoted 24 lines
drivers/net/phy/phylink.c +15
-0@@ -2066,11 +2084,91 @@ static int phylink_fill_available_pcs(struct phylink *pl, } out: +mutex_unlock (&pl->state_mutex); +kfree (pcss);return ret; } +static void phylink_del_pcs (struct phylink *pl,struct phylink_pcs *pcs) +{ +lockdep_assert_held (&pl->state_mutex); + +rcu_assign_pointer (pcs->phylink,NULL ); +synchronize_rcu (); +list_del (&pcs->list); + +/* +* Check if we are removing the PCS currently +* in use by this phylink instance. If this is the case, +* tear down the link, force phylink resolve to reconfigure the +* interface mode, disable the current PCS and set the
drivers/net/phy/phylink.c static int phylink_fill_available_pcs(struct phylink *pl, · line 2116
Quoted 10 lines
drivers/net/phy/phylink.c +10
-0+* phylink PCS to NULL. +*/ +if (pl->pcs == pcs) { +if (pl->old_link_state) { +phylink_link_down (pl); + pl->old_link_state = false; + } +if (pl->cfg_link_an_mode ==MLO_AN_INBAND ) +timer_delete_sync (&pl->link_poll); +phylink_pcs_disable (pl->pcs);
[Severity: Medium]
Can phylink_del_pcs() call phylink_pcs_disable(pl->pcs) a second time when the phylink instance is already stopped?
phylink_stop() sets pl->pcs_state to PCS_STATE_DOWN and calls phylink_pcs_disable(pl->pcs) while leaving pl->pcs non-NULL. If the PCS provider is removed while stopped, phylink_del_pcs() calls phylink_pcs_disable(pl->pcs) again without an intervening enable, breaking PCS drivers that refcount enable and disable calls such as mxl862xx_pcs_disable(). Should this check pl->pcs_state != PCS_STATE_DOWN before disabling the PCS?
drivers/net/phy/phylink.c static int phylink_fill_available_pcs(struct phylink *pl, · line 2121
Quoted 5 lines
drivers/net/phy/phylink.c +5
-0+ + pl->force_major_config = true; +WRITE_ONCE (pl->pcs,NULL ); + } +}
[Severity: Medium]
Should pl->force_major_config be set when pl->phylink_disable_state is non-zero?
In phylink_resolve(), pl->force_major_config bypasses the mac_config gate that normally suppresses reconfiguration when pl->phylink_disable_state is non-zero:
drivers/net/phy/phylink.c:phylink_resolve() {
...
if ((mac_config && link_state.interface != pl->link_config.interface) ||
pl->force_major_config) {
...
phylink_major_config(pl, false, &link_state);
pl->link_config.interface = link_state.interface;
pl->force_major_config = false;
}
}If phylink_stop() runs phylink_run_resolve_and_disable() after timer_delete_sync(&pl->link_poll) while pl->force_major_config is set, phylink_major_config() reconfigures the stopping link and calls phylink_pcs_poll_start(), which can re-arm pl->link_poll after it was deleted. If the interface was already stopped when the PCS was removed, pl->force_major_config stays set until the next phylink_start(), causing phylink_enable_and_run_resolve() to run a duplicate phylink_major_config() right after phylink_mac_initial_config().
Quoted 28 lines
drivers/net/phy/phylink.c +28
-0+ +static int pcs_provider_notify (struct notifier_block *self, +unsigned long val,void *data) +{ + struct phylink *pl = container_of(self, struct phylink, fwnode_pcs_nb); +struct fwnode_pcs_provider *pp = data; +struct phylink_pcs *pcs, *tmp; +bool resolve = false; + +rtnl_lock (); +mutex_lock (&pl->state_mutex); + +/* +* Loop all the PCS for phylink instance and check if +* this notification is relevant for some of them. +*/ +list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list) { +if (!fwnode_pcs_matches_provider (pp, pl->fwnode, pcs)) +continue ; + +phylink_del_pcs (pl, pcs); + resolve = true; + } + +/* Exit early if nothing has changed */ +if (!resolve) { +mutex_unlock (&pl->state_mutex); +rtnl_unlock ();
drivers/net/phy/phylink.c static int phylink_fill_available_pcs(struct phylink *pl, · line 2159
Quoted 10 lines
drivers/net/phy/phylink.c +10
-0+return NOTIFY_DONE ; + } + +/* Refresh supported interfaces */ +phy_interface_copy (pl->supported_interfaces, + pl->config->supported_interfaces); +list_for_each_entry (pcs, &pl->pcs_list, list) +phy_interface_or (pl->supported_interfaces, + pl->supported_interfaces, + pcs->supported_interfaces);
[Severity: Medium]
When a PCS is removed and pl->supported_interfaces is reset from pl->config->supported_interfaces, can __phylink_validate() still treat an interface in pl->config->pcs_interfaces as supported without a PCS?
Drivers populate pl->config->supported_interfaces with all MAC-supported interfaces and mark those requiring a dedicated PCS in pl->config->pcs_interfaces. When no matching PCS remains in pl->pcs_list, phylink_validate_mac_and_pcs() leaves pcs as NULL without returning an error and validates against MAC capabilities alone:
drivers/net/phy/phylink.c:phylink_validate_mac_and_pcs() {
...
} else if (test_bit(state->interface, pl->config->pcs_interfaces)) {
struct phylink_pcs *tmp;
list_for_each_entry(tmp, &pl->pcs_list, list) {
if (!phylink_validate_pcs_interface(tmp, state->interface)) {
pcs = tmp;
break;
}
}
}
if (pcs) {
...
}Should phylink_validate_mac_and_pcs() return -EINVAL when !pcs in the pl->config->pcs_interfaces branch, matching phylink_major_config()?
drivers/net/phy/phylink.c static int phylink_fill_available_pcs(struct phylink *pl, · line 2162
Quoted 3 lines
drivers/net/phy/phylink.c +3
-0+ +/* Recalculate capabilities */ +phylink_calculate_capabilities (pl);
[Severity: Medium]
Does calling phylink_calculate_capabilities() from pcs_provider_notify() clobber mode- and media-specific masks in pl->supported and pl->link_config.advertising?
After phylink_create() runs phylink_calculate_capabilities(), phylink_parse_mode() (for MLO_AN_INBAND), phylink_parse_fixedlink(), phylink_bringup_phy(), or SFP insertion restrict pl->supported and pl->link_config.advertising without updating pl->advertising. When pcs_provider_notify() later calls phylink_calculate_capabilities(), linkmode_xor(disabled_advertising, pl->advertising, pl->link_config.advertising) treats those mode, PHY, or SFP restrictions as user-disabled bits, and linkmode_fill(pl->supported) followed by __phylink_validate() overwrites pl->supported and pl->advertising with unconstrained MAC/PCS capabilities.
[ ... ]
Quoted 21 lines
drivers/net/phy/phylink.c +9
-1@@ -2281,10 +2379,18 @@ struct phylink *phylink_create(struct phylink_config *config,__set_bit (PHYLINK_DISABLE_STOPPED , &pl->phylink_disable_state);timer_setup (&pl->link_poll, phylink_fixed_poll,0 ); +/* First register notifier for hotplug PCS events */ +if (!phy_interface_empty (config->pcs_interfaces)) { + pl->fwnode_pcs_nb.notifier_call = pcs_provider_notify; +register_fwnode_pcs_notifier (&pl->fwnode_pcs_nb); + } +/* Fill the PCS list with available PCS from phylink config */ ret =phylink_fill_available_pcs (pl, config);if (ret <0 ) - goto free_pl; + goto unregister_pcs_notify; + +mutex_lock (&pl->state_mutex);/* Link available PCS to phylink */ list_for_each_entry (pcs, &pl->pcs_list, list)
drivers/net/phy/phylink.c struct phylink *phylink_create(struct phylink_config *config, · line 2414
Quoted 9 lines
drivers/net/phy/phylink.c +3
-1@@ -2301,9 +2407,11 @@ struct phylink *phylink_create(struct phylink_config *config,phylink_calculate_capabilities (pl); +mutex_unlock (&pl->state_mutex); + ret =phylink_parse_mode (pl, fwnode);if (ret <0 ) - goto unlink_pcs_list; + goto unregister_pcs_notify;
[Severity: Medium]
Can pcs_provider_notify() race with phylink_create() because pl->fwnode_pcs_nb is registered before initialization finishes and pl->state_mutex is dropped between steps?
phylink_create() is called without rtnl_lock() held, so only pl->state_mutex serializes it against pcs_provider_notify():
CPU0 CPU1phylink_create()
register_fwnode_pcs_notifier()
phylink_fill_available_pcs()
mutex_lock(&pl->state_mutex)
list_add_tail(&pcs->list, ...)
mutex_unlock(&pl->state_mutex)
...
mutex_lock(&pl->state_mutex)
phylink_calculate_capabilities()
mutex_unlock(&pl->state_mutex)
fwnode_pcs_del_provider()
pcs_provider_notify()
mutex_lock(&pl->state_mutex)
phylink_calculate_capabilities()
phylink_parse_mode()
linkmode_zero(pl->supported) <-- data race on pl->supported /
pl->link_config.advertisingpcs_provider_notify() can also run between phylink_fill_available_pcs() unlocking pl->state_mutex and phylink_create() re-locking it before pcs->phylink and pl->supported_interfaces are initialized.
[ ... ]
Quoted 34 lines
drivers/net/phy/phylink.c +11
-3@@ -2322,14 +2430,18 @@ struct phylink *phylink_create(struct phylink_config *config, release_link_gpio:if (pl->link_gpio)gpiod_put (pl->link_gpio); -unlink_pcs_list: +unregister_pcs_notify: +if (pl->fwnode_pcs_nb.notifier_call) +unregister_fwnode_pcs_notifier (&pl->fwnode_pcs_nb);list_for_each_entry (pcs, &pl->pcs_list, list)rcu_assign_pointer (pcs->phylink,NULL ); -synchronize_rcu (); - +/* PCS notifier might queue a resolve, cancel it */ +cancel_work_sync (&pl->resolve); +mutex_lock (&pl->state_mutex);list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list)list_del (&pcs->list); +mutex_unlock (&pl->state_mutex); free_pl:fwnode_handle_put (pl->fwnode);kfree (pl);@@ -2355,6 +2467,10 @@ void phylink_destroy(struct phylink *pl)if (pl->link_gpio)gpiod_put (pl->link_gpio); +/* Unregister notifier for late PCS attach */ +if (pl->fwnode_pcs_nb.notifier_call) +unregister_fwnode_pcs_notifier (&pl->fwnode_pcs_nb); +/* Remove phylink instance from every PCS */ list_for_each_entry (pcs, &pl->pcs_list, list)rcu_assign_pointer (pcs->phylink,NULL );
drivers/net/phy/phylink.c void phylink_destroy(struct phylink *pl) · line 2492
Quoted 10 lines
drivers/net/phy/phylink.c +3
-0@@ -2367,10 +2483,14 @@ void phylink_destroy(struct phylink *pl)cancel_work_sync (&pl->resolve); +mutex_lock (&pl->state_mutex); +/* Remove every PCS from phylink PCS list */ list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list)list_del (&pcs->list); +mutex_unlock (&pl->state_mutex);
[Severity: Medium]
Can unregistering pl->fwnode_pcs_nb before detaching pl->pcs_list in phylink_destroy() and the phylink_create() error path cause a use-after-free on struct phylink_pcs?
fwnode_pcs_del_provider() relies on fwnode_pcs_notify_list to detach all phylink consumers before returning to the PCS provider driver, which then frees its struct phylink_pcs:
CPU0 CPU1phylink_destroy()
unregister_fwnode_pcs_notifier()
pcs_driver_remove()
fwnode_pcs_del_provider()
blocking_notifier_call_chain()
/* pl already unregistered */
kfree(pcs)
list_for_each_entry(pcs, ...)
rcu_assign_pointer(pcs->phylink, NULL) <-- use-after-free synchronize_rcu()
...
list_del(&pcs->list) <-- use-after-free
Unregistering the notifier after removing all PCS entries from pl->pcs_list and clearing pl->pcs would prevent fwnode_pcs_del_provider() from returning while phylink still holds pointers to those PCS instances.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
PATCH v20 9/15 net: phylink: support late PCS provider attach
In reply to Christian MarangiAdd support for late PCS provider attachment to a phylink instance. Similar to FWNODE_PCS_PROVIDER_DEL, FWNODE_PCS_PROVIDER_ADD is added to address the case where a PCS provider is added after a phylink instance is created and started.
The PCS notifier will emit the event FWNODE_PCS_PROVIDER_ADD every time a new PCS provider is added.
If a related PCS is found, then such PCS is added to the phylink instance PCS list.
Such PCS is then linked to the phylink instance and the supported interfaces of the phylink instance get refreshed.
If we are in a major_config_failed scenario an interface reconfiguration is triggered in the next phylink resolve.
In the example scenario where the link was previously torn down due to removal of PCS, the link will be established again as the PCS came back and is now available to phylink.
--- drivers/net/pcs/pcs.c | 22 +++++++++++ drivers/net/phy/phylink.c | 80 +++++++++++++++++++++++++++++---------- include/linux/pcs/pcs.h | 31 +++++++++++++++ 3 files changed, 114 insertions(+), 19 deletions(-)
drivers/net/pcs/pcs.c +22 -0
@@ -69,6 +69,10 @@ fwnode_pcs_add_provider(struct fwnode_handle *fwnode,mutex_unlock (&fwnode_pcs_mutex); +blocking_notifier_call_chain (&fwnode_pcs_notify_list, +FWNODE_PCS_PROVIDER_ADD , + pp); +pr_debug ("Added pcs provider from %pfwf\n" , fwnode);return pp;
@@ -201,6 +205,24 @@ struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwnode, unsigned }EXPORT_SYMBOL_GPL (fwnode_pcs_get); +struct phylink_pcs *fwnode_pcs_get_from_provider (struct fwnode_pcs_provider *provider, +const struct fwnode_handle *fwnode, +int index) +{ +struct fwnode_reference_args pcsspec; +struct phylink_pcs *pcs; +int ret; + + ret =fwnode_parse_pcsspec (fwnode, index,NULL , &pcsspec); +if (ret) +return ERR_PTR (ret); + + pcs =__fwnode_pcs_get_from_pcsspec_provider (&pcsspec, provider); +fwnode_handle_put (pcsspec.fwnode); +return pcs; +} +EXPORT_SYMBOL_GPL (fwnode_pcs_get_from_provider); +bool fwnode_pcs_matches_provider (struct fwnode_pcs_provider *provider,const struct fwnode_handle *fwnode,struct phylink_pcs *pl_pcs)
drivers/net/phy/phylink.c +61 -19
109 lines not on this page · raw message
include/linux/pcs/pcs.h +31 -0
@@ -5,6 +5,7 @@#include <linux/phylink.h> enum fwnode_pcs_notify_event { +FWNODE_PCS_PROVIDER_ADD ,FWNODE_PCS_PROVIDER_DEL , };
@@ -50,6 +51,28 @@ int unregister_fwnode_pcs_notifier(struct notifier_block *nb);struct phylink_pcs *fwnode_pcs_get (const struct fwnode_handle *fwnode,unsigned int index); +/** +* fwnode_pcs_get_from_provider() - Retrieve a PCS from a specific provider +* @provider: PCS provider to use +* @fwnode: firmware node +* @index: index fwnode PCS handle in firmware node +* +* Get a PCS from the firmware node at index specifically provided by +* passed PCS provider. +* +* Unlike fwnode_pcs_get(), this function does not search the global list of +* PCS providers. The caller must provide the provider responsible for the +* referenced PCS. +* +* Returns: a pointer to the phylink_pcs or a negative error pointer. Can +* return -ENODEV if the PCS is not present in global providers list (either +* due to driver still needs to be probed or it failed to probe/removed) or +* can return -EINVAL if the PCS provider doesn't expose any PCS for the fwnode. +*/ +struct phylink_pcs *fwnode_pcs_get_from_provider (struct fwnode_pcs_provider *provider, +const struct fwnode_handle *fwnode, +int index); +/** * fwnode_pcs_matches_provider() - Check whether a PCS belongs to a provider * @provider: PCS provider to check
@@ -120,6 +143,14 @@ static inline struct phylink_pcs *fwnode_pcs_get(const struct fwnode_handle *fwnreturn ERR_PTR (-ENOENT ); } +static inline struct phylink_pcs * +fwnode_pcs_get_from_provider (struct fwnode_pcs_provider *provider, +const struct fwnode_handle *fwnode, +int index) +{ +return ERR_PTR (-ENOENT ); +} +static inline bool fwnode_pcs_matches_provider (struct fwnode_pcs_provider *provider,const struct fwnode_handle *fwnode,struct phylink_pcs *pl_pcs)
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 09/15] net: phylink: support late PCS provider attach
Thank you for your contribution! Sashiko AI review found 4 potential issues to consider: - [High] net: phylink: broken MLO_AN_FIXED and MLO_AN_INBAND recovery in phylink_resolve() - [Medium] net…
Thank you for your contribution! Sashiko AI review found 4 potential issues to consider:
- [High] net: phylink: broken MLO_AN_FIXED and MLO_AN_INBAND recovery in phylink_resolve()
- [Medium] net: phylink: capability mask corruption in phylink_calculate_capabilities()
- [Medium] net: phylink: data race on linkmode bitmaps in phylink_create()
- [Low] net: pcs: inaccurate Returns kernel-doc for fwnode_pcs_get_from_provider()
--
commit 483dcebdc3997073778f57fa52e0f5ffb3f2eaf9
Author: Christian Marangi <[email protected]>
net: phylink: support late PCS provider attach
This commit adds the FWNODE_PCS_PROVIDER_ADD notifier event and fwnode_pcs_get_from_provider() helper so phylink instances can attach PCS providers that register after phylink creation and re-trigger link resolution.
Quoted 5 lines
drivers/net/pcs/pcs.c +0
-0
drivers/net/pcs/pcs.c fwnode_pcs_add_provider(struct fwnode_handle *fwnode, · line 78
Quoted 10 lines
drivers/net/pcs/pcs.c +4
-0@@ -69,6 +69,10 @@ fwnode_pcs_add_provider(struct fwnode_handle *fwnode,mutex_unlock (&fwnode_pcs_mutex); +blocking_notifier_call_chain (&fwnode_pcs_notify_list, +FWNODE_PCS_PROVIDER_ADD , + pp); +pr_debug ("Added pcs provider from %pfwf\n" , fwnode);return pp;
[Severity: Medium]
Can firing FWNODE_PCS_PROVIDER_ADD here cause a data race on pl->supported, pl->link_config.advertising, and pl->supported_interfaces if a PCS provider registers while phylink_create() or phylink_validate_phy() is running on another CPU?
phylink_create() registers pcs_provider_notify() before setup is finished and releases pl->state_mutex before calling phylink_parse_mode() and phylink_parse_fixedlink() (and phylink_create() is called without rtnl_lock):
CPU0 CPU1phylink_create()
register_fwnode_pcs_notifier()
...
mutex_unlock(&pl->state_mutex)
fwnode_pcs_add_provider()
...
pcs_provider_notify()
mutex_lock(&pl->state_mutex)
phylink_calculate_capabilities()
linkmode_fill(pl->supported)
phylink_parse_mode()
phylink_set(pl->supported, ...) <-- data racephylink_validate_phy() similarly reads pl->supported_interfaces outside pl->state_mutex before phylink_bringup_phy() acquires the lock, racing with pcs_provider_notify() updating pl->supported_interfaces.
[ ... ]
Quoted 4 lines
drivers/net/phy/phylink.c +0
-0
[ ... ]
Quoted 22 lines
drivers/net/phy/phylink.c +7
-7@@ -2127,20 +2151,42 @@ static int pcs_provider_notify(struct notifier_block *self,struct fwnode_pcs_provider *pp = data;struct phylink_pcs *pcs, *tmp;bool resolve = false; +int count, i;rtnl_lock ();mutex_lock (&pl->state_mutex); -/* -* Loop all the PCS for phylink instance and check if -* this notification is relevant for some of them. -*/ -list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list) { -if (!fwnode_pcs_matches_provider (pp, pl->fwnode, pcs)) -continue ; +switch (val) { +case FWNODE_PCS_PROVIDER_ADD : + count =fwnode_phylink_pcs_count (pl->fwnode); +for (i =0 ; i < count; i++) { + pcs =fwnode_pcs_get_from_provider (pp, pl->fwnode, i); +if (IS_ERR_OR_NULL (pcs))
drivers/net/phy/phylink.c static int pcs_provider_notify(struct notifier_block *self, · line 2174
Quoted 10 lines
drivers/net/phy/phylink.c +10
-0+continue ; + +/* Trigger a resolve only if a PCS is actually added */ +if (phylink_add_pcs (pl, pcs)) + resolve = true; + } + +/* Force an interface reconfig if major config fail */ +if (resolve && pl->major_config_failed) + pl->force_major_config = true;
[Severity: High]
Does setting pl->force_major_config here actually recover MLO_AN_FIXED and MLO_AN_INBAND links when phylink_major_config() previously failed during phylink_start()?
When phylink_start() runs before the PCS provider is registered, phylink_major_config() fails and returns before phylink_pcs_neg_mode() can set pl->act_link_an_mode, leaving pl->act_link_an_mode at 0 (MLO_AN_PHY):
drivers/net/phy/phylink.c:phylink_major_config() {
...
if (!pcs) {
phylink_err(pl,
"couldn't find a PCS for %s\n",
phy_modes(state->interface));
pl->major_config_failed = true;
return;
}
}
pcs_changed = pl->pcs != pcs;
phylink_pcs_neg_mode(pl, pcs, state->interface, state->advertising);
...
}When the PCS provider later attaches and phylink_resolve() runs, phylink_resolve() selects the link_state source using pl->act_link_an_mode before calling phylink_major_config():
drivers/net/phy/phylink.c:phylink_resolve() {
...
} else if (pl->act_link_an_mode == MLO_AN_FIXED) {
phylink_get_fixed_state(pl, &link_state);
mac_config = link_state.link;
} else if (pl->act_link_an_mode == MLO_AN_PHY) {
link_state = pl->phy_state;
mac_config = link_state.link;
} else {
phylink_mac_pcs_get_state(pl, &link_state);
...
if ((mac_config && link_state.interface != pl->link_config.interface) ||
pl->force_major_config) {
...
phylink_major_config(pl, false, &link_state);
pl->link_config.interface = link_state.interface;
pl->force_major_config = false;
}
}Because pl->act_link_an_mode is still MLO_AN_PHY, phylink_resolve() copies the unpopulated pl->phy_state (where link is false and advertising is zero) into link_state. For MLO_AN_INBAND 802.3z links without a PHY, phylink_pcs_neg_mode() sees ETHTOOL_LINK_MODE_Autoneg_BIT cleared in state->advertising, selects PHYLINK_PCS_NEG_INBAND_DISABLED, and programs an empty advertisement into the PCS. For MLO_AN_FIXED links without polling or a link GPIO interrupt, link_state.link is false, pl->force_major_config is cleared, and the fixed link stays down forever.
Even when pl->act_link_an_mode is already MLO_AN_INBAND (such as after FWNODE_PCS_PROVIDER_DEL followed by FWNODE_PCS_PROVIDER_ADD), phylink_resolve() calls phylink_mac_pcs_get_state() while pl->pcs is still NULL, before phylink_major_config() attaches and enables the new PCS, so a non-polled PCS is never queried for its link state after attachment.
Quoted 9 lines
drivers/net/phy/phylink.c +7
-2-phylink_del_pcs (pl, pcs); - resolve = true; +break ; +case FWNODE_PCS_PROVIDER_DEL : +/* +* Loop all the PCS for phylink instance and check if +* this notification is relevant for some of them. +*/ +list_for_each_entry_safe (pcs, tmp, &pl->pcs_list, list) {
drivers/net/phy/phylink.c static int pcs_provider_notify(struct notifier_block *self, · line 2192
Quoted 10 lines
drivers/net/phy/phylink.c +7
-0+if (!fwnode_pcs_matches_provider (pp, pl->fwnode, pcs)) +continue ; + +phylink_del_pcs (pl, pcs); + resolve = true; + } +break ; }/* Exit early if nothing has changed */
[Severity: Medium]
Does calling phylink_calculate_capabilities(pl) below this check in pcs_provider_notify() overwrite the mode-, PHY-, and SFP-restricted capability masks in pl->supported and pl->link_config.advertising?
After phylink_calculate_capabilities() runs in phylink_create(), phylink_parse_mode(), phylink_parse_fixedlink(), phylink_bringup_phy(), and phylink_sfp_set_config() narrow pl->supported and pl->link_config.advertising to the active link mode, attached PHY, or SFP module without updating pl->advertising. When pcs_provider_notify() later calls phylink_calculate_capabilities(), it refills pl->supported with all ones and validates only against the raw MAC and PCS capabilities, wiping out those restrictions:
drivers/net/phy/phylink.c:phylink_calculate_capabilities() {
...
/* Get user-disabled advertising modes */
linkmode_xor(disabled_advertising, pl->advertising,
pl->link_config.advertising);
/* Calculate the full supported advertisement */
linkmode_fill(pl->supported);
linkmode_copy(pl->link_config.advertising, pl->supported);
__phylink_validate(pl, pl->supported, &pl->link_config);
...
}In addition, if pl->link_config.interface is only supported by a PCS that has not attached yet (or was just removed), __phylink_validate() returns -EINVAL early when test_bit(state->interface, interfaces) fails, leaving pl->supported and pl->advertising filled with all ones and causing phylink_parse_mode() or phylink_validate_phy() to fail with -EINVAL before the PCS provider can attach.
[ ... ]
Quoted 4 lines
include/linux/pcs/pcs.h +0
-0
[ ... ]
Quoted 10 lines
+/**
+ *fwnode_pcs_get_from_provider()- Retrieve a PCS from a specific provider
+ * @provider: PCS provider to use
+ * @fwnode: firmware node
+ * @index: index fwnode PCS handle in firmware node
+ *
+ * Get a PCS from the firmware node at index specifically provided by
+ * passed PCS provider.
+ *
+ * Unlikefwnode_pcs_get(), this function does not search the global list of
Quoted 8 lines
+ * PCS providers. The caller must provide the provider responsible for the
+ * referenced PCS.
+ *
+ * Returns: a pointer to thephylink_pcsor a negative error pointer. Can
+ * return-ENODEVif the PCS is not present in global providers list (either
+ * due to driver still needs to be probed or it failed to probe/removed) or
+ * can return-EINVALif the PCS provider doesn't expose any PCS for the fwnode.
+ */
[Severity: Low]
This isn't a bug, but the Returns description says fwnode_pcs_get_from_provider() can return -ENODEV if the PCS is not present in the global providers list, which contradicts the preceding paragraph and the implementation in drivers/net/pcs/pcs.c (which only checks the passed provider and never searches fwnode_pcs_providers).
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
PATCH v20 10/15 net: Document PCS subsystem
In reply to Christian MarangiAdd extensive documentation of the new PCS subsystem and the fwnode implementation with producer/consumer API.
Also update the sfp-phylink migration guide.
--- Documentation/networking/index.rst | 1 + Documentation/networking/pcs.rst | 231 +++++++++++++++++++++++ Documentation/networking/sfp-phylink.rst | 35 ++-- 3 files changed, 243 insertions(+), 24 deletions(-) create mode 100644 Documentation/networking/pcs.rst
Documentation/networking/index.rst +1 -0
@@ -28,6 +28,7 @@ Contents: net_failover page_pool phy + pcs sfp-phylink alias bridge
Documentation/networking/pcs.rst new file +231 -0
231 lines not on this page · raw message
Documentation/networking/sfp-phylink.rst +11 -24
@@ -311,33 +311,20 @@ this documentation. priv->pcs = lynx_pcs_create_mdiodev(bus, 0); - Some PCS can be recovered based on firmware information: + PCS that should be recovered based on firmware information should implement + the external PCS as a :ref:`PCS provider <pcs_producer>` and reference it + with the use of PCS fwnode helper :ref:`PCS fwnode helper <pcs_fwnode>`. - .. code-block:: c - - priv->pcs = lynx_pcs_create_fwnode(of_fwnode_handle(node)); - -12. Populate the :c:func:`mac_select_pcs` callback and add it to your - :c:type:`struct phylink_mac_ops <phylink_mac_ops>` set of ops. This function - must return a pointer to the relevant :c:type:`struct phylink_pcs <phylink_pcs>` - that will be used for the requested link configuration: - - .. code-block:: c - - static struct phylink_pcs *foo_select_pcs(struct phylink_config *config, - phy_interface_t interface) - { - struct foo_priv *priv = container_of(config, struct foo_priv, - phylink_config); - - if ( /* 'interface' needs a PCS to function */ ) - return priv->pcs; +12. Populate the :c:var:`num_possible_pcs` value and + :c:func:`fill_available_pcs` callback and add it to your + :c:type:`struct phylink_config <phylink_config>`. - return NULL; - } + Refer to :ref:`Documentation/networking/pcs.rst <pcs_consumer>` for + further details and examples. - See :c:func:`mvpp2_select_pcs` for an example of a driver that has multiple - internal PCS. + Notice that the previous implementation of populating + :c:func:`mac_select_pcs` is considered deprecated in favor of the new + described above. 13. Fill-in all the :c:type:`phy_interface_t <phy_interface_t>` (i.e. all MAC to PHY link modes) that your MAC can output. The following example shows a
Signature · 1 line
2.55.0
PATCH v20 11/15 MAINTAINERS: add myself as PCS subsystem maintainer
In reply to Christian MarangiList all the files of the Ethernet PCS subsystem and add myself as maintainer.
--- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
@@ -10033,6 +10033,15 @@ F: include/uapi/linux/if_bridge.h F: include/linux/netfilter_bridge/ F: net/bridge/ +ETHERNET PCS SUBSYSTEM +M: Christian Marangi <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/networking/pcs.rst +F: drivers/net/pcs/pcs.c +F: include/linux/pcs/pcs-provider.h +F: include/linux/pcs/pcs.h + ETHERNET PHY LIBRARY M: Andrew Lunn <[email protected]> M: Heiner Kallweit <[email protected]>
Signature · 1 line
2.55.0
PATCH v20 12/15 net: phylink: add .pcs_link_down PCS OP
In reply to Christian MarangiPermit for PCS driver to define specific operation to tear down the link between the MAC and the PCS.
This might be needed for some PCS that reset counter or require special reset to correctly work if the link needs to be restored later.
On phylink_link_down() call, the additional phylink_pcs_link_down() will be called after .mac_link_down to tear down the link.
PCS driver will need to define .pcs_link_down to make use of this.
--- drivers/net/phy/phylink.c | 9 +++++++++ include/linux/phylink.h | 12 ++++++++++++ 2 files changed, 21 insertions(+)
drivers/net/phy/phylink.c +9 -0
@@ -1044,6 +1044,12 @@ static void phylink_pcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode, pcs->ops->pcs_link_up (pcs, neg_mode, interface, speed, duplex); } +static void phylink_pcs_link_down (struct phylink_pcs *pcs) +{ +if (pcs && pcs->ops->pcs_link_down) + pcs->ops->pcs_link_down (pcs); +} +static void phylink_pcs_disable_eee (struct phylink_pcs *pcs) {if (pcs && pcs->ops->pcs_disable_eee)
@@ -1756,6 +1762,9 @@ static void phylink_link_down(struct phylink *pl) pl->mac_ops->mac_link_down (pl->config, pl->act_link_an_mode, pl->cur_interface); + +phylink_pcs_link_down (pl->pcs); +phylink_info (pl,"Link is Down\n" ); }
include/linux/phylink.h +12 -0
@@ -528,6 +528,7 @@ struct phylink_pcs {* @pcs_an_restart: restart 802.3z BaseX autonegotiation. * @pcs_link_up: program the PCS for the resolved link configuration * (where necessary). +* @pcs_link_down: tear down link between MAC and PCS. * @pcs_disable_eee: optional notification to PCS that EEE has been disabled * at the MAC. * @pcs_enable_eee: optional notification to PCS that EEE will be enabled at
@@ -555,6 +556,7 @@ struct phylink_pcs_ops {void (*pcs_an_restart)(struct phylink_pcs *pcs);void (*pcs_link_up)(struct phylink_pcs *pcs,unsigned int neg_mode,phy_interface_t interface,int speed,int duplex); +void (*pcs_link_down)(struct phylink_pcs *pcs);void (*pcs_disable_eee)(struct phylink_pcs *pcs);void (*pcs_enable_eee)(struct phylink_pcs *pcs);int (*pcs_pre_init)(struct phylink_pcs *pcs);
@@ -690,6 +692,16 @@ void pcs_an_restart(struct phylink_pcs *pcs);void pcs_link_up (struct phylink_pcs *pcs,unsigned int neg_mode,phy_interface_t interface,int speed,int duplex); +/** +* pcs_link_down() - tear down link between MAC and PCS +* @pcs: a pointer to a &struct phylink_pcs. +* +* This call will be made just after mac_link_down() to inform the PCS the +* link has gone down. PCS should be configured to stop processing packets +* for transmission and reception. +*/ +void pcs_link_down (struct phylink_pcs *pcs); +/** * pcs_disable_eee() - Disable EEE at the PCS * @pcs: a pointer to a &struct phylink_pcs
Signature · 1 line
2.55.0
PATCH v20 13/15 dt-bindings: net: pcs: Document support for Airoha Ethernet PCS
In reply to Christian MarangiDocument support for Airoha Ethernet PCS for AN7581 SoC.
Airoha AN7581 SoC expose multiple Physical Coding Sublayer (PCS) for the various Serdes port supporting different Media Independent Interface (10BASE-R, USXGMII, 2500BASE-X, 1000BASE-X, SGMII).
This follow the new PCS provider with the use of #pcs-cells property.
--- .../bindings/net/pcs/airoha,pcs.yaml | 261 ++++++++++++++++++ 1 file changed, 261 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml new file +261 -0
@@ -0,0 +1,261 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/pcs/airoha,pcs.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Airoha Ethernet PCS and Serdes + +maintainers: + - Christian Marangi <[email protected]> + +description: + Airoha AN7581 SoC expose multiple Physical Coding Sublayer (PCS) for + the various Serdes port supporting different Media Independent Interface + (10BASE-R, USXGMII, 2500BASE-X, 1000BASE-X, SGMII). + +properties: + compatible: + enum: + - airoha,an7581-pcs-eth + - airoha,an7581-pcs-pon + - airoha,an7581-pcs-pcie + - airoha,an7581-pcs-usb + + reg: + minItems: 6 + maxItems: 15 + + reg-names: + minItems: 6 + maxItems: 15 + + airoha,scu: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to the SCU node required to configure + the serdes line to the correct interface mode. + + phys: + maxItems: 1 + + "#pcs-cells": true + +required: + - compatible + - reg + - reg-names + - "#pcs-cells" + +allOf: + - if: + properties: + compatible: + contains: + enum: + - airoha,an7581-pcs-eth + - airoha,an7581-pcs-pon + + then: + properties: + reg: + items: + - description: PCS MAC reg + - description: HSGMII AN reg + - description: HSGMII PCS reg + - description: MULTI SGMII reg + - description: USXGMII reg + - description: HSGMII rate adaption reg + - description: PCS Analog register + - description: PCS PMA (Physical Medium Attachment) register + + reg-names: + items: + - const: pcs_mac + - const: hsgmii_an + - const: hsgmii_pcs + - const: multi_sgmii + - const: usxgmii + - const: hsgmii_rate_adp + - const: pcs_ana + - const: pcs_pma + + phys: false + + "#pcs-cells": + const: 0 + + required: + - airoha,scu + + - if: + properties: + compatible: + contains: + const: airoha,an7581-pcs-pcie + + then: + properties: + reg: + items: + - description: PCS MAC 0 reg + - description: HSGMII AN 0 reg + - description: HSGMII PCS 0 reg + - description: MULTI SGMII 0 reg + - description: USXGMII 0 reg + - description: HSGMII rate adaption 0 reg + - description: PCS MAC 1 reg + - description: HSGMII AN 1 reg + - description: HSGMII PCS 1 reg + - description: MULTI SGMII 1 reg + - description: USXGMII 1 reg + - description: HSGMII rate adaption 1 reg + - description: PCS Analog register + - description: PCS PMA (Physical Medium Attachment) 0 register + - description: PCS PMA (Physical Medium Attachment) 1 register + + reg-names: + items: + - const: pcs_mac0 + - const: hsgmii_an0 + - const: hsgmii_pcs0 + - const: multi_sgmii0 + - const: usxgmii0 + - const: hsgmii_rate_adp0 + - const: pcs_mac1 + - const: hsgmii_an1 + - const: hsgmii_pcs1 + - const: multi_sgmii1 + - const: usxgmii1 + - const: hsgmii_rate_adp1 + - const: pcs_ana + - const: pcs_pma0 + - const: pcs_pma1 + + phys: false + + "#pcs-cells": + const: 1 + + required: + - airoha,scu + + - if: + properties: + compatible: + contains: + const: airoha,an7581-pcs-usb + + then: + properties: + reg: + items: + - description: PCS MAC reg + - description: HSGMII AN reg + - description: HSGMII PCS reg + - description: MULTI SGMII reg + - description: HSGMII rate adaption reg + - description: PCS Analog register + + reg-names: + items: + - const: pcs_mac + - const: hsgmii_an + - const: hsgmii_pcs + - const: multi_sgmii + - const: hsgmii_rate_adp + - const: pcs_ana + + airoha,scu: false + + "#pcs-cells": + const: 0 + + required: + - phys + +additionalProperties: false + +examples: + - | + #include <dt-bindings/phy/phy.h> + + pcs@1fa08000 { + compatible = "airoha,an7581-pcs-pon"; + reg = <0x1fa08000 0x1000>, + <0x1fa80000 0x60>, + <0x1fa80a00 0x164>, + <0x1fa84000 0x450>, + <0x1fa85900 0x338>, + <0x1fa86000 0x300>, + <0x1fa8a000 0x1000>, + <0x1fa8b000 0x1000>; + reg-names = "pcs_mac", "hsgmii_an", "hsgmii_pcs", + "multi_sgmii", "usxgmii", + "hsgmii_rate_adp", "pcs_ana", "pcs_pma"; + + airoha,scu = <&scuclk>; + #pcs-cells = <0>; + }; + + pcs@1fa09000 { + compatible = "airoha,an7581-pcs-eth"; + reg = <0x1fa09000 0x1000>, + <0x1fa70000 0x60>, + <0x1fa70a00 0x164>, + <0x1fa74000 0x450>, + <0x1fa75900 0x338>, + <0x1fa76000 0x300>, + <0x1fa7a000 0x1000>, + <0x1fa7b000 0x1000>; + reg-names = "pcs_mac", "hsgmii_an", "hsgmii_pcs", + "multi_sgmii", "usxgmii", + "hsgmii_rate_adp", "pcs_ana", "pcs_pma"; + + airoha,scu = <&scuclk>; + #pcs-cells = <0>; + }; + + pcs@1fa04000 { + compatible = "airoha,an7581-pcs-pcie"; + reg = <0x1fa04000 0x1000>, + <0x1fa50000 0x60>, + <0x1fa50a00 0x164>, + <0x1fa54000 0x450>, + <0x1fa55900 0x338>, + <0x1fa56000 0x300>, + <0x1fa05000 0x1000>, + <0x1fa60000 0x60>, + <0x1fa60a00 0x164>, + <0x1fa64000 0x450>, + <0x1fa65900 0x338>, + <0x1fa66000 0x300>, + <0x1fa5a000 0x1000>, + <0x1fa5b000 0x1000>, + <0x1fa5c000 0x1000>; + reg-names = "pcs_mac0", "hsgmii_an0", "hsgmii_pcs0", + "multi_sgmii0", "usxgmii0", + "hsgmii_rate_adp0", + "pcs_mac1", "hsgmii_an1", "hsgmii_pcs1", + "multi_sgmii1", "usxgmii1", + "hsgmii_rate_adp1", + "pcs_ana", "pcs_pma0", "pcs_pma1"; + + airoha,scu = <&scuclk>; + #pcs-cells = <1>; + }; + + pcs@1fa07000 { + compatible = "airoha,an7581-pcs-usb"; + reg = <0x1fa07000 0x1000>, + <0x1fa90000 0x60>, + <0x1fa90a00 0x164>, + <0x1fa94000 0x450>, + <0x1fa96000 0x300>, + <0x1fa9a000 0x600>; + reg-names = "pcs_mac", "hsgmii_an", "hsgmii_pcs", + "multi_sgmii", "hsgmii_rate_adp","pcs_ana"; + + phys = <&usb0_phy PHY_TYPE_USB3>; + + #pcs-cells = <0>; + };
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 13/15] dt-bindings: net: pcs: Document support for Airoha Ethernet PCS
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [Medium] dt-bindings: net: pcs: airoha,scu conflicts with SCU generic PHY binding - [Low] dt-bindings: net…
Thank you for your contribution! Sashiko AI review found 2 potential issues to consider:
- [Medium] dt-bindings: net: pcs: airoha,scu conflicts with SCU generic PHY binding
- [Low] dt-bindings: net: pcs: unwieldy per-compatible conditionals in airoha,pcs.yaml
--
commit 7c02c1d65d1b1089188d04c1629d9473870df4bb
Author: Christian Marangi <[email protected]>
dt-bindings: net: pcs: Document support for Airoha Ethernet PCS
This commit adds the Device Tree binding schema for the Airoha AN7581 Ethernet, PON, PCIe, and USB PCS and SerDes blocks.
Quoted 35 lines
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml new file +29
-0@@ -0,0 +1,261 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/pcs/airoha,pcs.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Airoha Ethernet PCS and Serdes + +maintainers: + - Christian Marangi <[email protected]> + +description: + Airoha AN7581 SoC expose multiple Physical Coding Sublayer (PCS) for + the various Serdes port supporting different Media Independent Interface + (10BASE-R, USXGMII, 2500BASE-X, 1000BASE-X, SGMII). + +properties: + compatible: + enum: + - airoha,an7581-pcs-eth + - airoha,an7581-pcs-pon + - airoha,an7581-pcs-pcie + - airoha,an7581-pcs-usb + + reg: + minItems: 6 + maxItems: 15 + + reg-names:
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml line 39
Quoted 10 lines
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml new file +10
-0+ minItems: 6 + maxItems: 15 + + airoha,scu: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to the SCU node required to configure + the serdes line to the correct interface mode. + + phys: + maxItems: 1
[Severity: Medium]
Should the Ethernet, PON, and PCIe PCS nodes use the standard phys property instead of introducing a custom airoha,scu phandle to &scuclk for SerDes interface mode selection?
In Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml and drivers/clk/clk-en7523.c (en7581_serdes_phy_set_mode()), the airoha,en7581-scu node (scuclk) is not a syscon and already exposes SerDes port mode switching via a generic PHY provider (#phy-cells = <1>). For the separate Chip SCU syscon (airoha,en7581-chip-scu), existing bindings such as Documentation/devicetree/bindings/thermal/airoha,en7581-thermal.yaml use airoha,chip-scu pointing to &chip_scu.
Quoted 7 lines
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml new file +7
-0+ + "#pcs-cells": true + +required: + - compatible + - reg + - reg-names
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml line 56
Quoted 10 lines
Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml new file +10
-0+ - "#pcs-cells" + +allOf: + - if: + properties: + compatible: + contains: + enum: + - airoha,an7581-pcs-eth + - airoha,an7581-pcs-pon
[Severity: Low]
Should these variants be split into separate binding schema files instead of combining all four compatibles into a single generic airoha,pcs.yaml?
Because the eth/pon, pcie, and usb blocks have different register sets (8, 15, or 6 reg entries), different #pcs-cells values (0 vs 1), and mutually exclusive required properties (airoha,scu vs phys), the top-level properties can only state loose bounds while three large if-then blocks under allOf redefine almost the entire schema for each variant.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=13
PATCH v20 14/15 net: pcs: airoha: add PCS driver for Airoha AN7581 SoC
In reply to Christian MarangiAdd PCS driver for Airoha AN7581 SoC for Ethernet/PON/PCIe/USB SERDES and permit usage of external PHY or connected SFP cage. Supported modes are USXGMII, 10G-BASER, 2500BASE-X, 1000BASE-X and SGMII.
The driver probe and register the various needed registers and register as a PCS provider for fwnode usage.
--- drivers/net/pcs/Kconfig | 2 + drivers/net/pcs/Makefile | 2 + drivers/net/pcs/airoha/Kconfig | 13 + drivers/net/pcs/airoha/Makefile | 7 + drivers/net/pcs/airoha/pcs-airoha-common.c | 1306 ++++++++++++ drivers/net/pcs/airoha/pcs-airoha.h | 1311 ++++++++++++ drivers/net/pcs/airoha/pcs-an7581.c | 2100 ++++++++++++++++++++ 7 files changed, 4741 insertions(+) create mode 100644 drivers/net/pcs/airoha/Kconfig create mode 100644 drivers/net/pcs/airoha/Makefile create mode 100644 drivers/net/pcs/airoha/pcs-airoha-common.c create mode 100644 drivers/net/pcs/airoha/pcs-airoha.h create mode 100644 drivers/net/pcs/airoha/pcs-an7581.c
drivers/net/pcs/Kconfig +2 -0
@@ -64,4 +64,6 @@ config PCS_RZN1_MIIC Renesas RZ/N1, RZ/N2H, and RZ/T2H SoCs. This PCS converts MII to RMII/RGMII, or can be set in pass-through mode for MII. +source "drivers/net/pcs/airoha/Kconfig" + endmenu
drivers/net/pcs/Makefile +2 -0
@@ -10,3 +10,5 @@ obj-$(CONFIG_PCS_XPCS_ROCKCHIP) += pcs-xpcs-rk.o obj-$(CONFIG_PCS_LYNX) += pcs-lynx.o obj-$(CONFIG_PCS_MTK_LYNXI) += pcs-mtk-lynxi.o obj-$(CONFIG_PCS_RZN1_MIIC) += pcs-rzn1-miic.o + +obj-$(CONFIG_PCS_AIROHA) += airoha/
drivers/net/pcs/airoha/Kconfig new file +13 -0
@@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config PCS_AIROHA + tristate + select FWNODE_PCS + +config PCS_AIROHA_AN7581 + tristate "Airoha AN7581 PCS driver" + depends on ARCH_AIROHA || COMPILE_TEST + select PCS_AIROHA + help + This module provides helper to phylink for managing the Airoha + AN7581 PCS for SoC Ethernet and PON SERDES.
drivers/net/pcs/airoha/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_PCS_AIROHA) := pcs-airoha.o +pcs-airoha-objs := pcs-airoha-common.o +ifdef CONFIG_PCS_AIROHA_AN7581 +pcs-airoha-objs += pcs-an7581.o +endif
drivers/net/pcs/airoha/pcs-airoha-common.c new file +1306 -0
1,306 lines not on this page · raw message
drivers/net/pcs/airoha/pcs-airoha.h new file +1311 -0
1,311 lines not on this page · raw message
drivers/net/pcs/airoha/pcs-an7581.c new file +2100 -0
352 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.55.0
Part of the diff is not shown here. View the raw message.
[email protected]
AI reviewRe: [PATCH net-next v20 14/15] net: pcs: airoha: add PCS driver for Airoha AN7581 SoC
Thank you for your contribution! Sashiko AI review found 6 potential issues to consider: - [High] net: pcs: airoha: missing 1000BASE-X AN setup in airoha_pcs_config() - [High] net: pcs: airoha…
Thank you for your contribution! Sashiko AI review found 6 potential issues to consider:
- [High] net: pcs: airoha: missing 1000BASE-X AN setup in airoha_pcs_config()
- [High] net: pcs: airoha: invalid in-band AN capability reported for 2500BASE-X
- [High] net: pcs: airoha: broken syscon lookup and RMW race on airoha,scu
- [High] net: pcs: airoha: unsynchronized shared PLLs and resets in an7581_pcs_bringup()
- [Medium] net: pcs: airoha: missing Kconfig dependencies for PHYLINK and REGMAP_MMIO
- [Medium] net: pcs: airoha: uninitialized speed_reg in airoha_pcs_link_up()
--
commit 5496b74992ab5a11c007cdfeb5d147b3fefaeace
Author: Christian Marangi <[email protected]>
net: pcs: airoha: add PCS driver for Airoha AN7581 SoC
This commit adds a phylink PCS driver for the Ethernet, PON, PCIe and USB SerDes on the Airoha AN7581 SoC, supporting USXGMII, 10GBASE-R, 2500BASE-X, 1000BASE-X and SGMII modes.
Quoted 6 lines
drivers/net/pcs/airoha/Kconfig new file +0
-0
drivers/net/pcs/airoha/Kconfig line 10
Quoted 10 lines
drivers/net/pcs/airoha/Kconfig new file +10
-0@@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config PCS_AIROHA + tristate + select FWNODE_PCS + +config PCS_AIROHA_AN7581 + tristate "Airoha AN7581 PCS driver" + depends on ARCH_AIROHA || COMPILE_TEST + select PCS_AIROHA
[Severity: Medium]
Does PCS_AIROHA need dependencies or selects for PHYLINK, REGMAP_MMIO, GENERIC_PHY and MFD_SYSCON?
airoha_pcs_init_named_regmap() calls devm_regmap_init_mmio() and __an7581_pcs_alloc_regmap_fields() calls devm_regmap_field_alloc(), which have no stubs when CONFIG_REGMAP is disabled and fail to link without CONFIG_REGMAP_MMIO. The driver also calls phylink helpers such as phylink_mii_c22_pcs_decode_state(), phylink_decode_usxgmii_word() and phylink_mii_c22_pcs_encode_advertisement() (which require CONFIG_PHYLINK), devm_phy_get() and phy_set_mode_ext() (which fail to link if PCS_AIROHA=y and GENERIC_PHY=m), and syscon_regmap_lookup_by_phandle() (which returns -ENOTSUPP without CONFIG_MFD_SYSCON).
Quoted 5 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +0
-0
[ ... ]
Quoted 10 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +10
-0+/* Setup SGMII AN and advertisement in DEV_ABILITY */ +if (interface ==PHY_INTERFACE_MODE_SGMII ) { +if (neg_mode ==PHYLINK_PCS_NEG_INBAND_ENABLED ) { +int advertise =phylink_mii_c22_pcs_encode_advertisement (interface, + advertising); +if (advertise <0 ) +return advertise; + + regmap_update_bits(maps->hsgmii_an, AIROHA_PCS_HSGMII_AN_SGMII_REG_AN_4, + AIROHA_PCS_HSGMII_AN_SGMII_DEV_ABILITY,
drivers/net/pcs/airoha/pcs-airoha-common.c line 581
Quoted 10 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +10
-0+FIELD_PREP (AIROHA_PCS_HSGMII_AN_SGMII_DEV_ABILITY , + advertise)); + +regmap_set_bits (maps->hsgmii_an,AIROHA_PCS_HSGMII_AN_SGMII_REG_AN_0 , +AIROHA_PCS_HSGMII_AN_SGMII_RA_ENABLE ); + }else { +regmap_clear_bits (maps->hsgmii_an,AIROHA_PCS_HSGMII_AN_SGMII_REG_AN_0 , +AIROHA_PCS_HSGMII_AN_SGMII_RA_ENABLE ); + } + }
[Severity: High]
Should this block also run when interface is PHY_INTERFACE_MODE_1000BASEX?
phylink_mii_c22_pcs_encode_advertisement() encodes the Clause 37 ADVERTISE_1000XFULL, ADVERTISE_1000XPAUSE and ADVERTISE_1000XPSE_ASYM bits for 1000BASE-X (while returning constant 0x0001 for SGMII). Guarding this with only PHY_INTERFACE_MODE_SGMII leaves AIROHA_PCS_HSGMII_AN_SGMII_REG_AN_4 and AIROHA_PCS_HSGMII_AN_SGMII_RA_ENABLE unconfigured in 1000BASE-X mode, breaking Clause 37 auto-negotiation and pause advertisement.
[ ... ]
Quoted 35 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +35
-0+if (interface ==PHY_INTERFACE_MODE_SGMII || + interface ==PHY_INTERFACE_MODE_2500BASEX ) { +u32 ck_gen_mode; +u32 speed_reg; +u32 if_mode; + +switch (speed) { +case SPEED_2500 : + speed_reg =AIROHA_PCS_LINK_MODE_P0_2_5G ; +break ; +case SPEED_1000 : + speed_reg =AIROHA_PCS_LINK_MODE_P0_1G ; + if_mode =AIROHA_PCS_HSGMII_AN_SPEED_FORCE_MODE_1000 ; + ck_gen_mode =AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE_1000 ; +break ; +case SPEED_100 : + speed_reg =AIROHA_PCS_LINK_MODE_P0_100M ; + if_mode =AIROHA_PCS_HSGMII_AN_SPEED_FORCE_MODE_100 ; + ck_gen_mode =AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE_100 ; +break ; +case SPEED_10 : + speed_reg =AIROHA_PCS_LINK_MODE_P0_10M ; + if_mode =AIROHA_PCS_HSGMII_AN_SPEED_FORCE_MODE_10 ; + ck_gen_mode =AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE_10 ; +break ; + } + +if (interface ==PHY_INTERFACE_MODE_SGMII ) { +regmap_update_bits (maps->hsgmii_an,AIROHA_PCS_HSGMII_AN_SGMII_REG_AN_13 , +AIROHA_PCS_HSGMII_AN_SPEED_FORCE_MODE , + if_mode); + + regmap_update_bits(maps->hsgmii_pcs, AIROHA_PCS_HSGMII_PCS_AN_SGMII_MODE_FORCE, + AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE | + AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE_SEL,
drivers/net/pcs/airoha/pcs-airoha-common.c line 836
Quoted 10 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +10
-0+ ck_gen_mode | + AIROHA_PCS_HSGMII_PCS_FORCE_CUR_SGMII_MODE_SEL); + } + +regmap_update_bits (maps->multi_sgmii,AIROHA_PCS_MULTI_SGMII_SGMII_STS_CTRL_0 , +AIROHA_PCS_LINK_MODE_P0 | +AIROHA_PCS_FORCE_SPD_MODE_P0 , + speed_reg | +AIROHA_PCS_FORCE_SPD_MODE_P0 ); + }
[Severity: Medium]
Can speed_reg be used uninitialized here when interface is PHY_INTERFACE_MODE_2500BASEX?
Unlike the preceding USXGMII/10GBASER and SGMII/1000BASEX blocks, this switch (speed) has no default: return; branch. In 2500BASE-X mode, execution skips the earlier blocks, so an unexpected speed leaves speed_reg uninitialized when written to AIROHA_PCS_MULTI_SGMII_SGMII_STS_CTRL_0 (and triggers compiler uninitialized-variable warnings, along with if_mode and ck_gen_mode under SPEED_2500).
[ ... ]
drivers/net/pcs/airoha/pcs-airoha-common.c line 927
Quoted 5 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +5
-0+static unsigned int airoha_pcs_inband_caps (struct phylink_pcs *pcs, +phy_interface_t interface) +{ +return LINK_INBAND_ENABLE |LINK_INBAND_DISABLE ; +}
[Severity: High]
Does reporting LINK_INBAND_ENABLE for PHY_INTERFACE_MODE_2500BASEX break 2500BASE-X link configuration?
Because phylink_get_inband_type(PHY_INTERFACE_MODE_2500BASEX) is INBAND_BASEX, returning LINK_INBAND_ENABLE causes phylink_pcs_neg_mode() to select PHYLINK_PCS_NEG_INBAND_ENABLED when autonegotiation is advertised or used with a PHY. However, for 2500BASE-X, airoha_pcs_config() unconditionally clears AIROHA_PCS_HSGMII_AN_SGMII_RA_ENABLE in hardware, and airoha_pcs_link_up() only programs AIROHA_PCS_LINK_MODE_P0_2_5G in the neg_mode != PHYLINK_PCS_NEG_INBAND_ENABLED branch.
[ ... ]
drivers/net/pcs/airoha/pcs-airoha-common.c line 1193
Quoted 6 lines
drivers/net/pcs/airoha/pcs-airoha-common.c new file +6
-0+/* SCU is used to toggle XFI or HSGMII in global SoC registers */ +if (!priv->phy) { + priv->scu =syscon_regmap_lookup_by_phandle (dev->of_node,"airoha,scu" ); +if (IS_ERR (priv->scu)) +return PTR_ERR (priv->scu); + }
[Severity: High]
Will syscon_regmap_lookup_by_phandle(dev->of_node, "airoha,scu") permanently return -EPROBE_DEFER on AN7581?
In arch/arm64/boot/dts/airoha/en7581.dtsi and Documentation/devicetree/bindings/net/pcs/airoha,pcs.yaml, airoha,scu points to the clock controller node with compatible = "airoha,en7581-scu", which does not have "syscon" in its compatible list. In drivers/clk/clk-en7523.c, en7581_clk_hw_init() maps those registers with devm_platform_ioremap_resource() and never registers a syscon regmap, so syscon_node_to_regmap() always fails with -EPROBE_DEFER and prevents the ETH, PON and PCIE PCS devices from probing.
In addition, en7581_serdes_phy_set_mode() in drivers/clk/clk-en7523.c modifies REG_NP_SCU_SSR3 (0x94) and REG_NP_SCU_SSTR (0x9c) with raw readl()/writel() under en_clk_priv::lock, which would race with airoha_pcs_setup_scu() updating the same registers via regmap_update_bits().
Quoted 5 lines
drivers/net/pcs/airoha/pcs-an7581.c new file +0
-0
[ ... ]
Quoted 25 lines
drivers/net/pcs/airoha/pcs-an7581.c new file +25
-0+/* This comment only apply to Serdes PCIe that expose +* 2 PCS. +* +* The Serdes PCIe expose 2 PCS but always require +* the PMA for the first PCS to be configured +* for correct functionality for JCPLL. +*/ + pcs_pma = priv->pcs_pma[0 ]; + +/* Setup LDO */ +usleep_range (200 ,300 ); + +regmap_field_set_bits (pcs_ana_fields[AN7581_PCS_JCPLL_SPARE_L ], +AIROHA_PCS_ANA_JCPLL_SPARE_L_LDO ); + +/* Setup RSTB */ +regmap_field_write (pcs_ana_fields[AN7581_PCS_JCPLL_RST_DLY ], +AIROHA_PCS_ANA_JCPLL_RST_DLY_150_200 ); +regmap_field_write (pcs_ana_fields[AN7581_PCS_JCPLL_PLL_RSTB ],0x1 ); + +/* Enable PLL force selection and Force Disable */ +regmap_update_bits (pcs_pma,AIROHA_PCS_PMA_PXP_JCPLL_CKOUT_EN , +AIROHA_PCS_PMA_FORCE_SEL_DA_JCPLL_EN | +AIROHA_PCS_PMA_FORCE_DA_JCPLL_EN , +AIROHA_PCS_PMA_FORCE_SEL_DA_JCPLL_EN );
[ ... ]
Quoted 15 lines
drivers/net/pcs/airoha/pcs-an7581.c new file +15
-0+/* This comment only apply to Serdes PCIe that expose +* 2 PCS. +* +* The Serdes PCIe expose 2 PCS but always require +* the PMA for the first PCS to be configured +* for correct functionality for TXPLL. +*/ + pcs_pma = priv->pcs_pma[0 ]; + +/* Setup VCO LDO Output */ +regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_LDO_VCO_OUT ],0x1 ); +regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_LDO_OUT ],0x1 ); + +/* Setup RSTB */ +regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_PLL_RSTB ],0x1 );
drivers/net/pcs/airoha/pcs-an7581.c line 885
Quoted 10 lines
drivers/net/pcs/airoha/pcs-an7581.c new file +10
-0+regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_RST_DLY ],0x4 ); +regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_REFIN_DIV ], +AIROHA_PCS_ANA_TXPLL_REFIN_DIV_1 ); +regmap_field_write (pcs_ana_fields[AN7581_PCS_TXPLL_REFIN_INTERNAL ],0x1 ); + +/* Enable PLL force selection and Force Disable */ +regmap_update_bits (pcs_pma,AIROHA_PCS_PMA_PXP_TXPLL_CKOUT_EN , +AIROHA_PCS_PMA_FORCE_SEL_DA_TXPLL_EN | +AIROHA_PCS_PMA_FORCE_DA_TXPLL_EN , +AIROHA_PCS_PMA_FORCE_SEL_DA_TXPLL_EN );
[Severity: High]
On the 2-port PCIe SerDes PCS (airoha,an7581-pcs-pcie), can bringing up or reconfiguring one port disrupt the other port?
The two ports are exposed as independent phylink_pcs instances driven by separate phylink state machines without cross-port locking:
CPU0 (port 0 phylink) CPU1 (port 1 phylink)airoha_pcs_config(port 0)
an7581_pcs_bringup()
an7581_pcs_pll_bringup()
msleep(100)
airoha_pcs_pre_config(port 1)
airoha_pcs_setup_scu()
reset_control_bulk_assert(priv->rsts)
airoha_pcs_config(port 1)
an7581_pcs_jcpll_bringup()
/* clears FORCE_DA_JCPLL_EN on pma[0] */
an7581_pcs_txpll_bringup()
/* clears FORCE_DA_TXPLL_EN on pma[0] */
an7581_pcs_phya_bringup() <-- calibrates while shared PLLs are disabledEven when not racing concurrently, reconfiguring one port asserts the shared device-wide MAC/PHY reset lines in airoha_pcs_setup_scu() and force-disables and reprograms the shared JCPLL and TXPLL in priv->pcs_pma[0] and priv->pcs_ana (including interface-dependent TXPLL parameters), dropping an active link on the sibling port.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=14
PATCH v20 15/15 net: airoha: add phylink support
In reply to Christian MarangiAdd phylink support for each GDM port. For GDM1 add the internal interface mode as the only supported mode. For GDM2/3/4 add the required configuration of the PCS to make the external PHY or attached SFP cage work.
These needs to be defined in the GDM port node using the pcs-handle property.
Update and provide a .get/set_link_ksettings function that use phylink for ethtool OPs now that we fully support phylink.
--- drivers/net/ethernet/airoha/Kconfig | 2 + drivers/net/ethernet/airoha/airoha_eth.c | 197 +++++++++++++++++++++- drivers/net/ethernet/airoha/airoha_eth.h | 5 + drivers/net/ethernet/airoha/airoha_regs.h | 12 ++ 4 files changed, 213 insertions(+), 3 deletions(-)
drivers/net/ethernet/airoha/Kconfig +2 -0
@@ -20,6 +20,8 @@ config NET_AIROHA depends on NET_DSA || !NET_DSA select NET_AIROHA_NPU select PAGE_POOL + select PCS_AIROHA + select PHYLINK help This driver supports the gigabit ethernet MACs in the Airoha SoC family.
drivers/net/ethernet/airoha/airoha_eth.c +194 -3
272 lines not on this page · raw message
drivers/net/ethernet/airoha/airoha_eth.h +5 -0
@@ -612,6 +612,9 @@ struct airoha_gdm_dev {* QDMA migration. */ spinlock_t txq_lock[AIROHA_NUM_NETDEV_TX_RINGS ]; + +struct phylink *phylink; +struct phylink_config phylink_config; };struct airoha_gdm_port {
@@ -621,6 +624,8 @@ struct airoha_gdm_port {/* protect concurrent hw_stats accesses */ spinlock_t stats_lock; +/* protect concurrent GDM4 register access */ +struct mutex link_lock;struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS ]; };
drivers/net/ethernet/airoha/airoha_regs.h +12 -0
@@ -371,6 +371,18 @@#define IP_FRAGMENT_PORT_MASK GENMASK(8, 5)#define IP_FRAGMENT_NBQ_MASK GENMASK(4, 0) +#define REG_FE_GDM4_TMBI_FRAG 0x2028 +#define GDM4_SGMII1_TX_WEIGHT_MASK GENMASK(31, 26) +#define GDM4_SGMII1_TX_FRAG_SIZE_MASK GENMASK(25, 16) +#define GDM4_SGMII0_TX_WEIGHT_MASK GENMASK(15, 10) +#define GDM4_SGMII0_TX_FRAG_SIZE_MASK GENMASK(9, 0) + +#define REG_FE_GDM4_RMBI_FRAG 0x202c +#define GDM4_SGMII1_RX_WEIGHT_MASK GENMASK(31, 26) +#define GDM4_SGMII1_RX_FRAG_SIZE_MASK GENMASK(25, 16) +#define GDM4_SGMII0_RX_WEIGHT_MASK GENMASK(15, 10) +#define GDM4_SGMII0_RX_FRAG_SIZE_MASK GENMASK(9, 0) +#define REG_MC_VLAN_EN 0x2100#define MC_VLAN_EN_MASK BIT(0)
Signature · 1 line
2.55.0
[email protected]
AI reviewRe: [PATCH net-next v20 15/15] net: airoha: add phylink support
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Medium] net: airoha: Kconfig selects hidden PCS_AIROHA symbol in NET_AIROHA --
Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Medium] net: airoha: Kconfig selects hidden PCS_AIROHA symbol in NET_AIROHA
--
commit 5ff2dca20962cb3dbeba514686627b90b3733e68
Author: Christian Marangi <[email protected]>
net: airoha: add phylink support
This commit adds phylink support for the GDM ports in the Airoha Ethernet driver, including PCS attachment for GDM2/3/4 and phylink-backed ethtool link ksettings callbacks.
drivers/net/ethernet/airoha/Kconfig config NET_AIROHA · line 24
Quoted 10 lines
drivers/net/ethernet/airoha/Kconfig +2
-0@@ -20,6 +20,8 @@ config NET_AIROHA depends on NET_DSA || !NET_DSA select NET_AIROHA_NPU select PAGE_POOL + select PCS_AIROHA + select PHYLINK
[Severity: Medium]
Should NET_AIROHA select FWNODE_PCS (or PCS_AIROHA_AN7581) instead of the hidden PCS_AIROHA symbol?
PCS_AIROHA only builds pcs-airoha-common.o, while pcs-an7581.o is gated on CONFIG_PCS_AIROHA_AN7581:
drivers/net/pcs/airoha/Makefile:
obj-$(CONFIG_PCS_AIROHA) := pcs-airoha.o pcs-airoha-objs := pcs-airoha-common.o ifdef CONFIG_PCS_AIROHA_AN7581 pcs-airoha-objs += pcs-an7581.o endif
When CONFIG_PCS_AIROHA_AN7581 is not enabled, selecting PCS_AIROHA builds pcs-airoha without pcs-an7581.o, so the AN7581 PCS callbacks fall back to inline stubs in pcs-airoha.h that return -EOPNOTSUPP during probe. Conversely, if CONFIG_NET_AIROHA=y and CONFIG_PCS_AIROHA_AN7581=m, selecting PCS_AIROHA forces CONFIG_PCS_AIROHA=y and builds pcs-an7581.o into vmlinux instead of as a module.
airoha_eth.c only calls fwnode_phylink_pcs_count() and fwnode_phylink_pcs_parse(), which are provided by CONFIG_FWNODE_PCS.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=15
Am 14. November 2026 um 11:43 schrieb "Christian Marangi":
Quoted 9 lines
This series introduce a most awaited feature that is correctly provide PCS with fwnode without having to use specific export symbol and additional handling of PCS in phylink.
At times there were 2 different implementation (this and the one from Sean) but Sean agreed that this can be picked and used in favor of his implementation as long as his case with race condition is correctly handled.
Hi Christian
Thank you very much for taking care of this!
sorry for html mail (have not found setting to force to text in linux.dev webmailer - if someone knows it please tell me).
@netdev maintainers:
is this now in shape enough to getting merged? or which part needs to be changed?
Some boards (e.g. mt7988a based) are stalled because not having network support yet in last 2 LTS kernels due to this part is unclear/missing.
regards Frank