From patchwork Thu Jun 8 16:34:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 105024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp379079vqr; Thu, 8 Jun 2023 09:03:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WHFIUC835Or4SYpx+757vOkx2sXCH5gY/dGphYEhfX2Yx/7gVNj+xrirreoDj2QBwL5nJ X-Received: by 2002:a05:6a00:18a4:b0:64d:5f9c:7b75 with SMTP id x36-20020a056a0018a400b0064d5f9c7b75mr6044552pfh.16.1686240191062; Thu, 08 Jun 2023 09:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686240191; cv=none; d=google.com; s=arc-20160816; b=G66VmeK/VR25aIFIl6lB03cVLKYRQQgUmKsk9JsPwAlJ4preGNiQCfnm26vyYGmKH4 XQq6jRQCKC5CA01II3uZQx/MgKWXJcuLwTs2zhM2f/LYDl2cxB5z2zHDigqxOqJZlB4N giH3S1qPLSzNj8PIZwE0IMpheMbbfoq6lGKm5TYKCqfZ0eKyo9RDPahyr0UWDG5knfQL fUn15/mU+tlyvkSqbN+EE0BeNU6svuWk0uSQxelsMmV+wXodPrr6Nkbr6oMG7an8dZpH LlD/jk55ziF1FbNyR0gz4xY9oX9zDcZ1iYGQHeEGAlrX125nP4NqUraXm9JviWHr4faR 2FCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3hdxcC4WdqdL013cjRLJFVxMqvKvDEFUWXgd/lspsZA=; b=CY6OVSQerbmxOrgDzNc/Eix4CHEobu5+7MzZhI8zvNl3VswUR4Exr/++bh0kor1h1P yqwjqDkIrnnN5BpGcbfb8CJaXUx3ufqx/91FAONlRLUvJqJiJSHWh1ijWvnyUzIr5n+g 13Qs6f/wFxTDAjRKgLIIedtjPl8J0q935KfiI2ArnfaodxVJLFbhtadC67VeaL+xBf+r CYA91UQ3M0MpUyEm9vMoNoAmssPpbceSxJaDsbFclG0fxKPzahXjSJW2caOku7sy2rei UtNrF3xXaIOey+PxkOqhKZU9ZAxapxVUSnF4ZIlQPUv61Pd91VpRromlJmOrbEhIX+4/ 8Kyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=juJrXjmN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h188-20020a6253c5000000b0065ff4b819b3si1037162pfb.52.2023.06.08.09.02.56; Thu, 08 Jun 2023 09:03:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=juJrXjmN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237257AbjFHPwI (ORCPT + 99 others); Thu, 8 Jun 2023 11:52:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236398AbjFHPwD (ORCPT ); Thu, 8 Jun 2023 11:52:03 -0400 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB3412D7C; Thu, 8 Jun 2023 08:51:40 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686239499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3hdxcC4WdqdL013cjRLJFVxMqvKvDEFUWXgd/lspsZA=; b=juJrXjmN+G5LxsOnRrmENc7ESQQKUHcD6uWaS8nnBrqG6aSp9cW+iinHIMxAs37yuBoe6M PUV5UQE3WGCQkgSqJ58dcxYdD+5PedNQUeCd3xMHn8WbN9ikwybzw/TAPCGCcsu3kEqhV1 IDMEKuM/iFM5E+mwmkxMdk72E8w+UFQ7LSQoo9qZIqUFmcz2hymOfzcp0x8zcTU0Ow9oAA wEMm27bWTH1ye6MsaLLKRebO3m5DMIZl4691mbOEhZrqjK/ADR7j+eGAqN0NdmZfPXWwTp d0f3YnL/s5fmYKohett38G3Gr24Do6BB31jm05fn11P8Le2vLoZsGM2sYfQXPQ== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 51AD06000C; Thu, 8 Jun 2023 15:51:38 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , linux-arm-kernel@lists.infradead.org, Horatiu.Vultur@microchip.com, Allan.Nielsen@microchip.com, UNGLinuxDriver@microchip.com, Vladimir Oltean Subject: [PATCH net 1/2] net: phylink: report correct max speed for QUSGMII Date: Thu, 8 Jun 2023 18:34:13 +0200 Message-Id: <20230608163415.511762-2-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608163415.511762-1-maxime.chevallier@bootlin.com> References: <20230608163415.511762-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768150994866668327?= X-GMAIL-MSGID: =?utf-8?q?1768150994866668327?= Q-USGMII is the quad port version of USGMII, and supports a max speed of 1Gbps on each line. Make so that phylink_interface_max_speed() reports this information correctly. Fixes: ae0e4bb2a0e0 ("net: phylink: Adjust link settings based on rate matching") Signed-off-by: Maxime Chevallier --- drivers/net/phy/phylink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index b4831110003c..809e6d5216dc 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -188,6 +188,7 @@ static int phylink_interface_max_speed(phy_interface_t interface) case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_QSGMII: + case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_GMII: return SPEED_1000; @@ -204,7 +205,6 @@ static int phylink_interface_max_speed(phy_interface_t interface) case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GKR: case PHY_INTERFACE_MODE_USXGMII: - case PHY_INTERFACE_MODE_QUSGMII: return SPEED_10000; case PHY_INTERFACE_MODE_25GBASER: From patchwork Thu Jun 8 16:34:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 105021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp376406vqr; Thu, 8 Jun 2023 09:00:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Rec1NBI6PB6dE22sYlZn54dRRtDibcarU2qIfkE5z0SJjCkQVuor+gnywhl8WCvOEh0tU X-Received: by 2002:a05:6358:c122:b0:129:d475:15db with SMTP id fh34-20020a056358c12200b00129d47515dbmr7211026rwb.17.1686240028204; Thu, 08 Jun 2023 09:00:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686240028; cv=none; d=google.com; s=arc-20160816; b=pVQ0qaFwsm97+UH78yNZCdaK0JCqA9Ow4IqkQkNhLJhz+5yWvvRnPEWPvl1aCInftv 1rD+SJ5kX6fVOBRCOnjIVAnZvzbO+ulwt5ZGvGp1hcjf8m7O1IAX1xcv1Ocd6PgYVtyX 1Z1VUwBMlrwRK2STMVikQFWqDheUSgk65cAYoLdGlGHqyBYjkbZ8R6yteRKkgbv/HwIm 8Vpl/zJgEdyIiKjcqWO4jSiyIK1fdki9upci2qCAAJwJDO+4Q/TCtW3gBkwo6CfkElvi 87xucarvtS5FdlrJsxDxELHm9h89P3lSH4QRztdWs1qu6auaWI5NdRcdw3RNg8wBE4p/ DvVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=C4HWsGpzkoFGrF2QEu9yk0kkw2l8QL+Vcx0ZQoZOw4Y=; b=SWiPOyxsUqICHWX2pTqxnknWRcaNZbvd0dxGTHIczw6bcIkfWtekh2FC9+IRq3dNXp pOgY3lmQlPt3ZK7Jike4NN0rFC+JH4FtG0YMTu070vQllm5wbGBp9UnUHE0t7wpUAupQ rIWm+n1SVj8yYq8QA9BjK2o4BA4JM++xyQNolH4wPW9VUV8i6IcDZBsKCSfNhRhxYyPg /4LsS9BCsaObDMnAIr62m1qrmnsfiz1qMIoPiE6/ZwCujGsTIliY1fhaX9gKcGKHKl09 pT1MWKtK7YvBSyMSP6g64etGDakzaWr69/MGppKlLnUGzQNHSfF4JYLsrdPd6nmlhr6P gLGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=ov0tYYI6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i190-20020a6387c7000000b00542a44ab16csi1171295pge.231.2023.06.08.09.00.12; Thu, 08 Jun 2023 09:00:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=ov0tYYI6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235738AbjFHPwF (ORCPT + 99 others); Thu, 8 Jun 2023 11:52:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237257AbjFHPwD (ORCPT ); Thu, 8 Jun 2023 11:52:03 -0400 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8D292718; Thu, 8 Jun 2023 08:51:41 -0700 (PDT) X-GND-Sasl: maxime.chevallier@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1686239500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C4HWsGpzkoFGrF2QEu9yk0kkw2l8QL+Vcx0ZQoZOw4Y=; b=ov0tYYI6P9Nam51C5snonGKLQjwNwTE2TuDYrR2Ygmivu1eCHw+Zx09wK8Nvk60MFMhNDp tuxWx0YvPjIeQlWbjNv8wnDHvsc8tFuHb0XLOIt4V59Z4v/i/R7muBPoqtdqL+YukusECG 1kaIsVO4J2RmVMM4/qSwxA2bqW8KCYrpfP7HkbTpW5VRiQLiekn3TZ2PFY9Ycf7KyEQcMz IT6w3r3kZuWM/bl4ZFmhIfvPwhN8t+0R5xewFZsY3I+TlDJ9zFrnSzTLkpHK13OmuWfuw6 8NC5TeJWpsbcn+w3muz7o3UXBZSmcQw8XAmbOrMHhdsw2Ogv0tF7exL/gaLbjQ== X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com X-GND-Sasl: maxime.chevallier@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 7620160006; Thu, 8 Jun 2023 15:51:39 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Cc: Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, Andrew Lunn , Florian Fainelli , Heiner Kallweit , Russell King , linux-arm-kernel@lists.infradead.org, Horatiu.Vultur@microchip.com, Allan.Nielsen@microchip.com, UNGLinuxDriver@microchip.com, Vladimir Oltean Subject: [PATCH net 2/2] net: phylink: use a dedicated helper to parse usgmii control word Date: Thu, 8 Jun 2023 18:34:14 +0200 Message-Id: <20230608163415.511762-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230608163415.511762-1-maxime.chevallier@bootlin.com> References: <20230608163415.511762-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768150823763118531?= X-GMAIL-MSGID: =?utf-8?q?1768150823763118531?= Q-USGMII is a derivative of USGMII, that uses a specific formatting for the control word. The layout is close to the USXGMII control word, but doesn't support speeds over 1Gbps. Use a dedicated decoding logic for the USGMII control word, re-using USXGMII definitions with a custom mask and only considering 10/100/1000 speeds Fixes: 5e61fe157a27 ("net: phy: Introduce QUSGMII PHY mode") Signed-off-by: Maxime Chevallier --- drivers/net/phy/phylink.c | 39 ++++++++++++++++++++++++++++++++++++++- include/uapi/linux/mdio.h | 3 +++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 809e6d5216dc..730f8860d2a6 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -3298,6 +3298,41 @@ void phylink_decode_usxgmii_word(struct phylink_link_state *state, } EXPORT_SYMBOL_GPL(phylink_decode_usxgmii_word); +/** + * phylink_decode_usgmii_word() - decode the USGMII word from a MAC PCS + * @state: a pointer to a struct phylink_link_state. + * @lpa: a 16 bit value which stores the USGMII auto-negotiation word + * + * Helper for MAC PCS supporting the USGMII protocol and the auto-negotiation + * code word. Decode the USGMII code word and populate the corresponding fields + * (speed, duplex) into the phylink_link_state structure. The structure for this + * word is the same as the USXGMII word, expect it only supports speeds up to + * 1Gbps. + */ +static void phylink_decode_usgmii_word(struct phylink_link_state *state, + uint16_t lpa) +{ + switch (lpa & MDIO_USGMII_SPD_MASK) { + case MDIO_USXGMII_10: + state->speed = SPEED_10; + break; + case MDIO_USXGMII_100: + state->speed = SPEED_100; + break; + case MDIO_USXGMII_1000: + state->speed = SPEED_1000; + break; + default: + state->link = false; + return; + } + + if (lpa & MDIO_USXGMII_FULL_DUPLEX) + state->duplex = DUPLEX_FULL; + else + state->duplex = DUPLEX_HALF; +} + /** * phylink_mii_c22_pcs_decode_state() - Decode MAC PCS state from MII registers * @state: a pointer to a &struct phylink_link_state. @@ -3335,9 +3370,11 @@ void phylink_mii_c22_pcs_decode_state(struct phylink_link_state *state, case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_QSGMII: - case PHY_INTERFACE_MODE_QUSGMII: phylink_decode_sgmii_word(state, lpa); break; + case PHY_INTERFACE_MODE_QUSGMII: + phylink_decode_usgmii_word(state, lpa); + break; default: state->link = false; diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h index 256b463e47a6..1d20a9082507 100644 --- a/include/uapi/linux/mdio.h +++ b/include/uapi/linux/mdio.h @@ -444,4 +444,7 @@ static inline __u16 mdio_phy_id_c45(int prtad, int devad) #define MDIO_USXGMII_5000FULL 0x1a00 /* 5000Mbps full-duplex */ #define MDIO_USXGMII_LINK 0x8000 /* PHY link with copper-side partner */ +/* Usgmii control word is based on Usxgmii, masking away 2.5, 5 and 10Gbps */ +#define MDIO_USGMII_SPD_MASK 0x0600 + #endif /* _UAPI__LINUX_MDIO_H__ */