From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D8DD25F79E; Sun, 11 May 2025 18:40:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988824; cv=none; b=K6FWWfIxFxFjtl9+osw2dIDBQXRRKYTih7KwQYHXludqPIey+TiQBlwRP33stCuByMnf0LdmFNEY07TEZjEhcU3SDSdaL0IL2CsF7EvDUvr0xEt2zByiIUtu+8YS9v0kBbXMKY9Wqp5vtpbfKCrk1oHBvrj/VHz+SylbFj299k4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988824; c=relaxed/simple; bh=+QNLiQDdt++4dsv9NbQAscz2i7SK4e8p+AbJ07dfeS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pyGUhTGC2xN3yrp3BpGnp+qtbl6fTRqry+uNNC3BjwXdWO7NTpluVy0hw7WwCPGLP+dUkVbFYHN1tIZSpL0ovNXShaT2/JYbKNIaLmSXhk6W6jLr+Z5gJaPRhYuQunolJRdFjtRntUjTB+49KvSQkv3N7d+gABUvJjB4JpfVOq0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d+6xk8te; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d+6xk8te" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso37728495e9.2; Sun, 11 May 2025 11:40:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988820; x=1747593620; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+CNFUjPq4HoPTCeEuaRY4Eb3Tx96n4QPBWivdYASBbo=; b=d+6xk8tegEZ5d7noa7PooehCkL/kwS8vAqLtdOvT1DUvaZ819W65JJRGeV5J6vPjDE POW7QLbE5V0vtyQ2l3+uqKA9HtKL4fATl823H6pwmXkRqfLgI/t2fz3I1KAyitPWjy3g 6xzvWWkgQQi6FfpFRYhqMy52MqIXXWTJkad2IIN4bmP475wRVSIyJDHGXIqQ/aQSZ/yQ 3QJ3UBnGYMr5X1/p7ikLLo6Q7PGepRzywjtD7n4N9PIlGT1RBIeSCmrFHT9hjL+Jwrdi GtOST3GdQUKyD2IvRGKrcIcJ0t+HUm1ZP5Yq8X6SqDZqzH8my9oiagJLDEWsmVetZVqY U7Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988820; x=1747593620; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+CNFUjPq4HoPTCeEuaRY4Eb3Tx96n4QPBWivdYASBbo=; b=QHJX/U08kvJgoeuKjBqMmhinf+txdfuq5N061IuXovJ/doMOW44EAAGnfjG7+sFjZk XCWEA8LhDybn8TK+gRxCIao6s8biOZCWDEjDmKt6cmFAiz38/Uvl55la9IiNN5cRhZ6B 2kcCVHTEZvLC9vZBlo05/ynS2wCjNwqnySzJLyDEX0IReHySYbFI3mxX1i8JDS1lokR4 0OyxSMpV/fLJG57ZC/4E/8/d3J7BszHqmTRbwVSN+MArAfpYZrIOSH9Ynap9DRMMV+Ij ai7AFbDPLWd7EfLWkboNI6ekxzUZE2uNB8bqQiXJE/oJY8wGNM/Ban3eEGwqcl/+CGdG AC9g== X-Forwarded-Encrypted: i=1; AJvYcCVe1dfgXjkPf8o6/dnsfd14j5jGyjlu4HDW0RF35bf4/wAk52Huut8alIGR41Tt4TCZi6RB6Z6q@vger.kernel.org, AJvYcCVp5sl4b3+HwTRLDFYpsvwWcNDSNKPFuMrvTz/sfAUNz2AkpoERtdknHgu7T4z65dIt6CE3PgjMEkIh@vger.kernel.org, AJvYcCWXx7So4axti6EPSPaCsbA5Oa5BQpctLc262oAFovvPE1FYvXUKXmrrcRfwofkOsDT07OWDXEodlyWOX4X9@vger.kernel.org X-Gm-Message-State: AOJu0Yzd/FPw0cZlV73JJdEz3w23LELgLhRHzZAfjwgAs2U6idQGqgAM QC/QL2B0clzEAoFe3EqCQOnVqAUZxhaHA+fmRqJvrm766sN7Lpe2 X-Gm-Gg: ASbGncsmlYkDE5VNEz4htTPH9qFC6sOPdhE/Iz/55PJEgLSyaq2fA3a/l3y6yn7Hs5D BDyTm+B1Mb0sw4D/iRKPrYKjg5Wq3ppV8YXqpkbQ62KctWyqMPow8142yZftiNm/bZMxi8AQIGG Ln+D8RBVg01b8P0p8/jiWAxHqk7fkalFXVqNSiEeyIHgWQbp0/NVpKCM1tK5GP8R6yyyCnJXHNb ewL/J+Aut/RweqPxj7iXq4W/CQAzxaskZ5G4T5SX65ftnu9iPbIi7r1RPYfWO+JsZLYhlblxwsf 5SgkD52Mf/cFFkdDiPcAk+ALWkJlNnW/nyfs4p/QuHEgNIvulAdo8KKClCXbZqJPs3StIYS46py nXIAspubK3iRi+XnOpxhk X-Google-Smtp-Source: AGHT+IEGUVlx3y/GnPHKFvnmEjhMY0WWd/Rv2Js237lQUtWoIWrWiBMNALBReJdK24iAbBKIW+238A== X-Received: by 2002:a05:600c:8284:b0:43c:fa52:7d2d with SMTP id 5b1f17b1804b1-442d6dd2478mr74252465e9.20.1746988819607; Sun, 11 May 2025 11:40:19 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:19 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Russell King (Oracle)" Subject: [net-next PATCH v9 1/6] net: phy: pass PHY driver to .match_phy_device OP Date: Sun, 11 May 2025 20:39:25 +0200 Message-ID: <20250511183933.3749017-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass PHY driver pointer to .match_phy_device OP in addition to phydev. Having access to the PHY driver struct might be useful to check the PHY ID of the driver is being matched for in case the PHY ID scanned in the phydev is not consistent. A scenario for this is a PHY that change PHY ID after a firmware is loaded, in such case, the PHY ID stored in PHY device struct is not valid anymore and PHY will manually scan the ID in the match_phy_device function. Having the PHY driver info is also useful for those PHY driver that implement multiple simple .match_phy_device OP to match specific MMD PHY ID. With this extra info if the parsing logic is the same, the matching function can be generalized by using the phy_id in the PHY driver instead of hardcoding. Suggested-by: Russell King (Oracle) Reviewed-by: Russell King (Oracle) Signed-off-by: Christian Marangi --- drivers/net/phy/bcm87xx.c | 6 ++++-- drivers/net/phy/icplus.c | 6 ++++-- drivers/net/phy/marvell10g.c | 12 ++++++++---- drivers/net/phy/micrel.c | 6 ++++-- drivers/net/phy/nxp-c45-tja11xx.c | 12 ++++++++---- drivers/net/phy/nxp-tja11xx.c | 6 ++++-- drivers/net/phy/phy_device.c | 2 +- drivers/net/phy/realtek/realtek_main.c | 27 +++++++++++++++++--------- drivers/net/phy/teranetics.c | 3 ++- include/linux/phy.h | 3 ++- 10 files changed, 55 insertions(+), 28 deletions(-) diff --git a/drivers/net/phy/bcm87xx.c b/drivers/net/phy/bcm87xx.c index e81404bf8994..1e1e2259fc2b 100644 --- a/drivers/net/phy/bcm87xx.c +++ b/drivers/net/phy/bcm87xx.c @@ -185,12 +185,14 @@ static irqreturn_t bcm87xx_handle_interrupt(struct ph= y_device *phydev) return IRQ_HANDLED; } =20 -static int bcm8706_match_phy_device(struct phy_device *phydev) +static int bcm8706_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->c45_ids.device_ids[4] =3D=3D PHY_ID_BCM8706; } =20 -static int bcm8727_match_phy_device(struct phy_device *phydev) +static int bcm8727_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->c45_ids.device_ids[4] =3D=3D PHY_ID_BCM8727; } diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index bbcc7d2b54cd..c0c4f19cfb6a 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -520,12 +520,14 @@ static int ip101a_g_match_phy_device(struct phy_devic= e *phydev, bool ip101a) return ip101a =3D=3D !ret; } =20 -static int ip101a_match_phy_device(struct phy_device *phydev) +static int ip101a_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return ip101a_g_match_phy_device(phydev, true); } =20 -static int ip101g_match_phy_device(struct phy_device *phydev) +static int ip101g_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return ip101a_g_match_phy_device(phydev, false); } diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c index 5354c8895163..13e81dff42c1 100644 --- a/drivers/net/phy/marvell10g.c +++ b/drivers/net/phy/marvell10g.c @@ -1264,7 +1264,8 @@ static int mv3310_get_number_of_ports(struct phy_devi= ce *phydev) return ret + 1; } =20 -static int mv3310_match_phy_device(struct phy_device *phydev) +static int mv3310_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { if ((phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] & MARVELL_PHY_ID_MASK) !=3D MARVELL_PHY_ID_88X3310) @@ -1273,7 +1274,8 @@ static int mv3310_match_phy_device(struct phy_device = *phydev) return mv3310_get_number_of_ports(phydev) =3D=3D 1; } =20 -static int mv3340_match_phy_device(struct phy_device *phydev) +static int mv3340_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { if ((phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] & MARVELL_PHY_ID_MASK) !=3D MARVELL_PHY_ID_88X3310) @@ -1297,12 +1299,14 @@ static int mv211x_match_phy_device(struct phy_devic= e *phydev, bool has_5g) return !!(val & MDIO_PCS_SPEED_5G) =3D=3D has_5g; } =20 -static int mv2110_match_phy_device(struct phy_device *phydev) +static int mv2110_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return mv211x_match_phy_device(phydev, true); } =20 -static int mv2111_match_phy_device(struct phy_device *phydev) +static int mv2111_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return mv211x_match_phy_device(phydev, false); } diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 71fb4410c31b..4d8460c93078 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -768,7 +768,8 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_= device *phydev, return !ret; } =20 -static int ksz8051_match_phy_device(struct phy_device *phydev) +static int ksz8051_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return ksz8051_ksz8795_match_phy_device(phydev, true); } @@ -888,7 +889,8 @@ static int ksz8061_config_init(struct phy_device *phyde= v) return kszphy_config_init(phydev); } =20 -static int ksz8795_match_phy_device(struct phy_device *phydev) +static int ksz8795_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return ksz8051_ksz8795_match_phy_device(phydev, false); } diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tj= a11xx.c index f11dd32494c3..22921b192a8b 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -1966,25 +1966,29 @@ static int nxp_c45_macsec_ability(struct phy_device= *phydev) return macsec_ability; } =20 -static int tja1103_match_phy_device(struct phy_device *phydev) +static int tja1103_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) && !nxp_c45_macsec_ability(phydev); } =20 -static int tja1104_match_phy_device(struct phy_device *phydev) +static int tja1104_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) && nxp_c45_macsec_ability(phydev); } =20 -static int tja1120_match_phy_device(struct phy_device *phydev) +static int tja1120_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) && !nxp_c45_macsec_ability(phydev); } =20 -static int tja1121_match_phy_device(struct phy_device *phydev) +static int tja1121_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) && nxp_c45_macsec_ability(phydev); diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c index 07e94a2478ac..3c38a8ddae2f 100644 --- a/drivers/net/phy/nxp-tja11xx.c +++ b/drivers/net/phy/nxp-tja11xx.c @@ -651,12 +651,14 @@ static int tja1102_match_phy_device(struct phy_device= *phydev, bool port0) return !ret; } =20 -static int tja1102_p0_match_phy_device(struct phy_device *phydev) +static int tja1102_p0_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return tja1102_match_phy_device(phydev, true); } =20 -static int tja1102_p1_match_phy_device(struct phy_device *phydev) +static int tja1102_p1_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return tja1102_match_phy_device(phydev, false); } diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 2eb735e68dd8..96a96c0334a7 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -554,7 +554,7 @@ static int phy_bus_match(struct device *dev, const stru= ct device_driver *drv) return 0; =20 if (phydrv->match_phy_device) - return phydrv->match_phy_device(phydev); + return phydrv->match_phy_device(phydev, phydrv); =20 if (phydev->is_c45) { for (i =3D 1; i < num_ids; i++) { diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realt= ek/realtek_main.c index 301fbe141b9b..6b655d3c7e1c 100644 --- a/drivers/net/phy/realtek/realtek_main.c +++ b/drivers/net/phy/realtek/realtek_main.c @@ -1314,13 +1314,15 @@ static bool rtlgen_supports_mmd(struct phy_device *= phydev) return val > 0; } =20 -static int rtlgen_match_phy_device(struct phy_device *phydev) +static int rtlgen_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->phy_id =3D=3D RTL_GENERIC_PHYID && !rtlgen_supports_2_5gbps(phydev); } =20 -static int rtl8226_match_phy_device(struct phy_device *phydev) +static int rtl8226_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->phy_id =3D=3D RTL_GENERIC_PHYID && rtlgen_supports_2_5gbps(phydev) && @@ -1336,32 +1338,38 @@ static int rtlgen_is_c45_match(struct phy_device *p= hydev, unsigned int id, return !is_c45 && (id =3D=3D phydev->phy_id); } =20 -static int rtl8221b_match_phy_device(struct phy_device *phydev) +static int rtl8221b_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->phy_id =3D=3D RTL_8221B && rtlgen_supports_mmd(phydev); } =20 -static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev) +static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, false); } =20 -static int rtl8221b_vb_cg_c45_match_phy_device(struct phy_device *phydev) +static int rtl8221b_vb_cg_c45_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return rtlgen_is_c45_match(phydev, RTL_8221B_VB_CG, true); } =20 -static int rtl8221b_vn_cg_c22_match_phy_device(struct phy_device *phydev) +static int rtl8221b_vn_cg_c22_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, false); } =20 -static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev) +static int rtl8221b_vn_cg_c45_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true); } =20 -static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev) +static int rtl_internal_nbaset_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { if (phydev->is_c45) return false; @@ -1379,7 +1387,8 @@ static int rtl_internal_nbaset_match_phy_device(struc= t phy_device *phydev) return rtlgen_supports_2_5gbps(phydev) && !rtlgen_supports_mmd(phydev); } =20 -static int rtl8251b_c45_match_phy_device(struct phy_device *phydev) +static int rtl8251b_c45_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return rtlgen_is_c45_match(phydev, RTL_8251B, true); } diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c index 752d4bf7bb99..46c5ff7d7b56 100644 --- a/drivers/net/phy/teranetics.c +++ b/drivers/net/phy/teranetics.c @@ -67,7 +67,8 @@ static int teranetics_read_status(struct phy_device *phyd= ev) return 0; } =20 -static int teranetics_match_phy_device(struct phy_device *phydev) +static int teranetics_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { return phydev->c45_ids.device_ids[3] =3D=3D PHY_ID_TN2020; } diff --git a/include/linux/phy.h b/include/linux/phy.h index d62d292024bc..cafac4f205d8 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -990,7 +990,8 @@ struct phy_driver { * driver for the given phydev. If NULL, matching is based on * phy_id and phy_id_mask. */ - int (*match_phy_device)(struct phy_device *phydev); + int (*match_phy_device)(struct phy_device *phydev, + const struct phy_driver *phydrv); =20 /** * @set_wol: Some devices (e.g. qnap TS-119P II) require PHY --=20 2.48.1 From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F71125F969; Sun, 11 May 2025 18:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988825; cv=none; b=dxCYPSHWvSnPN9knS3+jDA+q8rtoGK2Aq2/fL/kTZzBS1ttQACiqLV5dr1zsQk+LqtD4ugg1nhccHApKjrEMxpBI8ZfR+RYIlXaHMzsyfmobbcAMhe76CUGDvw428RZw9G8rbvU+FeHlbP7tVIgGCBc7CtYZWfsLHPov9E2vrv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988825; c=relaxed/simple; bh=9G4ubJ6lV4V2dWOs0FNh/K1YDBBBYb3K8frA6VqI9G8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KffF1+R1yBPZwqpuZ9sps4oZ6noEGIoRk7UsnL3bSCJkztc+8Vosz4zoZ/AfYnii6deSqJwX2OM2VFcTpFZVl6HOLrRD7NOG3Ijk6BBOHj82H1jLRTfPbPNwQlTqMFc/D7/0D8lmOl518ykZNwRFbxXsI6q8uX78RAXQ8zMiBZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TX7sK/0C; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TX7sK/0C" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso37728685e9.2; Sun, 11 May 2025 11:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988822; x=1747593622; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pvRhcUvsur4qZV9ZsxMG2pchOpKzL3rOM+elE1weNSU=; b=TX7sK/0ChNLIbtiyg6YMkwTMgVQEhfs5LPT0X3veT3lP5lpi1QSjiwAjLRC0TSCjpa 7AmkF1/LmHEuWgND6MSp7RnB4q35/dxO7HE8OVzWRwATYonZEaA19ozIMSk3tloBYhwz Xael4jfIHw+biBqt3jkX2GTa9dwCdQbHKAPwpG8PlLTItt0Ur/+t94pUfTtmeKRWa0i/ UU/k0neShJ+MUdZMKJvsdrfGUIYBpHjkwdSEt6N6FjrFHD3ZLT/AX62qjnYaFJkVpGIJ LNexSc0fqpwFLphLa07Wh0RecwBXpUjWN/hspFlvegAIKHx1U9Iq5UJOXUEm3RHhbgll M0fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988822; x=1747593622; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pvRhcUvsur4qZV9ZsxMG2pchOpKzL3rOM+elE1weNSU=; b=EdwgdWa6yUat1ZxPJy470Ome7YSiKCQgaw0T1h/waq6Y4qxS0w0GQwfAMxNTFM7Rfs gw3jWQAA2kDBpCBpldNqA4qYyStkMAbRHpwq3IzY/id7SDqbq+lg9A60NcWq/KI31Tl+ MJchZHhOOcZcMUYl0bDv7rE7PLLXW58XL2ZhU051EELmWuph9FJEdDaXVkPR57fUkSYv nMUosF6Ff9FFyuZGI69n3lbMs06qyB9XkORijwAmerLa4isXu/lrfhFDPpkkxYpJc643 GjVQ6rD7NKCWbJ1FpAcpha50Abfrd2Isa1i28VBT+dPotbFvV2U+JEaDfZjmMEhmIZJz 8y0A== X-Forwarded-Encrypted: i=1; AJvYcCVJrccilG9qo6mdyRMzcSWRPoxydWJlc2bR0QwTcmU/DPZMx3dDimMhIH1B02ZsdkV1QpoSf+P/pClRsatJ@vger.kernel.org, AJvYcCVjl1eKk2hgLAAQs8D2MGet/Xt+gBI/ozKYw5HwLQ88o4XlgYn/QZylA/7xKa01UCyQQR9C0MxKI1gy@vger.kernel.org, AJvYcCVx8rZ2IRHi3OEOV+NFSAHaL6ILbm/te9NDbRy3t0PvHkqdk/wIJzK8uKcH4yXFXhvUoauXeMKy@vger.kernel.org X-Gm-Message-State: AOJu0YweX0ibPSxGkhfBhteSIqK5JHYVXElBI5G5JYMXL2Eja6Wh2Pdw nz0srQXHu+bbZctTVWyEOiaT8kM2SPe/1238fpEzxgvZpvUKl8zz X-Gm-Gg: ASbGnct9NZNHluoGnUWjWrEOXz2/mu3FOhW2WdVOx9fB3Dg5pyD9aYjPTJae0u0TwTM uFMnw+bxzb4eBuryKBhwlLnkXfd6rzG4RNMenJxm0XqmsNMxjMhkkMTkELyd6nZczwEZZhvi6LY OjvwbTo+U35sx527VqLCyXGlWyv9gPKo3bL5r5u0PmLBKSXCQYrPa+SwhQUJWRhWnUWNt+v1m2t dBIDNbGRK92DCcSDX92HJgryp2dEWJFC43yEp2V3It3zE/7j3uNwiOXq86i8nuRKU6NJXnVLHQT 5gMkI0zO9z2JJwTqakpKpclRfxgD4hUu9BUXQdbiQi35Ng4ibGi6a1aX4SgCGnFb1YWKX/NK8Ly dGTSSFXCRdOi2YoO0MpoD X-Google-Smtp-Source: AGHT+IG1lgJdBBtBufUu7EMqcsypH7gqNW2zn6PVpB1dxzTe9b8x/aeuiNP1WuW2g0rxcg7QnIN1lg== X-Received: by 2002:a05:600c:510b:b0:43d:300f:fa4a with SMTP id 5b1f17b1804b1-442d6d4483fmr86993445e9.12.1746988821312; Sun, 11 May 2025 11:40:21 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:20 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Russell King (Oracle)" Subject: [net-next PATCH v9 2/6] net: phy: bcm87xx: simplify .match_phy_device OP Date: Sun, 11 May 2025 20:39:26 +0200 Message-ID: <20250511183933.3749017-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify .match_phy_device OP by using a generic function and using the new phy_id PHY driver info instead of hardcoding the matching PHY ID. Reviewed-by: Russell King (Oracle) Signed-off-by: Christian Marangi --- drivers/net/phy/bcm87xx.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/phy/bcm87xx.c b/drivers/net/phy/bcm87xx.c index 1e1e2259fc2b..299f9a8f30f4 100644 --- a/drivers/net/phy/bcm87xx.c +++ b/drivers/net/phy/bcm87xx.c @@ -185,16 +185,10 @@ static irqreturn_t bcm87xx_handle_interrupt(struct ph= y_device *phydev) return IRQ_HANDLED; } =20 -static int bcm8706_match_phy_device(struct phy_device *phydev, +static int bcm87xx_match_phy_device(struct phy_device *phydev, const struct phy_driver *phydrv) { - return phydev->c45_ids.device_ids[4] =3D=3D PHY_ID_BCM8706; -} - -static int bcm8727_match_phy_device(struct phy_device *phydev, - const struct phy_driver *phydrv) -{ - return phydev->c45_ids.device_ids[4] =3D=3D PHY_ID_BCM8727; + return phydev->c45_ids.device_ids[4] =3D=3D phydrv->phy_id; } =20 static struct phy_driver bcm87xx_driver[] =3D { @@ -208,7 +202,7 @@ static struct phy_driver bcm87xx_driver[] =3D { .read_status =3D bcm87xx_read_status, .config_intr =3D bcm87xx_config_intr, .handle_interrupt =3D bcm87xx_handle_interrupt, - .match_phy_device =3D bcm8706_match_phy_device, + .match_phy_device =3D bcm87xx_match_phy_device, }, { .phy_id =3D PHY_ID_BCM8727, .phy_id_mask =3D 0xffffffff, @@ -219,7 +213,7 @@ static struct phy_driver bcm87xx_driver[] =3D { .read_status =3D bcm87xx_read_status, .config_intr =3D bcm87xx_config_intr, .handle_interrupt =3D bcm87xx_handle_interrupt, - .match_phy_device =3D bcm8727_match_phy_device, + .match_phy_device =3D bcm87xx_match_phy_device, } }; =20 module_phy_driver(bcm87xx_driver); --=20 2.48.1 From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A4E72609EE; Sun, 11 May 2025 18:40:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988827; cv=none; b=ETyR1dNK5d5webIhF3FnnnjWZgRJn3TR/aXLVjJDGYqznkvLokMmksnMEzXrrHZD9ts7KjtULmts3d7yigv08SFxq5+QM14Or9u9t8umqyBinWBHu0y+q3zJ/fCTv+gJvLyk8EQbS0RbuBFF+TphQCK2sTCi94nKCC0ZGVRHjAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988827; c=relaxed/simple; bh=JMeorUGvSZqGdgT8eqo1GtEKe7cqqq8Xmt0oOBKX1/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TmhCbrywhZGlAJtqp0qY3Y+JRO07I1FHPMZGMa9k2pdA6MFYBSxd4HktRgvLWZdkXg02+NujE7GBBM6tjOr+qZ2g2fHsMwukhpQE0yz7Mj40chkYjEXjDEN5WaGMIGfU66wFHPTSo+CE5JvDIfj5XgvKzjs6zDus7HYbjvt6QaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D3hgDRFW; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D3hgDRFW" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso37728825e9.2; Sun, 11 May 2025 11:40:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988823; x=1747593623; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lTQhXTyWA+dzynRUt+APtRqGDF+FBiwvMZ8BjXEGJS4=; b=D3hgDRFWDcZB10GJyPqH1QQhBp/k19WXDollwru/bYun4nU9Judkx9rUNo7jAlP1+E ZBXJX8/+JxWPi0CeWIMc2qyvr/nQGMdIqExlG3ruhSXqwVxxfUlIyRLx2bO9WkD8qkm6 bf5WSpOwNEs13hi/NEJeEetxF/Mlc7pMojB38xNxjfGDJmvh5lAW/dq4jS0O1tECk+6v NYNjSdKaHJkVe/cBKRBMyS6twSWvCvuMxTmVHSX2IDaqQxKbd26P3TYyeH6zIG9G4lw2 c30Tv8Tyk3HkoZZGS873X19k+h4Qld4hIeWQ9lDp+IpBra8JUqUtymwMz1opETKea5NY Dq4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988823; x=1747593623; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lTQhXTyWA+dzynRUt+APtRqGDF+FBiwvMZ8BjXEGJS4=; b=aspjIGcVB0uJnQmHSN6h4K2lRFkGtYDKsU7VQv1JvLUS6Np93bQEtFjLZptOo3PTJQ hKOdnptrCDMgqsVwFngOGbvMxnXcKfrzcYqQ3/f9sVBWfTHx5KUgD2k0gsAA9PKXRex4 cUWLXa/vVYCWxofN7PpkAjzMhCZMC/LzP93cyMwiFwN4mGcIvLP6jFzhMeadcYUjybDz FYEsHDFdjxe4H9Mp/OuHZcT2oGGSJLAG2dRD2Rib0ZtQ4qvtswFaIOtV4EDTUX+pxe4g rg1WXo60bb9HYkeoUogsyWhOvBYSyBHJqZ98/XanBR8DopVB/nowehcin4SOqlV9UbM/ X6PA== X-Forwarded-Encrypted: i=1; AJvYcCUz+ha8vo9Nz3F8VSazEcl/5IL4WEnS7Uq/egxDN4u7hAEneTYr10vEERsf3dQkjALXYym/8yHnpHLqGfA6@vger.kernel.org, AJvYcCVZyQlgeKm8juiTJx7JSyNBjSFVbGRS/DBz79nRTt0/S/G2g7Hc8RacluEMto02YWn9ruq25ERq@vger.kernel.org, AJvYcCWyx1An2euobkpji73AQqLGYXPGUxDEWPZ2rKYbkNdfrvKx5C9VCyix1xRJti4p7/tjLs9CiRFlnwH3@vger.kernel.org X-Gm-Message-State: AOJu0YwBjsde/Mu+akCAn12TZCshoTT4aMspwjZLz6m/AXj+BPR70Si4 Zrjr1aghp6hSuJ71t5BaLUIM8PA2RsGPy5rue0NqhhnQtT3zWDut X-Gm-Gg: ASbGncu+t/m2r06O7j+QAUz8Sy0A8U+Z7jaiaRWTkKEh/ASccao5+/3puxoClqiqFRa hsz3TUaTih1y31/z74GCdzZS4LsaXYJzCFRReOavra7cOVlMSY/gUd5Btkpe0LX6tZUP3K+i2/v YpOl9CNd79JomGnKygMEl8aMrwRObbALM0Td/5QAza9uaem8GHtwPFKGdoXCwX7ltuYaSflejJl /jM50LZTcvlhCZBx8NUUWtG39iPb508XTss71PWybRTRA+QqmSYYOPvPVVC2PoNbn8jiAe+nZ5c lHgc8XFf/HhFMNIQrbqI5+akKGg9V0BhxWazXcdBgDTeJ9g/3giO/nMgxpk8NatyPqfVGYZjY5/ 7gGUV0SurAuwxg+3WF81l X-Google-Smtp-Source: AGHT+IGaWWznm1g3/EE3XRPbpAWq5hRI4HNyqj7w1FypcqerY4CKOJ5dbZnmsHxw3yLaCugp4W2Dzw== X-Received: by 2002:a05:600c:a343:b0:43d:1b74:e89a with SMTP id 5b1f17b1804b1-442d6d3e238mr97781515e9.9.1746988823299; Sun, 11 May 2025 11:40:23 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:22 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Russell King (Oracle)" Subject: [net-next PATCH v9 3/6] net: phy: nxp-c45-tja11xx: simplify .match_phy_device OP Date: Sun, 11 May 2025 20:39:27 +0200 Message-ID: <20250511183933.3749017-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify .match_phy_device OP by using a generic function and using the new phy_id PHY driver info instead of hardcoding the matching PHY ID with new variant for macsec and no_macsec PHYs. Also make use of PHY_ID_MATCH_MODEL macro and drop PHY_ID_MASK define to introduce phy_id and phy_id_mask again in phy_driver struct. Reviewed-by: Russell King (Oracle) Signed-off-by: Christian Marangi --- drivers/net/phy/nxp-c45-tja11xx.c | 45 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tj= a11xx.c index 22921b192a8b..4c6d905f0a9f 100644 --- a/drivers/net/phy/nxp-c45-tja11xx.c +++ b/drivers/net/phy/nxp-c45-tja11xx.c @@ -19,7 +19,6 @@ =20 #include "nxp-c45-tja11xx.h" =20 -#define PHY_ID_MASK GENMASK(31, 4) /* Same id: TJA1103, TJA1104 */ #define PHY_ID_TJA_1103 0x001BB010 /* Same id: TJA1120, TJA1121 */ @@ -1966,32 +1965,24 @@ static int nxp_c45_macsec_ability(struct phy_device= *phydev) return macsec_ability; } =20 -static int tja1103_match_phy_device(struct phy_device *phydev, - const struct phy_driver *phydrv) +static int tja11xx_no_macsec_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { - return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) && - !nxp_c45_macsec_ability(phydev); -} + if (!phy_id_compare(phydev->phy_id, phydrv->phy_id, + phydrv->phy_id_mask)) + return 0; =20 -static int tja1104_match_phy_device(struct phy_device *phydev, - const struct phy_driver *phydrv) -{ - return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1103, PHY_ID_MASK) && - nxp_c45_macsec_ability(phydev); + return !nxp_c45_macsec_ability(phydev); } =20 -static int tja1120_match_phy_device(struct phy_device *phydev, - const struct phy_driver *phydrv) +static int tja11xx_macsec_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { - return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) && - !nxp_c45_macsec_ability(phydev); -} + if (!phy_id_compare(phydev->phy_id, phydrv->phy_id, + phydrv->phy_id_mask)) + return 0; =20 -static int tja1121_match_phy_device(struct phy_device *phydev, - const struct phy_driver *phydrv) -{ - return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) && - nxp_c45_macsec_ability(phydev); + return nxp_c45_macsec_ability(phydev); } =20 static const struct nxp_c45_regmap tja1120_regmap =3D { @@ -2064,6 +2055,7 @@ static const struct nxp_c45_phy_data tja1120_phy_data= =3D { =20 static struct phy_driver nxp_c45_driver[] =3D { { + PHY_ID_MATCH_MODEL(PHY_ID_TJA_1103), .name =3D "NXP C45 TJA1103", .get_features =3D nxp_c45_get_features, .driver_data =3D &tja1103_phy_data, @@ -2085,9 +2077,10 @@ static struct phy_driver nxp_c45_driver[] =3D { .get_sqi =3D nxp_c45_get_sqi, .get_sqi_max =3D nxp_c45_get_sqi_max, .remove =3D nxp_c45_remove, - .match_phy_device =3D tja1103_match_phy_device, + .match_phy_device =3D tja11xx_no_macsec_match_phy_device, }, { + PHY_ID_MATCH_MODEL(PHY_ID_TJA_1103), .name =3D "NXP C45 TJA1104", .get_features =3D nxp_c45_get_features, .driver_data =3D &tja1103_phy_data, @@ -2109,9 +2102,10 @@ static struct phy_driver nxp_c45_driver[] =3D { .get_sqi =3D nxp_c45_get_sqi, .get_sqi_max =3D nxp_c45_get_sqi_max, .remove =3D nxp_c45_remove, - .match_phy_device =3D tja1104_match_phy_device, + .match_phy_device =3D tja11xx_macsec_match_phy_device, }, { + PHY_ID_MATCH_MODEL(PHY_ID_TJA_1120), .name =3D "NXP C45 TJA1120", .get_features =3D nxp_c45_get_features, .driver_data =3D &tja1120_phy_data, @@ -2134,9 +2128,10 @@ static struct phy_driver nxp_c45_driver[] =3D { .get_sqi =3D nxp_c45_get_sqi, .get_sqi_max =3D nxp_c45_get_sqi_max, .remove =3D nxp_c45_remove, - .match_phy_device =3D tja1120_match_phy_device, + .match_phy_device =3D tja11xx_no_macsec_match_phy_device, }, { + PHY_ID_MATCH_MODEL(PHY_ID_TJA_1120), .name =3D "NXP C45 TJA1121", .get_features =3D nxp_c45_get_features, .driver_data =3D &tja1120_phy_data, @@ -2159,7 +2154,7 @@ static struct phy_driver nxp_c45_driver[] =3D { .get_sqi =3D nxp_c45_get_sqi, .get_sqi_max =3D nxp_c45_get_sqi_max, .remove =3D nxp_c45_remove, - .match_phy_device =3D tja1121_match_phy_device, + .match_phy_device =3D tja11xx_macsec_match_phy_device, }, }; =20 --=20 2.48.1 From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFCDC2620FC; Sun, 11 May 2025 18:40:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988829; cv=none; b=HssMSQ39EzrjdmyMkz1I/S6OSzwXySH8ERxlYvOjcTLoEHC4udvPjUT7RsPUfSAe+/fh+xcGGAbmvBzkueO/cVZ7TnH+ZNtI7ScR15rcQ+3QamofcxljFF0sVTrAhIeZQ/Qlcf1pY8Sqp5K8FBvaJrXlXaK/qidYW1nkuki0YQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988829; c=relaxed/simple; bh=kW1rAjVyXUckn0dcQM5p/iQemZPuxBVrdIvHlZvSnfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZASsra1ryVJZ3UghV8V7AG+ya96Dkmsfl1CPZBM7kYACXxI8WKWaKkMQZTIHqhDEh2S9V1RKq7oRUtSY3+wHfSHdiEU7Leq6aTsIA5+i/5NUblQLN39BVJ8F4jhiN8Csc1N2xuZKr/f+FzzLiuyKXgIm5QiS4FBx/3cIqutqXOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BdhKKdDj; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BdhKKdDj" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so41142215e9.3; Sun, 11 May 2025 11:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988825; x=1747593625; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LBOXtLmY3i+TUAFPIrzedUySgsNtLLxnleQj5jKUdg4=; b=BdhKKdDjn2bbQljRe4L3bnLVv9QUMswRuclbw5X60h2HIsWCRdWlz7ie8wEAZfmsP2 olVATTH3XrsvVTJ9bUMYgmiNbR3R3bmQ/psKaQhtTNkYlu7LJhNB8bDx4eU/OywxQ5Bo MXqabjBJQPMUS+ce/+E+2VcptY4ruu80fw3vHnFpGMBke//frXkbyEYt2u8x4KvjjlLc rA+hCMFNeI6l8KZwfKyPA7hDpT+ICFwfOkVS9HYjK7cFhH7GerrscjIrbeufmTQz75lY rU73YHXu45q06DJ0AdNgnNjOwmFYNkMY5Qt5pbOKIAuEOSdwwWYKtt+/dWRhXVhrBhAz nvlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988825; x=1747593625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LBOXtLmY3i+TUAFPIrzedUySgsNtLLxnleQj5jKUdg4=; b=lzAXCKrv+a1bW7MuGYe0aL2aEnD9Spc68bZX2+yfexMV9bSeAohSBMJwqEC3+XaN47 VRj2+W7W2LBQT5qxqG6JuUVgI+j4t0BHW/JX/RX9/LpRkKh6ZdhJFwafN3XMdH9OWlGU u8Tyz7fwhft+T4pWO33KefCZFcv1u2p4+qKhSUHSu0lYjRHZa5UyHbdRrLvW4QpysSWB Uvxr35XuSQ6A9T+Epw5lhtD2bB5xpAJeDexPmvsas5ArNJB57a9tqFNIgngknLfpkht5 RTX++AYeL9k/RLQ+xoUc/wq7BTIj6GxTPAEMMM/hXSetDrIL97Y0SskAfTbnxwqE0cYy 4NiQ== X-Forwarded-Encrypted: i=1; AJvYcCUpgn/SJ9/QvhdLeZC7FIs0N92lmBvIpY7pQrmLSo0E1jo7xo0fT8VzhjRX+9TMv7Js01yD537T@vger.kernel.org, AJvYcCVkPSaB5u9Qkt4392ACiMuxquXR9mO+LRgbgQo3b29RIkWecWqy8VFBY/M0XrnFW+xOWgrJCp1WDL/jP/Os@vger.kernel.org, AJvYcCXp5CaDygcYdjaJTUdbvNNpHfVic/PbtrDdIBq9iKaYJCeIgrmEmX47QZwfUosG4M3LvWfjqaNbL5gZ@vger.kernel.org X-Gm-Message-State: AOJu0Ywo0LJADgF8PacZfd/Aov+fYcFdsIj7DzGlc6aZtGHoHbWiUhRr DCwcDzk1hhG/z96jlpAVt8l0fyRM34J26Mhy7Fda2WmWtb6bBx+4 X-Gm-Gg: ASbGnctQiNaSJYdY+5nBHHcReM1QUmj7G4vZntG+E7rAjkWsn0zrSotUYQcIfqkuXXP aI9Zjksp2u8J/hZvoZoyqFKhKCWm8vyvLAWOZvTbK480TFmgqH8KoykVRb0WFLSibhVKq7aW2w8 KYG+HIvRXNzsDP3v3xrk3gpVcV4oAK18lF+0hbBnzxujCQ9oS2fQ6o4xnb7/tlXJkTZRfqV+1SX BkAL/GdXWQBLWjiXeZkzmUTcMvzEqEoBJM0qDS7gPFWB6Yv6HmP4uqY6mKwN7/Xy+BwEPhb7rIm LpjoqWtRFWSuPJg881pajHzugoWsaD91FhO5VQgHrY5qa/atcbHunrBFcFP2H5sdim55JclEyL7 LT1Yf7MYvremtp1D8DD2c X-Google-Smtp-Source: AGHT+IHGdhRiurFYBD9DlR0S1fAMB571C1ZhGga0UQNCNk/2gbVMXoe1nKkd0v7BLiA5zz5X5J4NTg== X-Received: by 2002:a05:600c:3482:b0:43d:7588:6688 with SMTP id 5b1f17b1804b1-442d6d1fb46mr101706555e9.12.1746988824958; Sun, 11 May 2025 11:40:24 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:24 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Russell King (Oracle)" Subject: [net-next PATCH v9 4/6] net: phy: introduce genphy_match_phy_device() Date: Sun, 11 May 2025 20:39:28 +0200 Message-ID: <20250511183933.3749017-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce new API, genphy_match_phy_device(), to provide a way to check to match a PHY driver for a PHY device based on the info stored in the PHY device struct. The function generalize the logic used in phy_bus_match() to check the PHY ID whether if C45 or C22 ID should be used for matching. This is useful for custom .match_phy_device function that wants to use the generic logic under some condition. (example a PHY is already setup and provide the correct PHY ID) Reviewed-by: Russell King (Oracle) Signed-off-by: Christian Marangi --- drivers/net/phy/phy_device.c | 52 +++++++++++++++++++++++++----------- include/linux/phy.h | 3 +++ 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 96a96c0334a7..9282de0d591e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -543,20 +543,26 @@ static int phy_scan_fixups(struct phy_device *phydev) return 0; } =20 -static int phy_bus_match(struct device *dev, const struct device_driver *d= rv) +/** + * genphy_match_phy_device - match a PHY device with a PHY driver + * @phydev: target phy_device struct + * @phydrv: target phy_driver struct + * + * Description: Checks whether the given PHY device matches the specified + * PHY driver. For Clause 45 PHYs, iterates over the available device + * identifiers and compares them against the driver's expected PHY ID, + * applying the provided mask. For Clause 22 PHYs, a direct ID comparison + * is performed. + * + * Return: 1 if the PHY device matches the driver, 0 otherwise. + */ +int genphy_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) { - struct phy_device *phydev =3D to_phy_device(dev); - const struct phy_driver *phydrv =3D to_phy_driver(drv); - const int num_ids =3D ARRAY_SIZE(phydev->c45_ids.device_ids); - int i; - - if (!(phydrv->mdiodrv.flags & MDIO_DEVICE_IS_PHY)) - return 0; - - if (phydrv->match_phy_device) - return phydrv->match_phy_device(phydev, phydrv); - if (phydev->is_c45) { + const int num_ids =3D ARRAY_SIZE(phydev->c45_ids.device_ids); + int i; + for (i =3D 1; i < num_ids; i++) { if (phydev->c45_ids.device_ids[i] =3D=3D 0xffffffff) continue; @@ -565,11 +571,27 @@ static int phy_bus_match(struct device *dev, const st= ruct device_driver *drv) phydrv->phy_id, phydrv->phy_id_mask)) return 1; } + return 0; - } else { - return phy_id_compare(phydev->phy_id, phydrv->phy_id, - phydrv->phy_id_mask); } + + return phy_id_compare(phydev->phy_id, phydrv->phy_id, + phydrv->phy_id_mask); +} +EXPORT_SYMBOL_GPL(genphy_match_phy_device); + +static int phy_bus_match(struct device *dev, const struct device_driver *d= rv) +{ + struct phy_device *phydev =3D to_phy_device(dev); + const struct phy_driver *phydrv =3D to_phy_driver(drv); + + if (!(phydrv->mdiodrv.flags & MDIO_DEVICE_IS_PHY)) + return 0; + + if (phydrv->match_phy_device) + return phydrv->match_phy_device(phydev, phydrv); + + return genphy_match_phy_device(phydev, phydrv); } =20 static ssize_t diff --git a/include/linux/phy.h b/include/linux/phy.h index cafac4f205d8..6afe295dac01 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1868,6 +1868,9 @@ char *phy_attached_info_irq(struct phy_device *phydev) __malloc; void phy_attached_info(struct phy_device *phydev); =20 +int genphy_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv); + /* Clause 22 PHY */ int genphy_read_abilities(struct phy_device *phydev); int genphy_setup_forced(struct phy_device *phydev); --=20 2.48.1 From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51C1E264FB8; Sun, 11 May 2025 18:40:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988832; cv=none; b=YBCHSt5csngMubac8M4gIX8p5ibw2B2HVLk8QwIHwexsAgzjYWDxw55mNdXz2esdRn2IRJ1VYX7l5K6JwEWoslPX4IxXQ6+JThYep/AFiFqpdHpl1Tuc9Dty63QQfAswzUToXl9DMWbyHwCZ9eoh2sbg2G+KzbSQ7znaiuDTmlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988832; c=relaxed/simple; bh=1kSfq2U/2+atepoqqwhjviGJwY0PSWYYoqhe2cxkbas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Nfwb7GykOHsMyvmloNhxxvVzRZGf9qP+CfO/o9PeAeiEdCiUGymTSVPseyh5dHvr+HMUN586oo7AEJVJBRMN70sBLPYLb1Yer90PPNDhaDknoiohvGFvQoloLaXhC7rB8dmnlICkR2LMVzrNAQBanDir9h/yJ+iVNPPi3mkRH94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=c8RgHe3V; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c8RgHe3V" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43ede096d73so25867845e9.2; Sun, 11 May 2025 11:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988828; x=1747593628; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tvhYi4Amju+xPXSoHIRNwB4mJnWO7069+fG+XmOLEQI=; b=c8RgHe3VuoNQyiRSzyRnYs17IFNPs9yU9+4uncysbSPiw9p4q/1PfGyZkYb8jY42BY WYZWljdcWgTNuXBe0RXC1Uzun10mm9s04Oi+mkvMOz8HewIDCE842pUuDBs0EvkwUR/+ 9cGmbTE3RexBg8KuvRVkyp71UGyBlfUbFE+ENqM0Op+121DCqZUopoyYWBi/UGZWXOgS Axvs20hZV0YNpNDyhE8XJTONRvyeAcTdiDSK/ycsrVkBNbhaoa/23rGs4HmcJ75lGqMN PU0ugsxCVFKJnuE0e0t5r1n/6yiG6E8Y3QWiDifLzrXI6BkGDvod6P1/mtYxYHkznkcx j0Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988828; x=1747593628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tvhYi4Amju+xPXSoHIRNwB4mJnWO7069+fG+XmOLEQI=; b=N7IigFousQYCDRTPCBzUyMriVAbjdgClBZmACTOfiLfC5oE0rCx6aArJRD66A6zdOI O1G5C0Knx7wcNtF+pwzFQiv5ZkCbmqN9UjyPrHxH3k1GqfzxeZK+QjTaVtCOlF2dkoB1 8WRMKgos6WX03MPlyJBmkPEvsMyUhkg1o2iTDW5LONNET6PD0gXsr1kdxb/eEZSlewTM vh3d9TTQXyL2Wzw45zhfUBV/Ks41FOCe/W8v5muQrynJKcclO8k84JGuz17eRX6gDhfu EIOLcw9Fu8xXD+kZVRe7aHi2yntYPWSpW6+9wegmWnZ8Jt7OIqnLulocdBBdqjuxuXBv iA3A== X-Forwarded-Encrypted: i=1; AJvYcCU8JCZYZDXkf3RHc7Mub+TlSeRCTNm4l2IvWslYeUxC6o/mJnQxHHVKT8b3UR8KPe3/0ZBntEp+@vger.kernel.org, AJvYcCUYdjkbxyQ4lixrU1CAsR5nMENIpxd7pc90hL1b9NyPsAUIKQKgcgumtg7xxFbKXpuDgk776Fy2aNfW@vger.kernel.org, AJvYcCXigk6Z8I0/aYbTWmvZBzdC+6ARHJQQXgPstwRsYrPaJCWMMtNhJtSNqOmg+3+L/3MACSrGAJSdVofA13CU@vger.kernel.org X-Gm-Message-State: AOJu0YzvWY8gSL2wZE4Q5seYqStJSQH8vXdqAl9vT5Dy6Kl5P79i4P14 jb5hqtRfLtvesSMISFimAu2TYz+vsCXcEWperBJ5HzdUG0RTFpjt X-Gm-Gg: ASbGnct8Z+Zj5jh7Ja+kLslKl8bDp7RNUWr809fb8v9Q4Xt/6ADHuQ04pPVTgvRcRfo nX+P54TQsulF3b/8eDoyRqiEX8HX/64u0z5iAeTm/S99Hmyrmn6cKyS5qZIkd2h0gNgoa8cKdff HYsj6hYMLiPfq9Vyn7tRP+4WL9BKkxWcAdJC9YDFxDDdl8gSsicpPqyWXEvVHiJi9+J/LBO+y+y /Rzzv3Vkq1tt6gkWUKo9aISu2x5ikObtLLqSqBJOyes+Ass0UKTgtoJAqbBbBcaAuuSHql+aGxN Wcn1FxhGmTySZMrkxXQXQJ7zlLlZzZXVs+tue5Tx9/y90TXPJMD7JQ6R6JzlE/qjNcZPSO+qdIG yvuECes02qbrStoX+g70/cJSxcKhNJ50= X-Google-Smtp-Source: AGHT+IFhzNVSUGJ1zTk53f8UY+Q4lp3ve/K1NH8qiLFqcaz7V6NtpGjePrAmvAkumIpZ1AH/zA0xsg== X-Received: by 2002:a05:600c:34d5:b0:43d:17f1:2640 with SMTP id 5b1f17b1804b1-442d6dc7cfdmr76651435e9.26.1746988827324; Sun, 11 May 2025 11:40:27 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:26 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andrew Lunn Subject: [net-next PATCH v9 5/6] net: phy: Add support for Aeonsemi AS21xxx PHYs Date: Sun, 11 May 2025 20:39:29 +0200 Message-ID: <20250511183933.3749017-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add support for Aeonsemi AS21xxx 10G C45 PHYs. These PHYs integrate an IPC to setup some configuration and require special handling to sync with the parity bit. The parity bit is a way the IPC use to follow correct order of command sent. Supported PHYs AS21011JB1, AS21011PB1, AS21010JB1, AS21010PB1, AS21511JB1, AS21511PB1, AS21510JB1, AS21510PB1, AS21210JB1, AS21210PB1 that all register with the PHY ID 0x7500 0x7510 before the firmware is loaded. They all support up to 5 LEDs with various HW mode supported. While implementing it was found some strange coincidence with using the same logic for implementing C22 in MMD regs in Broadcom PHYs. For reference here the AS21xxx PHY name logic: AS21x1xxB1 ^ ^^ | |J: Supports SyncE/PTP | |P: No SyncE/PTP support | 1: Supports 2nd Serdes | 2: Not 2nd Serdes support 0: 10G, 5G, 2.5G 5: 5G, 2.5G 2: 2.5G Reviewed-by: Andrew Lunn Signed-off-by: Christian Marangi --- MAINTAINERS | 6 + drivers/net/phy/Kconfig | 12 + drivers/net/phy/Makefile | 1 + drivers/net/phy/as21xxx.c | 1087 +++++++++++++++++++++++++++++++++++++ 4 files changed, 1106 insertions(+) create mode 100644 drivers/net/phy/as21xxx.c diff --git a/MAINTAINERS b/MAINTAINERS index 890699d937b6..39f66be67729 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -646,6 +646,12 @@ F: drivers/iio/accel/adxl380.h F: drivers/iio/accel/adxl380_i2c.c F: drivers/iio/accel/adxl380_spi.c =20 +AEONSEMI PHY DRIVER +M: Christian Marangi +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/phy/as21xxx.c + AF8133J THREE-AXIS MAGNETOMETER DRIVER M: Ond=C5=99ej Jirman S: Maintained diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 0b8cc325e2bf..95f98717b675 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -77,6 +77,18 @@ config SFP =20 comment "MII PHY device drivers" =20 +config AS21XXX_PHY + tristate "Aeonsemi AS21xxx PHYs" + help + Currently supports the Aeonsemi AS21xxx PHY. + + These are C45 PHYs 10G that require all a generic firmware. + + Supported PHYs AS21011JB1, AS21011PB1, AS21010JB1, AS21010PB1, + AS21511JB1, AS21511PB1, AS21510JB1, AS21510PB1, AS21210JB1, + AS21210PB1 that all register with the PHY ID 0x7500 0x7500 + before the firmware is loaded. + config AIR_EN8811H_PHY tristate "Airoha EN8811H 2.5 Gigabit PHY" help diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 631859d44451..9d18e713dacf 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_AIR_EN8811H_PHY) +=3D air_en8811h.o obj-$(CONFIG_AMD_PHY) +=3D amd.o obj-$(CONFIG_AMCC_QT2025_PHY) +=3D qt2025.o obj-$(CONFIG_AQUANTIA_PHY) +=3D aquantia/ +obj-$(CONFIG_AS21XXX_PHY) +=3D as21xxx.o ifdef CONFIG_AX88796B_RUST_PHY obj-$(CONFIG_AX88796B_PHY) +=3D ax88796b_rust.o else diff --git a/drivers/net/phy/as21xxx.c b/drivers/net/phy/as21xxx.c new file mode 100644 index 000000000000..92697f43087d --- /dev/null +++ b/drivers/net/phy/as21xxx.c @@ -0,0 +1,1087 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Aeonsemi AS21XXxX PHY Driver + * + * Author: Christian Marangi + */ + +#include +#include +#include +#include +#include + +#define VEND1_GLB_REG_CPU_RESET_ADDR_LO_BASEADDR 0x3 +#define VEND1_GLB_REG_CPU_RESET_ADDR_HI_BASEADDR 0x4 + +#define VEND1_GLB_REG_CPU_CTRL 0xe +#define VEND1_GLB_CPU_CTRL_MASK GENMASK(4, 0) +#define VEND1_GLB_CPU_CTRL_LED_POLARITY_MASK GENMASK(12, 8) +#define VEND1_GLB_CPU_CTRL_LED_POLARITY(_n) FIELD_PREP(VEND1_GLB_CPU_CTR= L_LED_POLARITY_MASK, \ + BIT(_n)) + +#define VEND1_FW_START_ADDR 0x100 + +#define VEND1_GLB_REG_MDIO_INDIRECT_ADDRCMD 0x101 +#define VEND1_GLB_REG_MDIO_INDIRECT_LOAD 0x102 + +#define VEND1_GLB_REG_MDIO_INDIRECT_STATUS 0x103 + +#define VEND1_PTP_CLK 0x142 +#define VEND1_PTP_CLK_EN BIT(6) + +/* 5 LED at step of 0x20 + * FE: Fast-Ethernet (10/100) + * GE: Gigabit-Ethernet (1000) + * NG: New-Generation (2500/5000/10000) + */ +#define VEND1_LED_REG(_n) (0x1800 + ((_n) * 0x10)) +#define VEND1_LED_REG_A_EVENT GENMASK(15, 11) +#define VEND1_LED_CONF 0x1881 +#define VEND1_LED_CONFG_BLINK GENMASK(7, 0) + +#define VEND1_SPEED_STATUS 0x4002 +#define VEND1_SPEED_MASK GENMASK(7, 0) +#define VEND1_SPEED_10000 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x3) +#define VEND1_SPEED_5000 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x5) +#define VEND1_SPEED_2500 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x9) +#define VEND1_SPEED_1000 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x10) +#define VEND1_SPEED_100 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x20) +#define VEND1_SPEED_10 FIELD_PREP_CONST(VEND1_SPEED_MASK, 0x0) + +#define VEND1_IPC_CMD 0x5801 +#define AEON_IPC_CMD_PARITY BIT(15) +#define AEON_IPC_CMD_SIZE GENMASK(10, 6) +#define AEON_IPC_CMD_OPCODE GENMASK(5, 0) + +#define IPC_CMD_NOOP 0x0 /* Do nothing */ +#define IPC_CMD_INFO 0x1 /* Get Firmware Version */ +#define IPC_CMD_SYS_CPU 0x2 /* SYS_CPU */ +#define IPC_CMD_BULK_DATA 0xa /* Pass bulk data in ipc registers. */ +#define IPC_CMD_BULK_WRITE 0xc /* Write bulk data to memory */ +#define IPC_CMD_CFG_PARAM 0x1a /* Write config parameters to memory */ +#define IPC_CMD_NG_TESTMODE 0x1b /* Set NG test mode and tone */ +#define IPC_CMD_TEMP_MON 0x15 /* Temperature monitoring function */ +#define IPC_CMD_SET_LED 0x23 /* Set led */ + +#define VEND1_IPC_STS 0x5802 +#define AEON_IPC_STS_PARITY BIT(15) +#define AEON_IPC_STS_SIZE GENMASK(14, 10) +#define AEON_IPC_STS_OPCODE GENMASK(9, 4) +#define AEON_IPC_STS_STATUS GENMASK(3, 0) +#define AEON_IPC_STS_STATUS_RCVD FIELD_PREP_CONST(AEON_IPC_STS_STATUS, 0= x1) +#define AEON_IPC_STS_STATUS_PROCESS FIELD_PREP_CONST(AEON_IPC_STS_STATUS= , 0x2) +#define AEON_IPC_STS_STATUS_SUCCESS FIELD_PREP_CONST(AEON_IPC_STS_STATUS= , 0x4) +#define AEON_IPC_STS_STATUS_ERROR FIELD_PREP_CONST(AEON_IPC_STS_STATUS, = 0x8) +#define AEON_IPC_STS_STATUS_BUSY FIELD_PREP_CONST(AEON_IPC_STS_STATUS, 0= xe) +#define AEON_IPC_STS_STATUS_READY FIELD_PREP_CONST(AEON_IPC_STS_STATUS, = 0xf) + +#define VEND1_IPC_DATA0 0x5808 +#define VEND1_IPC_DATA1 0x5809 +#define VEND1_IPC_DATA2 0x580a +#define VEND1_IPC_DATA3 0x580b +#define VEND1_IPC_DATA4 0x580c +#define VEND1_IPC_DATA5 0x580d +#define VEND1_IPC_DATA6 0x580e +#define VEND1_IPC_DATA7 0x580f +#define VEND1_IPC_DATA(_n) (VEND1_IPC_DATA0 + (_n)) + +/* Sub command of CMD_INFO */ +#define IPC_INFO_VERSION 0x1 + +/* Sub command of CMD_SYS_CPU */ +#define IPC_SYS_CPU_REBOOT 0x3 +#define IPC_SYS_CPU_IMAGE_OFST 0x4 +#define IPC_SYS_CPU_IMAGE_CHECK 0x5 +#define IPC_SYS_CPU_PHY_ENABLE 0x6 + +/* Sub command of CMD_CFG_PARAM */ +#define IPC_CFG_PARAM_DIRECT 0x4 + +/* CFG DIRECT sub command */ +#define IPC_CFG_PARAM_DIRECT_NG_PHYCTRL 0x1 +#define IPC_CFG_PARAM_DIRECT_CU_AN 0x2 +#define IPC_CFG_PARAM_DIRECT_SDS_PCS 0x3 +#define IPC_CFG_PARAM_DIRECT_AUTO_EEE 0x4 +#define IPC_CFG_PARAM_DIRECT_SDS_PMA 0x5 +#define IPC_CFG_PARAM_DIRECT_DPC_RA 0x6 +#define IPC_CFG_PARAM_DIRECT_DPC_PKT_CHK 0x7 +#define IPC_CFG_PARAM_DIRECT_DPC_SDS_WAIT_ETH 0x8 +#define IPC_CFG_PARAM_DIRECT_WDT 0x9 +#define IPC_CFG_PARAM_DIRECT_SDS_RESTART_AN 0x10 +#define IPC_CFG_PARAM_DIRECT_TEMP_MON 0x11 +#define IPC_CFG_PARAM_DIRECT_WOL 0x12 + +/* Sub command of CMD_TEMP_MON */ +#define IPC_CMD_TEMP_MON_GET 0x4 + +#define AS21XXX_MDIO_AN_C22 0xffe0 + +#define PHY_ID_AS21XXX 0x75009410 +/* AS21xxx ID Legend + * AS21x1xxB1 + * ^ ^^ + * | |J: Supports SyncE/PTP + * | |P: No SyncE/PTP support + * | 1: Supports 2nd Serdes + * | 2: Not 2nd Serdes support + * 0: 10G, 5G, 2.5G + * 5: 5G, 2.5G + * 2: 2.5G + */ +#define PHY_ID_AS21011JB1 0x75009402 +#define PHY_ID_AS21011PB1 0x75009412 +#define PHY_ID_AS21010JB1 0x75009422 +#define PHY_ID_AS21010PB1 0x75009432 +#define PHY_ID_AS21511JB1 0x75009442 +#define PHY_ID_AS21511PB1 0x75009452 +#define PHY_ID_AS21510JB1 0x75009462 +#define PHY_ID_AS21510PB1 0x75009472 +#define PHY_ID_AS21210JB1 0x75009482 +#define PHY_ID_AS21210PB1 0x75009492 +#define PHY_VENDOR_AEONSEMI 0x75009400 + +#define AEON_MAX_LEDS 5 +#define AEON_IPC_DELAY 10000 +#define AEON_IPC_TIMEOUT (AEON_IPC_DELAY * 100) +#define AEON_IPC_DATA_NUM_REGISTERS 8 +#define AEON_IPC_DATA_MAX (AEON_IPC_DATA_NUM_REGISTERS * sizeof(u16)) + +#define AEON_BOOT_ADDR 0x1000 +#define AEON_CPU_BOOT_ADDR 0x2000 +#define AEON_CPU_CTRL_FW_LOAD (BIT(4) | BIT(2) | BIT(1) | BIT(0)) +#define AEON_CPU_CTRL_FW_START BIT(0) + +enum as21xxx_led_event { + VEND1_LED_REG_A_EVENT_ON_10 =3D 0x0, + VEND1_LED_REG_A_EVENT_ON_100, + VEND1_LED_REG_A_EVENT_ON_1000, + VEND1_LED_REG_A_EVENT_ON_2500, + VEND1_LED_REG_A_EVENT_ON_5000, + VEND1_LED_REG_A_EVENT_ON_10000, + VEND1_LED_REG_A_EVENT_ON_FE_GE, + VEND1_LED_REG_A_EVENT_ON_NG, + VEND1_LED_REG_A_EVENT_ON_FULL_DUPLEX, + VEND1_LED_REG_A_EVENT_ON_COLLISION, + VEND1_LED_REG_A_EVENT_BLINK_TX, + VEND1_LED_REG_A_EVENT_BLINK_RX, + VEND1_LED_REG_A_EVENT_BLINK_ACT, + VEND1_LED_REG_A_EVENT_ON_LINK, + VEND1_LED_REG_A_EVENT_ON_LINK_BLINK_ACT, + VEND1_LED_REG_A_EVENT_ON_LINK_BLINK_RX, + VEND1_LED_REG_A_EVENT_ON_FE_GE_BLINK_ACT, + VEND1_LED_REG_A_EVENT_ON_NG_BLINK_ACT, + VEND1_LED_REG_A_EVENT_ON_NG_BLINK_FE_GE, + VEND1_LED_REG_A_EVENT_ON_FD_BLINK_COLLISION, + VEND1_LED_REG_A_EVENT_ON, + VEND1_LED_REG_A_EVENT_OFF, +}; + +struct as21xxx_led_pattern_info { + unsigned int pattern; + u16 val; +}; + +struct as21xxx_priv { + bool parity_status; + /* Protect concurrent IPC access */ + struct mutex ipc_lock; +}; + +static struct as21xxx_led_pattern_info as21xxx_led_supported_pattern[] =3D= { + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10), + .val =3D VEND1_LED_REG_A_EVENT_ON_10 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_100), + .val =3D VEND1_LED_REG_A_EVENT_ON_100 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_1000), + .val =3D VEND1_LED_REG_A_EVENT_ON_1000 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_2500), + .val =3D VEND1_LED_REG_A_EVENT_ON_2500 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_5000), + .val =3D VEND1_LED_REG_A_EVENT_ON_5000 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10000), + .val =3D VEND1_LED_REG_A_EVENT_ON_10000 + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK), + .val =3D VEND1_LED_REG_A_EVENT_ON_LINK + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_1000), + .val =3D VEND1_LED_REG_A_EVENT_ON_FE_GE + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_2500) | + BIT(TRIGGER_NETDEV_LINK_5000) | + BIT(TRIGGER_NETDEV_LINK_10000), + .val =3D VEND1_LED_REG_A_EVENT_ON_NG + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_FULL_DUPLEX), + .val =3D VEND1_LED_REG_A_EVENT_ON_FULL_DUPLEX + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_TX), + .val =3D VEND1_LED_REG_A_EVENT_BLINK_TX + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_BLINK_RX + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_TX) | + BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_BLINK_ACT + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_2500) | + BIT(TRIGGER_NETDEV_LINK_5000) | + BIT(TRIGGER_NETDEV_LINK_10000), + .val =3D VEND1_LED_REG_A_EVENT_ON_LINK + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_2500) | + BIT(TRIGGER_NETDEV_LINK_5000) | + BIT(TRIGGER_NETDEV_LINK_10000) | + BIT(TRIGGER_NETDEV_TX) | + BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_ON_LINK_BLINK_ACT + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_LINK_2500) | + BIT(TRIGGER_NETDEV_LINK_5000) | + BIT(TRIGGER_NETDEV_LINK_10000) | + BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_ON_LINK_BLINK_RX + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_10) | + BIT(TRIGGER_NETDEV_LINK_100) | + BIT(TRIGGER_NETDEV_LINK_1000) | + BIT(TRIGGER_NETDEV_TX) | + BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_ON_FE_GE_BLINK_ACT + }, + { + .pattern =3D BIT(TRIGGER_NETDEV_LINK_2500) | + BIT(TRIGGER_NETDEV_LINK_5000) | + BIT(TRIGGER_NETDEV_LINK_10000) | + BIT(TRIGGER_NETDEV_TX) | + BIT(TRIGGER_NETDEV_RX), + .val =3D VEND1_LED_REG_A_EVENT_ON_NG_BLINK_ACT + } +}; + +static int aeon_firmware_boot(struct phy_device *phydev, const u8 *data, + size_t size) +{ + int i, ret; + u16 val; + + ret =3D phy_modify_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLB_REG_CPU_CTRL, + VEND1_GLB_CPU_CTRL_MASK, AEON_CPU_CTRL_FW_LOAD); + if (ret) + return ret; + + ret =3D phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_FW_START_ADDR, + AEON_BOOT_ADDR); + if (ret) + return ret; + + ret =3D phy_modify_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_MDIO_INDIRECT_ADDRCMD, + 0x3ffc, 0xc000); + if (ret) + return ret; + + val =3D phy_read_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_MDIO_INDIRECT_STATUS); + if (val > 1) { + phydev_err(phydev, "wrong origin mdio_indirect_status: %x\n", val); + return -EINVAL; + } + + /* Firmware is always aligned to u16 */ + for (i =3D 0; i < size; i +=3D 2) { + val =3D data[i + 1] << 8 | data[i]; + + ret =3D phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_MDIO_INDIRECT_LOAD, val); + if (ret) + return ret; + } + + ret =3D phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_CPU_RESET_ADDR_LO_BASEADDR, + lower_16_bits(AEON_CPU_BOOT_ADDR)); + if (ret) + return ret; + + ret =3D phy_write_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_CPU_RESET_ADDR_HI_BASEADDR, + upper_16_bits(AEON_CPU_BOOT_ADDR)); + if (ret) + return ret; + + return phy_modify_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLB_REG_CPU_CTRL, + VEND1_GLB_CPU_CTRL_MASK, AEON_CPU_CTRL_FW_START); +} + +static int aeon_firmware_load(struct phy_device *phydev) +{ + struct device *dev =3D &phydev->mdio.dev; + const struct firmware *fw; + const char *fw_name; + int ret; + + ret =3D of_property_read_string(dev->of_node, "firmware-name", + &fw_name); + if (ret) + return ret; + + ret =3D request_firmware(&fw, fw_name, dev); + if (ret) { + phydev_err(phydev, "failed to find FW file %s (%d)\n", + fw_name, ret); + return ret; + } + + ret =3D aeon_firmware_boot(phydev, fw->data, fw->size); + + release_firmware(fw); + + return ret; +} + +static bool aeon_ipc_ready(u16 val, bool parity_status) +{ + u16 status; + + if (FIELD_GET(AEON_IPC_STS_PARITY, val) !=3D parity_status) + return false; + + status =3D val & AEON_IPC_STS_STATUS; + + return status !=3D AEON_IPC_STS_STATUS_RCVD && + status !=3D AEON_IPC_STS_STATUS_PROCESS && + status !=3D AEON_IPC_STS_STATUS_BUSY; +} + +static int aeon_ipc_wait_cmd(struct phy_device *phydev, bool parity_status) +{ + u16 val; + + /* Exit condition logic: + * - Wait for parity bit equal + * - Wait for status success, error OR ready + */ + return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1, VEND1_IPC_STS, v= al, + aeon_ipc_ready(val, parity_status), + AEON_IPC_DELAY, AEON_IPC_TIMEOUT, false); +} + +static int aeon_ipc_send_cmd(struct phy_device *phydev, + struct as21xxx_priv *priv, + u16 cmd, u16 *ret_sts) +{ + bool curr_parity; + int ret; + + /* The IPC sync by using a single parity bit. + * Each CMD have alternately this bit set or clear + * to understand correct flow and packet order. + */ + curr_parity =3D priv->parity_status; + if (priv->parity_status) + cmd |=3D AEON_IPC_CMD_PARITY; + + /* Always update parity for next packet */ + priv->parity_status =3D !priv->parity_status; + + ret =3D phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_IPC_CMD, cmd); + if (ret) + return ret; + + /* Wait for packet to be processed */ + usleep_range(AEON_IPC_DELAY, AEON_IPC_DELAY + 5000); + + /* With no ret_sts, ignore waiting for packet completion + * (ipc parity bit sync) + */ + if (!ret_sts) + return 0; + + ret =3D aeon_ipc_wait_cmd(phydev, curr_parity); + if (ret) + return ret; + + ret =3D phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_IPC_STS); + if (ret < 0) + return ret; + + *ret_sts =3D ret; + if ((*ret_sts & AEON_IPC_STS_STATUS) !=3D AEON_IPC_STS_STATUS_SUCCESS) + return -EINVAL; + + return 0; +} + +/* If data is NULL, return 0 or negative error. + * If data not NULL, return number of Bytes received from IPC or + * a negative error. + */ +static int aeon_ipc_send_msg(struct phy_device *phydev, + u16 opcode, u16 *data, unsigned int data_len, + u16 *ret_data) +{ + struct as21xxx_priv *priv =3D phydev->priv; + unsigned int ret_size; + u16 cmd, ret_sts; + int ret; + int i; + + /* IPC have a max of 8 register to transfer data, + * make sure we never exceed this. + */ + if (data_len > AEON_IPC_DATA_MAX) + return -EINVAL; + + for (i =3D 0; i < data_len / sizeof(u16); i++) + phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_IPC_DATA(i), + data[i]); + + cmd =3D FIELD_PREP(AEON_IPC_CMD_SIZE, data_len) | + FIELD_PREP(AEON_IPC_CMD_OPCODE, opcode); + + mutex_lock(&priv->ipc_lock); + + ret =3D aeon_ipc_send_cmd(phydev, priv, cmd, &ret_sts); + if (ret) { + phydev_err(phydev, "failed to send ipc msg for %x: %d\n", + opcode, ret); + goto out; + } + + if (!data) + goto out; + + if ((ret_sts & AEON_IPC_STS_STATUS) =3D=3D AEON_IPC_STS_STATUS_ERROR) { + ret =3D -EINVAL; + goto out; + } + + /* Prevent IPC from stack smashing the kernel. + * We can't trust IPC to return a good value and we always + * preallocate space for 16 Bytes. + */ + ret_size =3D FIELD_GET(AEON_IPC_STS_SIZE, ret_sts); + if (ret_size > AEON_IPC_DATA_MAX) { + ret =3D -EINVAL; + goto out; + } + + /* Read data from IPC data register for ret_size value from IPC */ + for (i =3D 0; i < DIV_ROUND_UP(ret_size, sizeof(u16)); i++) { + ret =3D phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_IPC_DATA(i)); + if (ret < 0) + goto out; + + ret_data[i] =3D ret; + } + + ret =3D ret_size; + +out: + mutex_unlock(&priv->ipc_lock); + + return ret; +} + +static int aeon_ipc_noop(struct phy_device *phydev, + struct as21xxx_priv *priv, u16 *ret_sts) +{ + u16 cmd; + + cmd =3D FIELD_PREP(AEON_IPC_CMD_SIZE, 0) | + FIELD_PREP(AEON_IPC_CMD_OPCODE, IPC_CMD_NOOP); + + return aeon_ipc_send_cmd(phydev, priv, cmd, ret_sts); +} + +/* Logic to sync parity bit with IPC. + * We send 2 NOP cmd with same partity and we wait for IPC + * to handle the packet only for the second one. This way + * we make sure we are sync for every next cmd. + */ +static int aeon_ipc_sync_parity(struct phy_device *phydev, + struct as21xxx_priv *priv) +{ + u16 ret_sts; + int ret; + + mutex_lock(&priv->ipc_lock); + + /* Send NOP with no parity */ + aeon_ipc_noop(phydev, priv, NULL); + + /* Reset packet parity */ + priv->parity_status =3D false; + + /* Send second NOP with no parity */ + ret =3D aeon_ipc_noop(phydev, priv, &ret_sts); + + mutex_unlock(&priv->ipc_lock); + + /* We expect to return -EINVAL */ + if (ret !=3D -EINVAL) + return ret; + + if ((ret_sts & AEON_IPC_STS_STATUS) !=3D AEON_IPC_STS_STATUS_READY) { + phydev_err(phydev, "Invalid IPC status on sync parity: %x\n", + ret_sts); + return -EINVAL; + } + + return 0; +} + +static int aeon_ipc_get_fw_version(struct phy_device *phydev) +{ + u16 ret_data[AEON_IPC_DATA_NUM_REGISTERS], data[1]; + char fw_version[AEON_IPC_DATA_MAX + 1]; + int ret; + + data[0] =3D IPC_INFO_VERSION; + + ret =3D aeon_ipc_send_msg(phydev, IPC_CMD_INFO, data, + sizeof(data), ret_data); + if (ret < 0) + return ret; + + /* Make sure FW version is NULL terminated */ + memcpy(fw_version, ret_data, ret); + fw_version[ret] =3D '\0'; + + phydev_info(phydev, "Firmware Version: %s\n", fw_version); + + return 0; +} + +static int aeon_dpc_ra_enable(struct phy_device *phydev) +{ + u16 data[2]; + + data[0] =3D IPC_CFG_PARAM_DIRECT; + data[1] =3D IPC_CFG_PARAM_DIRECT_DPC_RA; + + return aeon_ipc_send_msg(phydev, IPC_CMD_CFG_PARAM, data, + sizeof(data), NULL); +} + +static int as21xxx_probe(struct phy_device *phydev) +{ + struct as21xxx_priv *priv; + int ret; + + priv =3D devm_kzalloc(&phydev->mdio.dev, + sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + phydev->priv =3D priv; + + ret =3D devm_mutex_init(&phydev->mdio.dev, + &priv->ipc_lock); + if (ret) + return ret; + + ret =3D aeon_ipc_sync_parity(phydev, priv); + if (ret) + return ret; + + ret =3D aeon_ipc_get_fw_version(phydev); + if (ret) + return ret; + + /* Enable PTP clk if not already Enabled */ + ret =3D phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_PTP_CLK, + VEND1_PTP_CLK_EN); + if (ret) + return ret; + + return aeon_dpc_ra_enable(phydev); +} + +static int as21xxx_read_link(struct phy_device *phydev, int *bmcr) +{ + int status; + + /* Normal C22 BMCR report inconsistent data, use + * the mapped C22 in C45 to have more consistent link info. + */ + *bmcr =3D phy_read_mmd(phydev, MDIO_MMD_AN, + AS21XXX_MDIO_AN_C22 + MII_BMCR); + if (*bmcr < 0) + return *bmcr; + + /* Autoneg is being started, therefore disregard current + * link status and report link as down. + */ + if (*bmcr & BMCR_ANRESTART) { + phydev->link =3D 0; + return 0; + } + + status =3D phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1); + if (status < 0) + return status; + + phydev->link =3D !!(status & MDIO_STAT1_LSTATUS); + + return 0; +} + +static int as21xxx_read_c22_lpa(struct phy_device *phydev) +{ + int lpagb; + + /* MII_STAT1000 are only filled in the mapped C22 + * in C45, use that to fill lpagb values and check. + */ + lpagb =3D phy_read_mmd(phydev, MDIO_MMD_AN, + AS21XXX_MDIO_AN_C22 + MII_STAT1000); + if (lpagb < 0) + return lpagb; + + if (lpagb & LPA_1000MSFAIL) { + int adv =3D phy_read_mmd(phydev, MDIO_MMD_AN, + AS21XXX_MDIO_AN_C22 + MII_CTRL1000); + + if (adv < 0) + return adv; + + if (adv & CTL1000_ENABLE_MASTER) + phydev_err(phydev, "Master/Slave resolution failed, maybe conflicting m= anual settings?\n"); + else + phydev_err(phydev, "Master/Slave resolution failed\n"); + return -ENOLINK; + } + + mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, + lpagb); + + return 0; +} + +static int as21xxx_read_status(struct phy_device *phydev) +{ + int bmcr, old_link =3D phydev->link; + int ret; + + ret =3D as21xxx_read_link(phydev, &bmcr); + if (ret) + return ret; + + /* why bother the PHY if nothing can have changed */ + if (phydev->autoneg =3D=3D AUTONEG_ENABLE && old_link && phydev->link) + return 0; + + phydev->speed =3D SPEED_UNKNOWN; + phydev->duplex =3D DUPLEX_UNKNOWN; + phydev->pause =3D 0; + phydev->asym_pause =3D 0; + + if (phydev->autoneg =3D=3D AUTONEG_ENABLE) { + ret =3D genphy_c45_read_lpa(phydev); + if (ret) + return ret; + + ret =3D as21xxx_read_c22_lpa(phydev); + if (ret) + return ret; + + phy_resolve_aneg_linkmode(phydev); + } else { + int speed; + + linkmode_zero(phydev->lp_advertising); + + speed =3D phy_read_mmd(phydev, MDIO_MMD_VEND1, + VEND1_SPEED_STATUS); + if (speed < 0) + return speed; + + switch (speed & VEND1_SPEED_STATUS) { + case VEND1_SPEED_10000: + phydev->speed =3D SPEED_10000; + phydev->duplex =3D DUPLEX_FULL; + break; + case VEND1_SPEED_5000: + phydev->speed =3D SPEED_5000; + phydev->duplex =3D DUPLEX_FULL; + break; + case VEND1_SPEED_2500: + phydev->speed =3D SPEED_2500; + phydev->duplex =3D DUPLEX_FULL; + break; + case VEND1_SPEED_1000: + phydev->speed =3D SPEED_1000; + if (bmcr & BMCR_FULLDPLX) + phydev->duplex =3D DUPLEX_FULL; + else + phydev->duplex =3D DUPLEX_HALF; + break; + case VEND1_SPEED_100: + phydev->speed =3D SPEED_100; + phydev->duplex =3D DUPLEX_FULL; + break; + case VEND1_SPEED_10: + phydev->speed =3D SPEED_10; + phydev->duplex =3D DUPLEX_FULL; + break; + default: + return -EINVAL; + } + } + + return 0; +} + +static int as21xxx_led_brightness_set(struct phy_device *phydev, + u8 index, enum led_brightness value) +{ + u16 val =3D VEND1_LED_REG_A_EVENT_OFF; + + if (index > AEON_MAX_LEDS) + return -EINVAL; + + if (value) + val =3D VEND1_LED_REG_A_EVENT_ON; + + return phy_modify_mmd(phydev, MDIO_MMD_VEND1, + VEND1_LED_REG(index), + VEND1_LED_REG_A_EVENT, + FIELD_PREP(VEND1_LED_REG_A_EVENT, val)); +} + +static int as21xxx_led_hw_is_supported(struct phy_device *phydev, u8 index, + unsigned long rules) +{ + int i; + + if (index > AEON_MAX_LEDS) + return -EINVAL; + + for (i =3D 0; i < ARRAY_SIZE(as21xxx_led_supported_pattern); i++) + if (rules =3D=3D as21xxx_led_supported_pattern[i].pattern) + return 0; + + return -EOPNOTSUPP; +} + +static int as21xxx_led_hw_control_get(struct phy_device *phydev, u8 index, + unsigned long *rules) +{ + int i, val; + + if (index > AEON_MAX_LEDS) + return -EINVAL; + + val =3D phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_LED_REG(index)); + if (val < 0) + return val; + + val =3D FIELD_GET(VEND1_LED_REG_A_EVENT, val); + for (i =3D 0; i < ARRAY_SIZE(as21xxx_led_supported_pattern); i++) + if (val =3D=3D as21xxx_led_supported_pattern[i].val) { + *rules =3D as21xxx_led_supported_pattern[i].pattern; + return 0; + } + + /* Should be impossible */ + return -EINVAL; +} + +static int as21xxx_led_hw_control_set(struct phy_device *phydev, u8 index, + unsigned long rules) +{ + u16 val =3D 0; + int i; + + if (index > AEON_MAX_LEDS) + return -EINVAL; + + for (i =3D 0; i < ARRAY_SIZE(as21xxx_led_supported_pattern); i++) + if (rules =3D=3D as21xxx_led_supported_pattern[i].pattern) { + val =3D as21xxx_led_supported_pattern[i].val; + break; + } + + return phy_modify_mmd(phydev, MDIO_MMD_VEND1, + VEND1_LED_REG(index), + VEND1_LED_REG_A_EVENT, + FIELD_PREP(VEND1_LED_REG_A_EVENT, val)); +} + +static int as21xxx_led_polarity_set(struct phy_device *phydev, int index, + unsigned long modes) +{ + bool led_active_low =3D false; + u16 mask, val =3D 0; + u32 mode; + + if (index > AEON_MAX_LEDS) + return -EINVAL; + + for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) { + switch (mode) { + case PHY_LED_ACTIVE_LOW: + led_active_low =3D true; + break; + case PHY_LED_ACTIVE_HIGH: /* default mode */ + led_active_low =3D false; + break; + default: + return -EINVAL; + } + } + + mask =3D VEND1_GLB_CPU_CTRL_LED_POLARITY(index); + if (led_active_low) + val =3D VEND1_GLB_CPU_CTRL_LED_POLARITY(index); + + return phy_modify_mmd(phydev, MDIO_MMD_VEND1, + VEND1_GLB_REG_CPU_CTRL, + mask, val); +} + +static int as21xxx_match_phy_device(struct phy_device *phydev, + const struct phy_driver *phydrv) +{ + struct as21xxx_priv *priv; + u16 ret_sts; + u32 phy_id; + int ret; + + /* Skip PHY that are not AS21xxx or already have firmware loaded */ + if (phydev->c45_ids.device_ids[MDIO_MMD_PCS] !=3D PHY_ID_AS21XXX) + return genphy_match_phy_device(phydev, phydrv); + + /* Read PHY ID to handle firmware just loaded */ + ret =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MII_PHYSID1); + if (ret < 0) + return ret; + phy_id =3D ret << 16; + + ret =3D phy_read_mmd(phydev, MDIO_MMD_PCS, MII_PHYSID2); + if (ret < 0) + return ret; + phy_id |=3D ret; + + /* With PHY ID not the generic AS21xxx one assume + * the firmware just loaded + */ + if (phy_id !=3D PHY_ID_AS21XXX) + return phy_id =3D=3D phydrv->phy_id; + + /* Allocate temp priv and load the firmware */ + priv =3D kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + mutex_init(&priv->ipc_lock); + + ret =3D aeon_firmware_load(phydev); + if (ret) + goto out; + + /* Sync parity... */ + ret =3D aeon_ipc_sync_parity(phydev, priv); + if (ret) + goto out; + + /* ...and send a third NOOP cmd to wait for firmware finish loading */ + ret =3D aeon_ipc_noop(phydev, priv, &ret_sts); + if (ret) + goto out; + +out: + mutex_destroy(&priv->ipc_lock); + kfree(priv); + + /* Return can either be 0 or a negative error code. + * Returning 0 here means THIS is NOT a suitable PHY. + * + * For the specific case of the generic Aeonsemi PHY ID that + * needs the firmware the be loaded first to have a correct PHY ID, + * this is OK as a matching PHY ID will be found right after. + * This relies on the driver probe order where the first PHY driver + * probed is the generic one. + */ + return ret; +} + +static struct phy_driver as21xxx_drivers[] =3D { + { + /* PHY expose in C45 as 0x7500 0x9410 + * before firmware is loaded. + * This driver entry must be attempted first to load + * the firmware and thus update the ID registers. + */ + PHY_ID_MATCH_EXACT(PHY_ID_AS21XXX), + .name =3D "Aeonsemi AS21xxx", + .match_phy_device =3D as21xxx_match_phy_device, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21011JB1), + .name =3D "Aeonsemi AS21011JB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21011PB1), + .name =3D "Aeonsemi AS21011PB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21010PB1), + .name =3D "Aeonsemi AS21010PB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21010JB1), + .name =3D "Aeonsemi AS21010JB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21210PB1), + .name =3D "Aeonsemi AS21210PB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21510JB1), + .name =3D "Aeonsemi AS21510JB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21510PB1), + .name =3D "Aeonsemi AS21510PB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21511JB1), + .name =3D "Aeonsemi AS21511JB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21210JB1), + .name =3D "Aeonsemi AS21210JB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, + { + PHY_ID_MATCH_EXACT(PHY_ID_AS21511PB1), + .name =3D "Aeonsemi AS21511PB1", + .probe =3D as21xxx_probe, + .match_phy_device =3D as21xxx_match_phy_device, + .read_status =3D as21xxx_read_status, + .led_brightness_set =3D as21xxx_led_brightness_set, + .led_hw_is_supported =3D as21xxx_led_hw_is_supported, + .led_hw_control_set =3D as21xxx_led_hw_control_set, + .led_hw_control_get =3D as21xxx_led_hw_control_get, + .led_polarity_set =3D as21xxx_led_polarity_set, + }, +}; +module_phy_driver(as21xxx_drivers); + +static struct mdio_device_id __maybe_unused as21xxx_tbl[] =3D { + { PHY_ID_MATCH_VENDOR(PHY_VENDOR_AEONSEMI) }, + { } +}; +MODULE_DEVICE_TABLE(mdio, as21xxx_tbl); + +MODULE_DESCRIPTION("Aeonsemi AS21xxx PHY driver"); +MODULE_AUTHOR("Christian Marangi "); +MODULE_LICENSE("GPL"); --=20 2.48.1 From nobody Thu Dec 18 00:59:46 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2A3426561A; Sun, 11 May 2025 18:40:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988833; cv=none; b=EKo1GQQPz8gDOXOYuIOzKDTzpkSUfrk/lbiPV/NiMIi9cazJnselGe0lFZ8BWC5HyI6N/s6zHEUDPW+BmvzruwS+SP9tuaX9ZKMAobp8wLZue7IoaA9asbu0EQ7NfTrQYEAuNLQQw6O8Mq/7ijKt90oklIDjw17t6uyKLglVQlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746988833; c=relaxed/simple; bh=p1ogddfKyDLswZD+8Lq4q/ukt2Ed9aQburf2hvVJ6Ro=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IBkUc/VObJxN7DWNFH3PjeCfWuK82oVyiJ1CsPhZawG/Q5vsgvzVsV0tXo2ddO7Q8+RQhXvzlNz2EaIGZds6duZbl0+JEiS7Fel25nPek4XfbXJg6zsaPC6q/rmgUlzbgqRUmOhwDpysvctTL/8gsKKOD7PHqyafd6IDEBFG3us= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GDkV+Tlc; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GDkV+Tlc" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43edb40f357so24693435e9.0; Sun, 11 May 2025 11:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746988829; x=1747593629; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uezwVFz0Zcagk+1GhVcJ7am3l2Fc5VtSdFSVCAllSAg=; b=GDkV+Tlc3WlIsEGdUsMO6rJsEPR5xQhF2Te0UEu1MwqfGB4pa5Q+IHuEvUmg+AJ0Ud ZYZ7hVoPtCnHmjKTE0wenTbFNcHIAcpe9ivu3U0JWGDOWJ5liiyulLsG3Zf9bvwmJNSW JEmot8/szIkPiYTIPVCphZdHjurE9JXlYlth4VeBew+KuG1HamD/bwqJnlMMN1cUMWII EKqn+UBng21OXHDMf6b7Gdqr6FoctOGmU6GyjHCUYymexjyzttuawtbp6xge8r8gFMXB jpe578LAQ2vxDk1ZwkefIqDzh5SlAlGekHjD+lJ5TItYA6t1zvYf/HxPvnOCRshOjnuG OusA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746988829; x=1747593629; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uezwVFz0Zcagk+1GhVcJ7am3l2Fc5VtSdFSVCAllSAg=; b=B26ml9bbmNhMeR/981+gZXkhN4aCJOWGXbDJjL/U78U+34Zn+vH3uzEaSag4nzAec5 f77rxGPGhdlXYb2sYLz+b02Nd6vCuy8VoSgCQQ7l3J5KHx6PYhOlVKouG+WrVQ7sDYJT O3csjzjTfx80n9l+tV4yqY5tmId/bTap+eOQKej6y0Wa8seb5axAbW1RXDs7WAMVYM5/ 2ZMSjc+jRV5o3EKofPDr4K2YMxq2ZWXw98XFeIgqW9scjQDOjQR/kO1I1LY7VL9R7drz NA5i8AgvmmXEr6usC8Me+XlbQYapibyO9Xl3YdCHJdrOna9Kt3wKz69W49FE72VrLWOv MXgQ== X-Forwarded-Encrypted: i=1; AJvYcCU26YQGhcAJbib0Qhj/Tz+kxLsBx9xUramPGpfpJW75STB0yInor6oczz0qSDnN5Gic1Mn9LvIWeqp2@vger.kernel.org, AJvYcCUXYYbQA4vJmnxd30p5yviHJRSstwGl6kduJ8CsRz0P6qgqAKKZEvLozAgfLFYAtIc66Z2DdLybHzMmy8Z9@vger.kernel.org, AJvYcCWu3BrADRCNsxpr2sx5MzMKX5WnD+o5Snx4UWDzQ/9oxaMXaWnZ1u2ukQLUB0sodftE7D630tZv@vger.kernel.org X-Gm-Message-State: AOJu0YzNy0/euWYL8b95STngi9hCwBNcb7Kg89Yxhf+orQ3/RxaxlcQK NFiKZz0RWv1M8k2V6sES0+LSn7ATqm+eM/xzRoQTZ40QqEy3i46m X-Gm-Gg: ASbGnctuooDf+29B2Hx2daMzr+XkIP4JkvOlrjYx97pKg8cCWC8+QJ055gIx7Bx9O3S E1v63wR26/EM5RBVNuV6ycy0ygntusubzb1KhpKBfJDvkGVHdKoFgQSw4xZnvuybnMoePTvU9zo 9P+hXgiSq1wlJFlBcrni7MU3CPEecLyqCoU4hJM21SwZWRqR+pE3oCg0e+D8GDemiTcOT7vq++x MXUWNZSi3Lsinb3vGpbWZ93CVballaNCM5dXrbCRwq4b7PGZUu8NGrI3K5RSCLjLFWXqxddyBvr qeP2CvyCJ3UhvURpsNGCP1way4BkhJULhR5z/Jv6cVKy6FRbKbU2VuSAi44c+P9PDeY8Sx69XRd CTAZMXqDRDNNsdA1GzVpI X-Google-Smtp-Source: AGHT+IGPjqsU0Ip7uh8YSG5JzxxEBr4k3RRUbVfTQt+wUKn8t+Nq0pI8B+VtSjQZzfxKUTtTNDf3yA== X-Received: by 2002:a05:600c:8207:b0:43c:ee62:33f5 with SMTP id 5b1f17b1804b1-442d6ddcf2dmr84090325e9.27.1746988828786; Sun, 11 May 2025 11:40:28 -0700 (PDT) Received: from localhost.localdomain (93-34-88-225.ip49.fastwebnet.it. [93.34.88.225]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-442d76b7fd6sm61020615e9.0.2025.05.11.11.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 May 2025 11:40:28 -0700 (PDT) From: Christian Marangi To: Christian Marangi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiner Kallweit , Russell King , Florian Fainelli , Broadcom internal kernel review list , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrei Botila , Sabrina Dubroca , Michael Klein , Daniel Golle , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next PATCH v9 6/6] dt-bindings: net: Document support for Aeonsemi PHYs Date: Sun, 11 May 2025 20:39:30 +0200 Message-ID: <20250511183933.3749017-7-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250511183933.3749017-1-ansuelsmth@gmail.com> References: <20250511183933.3749017-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add Aeonsemi PHYs and the requirement of a firmware to correctly work. Also document the max number of LEDs supported and what PHY ID expose when no firmware is loaded. Supported PHYs AS21011JB1, AS21011PB1, AS21010JB1, AS21010PB1, AS21511JB1, AS21511PB1, AS21510JB1, AS21510PB1, AS21210JB1, AS21210PB1 that all register with the PHY ID 0x7500 0x9410 on C45 registers before the firmware is loaded. Reviewed-by: Rob Herring (Arm) Signed-off-by: Christian Marangi --- .../bindings/net/aeonsemi,as21xxx.yaml | 122 ++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 123 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/aeonsemi,as21xxx.= yaml diff --git a/Documentation/devicetree/bindings/net/aeonsemi,as21xxx.yaml b/= Documentation/devicetree/bindings/net/aeonsemi,as21xxx.yaml new file mode 100644 index 000000000000..69eb29dc4d7b --- /dev/null +++ b/Documentation/devicetree/bindings/net/aeonsemi,as21xxx.yaml @@ -0,0 +1,122 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/aeonsemi,as21xxx.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aeonsemi AS21XXX Ethernet PHY + +maintainers: + - Christian Marangi + +description: | + Aeonsemi AS21xxx Ethernet PHYs requires a firmware to be loaded to actua= lly + work. The same firmware is compatible with various PHYs of the same fami= ly. + + A PHY with not firmware loaded will be exposed on the MDIO bus with ID + 0x7500 0x7500 or 0x7500 0x9410 on C45 registers. + + This can be done and is implemented by OEM in 2 different way: + - Attached SPI flash directly to the PHY with the firmware. The PHY + will self load the firmware in the presence of this configuration. + - Manually provided firmware loaded from a file in the filesystem. + + Each PHY can support up to 5 LEDs. + + AS2xxx PHY Name logic: + + AS21x1xxB1 + ^ ^^ + | |J: Supports SyncE/PTP + | |P: No SyncE/PTP support + | 1: Supports 2nd Serdes + | 2: Not 2nd Serdes support + 0: 10G, 5G, 2.5G + 5: 5G, 2.5G + 2: 2.5G + +allOf: + - $ref: ethernet-phy.yaml# + +select: + properties: + compatible: + contains: + enum: + - ethernet-phy-id7500.9410 + - ethernet-phy-id7500.9402 + - ethernet-phy-id7500.9412 + - ethernet-phy-id7500.9422 + - ethernet-phy-id7500.9432 + - ethernet-phy-id7500.9442 + - ethernet-phy-id7500.9452 + - ethernet-phy-id7500.9462 + - ethernet-phy-id7500.9472 + - ethernet-phy-id7500.9482 + - ethernet-phy-id7500.9492 + required: + - compatible + +properties: + reg: + maxItems: 1 + + firmware-name: + description: specify the name of PHY firmware to load + maxItems: 1 + +required: + - compatible + - reg + +if: + properties: + compatible: + contains: + const: ethernet-phy-id7500.9410 +then: + required: + - firmware-name +else: + properties: + firmware-name: false + +unevaluatedProperties: false + +examples: + - | + #include + + mdio { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ethernet-phy@1f { + compatible =3D "ethernet-phy-id7500.9410", + "ethernet-phy-ieee802.3-c45"; + + reg =3D <31>; + firmware-name =3D "as21x1x_fw.bin"; + + leds { + #address-cells =3D <1>; + #size-cells =3D <0>; + + led@0 { + reg =3D <0>; + color =3D ; + function =3D LED_FUNCTION_LAN; + function-enumerator =3D <0>; + default-state =3D "keep"; + }; + + led@1 { + reg =3D <1>; + color =3D ; + function =3D LED_FUNCTION_LAN; + function-enumerator =3D <1>; + default-state =3D "keep"; + }; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 39f66be67729..6ef492ffbaaf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -650,6 +650,7 @@ AEONSEMI PHY DRIVER M: Christian Marangi L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/aeonsemi,as21xxx.yaml F: drivers/net/phy/as21xxx.c =20 AF8133J THREE-AXIS MAGNETOMETER DRIVER --=20 2.48.1