From patchwork Wed Feb 1 18:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 51506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp441995wrn; Wed, 1 Feb 2023 10:35:47 -0800 (PST) X-Google-Smtp-Source: AK7set9P4upBp+bWvsxavTQmj9EikvpvsAm2RskZoSVi20BTFiAEmsyToAxzutpCtMxx4wwlrrc1 X-Received: by 2002:a05:6a20:8bb0:b0:bc:7dc0:6a55 with SMTP id m48-20020a056a208bb000b000bc7dc06a55mr3365364pzh.29.1675276546895; Wed, 01 Feb 2023 10:35:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675276546; cv=none; d=google.com; s=arc-20160816; b=dgXD6pqhvVewoApzoDU2xZvOC1doQ9mVBuORCWxGyJmoPYR/deF4BWm1UvYyXXCUyf NmZ9hhH7MrZMmdHKjY6VgGwi89Wq9G6miRuRIDv2sno6iozGLHaQ2l4ByqGw53qL4QzY EKsGXq2ZBzyH66Roh4ZmC2Sq6PAcMv41LptjT5azbbXsx0oavGMq9jywFbeIpvwZS2B6 7g1SAuZ47GX1IKeo47IdaEV+Q+Mp7JFuCcKR1VIkEOGjocc9vGJfZnAxzWruqbrRC4Dk esWrbpC4S8L69+9nWfJyDzl19Uidoom99urTe+A67ZLK/xFDyorAeOdvPbseFw9qALZK 0RXA== 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=GFp/X5eUiRxs39WBP/bBKYq6n8rAaordpE22XIcRs3o=; b=kzbwV7WniHqQaQwr8wMAFhe43NOHGxYpfsBFSYe3YFXWggyaFBxVCzsoNqPjI1oQlv qBjDSSz6GrAJO9YpIE1RAkUjx6VlBUynHbwykKSp1fwh1wU/VDgSbt2HSUer25SzteMN Ac9URm5Rx3zJSR4Fk8DjWOZgb/mty+a0l0V35no/OXfijOvQ3lyLhUHnZYV7okCUQQai jsE5nHTDw9898pZQlyYpx/z1EXnrR3kBuFUKZYENbZVsen0uzU9OebygrTVbYIfWd0A9 V0suel3yacVL+vTas40IcJljAOKOqQJTVBPQpDG8wvlzObIctbJYCnyZmP6K2ZgNT1rp DBRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mork.no header.s=b header.b="hWBN14/2"; 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=NONE sp=NONE dis=NONE) header.from=mork.no Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m4-20020a656a04000000b004cc3c59b5f0si23560417pgu.329.2023.02.01.10.35.34; Wed, 01 Feb 2023 10:35:46 -0800 (PST) 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=@mork.no header.s=b header.b="hWBN14/2"; 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=NONE sp=NONE dis=NONE) header.from=mork.no Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232034AbjBAS0g (ORCPT + 99 others); Wed, 1 Feb 2023 13:26:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjBAS02 (ORCPT ); Wed, 1 Feb 2023 13:26:28 -0500 Received: from dilbert.mork.no (dilbert.mork.no [IPv6:2a01:4f9:c010:a439::d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E5667F303; Wed, 1 Feb 2023 10:26:27 -0800 (PST) Received: from canardo.dyn.mork.no ([IPv6:2a01:799:c9a:3200:0:0:0:1]) (authenticated bits=0) by dilbert.mork.no (8.15.2/8.15.2) with ESMTPSA id 311INgIH648786 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Wed, 1 Feb 2023 18:23:44 GMT Received: from canardo.dyn.mork.no (ip6-localhost [IPv6:0:0:0:0:0:0:0:1]) by canardo.dyn.mork.no (8.15.2/8.15.2) with ESMTPS id 311INbnI943492 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Wed, 1 Feb 2023 19:23:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1675275817; bh=GFp/X5eUiRxs39WBP/bBKYq6n8rAaordpE22XIcRs3o=; h=From:To:Cc:Subject:Date:Message-Id:References:From; b=hWBN14/2wzWOK+nFje/kXjMYvsUSle8vOEHyiepQkgr21Jm8Eut/PqaJg8/UqG8yy 3u3/HKHiX3/pL9k0ut1bvwidn0bBcqglycX1udqOiIi0MmvRFyv+t7JvaFZgDFDYeW 6q+4KSL052su2g5UUYOrMtZFMu3YDDx3c6xOW8Qs= Received: (from bjorn@localhost) by canardo.dyn.mork.no (8.15.2/8.15.2/Submit) id 311INbIQ943491; Wed, 1 Feb 2023 19:23:37 +0100 From: =?utf-8?q?Bj=C3=B8rn_Mork?= To: netdev@vger.kernel.org Cc: Felix Fietkau , John Crispin , Sean Wang , Mark Lee , Lorenzo Bianconi , Russell King , Daniel Golle , Alexander Couzens , Simon Horman , Paolo Abeni , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Matthias Brugger , =?utf-8?q?Ren=C3=A9_van_Dorst?= , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, =?utf-8?q?Bj=C3=B8rn_Mork?= , Russell King Subject: [PATCH v5 net 2/3] net: mediatek: sgmii: fix duplex configuration Date: Wed, 1 Feb 2023 19:23:30 +0100 Message-Id: <20230201182331.943411-3-bjorn@mork.no> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230201182331.943411-1-bjorn@mork.no> References: <20230201182331.943411-1-bjorn@mork.no> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Virus-Scanned: clamav-milter 0.103.7 at canardo X-Virus-Status: Clean 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?1756654780249163271?= X-GMAIL-MSGID: =?utf-8?q?1756654780249163271?= The logic of the duplex bit is inverted. Setting it means half duplex, not full duplex. Fix and rename macro to avoid confusion. Fixes: 7e538372694b ("net: ethernet: mediatek: Re-add support SGMII") Reviewed-by: Russell King (Oracle) Signed-off-by: Bjørn Mork --- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- drivers/net/ethernet/mediatek/mtk_sgmii.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 01a38f5145b1..2d9186d32bc0 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -519,7 +519,7 @@ #define SGMII_SPEED_10 FIELD_PREP(SGMII_SPEED_MASK, 0) #define SGMII_SPEED_100 FIELD_PREP(SGMII_SPEED_MASK, 1) #define SGMII_SPEED_1000 FIELD_PREP(SGMII_SPEED_MASK, 2) -#define SGMII_DUPLEX_FULL BIT(4) +#define SGMII_DUPLEX_HALF BIT(4) #define SGMII_IF_MODE_BIT5 BIT(5) #define SGMII_REMOTE_FAULT_DIS BIT(8) #define SGMII_CODE_SYNC_SET_VAL BIT(9) diff --git a/drivers/net/ethernet/mediatek/mtk_sgmii.c b/drivers/net/ethernet/mediatek/mtk_sgmii.c index 0a06995099cf..c4261069b521 100644 --- a/drivers/net/ethernet/mediatek/mtk_sgmii.c +++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c @@ -154,11 +154,11 @@ static void mtk_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode, else sgm_mode = SGMII_SPEED_1000; - if (duplex == DUPLEX_FULL) - sgm_mode |= SGMII_DUPLEX_FULL; + if (duplex != DUPLEX_FULL) + sgm_mode |= SGMII_DUPLEX_HALF; regmap_update_bits(mpcs->regmap, SGMSYS_SGMII_MODE, - SGMII_DUPLEX_FULL | SGMII_SPEED_MASK, + SGMII_DUPLEX_HALF | SGMII_SPEED_MASK, sgm_mode); } }