net: pcs: xpcs: make supported_interfaces authoritative
Subsystems (6)
Coia Prant
maintainerPATCH v5 1/1 net: pcs: xpcs: make supported_interfaces authoritative
pcs.supported_interfaces is the mask of interfaces a given xpcs instance actually supports. The compat table describes what the Synopsys IP can do in general, but a specific integration may support a different subset. For example, the RK3568 XPCS supports 1000BASE-X, SGMII and QSGMII in hardware, but does not implement the C73, 10GBASE-R or 2500BASE-X modes that the Synopsys compat table advertises.
However, xpcs_find_compat() only walks desc->compat[] and does not look at pcs.supported_interfaces. If a caller ever passes an interface outside the mask, the core would still find and configure a compat entry for it, contradicting the mask the glue already set. This was a known gap: the mask was written but never consulted by the core.
Fix both sides:
- In xpcs_find_compat(), return NULL when the interface is not in pcs.supported_interfaces, so the mask is authoritative for what the core will configure.
- In the Rockchip glue, build a platform mask with the three modes supported by RK3568 (1000BASE-X, SGMII, QSGMII) and intersect it with the core's supported_interfaces using phy_interface_and(). This narrows the mask inherited from the generic compat table so it reflects the actual SoC capabilities.
Note that QSGMII is currently filtered out (a no-op) because the core's compat table does not support it yet, which demonstrates the intended filtering behavior of this intersection.
---
Changes since v4:
- replace DECLARE_PHY_INTERFACE_MASK_ZERO with DECLARE_PHY_INTERFACE_MASK and initialize it to { 0, }.
Links:
- https://lore.kernel.org/all/[email protected]/ (v1)
- https://lore.kernel.org/all/[email protected]/ (v2)
- https://lore.kernel.org/all/[email protected]/ (v3)
- https://lore.kernel.org/all/[email protected]/ (v4)
drivers/net/pcs/pcs-xpcs-rk.c | 10 ++++++++++ drivers/net/pcs/pcs-xpcs.c | 3 +++ 2 files changed, 13 insertions(+)
drivers/net/pcs/pcs-xpcs-rk.c +10 -0
@@ -480,6 +480,7 @@ MODULE_DEVICE_TABLE(of, xpcs_rk_of_ids);struct dw_xpcs *xpcs_rk_create (struct device *dev,struct device_node *pcs,int port) { +DECLARE_PHY_INTERFACE_MASK (supported_interfaces) = {0 , };struct platform_device *pdev;struct dw_xpcs_rk *pxpcs;struct dw_xpcs *xpcs;
@@ -536,6 +537,15 @@ struct dw_xpcs *xpcs_rk_create(struct device *dev, struct device_node *pcs, intreturn xpcs; } +/* +* The RK3568 XPCS supports 1000BASE-X, SGMII and QSGMII. +*/ +__set_bit (PHY_INTERFACE_MODE_1000BASEX , supported_interfaces); +__set_bit (PHY_INTERFACE_MODE_SGMII , supported_interfaces); +__set_bit (PHY_INTERFACE_MODE_QSGMII , supported_interfaces); +phy_interface_and (xpcs->pcs.supported_interfaces, xpcs->pcs.supported_interfaces, + supported_interfaces); +xpcs_config_eee_mult_fact (xpcs, pxpcs->eee_mult_fact);put_device (&pdev->dev);return xpcs;
drivers/net/pcs/pcs-xpcs.c +3 -0
@@ -169,6 +169,9 @@ xpcs_find_compat(struct dw_xpcs *xpcs, phy_interface_t interface) {const struct dw_xpcs_compat *compat; +if (!test_bit (interface, xpcs->pcs.supported_interfaces)) +return NULL ; +for (compat = xpcs->desc->compat; compat->supported; compat++)if (compat->interface == interface)return compat;
Signature · 1 line
2.47.3