From patchwork Fri Mar 31 21:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 77991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp862217vqo; Fri, 31 Mar 2023 14:56:51 -0700 (PDT) X-Google-Smtp-Source: AK7set+zmC8uMP2tq6ax1yHKlWlkggugnQAJ7fY7zN1jmDwqQSQu/yZyk7mTbICZWQCt/JIO3bJ+ X-Received: by 2002:a05:6a20:b26:b0:d8:d3b4:4912 with SMTP id x38-20020a056a200b2600b000d8d3b44912mr21917724pzf.9.1680299811385; Fri, 31 Mar 2023 14:56:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680299811; cv=none; d=google.com; s=arc-20160816; b=sHMpvtvyOYrwenoyAMIyjNMna6HFzGL75NYeXFxjATjWtDBXOnL7NzjkpiaC8erJ9O eq7bBbWXNbZ0vOBER8CbXFVYFlvhUcB6YNtHwbxk941ND3g1ia2clHdvOBZREpRI7cN6 LaqNqo14LHfW4uaJtcqG4kQdxqld8Bdkr2yO4hO9xo5bt4gg2Cqhy+RBPrc7ms1aJwty ZFjQYfTchey/rgDFt3cd7F6oV6S/CP+ir0OsJG5kPxWyNdJk64Csyb+F3r89NMHHbbyf tgKlz97WIcoFEVtM1Tupy7he8g1N6J7NSl/6EWjT6fapAlogpwOd9zb7kuhmOwEuHTzB eacA== 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=0Mton65QavIHW4pS7iCeuKjBRu19pdJkM06/aTTiBVM=; b=UwjJD8cs8B9LWOq0nEidZOEA3j6rDywc1WtvLNv/HWBKIPOeSl9/kiIuPUG38uxzTt H/E/hP67eyVxP7WgItMVuZQpIp7DeNZCOWnAcAYZCucf1aAh0UBKttE7MdeljaUwKhBn SQMpLrCchr9fpCiMESVEVBXudXtJFMbsRkl2aKrseopZjk/hfinu6nPhTFG9ylZNF+Hc zBjnTUGhOmDJygn/gjnHmdnjM3zH226+1us16qIPf4wgJL0V32dzvnddU6QJElPkuxJW wWERgeUdcpS8mnSE35rR0eEM5GKrDv7AG1fUzftVmlj4nm9PY8GJwYGpsvjlymivVtWe aRFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="hZphxt/z"; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t185-20020a6381c2000000b0050beb800603si3340055pgd.39.2023.03.31.14.56.38; Fri, 31 Mar 2023 14:56:51 -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=@redhat.com header.s=mimecast20190719 header.b="hZphxt/z"; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233186AbjCaVtb (ORCPT + 99 others); Fri, 31 Mar 2023 17:49:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233220AbjCaVsd (ORCPT ); Fri, 31 Mar 2023 17:48:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFF4224430 for ; Fri, 31 Mar 2023 14:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680299215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Mton65QavIHW4pS7iCeuKjBRu19pdJkM06/aTTiBVM=; b=hZphxt/zIPNTFb6CAAcp4VH4lcKiCsAvLFq0QizBBI/Ic3K9gf7RYNVlPwNzuVSZPFCLWy JsgRVElAab7/zEkA3EeLFDJaVkhpxKzVS2GlIuemR0EFScVSK9Kpc/XJweQy+ffz0ejaEN gziUyrdcFLYLyjaDOg/TSULB1KHZOPY= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-fQjlS8tKNt2S_VBZB1H0UA-1; Fri, 31 Mar 2023 17:46:50 -0400 X-MC-Unique: fQjlS8tKNt2S_VBZB1H0UA-1 Received: by mail-ot1-f72.google.com with SMTP id f23-20020a056830205700b006a1d2e5b085so1820971otp.14 for ; Fri, 31 Mar 2023 14:46:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299206; 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=0Mton65QavIHW4pS7iCeuKjBRu19pdJkM06/aTTiBVM=; b=s6v/JbErY1A30tiyAYy9I5FavM7yRkPZ7idtsM03Q84kJONQuLIkbtn/XEbTg14g+l 9Vd2yjtNGFtqJNQTN3wTFOKiYQkSpSKvZVDrKgk/1w5gkHJScGq36OzcB5BxPYAEyU4U /nXxycBDvEDQldmTgSnb5FPzkpBbcY0Z+NCKpQCONq01tVSMNQowRd8OCQzqOuraCVhW NKzRFUHkjecWQWTWUeTxgEHTBan+eeEZE5fCNfG7JzgeHLtbWPXoAvxUlvid3Ere+hWT LNFXfzeK6M6Kp3xmJoUNKgxUZ8MAFGfpfbI/kjNUTZm+4ydqyGz2yvy8ZBCyjb3+JXPt HTjg== X-Gm-Message-State: AO0yUKWozxFca276CaajGT1C52DRSfU/4rd/TEuyA6e11gtvqY5XjLf0 HUmh7MRSeIVMQTv4Cqzn2vLP3LaHl1KqpZK2nBPBaevaXKwL2D7bdh9e4na0zr2VVh99AoTiWHE eHbv7qV9X5ecijxvkEhncQE7n3p0Kyw+QWtNLPWfPIz5gAB5RgtJbIb5VhkA3xFuMERyI0ewykS iSWLnCTfDjvyY= X-Received: by 2002:a05:6808:1d2:b0:383:ee1d:f489 with SMTP id x18-20020a05680801d200b00383ee1df489mr12195951oic.0.1680299206218; Fri, 31 Mar 2023 14:46:46 -0700 (PDT) X-Received: by 2002:a05:6808:1d2:b0:383:ee1d:f489 with SMTP id x18-20020a05680801d200b00383ee1df489mr12195910oic.0.1680299205907; Fri, 31 Mar 2023 14:46:45 -0700 (PDT) Received: from halaney-x13s.attlocal.net (104-53-165-62.lightspeed.stlsmo.sbcglobal.net. [104.53.165.62]) by smtp.gmail.com with ESMTPSA id x80-20020a4a4153000000b0053d9be4be68sm1328531ooa.19.2023.03.31.14.46.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:46:45 -0700 (PDT) From: Andrew Halaney To: linux-kernel@vger.kernel.org Cc: agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, vkoul@kernel.org, bhupesh.sharma@linaro.org, wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, mturquette@baylibre.com, peppe.cavallaro@st.com, alexandre.torgue@foss.st.com, joabreu@synopsys.com, mcoquelin.stm32@gmail.com, richardcochran@gmail.com, linux@armlinux.org.uk, veekhee@apple.com, tee.min.tan@linux.intel.com, mohammad.athari.ismail@intel.com, jonathanh@nvidia.com, ruppala@nvidia.com, bmasney@redhat.com, andrey.konovalov@linaro.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, ncai@quicinc.com, jsuraj@qti.qualcomm.com, hisunil@quicinc.com, echanude@redhat.com, Andrew Halaney Subject: [PATCH net-next v3 10/12] net: stmmac: dwmac-qcom-ethqos: Respect phy-mode and TX delay Date: Fri, 31 Mar 2023 16:45:47 -0500 Message-Id: <20230331214549.756660-11-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331214549.756660-1-ahalaney@redhat.com> References: <20230331214549.756660-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761922055198018909?= X-GMAIL-MSGID: =?utf-8?q?1761922055198018909?= The driver currently sets a MAC TX delay of 2 ns no matter what the phy-mode is. If the phy-mode indicates the phy is in charge of the TX delay (rgmii-txid, rgmii-id), don't do it in the MAC. Signed-off-by: Andrew Halaney --- Changes since v2: * Fix spacing, reverse xmas tree (Jakub) Changes since v1: * Use a consistent subject prefix with other stmmac changes in series (myself) .../stmicro/stmmac/dwmac-qcom-ethqos.c | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 32763566c214..abec6dd27992 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -279,6 +279,17 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos) static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) { + int phase_shift; + int phy_mode; + + /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */ + phy_mode = device_get_phy_mode(ðqos->pdev->dev); + if (phy_mode == PHY_INTERFACE_MODE_RGMII_ID || + phy_mode == PHY_INTERFACE_MODE_RGMII_TXID) + phase_shift = 0; + else + phase_shift = RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN; + /* Disable loopback mode */ rgmii_updatel(ethqos, RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN, 0, RGMII_IO_MACRO_CONFIG2); @@ -300,9 +311,9 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_CONFIG_PROG_SWAP, RGMII_IO_MACRO_CONFIG); rgmii_updatel(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL, 0, RGMII_IO_MACRO_CONFIG2); + rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, - RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, - RGMII_IO_MACRO_CONFIG2); + phase_shift, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, 0, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, @@ -336,8 +347,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL, 0, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, - RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, - RGMII_IO_MACRO_CONFIG2); + phase_shift, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_2, BIT(6), RGMII_IO_MACRO_CONFIG); rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, @@ -375,7 +385,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_DATA_DIVIDE_CLK_SEL, 0, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN, - 0, RGMII_IO_MACRO_CONFIG2); + phase_shift, RGMII_IO_MACRO_CONFIG2); rgmii_updatel(ethqos, RGMII_CONFIG_MAX_SPD_PRG_9, BIT(12) | GENMASK(9, 8), RGMII_IO_MACRO_CONFIG);