From patchwork Mon Mar 13 16:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1310275wrd; Mon, 13 Mar 2023 10:24:17 -0700 (PDT) X-Google-Smtp-Source: AK7set/sRLCfK+28R1FpnbN1mjtADTfWXc/wh4gKyzyx61cAksx1XZWPhmjNkMi8KMtse5Yulydv X-Received: by 2002:aa7:9a50:0:b0:61d:e10f:4e70 with SMTP id x16-20020aa79a50000000b0061de10f4e70mr14573811pfj.0.1678728257659; Mon, 13 Mar 2023 10:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678728257; cv=none; d=google.com; s=arc-20160816; b=CCtGTMU/UuFsTeH2OhitlgrvyU0QmU4fIEfIKsMXE9ZbxR4AG6zwW7vS/BmZdqTGt/ mcln5BWUwXDBqxuHahXbkpbvwokvnMMdk0si6k/f1I18JI1kTWP/NDldaoxHzg8Gg2m3 qxaKv7DpQW41be+Zcc4R0XWZnjqUtUdnR/V/xuQC8y3l1mDTNfLRKFYr6c9S6mVM9+Fs /CSxQTn6RAyj9PncmEARmt0sG1IlzgOPhRNFMjQUiDrQpxO+hijA711ljIsi2rWTfQgC bK4WUEm6EDurWZcFcpyM/DUOqZmGJFnUzXu53h4DsZVvdOPG6mV7ikgppAebLv+DmE/Q wJjQ== 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=HOcsF4tnS6k1nG+I3+/hCEkdwUCH/vj5+6sHXcjYo8o=; b=uQR6b9YrWFQFaggyGM4Iqptzkjw+ZVJL5nBop1Bmpc57Dxn9XNrc2g0sJyhtzYiwaH 91F5qMJyNUUlQ6sj3tGVIpiCzo9o4FrKcjzg1Cjs6rY15DTNgDerJQ6wCQhcUBUxvlqN bqQwkR9K/whArYT6MuHFIdbLPDh8KBW17e8F2os1tYlngLSRn2aP9vWkqLmyKx/YLj9c t7b9dpAP2QDsoW0OuUo73JyxVbQ0x90THozRePZuBFg9gEYCVjf7LnZGXbSI7cCKDgHr fdykFO58ijJBRtOscw1jH5VHAwD+xc4v3SRU4PFjqAsso/TEOVgL8311GfAIQl4JhBbK YJEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=C3geN97q; 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 e66-20020a621e45000000b005a9dd8ef30csi7052097pfe.216.2023.03.13.10.24.04; Mon, 13 Mar 2023 10:24:17 -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=C3geN97q; 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 S231297AbjCMRBa (ORCPT + 99 others); Mon, 13 Mar 2023 13:01:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229826AbjCMRAL (ORCPT ); Mon, 13 Mar 2023 13:00:11 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1346C37553 for ; Mon, 13 Mar 2023 09:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726645; 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=HOcsF4tnS6k1nG+I3+/hCEkdwUCH/vj5+6sHXcjYo8o=; b=C3geN97q6tGx1sfjy0/Ynin1+VvE4OVFJZ/c0NnbyJ5yBdPU8htJt7K9IEYpXwYVgBlUiq GTW+mK/kciFzkMUEi2733T8wM6AB1ilg469FQ/dft+6X6upjvjsPV3czsfHRSaTSoagapv 0uNYUgn1V+xBQ/5p0p2R9PnaI68RWz0= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-396-FLAyjKegMAq8AIp0afUKfQ-1; Mon, 13 Mar 2023 12:57:24 -0400 X-MC-Unique: FLAyjKegMAq8AIp0afUKfQ-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-177aeb822d8so2158247fac.10 for ; Mon, 13 Mar 2023 09:57:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726643; 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=HOcsF4tnS6k1nG+I3+/hCEkdwUCH/vj5+6sHXcjYo8o=; b=0qU/sZNp6v+n13uMXTIuH3g2SOVukSy6D8V3NpUPCNLd/XrrHu/WiI3QYY+N/TJ1cD 9+eUuv4VCDe2S2KL71zJPRdNSzYveOGobZlvO9Ivgoppjh+YFcJkeBayqSATVkngO4Fj 9xyhs5081dqirrwKGcTapL+uYSDvnUVKYOnB55/Sid/Kwm1fwa4gOX6YBCxuYAZtGsCI wG4sAO8O0GLmoflC0IYjE4lYWokSfNXq7hkC8QKRJ9nPQc627tDI9L4SssCZ9msfb/V4 n/h8xK9udGR+eSZ7+wrt94wxenJdZyYAd8eJNiQMXoY4I4V86TG/6MfRU9lv8kg1OJkl +xyA== X-Gm-Message-State: AO0yUKXk7ixPj2qK/0SmAx62xLgDvuCpzZs6JEKfDdYDxna/7RaWYjqS XHKqodyZVjT/KlG+NBxb8vHzNxJWeP7wgm6gBXkfvdFVS1IXQOCFbAn+ZgBKmcEi2s8rFSRB+gv 6cQhXc+GD7IyuWVc6kgN0Zl1tcOq6cG2C5mMHUjbLYPUHZaM4Rf3qycWyoF3VUETuJpNe/eiskb 38Bf6gRNOroJw= X-Received: by 2002:aca:190f:0:b0:383:caf3:a30e with SMTP id l15-20020aca190f000000b00383caf3a30emr15249972oii.17.1678726643091; Mon, 13 Mar 2023 09:57:23 -0700 (PDT) X-Received: by 2002:aca:190f:0:b0:383:caf3:a30e with SMTP id l15-20020aca190f000000b00383caf3a30emr15249900oii.17.1678726641268; Mon, 13 Mar 2023 09:57:21 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:20 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Krzysztof Kozlowski , Andrew Halaney Subject: [PATCH net-next 01/11] dt-bindings: net: snps,dwmac: Update interrupt-names Date: Mon, 13 Mar 2023 11:56:10 -0500 Message-Id: <20230313165620.128463-2-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760274161823775392?= X-GMAIL-MSGID: =?utf-8?q?1760274161823775392?= From: Bhupesh Sharma As commit fc191af1bb0d ("net: stmmac: platform: Fix misleading interrupt error msg") noted, not every stmmac based platform makes use of the 'eth_wake_irq' or 'eth_lpi' interrupts. So, update the 'interrupt-names' inside 'snps,dwmac' YAML bindings to reflect the same. Acked-by: Krzysztof Kozlowski Signed-off-by: Bhupesh Sharma Signed-off-by: Andrew Halaney --- I picked this up from: https://lore.kernel.org/netdev/20220929060405.2445745-2-bhupesh.sharma@linaro.org/ No changes other than collecting the Acked-by. Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 16b7d2904696..52ce14a4bea7 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -105,8 +105,8 @@ properties: minItems: 1 items: - const: macirq - - const: eth_wake_irq - - const: eth_lpi + - enum: [eth_wake_irq, eth_lpi] + - enum: [eth_wake_irq, eth_lpi] clocks: minItems: 1 From patchwork Mon Mar 13 16:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68964 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1307443wrd; Mon, 13 Mar 2023 10:17:56 -0700 (PDT) X-Google-Smtp-Source: AK7set8GWt/3aMlyMM0W0hyOCfo06B0UcNchlGwfdLZ4aIvrlgKTlebRE6/Cj4yNWv96FIk7o95S X-Received: by 2002:a17:902:d492:b0:19d:abd:bb7e with SMTP id c18-20020a170902d49200b0019d0abdbb7emr43130137plg.34.1678727876435; Mon, 13 Mar 2023 10:17:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727876; cv=none; d=google.com; s=arc-20160816; b=idX2ukTdWVfvtLpKWUyQrsl0593FBjleFl77iotjskRhJOg+YyLbRf9P8o6oNKq5ID Q2rOJSHraGbkYu7j6SIjI0M7Sdx8t//yp8BhWUeEcMCeRp1sUeslRDoaxKtPDyt9oY45 zKRaQXDU9jlLGcCppx8ak3/qjeNM/uH9L7hy9vYaAo4ZMIeZXz7ddTpGbiLy/yh7XEfW NxlJE+5RAW+DXlMbJbawBYCaZIrInIyRNXjRVGMwN3u2Twg8aUgdgkZM58tpSpkEkdUA 7x+GENu+7/02akNwv1DHORkpY/aEB+JpWHynIuY6CWiO13IuCY0J+3iYWtekn9MqkhyY KpmQ== 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=JepgEUi2Rsg9+d2hOOa0Co6HIDw3s31TfucmHUz975I=; b=jNXxv2oQnFtivotT6FOWhD91A/a9ZnRhmtMJOr9I+dNV/+E4np7f5+BvPWt0toq6MT EQZF2e+CW+BYgo7F0FBhfvuN8/SJQIXYdczJ6+klvTE2e4woQE7DpgYVbFumgfpUGTwZ bYySn3OzV+XLCWma6Z3pzv7Tos0/gqzbphL2MI6OOB9VFqEifkGYe/Pu+CKKxNH3+pJ/ hA2zrRlfrmNH24LP3Muw7BmirNIVPmvzaHM41V7AG0AVMoNtXWJ07Inn8ZgYKB4+6PQ3 AOWcvySVOx0aPBuSdsrzMfKCeB/p4h8pGT48EcxbUT2syd56ZMpiMnFFFH+xtSaZK4GR GJCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IYlEOFvz; 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 kn3-20020a170903078300b0019ceb4b753fsi252559plb.26.2023.03.13.10.17.44; Mon, 13 Mar 2023 10:17:56 -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=IYlEOFvz; 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 S231509AbjCMQ7t (ORCPT + 99 others); Mon, 13 Mar 2023 12:59:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229723AbjCMQ7d (ORCPT ); Mon, 13 Mar 2023 12:59:33 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E029D23A7D for ; Mon, 13 Mar 2023 09:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726649; 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=JepgEUi2Rsg9+d2hOOa0Co6HIDw3s31TfucmHUz975I=; b=IYlEOFvzrjhLPFzknIKs4a1TPxSiyX3vJYNuyePoavoXdq2jGXGnjYdV6jKao/fCrREaPc 4ymAkQsvsYNH6OqFZMGJ1/cFtSfsXiATvVF28LLIL6y4QJOyhKfI2fmGF2hNUIUBFl6gbo LbyqXJ6BdpFo/wVhf2GE0EtH9mk2Obg= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-290-xt9QplucOnOut56xzJmeKg-1; Mon, 13 Mar 2023 12:57:28 -0400 X-MC-Unique: xt9QplucOnOut56xzJmeKg-1 Received: by mail-oo1-f70.google.com with SMTP id w5-20020a4a9785000000b0052521223553so3520577ooi.2 for ; Mon, 13 Mar 2023 09:57:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726647; 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=JepgEUi2Rsg9+d2hOOa0Co6HIDw3s31TfucmHUz975I=; b=iObu8xFxGfw/O3QBTvg1se9kiouSQTpOKdCvFAafislfnFgdL25aCJ0diHAUkAxBbI /bSh9Aei/5P0Cxa8tGgZU33aPIaegoXH4En+LvVcmfjKzkQnLIPgWhhIymgMuQ+hKYYP AwfIg/diXxjHg+64OA5VslYeezVqGaUDbA4oa6F6XPDfmqs2g+fWRtyOeBUzITA1f1JT 1D+uAKtpjSlaXZYGiG056CJm5RO79ZLDC2c9LIRCrAZEeYp3KnKdH1azRvQs0iaS1L+h VDSdSIpariO6Tckha0elDt5bloIYwOHeDY5BUdBWDdO0JmjHH70At/olXfLqHheFM9K0 DTzA== X-Gm-Message-State: AO0yUKXsAqrPJJh4nZQpUtcVlWFk0cZhai7qbmPjhStv/HQm1Fs6legJ +QrrZPD+zJOJ4VxKjkPKxvkUMSivATbGcELaymLpK+HW1Ci64m04Tyfs5Va3rClPNzb+tGqPK3n GdvBamancdeAyEnpXF0VMyXHF0as8062sjxQqfpHRESd7l9V5AONkl0ZYmtTAqEhhnpP5y6x5rv PE1g12rDo/ki8= X-Received: by 2002:a05:6808:48:b0:384:4739:dddc with SMTP id v8-20020a056808004800b003844739dddcmr15869271oic.2.1678726647172; Mon, 13 Mar 2023 09:57:27 -0700 (PDT) X-Received: by 2002:a05:6808:48:b0:384:4739:dddc with SMTP id v8-20020a056808004800b003844739dddcmr15869223oic.2.1678726646844; Mon, 13 Mar 2023 09:57:26 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:26 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Krzysztof Kozlowski , Andrew Halaney Subject: [PATCH net-next 02/11] dt-bindings: net: snps,dwmac: Add Qualcomm Ethernet ETHQOS compatibles Date: Mon, 13 Mar 2023 11:56:11 -0500 Message-Id: <20230313165620.128463-3-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273761833843197?= X-GMAIL-MSGID: =?utf-8?q?1760273761833843197?= From: Bhupesh Sharma Add Qualcomm Ethernet ETHQOS compatible checks in snps,dwmac YAML binding document. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bhupesh Sharma Signed-off-by: Andrew Halaney --- I picked this up from: https://lore.kernel.org/netdev/20220929060405.2445745-3-bhupesh.sharma@linaro.org/ No changes except the Reviewed-by collection. Documentation/devicetree/bindings/net/snps,dwmac.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 52ce14a4bea7..3ca1239da448 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -65,6 +65,8 @@ properties: - ingenic,x2000-mac - loongson,ls2k-dwmac - loongson,ls7a-dwmac + - qcom,qcs404-ethqos + - qcom,sm8150-ethqos - renesas,r9a06g032-gmac - renesas,rzn1-gmac - rockchip,px30-gmac @@ -625,6 +627,8 @@ allOf: - ingenic,x1600-mac - ingenic,x1830-mac - ingenic,x2000-mac + - qcom,qcs404-ethqos + - qcom,sm8150-ethqos - snps,dwmac-4.00 - snps,dwmac-4.10a - snps,dwmac-4.20a From patchwork Mon Mar 13 16:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1309079wrd; Mon, 13 Mar 2023 10:21:40 -0700 (PDT) X-Google-Smtp-Source: AK7set/6EKfIsTErZIOFLVrygRrxRTq2yATTLT9utfa4kSJWNGbHVkxu1T/bqaI12nCk5eYYD8Yb X-Received: by 2002:a17:902:e5d0:b0:19e:68b1:65b9 with SMTP id u16-20020a170902e5d000b0019e68b165b9mr45184548plf.12.1678728100615; Mon, 13 Mar 2023 10:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678728100; cv=none; d=google.com; s=arc-20160816; b=bnVmxfTLJlL9PyCbbCKYSUkMk961reA42CV8y+u8wM+R5xOokvv0XVkUXgpxNvWLRc /9ycVgMNC9R3MTxjKfW3AAHbhcxlSo22NAYtsl4XpaNvxa13GVdJbWnizYi26MQsvT5P Zq2B+qSUBvYxOd8SqLbZEphi6FFcHtsVOLAh5TDtCQ9THh6EOtqr/wl3XuDjTunNm6qL 5nbUlreaW5szLWZ+WtvMCHWAFRoS7eL6WbxJOnml5C2SpT0Hme9Z9InAbCrf3Hz1fke/ Qzl+b5xYmukzJAqtn/WNBLYk/C1MeepopA0drzru2q8qlIjHxtdEC59OUcrnwMTaiSmt og0w== 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=TPEAjXqtLe7sEldj4DCKu8ktiAl8IL0ME/tYH+iy+MU=; b=naG8z0ZriykyKTBo7JOlYHLKwhL3yt1qX/Cz5eAcIR6j4tvbLfwPNBhtX3RoptmsSp htXMZdKBbiNGs1YoQT0KWKqootHN9uKk2RNnlbWrzyhLZhHwgghcj93/N7hIVR5PGHV5 92O3h47iVPkNYcw9N1OUQdRQFScshzc1cUSKbVef59GPgOgmTCgFgvzF96fD2Pr2wHfI aulwWhmk9SbweC3O/Wc2bQIQXO8coeJYALoS5CeFUPtucZFKqnyRFHd2a/mp19P7286e fjWFjVwE43qhbjPP4ylLW9st2gk3xh4Z3lUKPGOygqT79bU4I1fzC3kX4ke3BTDIeP7p Q6AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SO3rfhyc; 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 g15-20020a63520f000000b004fb37497be2si6854341pgb.642.2023.03.13.10.21.25; Mon, 13 Mar 2023 10:21:40 -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=SO3rfhyc; 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 S231248AbjCMRAP (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbjCMQ7j (ORCPT ); Mon, 13 Mar 2023 12:59:39 -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 6C76829144 for ; Mon, 13 Mar 2023 09:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726656; 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=TPEAjXqtLe7sEldj4DCKu8ktiAl8IL0ME/tYH+iy+MU=; b=SO3rfhyctLuyM9NTiuvyfwwisulnW33M+AWEVq/p65oiG7yaN5oDMDogT2HqMaZVNY6jpR SE0onTjY2DtZdOCt0ERUM//gWQMTCeGORWW7zuXOrEBQ5ql0Bh387V/PFfX/Wb3yq3cBYI DHPOSh+ug5Klrxu0xKkD65V+Vwak8Mc= Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-Mp-i2ra4NFqJfcV-G5N1oA-1; Mon, 13 Mar 2023 12:57:35 -0400 X-MC-Unique: Mp-i2ra4NFqJfcV-G5N1oA-1 Received: by mail-oi1-f200.google.com with SMTP id u42-20020a056808152a00b003845d35bfb6so5657430oiw.22 for ; Mon, 13 Mar 2023 09:57:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726654; 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=TPEAjXqtLe7sEldj4DCKu8ktiAl8IL0ME/tYH+iy+MU=; b=cQcJZTggogI0+4pLtVfoYC/BG2FjN43xWD6pYmfgqvtEL0FEAv1QkHXOTuJ5d3MmlT w9rdSpFXacPw14bxEPawoQaZoOZtIK2WrmFQMb95/GAWSRYEE47iopV5lyU3mHnezQw7 xWRlq4jeHHTyujVFwN+axr57/smqwnwzDWUWudOP49V28EQwpfOfH3aqi8zcPE+spvpT JShmE4MfMqS4HSvvfg8vMspZjyxnS3cs3hwl+FaIPIEbGNnG6O3/ly2Gw8tBcrUjpy5O BhMqHENtrseRD2OCiRGl71liyqYh80yBZlbkcNJjZaKjaOouGjU8MbfK+hgLl3kQO2HZ EzYA== X-Gm-Message-State: AO0yUKV2F1EyMq64XIOWK/AZVJSggdUsHDv7VGvvB1UlN0dIE78LvBXy LMXfqCo3t25kKdLiAuonH2Al149su5uLA7frmXLoDDmNcGHV1tYfEMaR9MEZPww8ydmaFtWf4R3 eRKm5lOVD1Q9f1v4VFovKOXNUXcq/hq33NZ4ZsWA9Z2gowMvZXmkb1Oh4VyZWBkLbFryFmq2czd lWbsZbPQbWF5w= X-Received: by 2002:a05:6870:d24d:b0:177:81bb:1b1b with SMTP id h13-20020a056870d24d00b0017781bb1b1bmr5506902oac.40.1678726654349; Mon, 13 Mar 2023 09:57:34 -0700 (PDT) X-Received: by 2002:a05:6870:d24d:b0:177:81bb:1b1b with SMTP id h13-20020a056870d24d00b0017781bb1b1bmr5506853oac.40.1678726654035; Mon, 13 Mar 2023 09:57:34 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:33 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 03/11] dt-bindings: net: qcom,ethqos: Convert bindings to yaml Date: Mon, 13 Mar 2023 11:56:12 -0500 Message-Id: <20230313165620.128463-4-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273996573878110?= X-GMAIL-MSGID: =?utf-8?q?1760273996573878110?= From: Bhupesh Sharma Convert Qualcomm ETHQOS Ethernet devicetree binding to YAML. While at it, also update the MAINTAINERS file to point to the yaml version of the bindings. Signed-off-by: Bhupesh Sharma [halaney: Remove duplicated snps,dwmac.yaml properties, add MAINTAINERS] Signed-off-by: Andrew Halaney --- I picked this up from: https://lore.kernel.org/netdev/20220929060405.2445745-4-bhupesh.sharma@linaro.org/ Changes since then include: * Change MAINTAINERS atomically with the filename change * Remove duplicated snps,dwmac.yaml properties As listed on that thread, the issues Bhupesh saw were due to a bug in dtschema that has since been fixed. .../devicetree/bindings/net/qcom,ethqos.txt | 66 ----------- .../devicetree/bindings/net/qcom,ethqos.yaml | 112 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 113 insertions(+), 67 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.txt create mode 100644 Documentation/devicetree/bindings/net/qcom,ethqos.yaml diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.txt b/Documentation/devicetree/bindings/net/qcom,ethqos.txt deleted file mode 100644 index 1f5746849a71..000000000000 --- a/Documentation/devicetree/bindings/net/qcom,ethqos.txt +++ /dev/null @@ -1,66 +0,0 @@ -Qualcomm Ethernet ETHQOS device - -This documents dwmmac based ethernet device which supports Gigabit -ethernet for version v2.3.0 onwards. - -This device has following properties: - -Required properties: - -- compatible: Should be one of: - "qcom,qcs404-ethqos" - "qcom,sm8150-ethqos" - -- reg: Address and length of the register set for the device - -- reg-names: Should contain register names "stmmaceth", "rgmii" - -- clocks: Should contain phandle to clocks - -- clock-names: Should contain clock names "stmmaceth", "pclk", - "ptp_ref", "rgmii" - -- interrupts: Should contain phandle to interrupts - -- interrupt-names: Should contain interrupt names "macirq", "eth_lpi" - -Rest of the properties are defined in stmmac.txt file in same directory - - -Example: - -ethernet: ethernet@7a80000 { - compatible = "qcom,qcs404-ethqos"; - reg = <0x07a80000 0x10000>, - <0x07a96000 0x100>; - reg-names = "stmmaceth", "rgmii"; - clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii"; - clocks = <&gcc GCC_ETH_AXI_CLK>, - <&gcc GCC_ETH_SLAVE_AHB_CLK>, - <&gcc GCC_ETH_PTP_CLK>, - <&gcc GCC_ETH_RGMII_CLK>; - interrupts = , - ; - interrupt-names = "macirq", "eth_lpi"; - snps,reset-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - - snps,txpbl = <8>; - snps,rxpbl = <2>; - snps,aal; - snps,tso; - - phy-handle = <&phy1>; - phy-mode = "rgmii"; - - mdio { - #address-cells = <0x1>; - #size-cells = <0x0>; - compatible = "snps,dwmac-mdio"; - phy1: phy@4 { - device_type = "ethernet-phy"; - reg = <0x4>; - }; - }; - -}; diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml new file mode 100644 index 000000000000..68ef43fb283d --- /dev/null +++ b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml @@ -0,0 +1,112 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/qcom,ethqos.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Ethernet ETHQOS device + +maintainers: + - Bhupesh Sharma + +description: + This binding describes the dwmmac based Qualcomm ethernet devices which + support Gigabit ethernet (version v2.3.0 onwards). + + So, this file documents platform glue layer for dwmmac stmmac based Qualcomm + ethernet devices. + +allOf: + - $ref: snps,dwmac.yaml# + +properties: + compatible: + enum: + - qcom,qcs404-ethqos + - qcom,sm8150-ethqos + + reg: + maxItems: 2 + + reg-names: + items: + - const: stmmaceth + - const: rgmii + + interrupts: + items: + - description: Combined signal for various interrupt events + - description: The interrupt that occurs when Rx exits the LPI state + + interrupt-names: + items: + - const: macirq + - const: eth_lpi + + clocks: + maxItems: 4 + + clock-names: + items: + - const: stmmaceth + - const: pclk + - const: ptp_ref + - const: rgmii + + iommus: + maxItems: 1 + +required: + - compatible + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + + ethernet: ethernet@7a80000 { + compatible = "qcom,qcs404-ethqos"; + reg = <0x07a80000 0x10000>, + <0x07a96000 0x100>; + reg-names = "stmmaceth", "rgmii"; + clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii"; + clocks = <&gcc GCC_ETH_AXI_CLK>, + <&gcc GCC_ETH_SLAVE_AHB_CLK>, + <&gcc GCC_ETH_PTP_CLK>, + <&gcc GCC_ETH_RGMII_CLK>; + interrupts = , + ; + interrupt-names = "macirq", "eth_lpi"; + + rx-fifo-depth = <4096>; + tx-fifo-depth = <4096>; + + snps,tso; + snps,reset-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 10000>; + + pinctrl-names = "default"; + pinctrl-0 = <ðernet_defaults>; + + phy-handle = <&phy1>; + phy-mode = "rgmii"; + mdio { + #address-cells = <0x1>; + #size-cells = <0x0>; + + compatible = "snps,dwmac-mdio"; + phy1: phy@4 { + compatible = "ethernet-phy-ieee802.3-c22"; + device_type = "ethernet-phy"; + reg = <0x4>; + + #phy-cells = <0>; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 8d5bc223f305..720ae2f1bf95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17282,7 +17282,7 @@ M: Vinod Koul R: Bhupesh Sharma L: netdev@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/net/qcom,ethqos.txt +F: Documentation/devicetree/bindings/net/qcom,ethqos.yaml F: drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c QUALCOMM FASTRPC DRIVER From patchwork Mon Mar 13 16:56:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1306836wrd; Mon, 13 Mar 2023 10:16:48 -0700 (PDT) X-Google-Smtp-Source: AK7set/d+idItzepR0nBIOGP/fv+ZgDXLScN5q9X9sHjHYzEeIW6mRx8LJ89xEZ0sYOwEZ2l71Dl X-Received: by 2002:a62:388a:0:b0:622:555a:2716 with SMTP id f132-20020a62388a000000b00622555a2716mr6208159pfa.21.1678727808186; Mon, 13 Mar 2023 10:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727808; cv=none; d=google.com; s=arc-20160816; b=zZ9zf65PDVi2oZ8rq5L/ESRUmNUIKDe7CaHjOh6mS/c7oHrmJXD5/vX9x1ePQl9xQn Esye187xwemsFVXBq2CPedc02UEsHBilaUqTdHOSPClvq4ln22HU4UAxTeWx/X08L3oY qZfh6/vOgLiwKyuAZBLG4zEIBmkHWwLJfy6Kk0aW/S6aQA2ywdSi2LNG8IA2Tb4A4hIr s6q/vyWMNG+du3+ZydUDjkgJhSY8ePPouvB3dMwX3b45M+KNGsQZwr/ESabjm6hmZZre IAUhoXJQfRUhUyviqEOhTO59DSg7jeaZVtBuPpJpyDTl1fOpP6dwJsIMX2jfqjEDqkxr oFhw== 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=E28u3AC299JmAvjZr4iCran+GZMgF1vAVhXdcyHNMWs=; b=JuEynmFEH4sh5zDAi7PvyMdzEuajgeqZU2FYqgaCD8wajDI87Z4XsXqCVrC6I4xKya npFYWAgjCUsZvxSJxdJTMFv+LaJ/OxS31nnc/lsgHJUn7DiQ4qgQ/Ltwf1gLHmspAPR5 olnzRXIOlwbylM0nLMfV2hDMCUYlZBclL5DSsV8qGd2hn1pTk6quoql50/wAAsKLTDF5 y3tdFl9BwLueYWmvnQGBsHMFT6Eqpj/p6qidtFV9OViSRyrkOPUUIaWkTcNoWTgclku4 +5XuO7nv/INJCY9KkJCv/Y7zJqGjfaHVvRukBNGqKMYF0xrE6v10QNvlQZ+/RU+lfp2Z iQIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QmTgZHKg; 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 c22-20020a631c16000000b004c259db61fdsi7083455pgc.561.2023.03.13.10.16.35; Mon, 13 Mar 2023 10:16:48 -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=QmTgZHKg; 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 S231459AbjCMRAV (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjCMQ7m (ORCPT ); Mon, 13 Mar 2023 12:59:42 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A7536FE0 for ; Mon, 13 Mar 2023 09:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726675; 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=E28u3AC299JmAvjZr4iCran+GZMgF1vAVhXdcyHNMWs=; b=QmTgZHKgwYuPIFFrEIG5zde36PoUKp7+Cah5olEXd1zqX0DzpeIRz6GCPkZou65F/43vcQ whsLMv+8YjcBN7hHMUoUMC2xY4DEautX+CVLni3tp8jF30VeqkYuwVcXhZYxBYSNtc041r 7YE///m16ilQ7ni34QK0bTG201hYizE= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-L5eGn5olN-Gij_0r-z-qFw-1; Mon, 13 Mar 2023 12:57:43 -0400 X-MC-Unique: L5eGn5olN-Gij_0r-z-qFw-1 Received: by mail-oo1-f71.google.com with SMTP id l6-20020a4ad9c6000000b005254392994fso3523293oou.19 for ; Mon, 13 Mar 2023 09:57:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726658; 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=E28u3AC299JmAvjZr4iCran+GZMgF1vAVhXdcyHNMWs=; b=m5id/UJhtaWUz+m+YtoYSHnFZsWn/yzEEUfrNvSLKlzXciQB9bsqYENcqk/ir++97u rAa+KSF3y+Mh2A5XnklXFCoN505fH3IftmsUdet9Lm//Fe7BQRdVcbhevOcsFmxZXtyD qefMeR7t/3bQ6m0CTJH3nMnY0wxKlxurjJ1sFWXGXomnpwL5/Ctpc5uRaAqgfFF7OHzY p9NS6XLbK1/AVItO0GAIX/s8S/T/YdlBED1gHaLsYK41z/W++C4J4AGp+hI2wD3Db0is UmSer6qLnu4PX7Hzf2FERSvcT5Pex1ssbA5y01l9aT6zxqIzTNbsuqyOS1hrwE3WUHEY kMxg== X-Gm-Message-State: AO0yUKU3uVSdvHwpLN+PbefFtrlvYyfa/DFBEUszH3vT4tuPmDFwyUTS GWIgALB59PUIgGp4Ql5UTDNnQ4Az5dmNx2Tj6SJUS4DC1SNKPtwkon1192+BPgfPHKUinZ+4Mji O6+JcfVAI049W4nx5xf62ao9Pr4/rvB3B7hWAKw7sdovlCAnpXr2vca0sQNy5PvzML/gVcdSMdN wZeUlL12hwcp8= X-Received: by 2002:a54:4486:0:b0:384:704:9b5c with SMTP id v6-20020a544486000000b0038407049b5cmr15120534oiv.32.1678726658129; Mon, 13 Mar 2023 09:57:38 -0700 (PDT) X-Received: by 2002:a54:4486:0:b0:384:704:9b5c with SMTP id v6-20020a544486000000b0038407049b5cmr15120491oiv.32.1678726657851; Mon, 13 Mar 2023 09:57:37 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:37 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 04/11] dt-bindings: net: qcom,ethqos: Add Qualcomm sc8280xp compatibles Date: Mon, 13 Mar 2023 11:56:13 -0500 Message-Id: <20230313165620.128463-5-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273690491148277?= X-GMAIL-MSGID: =?utf-8?q?1760273690491148277?= The sc8280xp has a new version of the ETHQOS hardware in it, EMAC v3. Add a compatible for this. Signed-off-by: Andrew Halaney --- Documentation/devicetree/bindings/net/qcom,ethqos.yaml | 1 + Documentation/devicetree/bindings/net/snps,dwmac.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml index 68ef43fb283d..89c17ed0442f 100644 --- a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml @@ -24,6 +24,7 @@ properties: enum: - qcom,qcs404-ethqos - qcom,sm8150-ethqos + - qcom,sc8280xp-ethqos reg: maxItems: 2 diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 3ca1239da448..f981a89ab2a5 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -67,6 +67,7 @@ properties: - loongson,ls7a-dwmac - qcom,qcs404-ethqos - qcom,sm8150-ethqos + - qcom,sc8280xp-ethqos - renesas,r9a06g032-gmac - renesas,rzn1-gmac - rockchip,px30-gmac @@ -574,6 +575,7 @@ allOf: - ingenic,x1600-mac - ingenic,x1830-mac - ingenic,x2000-mac + - qcom,sc8280xp-ethqos - snps,dwmac-3.50a - snps,dwmac-4.10a - snps,dwmac-4.20a @@ -629,6 +631,7 @@ allOf: - ingenic,x2000-mac - qcom,qcs404-ethqos - qcom,sm8150-ethqos + - qcom,sc8280xp-ethqos - snps,dwmac-4.00 - snps,dwmac-4.10a - snps,dwmac-4.20a From patchwork Mon Mar 13 16:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1301200wrd; Mon, 13 Mar 2023 10:06:05 -0700 (PDT) X-Google-Smtp-Source: AK7set/jgoQbRy4WYBfJbligqKEQsGt/PACtPSFcrT91nIYUHQWKZbC8eAK9aVpn4PYFypi7nGSd X-Received: by 2002:a05:6a20:6909:b0:cc:ca9:4fde with SMTP id q9-20020a056a20690900b000cc0ca94fdemr19487029pzj.33.1678727165352; Mon, 13 Mar 2023 10:06:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727165; cv=none; d=google.com; s=arc-20160816; b=fs3APfUD7hldwveDXJuIjpSqkPhDsvOkprOE1sIQ8VEfFx9OkwYa4bT1eqGe747RF3 3UDl3/e4pWMK5507vE7OWYpCmMBYAg04nfhEi2oHEooBAISfe4GwUT9hD3O6cK4XNi+x iXjnBxsZ3dfDuWdNhiy7lSXSv3NpP4/aagsQ4SY1Mxdw2gJFfquwXS/Wxd+SOVw+T486 agQmY9JbzylRlBUXK9tXB/9rsKUoWF4+I6dwZdN4rOuWzBLJvsODqONqoBRu7vduTrlb WDWVnTpw2K68F9Lr8ZoYoHeS1D5lFJaeWZkYASDbOpMJpc1mWsOHjhz049cfN+ZqNVCJ cp2Q== 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=FkVDFtAQ2HQaEyizSIOrTNSjW2E/XPvrw+UQkBvQei4=; b=SwB6CbnTgqXbeYfTm8nwz9aXquUejEsQF+qWOgZwVQ2CdoGJFBiclbcJ9DlnFskO9g FH+D2WIKbjnGnXTnAF7HJA6O6+EC1sNfQpI9lC3L6fV6OpsQ9wAD1loMfa8yY4H5U1m/ S0rnHrmHbLE3A5e1b4kIxiMfcwSkaJbHuxWP626ySCMm8nhQ6Q1cJKj10LUrgWXOw2HV JzWGnMjrilJdRK0pozp4CzkymZ5qi5GoGddyXsrOsV1YmG2rW9gHr2VQiaZsUTg685T/ 0vsHiwpzW0B0GGnfiWrQOZQ9sAdn4I08TeMJLrFf9W/KHmrHZjfV0ywLQ6A3+ZxfaCRO 0Wxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QGbbnRdu; 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 x37-20020a631725000000b004cc67cfc92bsi7084105pgl.97.2023.03.13.10.05.49; Mon, 13 Mar 2023 10:06:05 -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=QGbbnRdu; 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 S229910AbjCMRAM (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229774AbjCMQ7g (ORCPT ); Mon, 13 Mar 2023 12:59:36 -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 A22FC2B288 for ; Mon, 13 Mar 2023 09:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726665; 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=FkVDFtAQ2HQaEyizSIOrTNSjW2E/XPvrw+UQkBvQei4=; b=QGbbnRdubhObgNFTX2SPT6calK5Xkzvpn0FFbrsFxx+6Wmp4kAjqjcxMfNxLPUR2BvJ6hz Yq9IyVLSdPhJawLn10HRnt3MAd+gt80Y6ABnm0x7or21Y5kHG2O6OZwQti6IQRetMdyAgK mSNGXwHWuEG+whnVE4QtKevCSIfAT+o= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-443-4U2qd09ePhyucpXC617XJw-1; Mon, 13 Mar 2023 12:57:43 -0400 X-MC-Unique: 4U2qd09ePhyucpXC617XJw-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-17268e44df1so7500031fac.9 for ; Mon, 13 Mar 2023 09:57:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726663; 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=FkVDFtAQ2HQaEyizSIOrTNSjW2E/XPvrw+UQkBvQei4=; b=T3xcLQN013AqL7/KIrT8CwBrNMotLgTd2EPtv0v7Rjw/AIbj/3AaanIWYdggpBROg9 CFmVFPHUAHfAT7HI/adO2km75aiKYVVpS0qZkvB6XyIRqAGDy8gRT2/ToeIno/qFR0lR vo3YBhvG1QbJD7h93t4PefFn7Li5icOLAsa5SuIjYt8qMm8hp3OiFPcmOfER2vt3XZjL IuwwKd9SOSmYr2CI3tf5yvgcLoV9tUt1V9jwhCPrwGEqkPvIO8wotAUy/Ke51clkHNLc DKvjoTnbWZVJcK+iWBTix7ucvAyS/1w5At7O93+3LdfgdBcUPo6YoCArMgiTenitbAJw xWPA== X-Gm-Message-State: AO0yUKVXdG5SsgVtRrRj7+GQWrdqXYkUOxnX/xrC4Y1loH+kXawySAzJ wFZDiz09y4nYOSmS/0y4z13LoxwF8/V5RW1KP+w5Vcr6RuNmV6txIAdFtXyvBqMkJBqLo12tpt9 CZJTj9MVzqyzYu/eocil8LQDclVBrxB2mahqLjA6GWRuHbfeB1kXynm3D6tr9R2VoO6jdbXdX0F 8595VyUwlRlic= X-Received: by 2002:aca:130d:0:b0:378:7c77:6021 with SMTP id e13-20020aca130d000000b003787c776021mr13373626oii.8.1678726662818; Mon, 13 Mar 2023 09:57:42 -0700 (PDT) X-Received: by 2002:aca:130d:0:b0:378:7c77:6021 with SMTP id e13-20020aca130d000000b003787c776021mr13373580oii.8.1678726662434; Mon, 13 Mar 2023 09:57:42 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:42 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 05/11] clk: qcom: gcc-sc8280xp: Add EMAC GDSCs Date: Mon, 13 Mar 2023 11:56:14 -0500 Message-Id: <20230313165620.128463-6-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273015796663128?= X-GMAIL-MSGID: =?utf-8?q?1760273015796663128?= Add the EMAC GDSCs to allow the EMAC hardware to be enabled. Signed-off-by: Andrew Halaney Acked-by: Stephen Boyd --- drivers/clk/qcom/gcc-sc8280xp.c | 18 ++++++++++++++++++ include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/drivers/clk/qcom/gcc-sc8280xp.c b/drivers/clk/qcom/gcc-sc8280xp.c index b3198784e1c3..04a99dbaa57e 100644 --- a/drivers/clk/qcom/gcc-sc8280xp.c +++ b/drivers/clk/qcom/gcc-sc8280xp.c @@ -6873,6 +6873,22 @@ static struct gdsc usb30_sec_gdsc = { .pwrsts = PWRSTS_RET_ON, }; +static struct gdsc emac_0_gdsc = { + .gdscr = 0xaa004, + .pd = { + .name = "emac_0_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, +}; + +static struct gdsc emac_1_gdsc = { + .gdscr = 0xba004, + .pd = { + .name = "emac_1_gdsc", + }, + .pwrsts = PWRSTS_OFF_ON, +}; + static struct clk_regmap *gcc_sc8280xp_clocks[] = { [GCC_AGGRE_NOC_PCIE0_TUNNEL_AXI_CLK] = &gcc_aggre_noc_pcie0_tunnel_axi_clk.clkr, [GCC_AGGRE_NOC_PCIE1_TUNNEL_AXI_CLK] = &gcc_aggre_noc_pcie1_tunnel_axi_clk.clkr, @@ -7351,6 +7367,8 @@ static struct gdsc *gcc_sc8280xp_gdscs[] = { [USB30_MP_GDSC] = &usb30_mp_gdsc, [USB30_PRIM_GDSC] = &usb30_prim_gdsc, [USB30_SEC_GDSC] = &usb30_sec_gdsc, + [EMAC_0_GDSC] = &emac_0_gdsc, + [EMAC_1_GDSC] = &emac_1_gdsc, }; static const struct clk_rcg_dfs_data gcc_dfs_clocks[] = { diff --git a/include/dt-bindings/clock/qcom,gcc-sc8280xp.h b/include/dt-bindings/clock/qcom,gcc-sc8280xp.h index cb2fb638825c..721105ea4fad 100644 --- a/include/dt-bindings/clock/qcom,gcc-sc8280xp.h +++ b/include/dt-bindings/clock/qcom,gcc-sc8280xp.h @@ -492,5 +492,7 @@ #define USB30_MP_GDSC 9 #define USB30_PRIM_GDSC 10 #define USB30_SEC_GDSC 11 +#define EMAC_0_GDSC 12 +#define EMAC_1_GDSC 13 #endif From patchwork Mon Mar 13 16:56:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1310143wrd; Mon, 13 Mar 2023 10:24:01 -0700 (PDT) X-Google-Smtp-Source: AK7set/I5UX8Xef1xindKHYHH1vfaIv3y424w3vFbsFHCxYmn6uxs31FjAFyDMfjpN0/duyiEZU3 X-Received: by 2002:a05:6a20:6a11:b0:d4:ab26:61df with SMTP id p17-20020a056a206a1100b000d4ab2661dfmr2596635pzk.1.1678728241214; Mon, 13 Mar 2023 10:24:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678728241; cv=none; d=google.com; s=arc-20160816; b=oymN19g0zDVUb7jxKqlGkzMzNn3KkxAEGHCZp9TifXUXhXorqdhnMMSvI0VQTUNI9R HkZq4SFMRV658k4+V/NAUtKisophDJLudRDZ0SqJvUwUNpiDQI9eFWxEBo7T+601N/nN T4DyFeuMVmGZtrvrGrtmpC+dzSZdb7IxKuLKNDhvfn5qgetd1ZW8vDYeasBHT/g+tR+6 +LsORFeDrFEtt6JFsQByp6baU+SF6oQyVwblQpFZxPFS4lbV8VBZ3Y0FEmlLyCSr7xBt jlgd32ovK91HoSM4N0yEoTbWuWfa4tdb0cX/RUYu1m+JPPvkqW05zhpiLmlmveIQsNMv R3Rw== 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=yTmnd9hxPpCOOutU5STf4RtQkxrVi6PXtGHNfI7VNJw=; b=qKNTtXQTriCbq1ru6uN+giCYOpaU3uZ+xzqoW9GcbAWqKe+skwATl+3O14CAK5ex0O 4TYsRkqBfciiYyZw8FnGZM1GOX8z8QwXFD/RXgJGl0axXm08OKVN+IGgo1LR1DEiANoU Zod0V6I4nXzpWeIK23NgIVsJ7l5GkLMoWtH5BMV3TuAfgQsbHicflEEo1n5bnKWp25ww uSzhGSiANjzEo4hmhw6mrWOXL7vkBjL590fBMSGgKSoQQ2wxhpPETQ19Jk1xQJPZkLmo c9f//k9MD0SDaVwOMwxNT/mCPzUdlmFWApMvisO3XAglx8WFsLhf/2mrO93cAMOz1sUr 9ptw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DEaL0+fN; 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 a20-20020a63cd54000000b0050726756edesi26109pgj.76.2023.03.13.10.23.41; Mon, 13 Mar 2023 10:24:01 -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=DEaL0+fN; 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 S231356AbjCMRAS (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231204AbjCMQ7j (ORCPT ); Mon, 13 Mar 2023 12:59:39 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0A7F34303 for ; Mon, 13 Mar 2023 09:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726669; 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=yTmnd9hxPpCOOutU5STf4RtQkxrVi6PXtGHNfI7VNJw=; b=DEaL0+fNPUYXgw5OhGyCV7Lp6czBeQLYg4QxQZXIrLrRPVzZlL4TyMakB5vhz52QKCpqB9 S7QTQG6boTy8bY110wxsBz66z44RBF1iRkK29LHiDbYHL6LzqilVt7HeA78P7zl2qbD9iB HA7OJ1zXJEoBecKYX6GqnkQ5rCamb7g= Received: from mail-oa1-f69.google.com (mail-oa1-f69.google.com [209.85.160.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-BEC-iuRuPgSzeoO7A93DGA-1; Mon, 13 Mar 2023 12:57:48 -0400 X-MC-Unique: BEC-iuRuPgSzeoO7A93DGA-1 Received: by mail-oa1-f69.google.com with SMTP id 586e51a60fabf-17268e44df1so7500130fac.9 for ; Mon, 13 Mar 2023 09:57:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726667; 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=yTmnd9hxPpCOOutU5STf4RtQkxrVi6PXtGHNfI7VNJw=; b=D20GtNtqQ9gytKMJZ7QGUjT0afQ7I+Fh7hUG9i+rrsN+DT9nbvWLxmrg9ILWReq+01 o3XrguwNRcmEjNKRzOgdX9ZKzzfhTIib0kx7KU+u+n57tzTTpVglQbGSBI4ZBdn9Hord evrilbrVr9K7B6/YCpcEybzeU9rK63fm39J4c1e7BKhXb7HLIVEpXaughzsL0ooyPg+v EAisve7vyhGnYSxP7vrMrCcIlRYDqUNmT2xC/LN1TMamITGZJ8Jj09QWNZn1CQrroObQ 8AW2+PkgFMF/awpitkKeZnfSnTQ+vf4dv3lWjf+QHISgI64Uwd7knEvOmKsCkxDdQmgL JTdQ== X-Gm-Message-State: AO0yUKUfhI+yIG4zWs0E/cxgqAXAJq3nbE1wBtMBuvOKI/3OdQlS39z3 War6gZcmcD4oBEc+9TOorRfl7Uv2iGkX2yibh+6cQwwg+U3bFYxCfKqc3fmTSAB23sKMnP0h+Gu Zfx/t1//bUN5ppBmg4SvUc2fBAj6G3bT7rFPkJmgbOwtKKWw0lRoqRZE93oCXWuWGMis1pckiMU 91Npt2QOhWsls= X-Received: by 2002:a05:6870:100f:b0:177:c2bd:3f70 with SMTP id 15-20020a056870100f00b00177c2bd3f70mr1768628oai.54.1678726667200; Mon, 13 Mar 2023 09:57:47 -0700 (PDT) X-Received: by 2002:a05:6870:100f:b0:177:c2bd:3f70 with SMTP id 15-20020a056870100f00b00177c2bd3f70mr1768573oai.54.1678726666521; Mon, 13 Mar 2023 09:57:46 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:46 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 06/11] arm64: dts: qcom: sc8280xp: Add ethernet nodes Date: Mon, 13 Mar 2023 11:56:15 -0500 Message-Id: <20230313165620.128463-7-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760274144509226214?= X-GMAIL-MSGID: =?utf-8?q?1760274144509226214?= This platform has 2 MACs integrated in it, go ahead and describe them. Signed-off-by: Andrew Halaney --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 0d02599d8867..a63e8e81a8c4 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -761,6 +761,59 @@ soc: soc@0 { ranges = <0 0 0 0 0x10 0>; dma-ranges = <0 0 0 0 0x10 0>; + ethernet0: ethernet@20000 { + compatible = "qcom,sc8280xp-ethqos"; + reg = <0x0 0x00020000 0x0 0x10000>, + <0x0 0x00036000 0x0 0x100>; + reg-names = "stmmaceth", "rgmii"; + + clocks = <&gcc GCC_EMAC0_AXI_CLK>, + <&gcc GCC_EMAC0_SLV_AHB_CLK>, + <&gcc GCC_EMAC0_PTP_CLK>, + <&gcc GCC_EMAC0_RGMII_CLK>; + clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii"; + + interrupts = , + ; + interrupt-names = "macirq", "eth_lpi"; + iommus = <&apps_smmu 0x4c0 0xf>; + power-domains = <&gcc EMAC_0_GDSC>; + + snps,tso; + snps,pbl = <32>; + rx-fifo-depth = <4096>; + tx-fifo-depth = <4096>; + + status = "disabled"; + }; + + ethernet1: ethernet@23000000 { + compatible = "qcom,sc8280xp-ethqos"; + reg = <0x0 0x23000000 0x0 0x10000>, + <0x0 0x23016000 0x0 0x100>; + reg-names = "stmmaceth", "rgmii"; + + clocks = <&gcc GCC_EMAC1_AXI_CLK>, + <&gcc GCC_EMAC1_SLV_AHB_CLK>, + <&gcc GCC_EMAC1_PTP_CLK>, + <&gcc GCC_EMAC1_RGMII_CLK>; + clock-names = "stmmaceth", "pclk", "ptp_ref", "rgmii"; + + interrupts = , + ; + interrupt-names = "macirq", "eth_lpi"; + + iommus = <&apps_smmu 0x40 0xf>; + power-domains = <&gcc EMAC_1_GDSC>; + + snps,tso; + snps,pbl = <32>; + rx-fifo-depth = <4096>; + tx-fifo-depth = <4096>; + + status = "disabled"; + }; + gcc: clock-controller@100000 { compatible = "qcom,gcc-sc8280xp"; reg = <0x0 0x00100000 0x0 0x1f0000>; From patchwork Mon Mar 13 16:56:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1301912wrd; Mon, 13 Mar 2023 10:07:20 -0700 (PDT) X-Google-Smtp-Source: AK7set+Edy4UYQWkCzm9Z3gCBaCJnfi1Ml10hUo3KKqUWTBvgsp2FrSPChC34C5Q2DH98rcI6sKa X-Received: by 2002:a17:902:c949:b0:19e:416e:abf5 with SMTP id i9-20020a170902c94900b0019e416eabf5mr11570510pla.34.1678727239891; Mon, 13 Mar 2023 10:07:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727239; cv=none; d=google.com; s=arc-20160816; b=OL0rn8V1fBt4S/C9nSk08nCdaJVyjcMdhJDrCdxYNfvMXNSdUzImOzXXsXW7bwDNjM c0hNO80T0jtyGDdMdBMcJRdgcD6plyYlHpLlrUG9H8LF3gy8U9RTHZ0lInGgED/J5wbQ eFFXdPby/Y5FacOzdTa1R5QLN4ncH4x4PydHkHug78j4EAxxhVcEgIRfx746BCg5yZJA sa+/FfzO4rZ+wxB8z/d6WZO9ogFSQhtMv0E3cgI4SbQEL12igXdAKx8o4KuJCYL6gDeZ 1lDDuNkE3HafLyWEEE3EW2upi4FVFsFvF+Z8YoWMPYcBOyB48gAygCpn6YqH6A/hjAkv Q34g== 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=EgUyAFiD1XudKGrCgIYV9yECJZPALfejLv+DfT2fuQE=; b=i/MGCKIbZXUWGx4BDVZdfEO+eVm2F7SJr+vR/9s+bkfxfh/vdUB98L/sJ411E6ehRC +e6p4WWSsHrjM5+0xLmPd2S4eLQZ+aEvQKIQHRDBiHW8CBD34EQejY3pjTo557Hyt6C1 z5ktaMssM3jP45HQsr09rZHSjQLZy9rIeSiVBUSad18Lzyd6i8oO5tX9mNkBhGEnQons EL91oxZ3lies96uZJpxhtSqqTn6yEiqcDY7WtTay8ISoQZi2XZ1ftHEuqlKig91dhBRN 1H/rGth5AlJ8rnNwGVpV4+YzsyFGVdQhpYFidS0wpdxJpH4GD1SEltJPEDwscUt3H1ip irVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=I5p904Cw; 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 18-20020a630712000000b0050336b0b08asi6904754pgh.449.2023.03.13.10.07.04; Mon, 13 Mar 2023 10:07:19 -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=I5p904Cw; 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 S229624AbjCMRAX (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230410AbjCMQ7n (ORCPT ); Mon, 13 Mar 2023 12:59:43 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BDAE36FDE for ; Mon, 13 Mar 2023 09:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726675; 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=EgUyAFiD1XudKGrCgIYV9yECJZPALfejLv+DfT2fuQE=; b=I5p904Cw7qQsFetkWbqcdqf8eiC37aL0jAaGyZw0B8Qm/KganQHDnKQg2RqoSDPFtqjdni 8CWYGjU8rA75p/c17tThWQWJbF6USwvnUChxVI6OLHOUBDVNvpPKFTxL/NYLW0O4eClDBi St4gFwimglcjAOj+v9FzbRY8ZBe8fC4= Received: from mail-oa1-f72.google.com (mail-oa1-f72.google.com [209.85.160.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-342-jLDMlQcNOuqJJy_I0Xwr2Q-1; Mon, 13 Mar 2023 12:57:54 -0400 X-MC-Unique: jLDMlQcNOuqJJy_I0Xwr2Q-1 Received: by mail-oa1-f72.google.com with SMTP id 586e51a60fabf-177b0f40c4eso2002908fac.12 for ; Mon, 13 Mar 2023 09:57:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726673; 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=EgUyAFiD1XudKGrCgIYV9yECJZPALfejLv+DfT2fuQE=; b=Oxt5XlV8BwrJdM6Fk9hP3F+YZCCzwaP2XHE8PrPm9D01jFY6FmQMh5AYtJxuMGfhYj q8I6t1DLP/R9rHlmZP5diTAfUc1nhIUGhNPz5qw1GWsyEyRNLrV5nkSA90oPJz9q84iz 71TCqnQFozJLzjNhFYlyVU3/4cEuZjspme3LWG2xV3V3oWg+kmPIHBcq6421Vx3BL9+k AWG1ecMFDxcM/gbCBDoMVHIe4q3LfqBg90VOz1AiqisH+hn6jVbFMi4nTMnghPHunip1 liVn766iISxNHthw2oPShclXtr+CDfp2yzQTK/Ckqhn+2CDFvmCtiJ3/ufOtSdMQW+Fn mUyQ== X-Gm-Message-State: AO0yUKUJdwietBV6Ydh5WUIEnm2opD5ElgQ8N4IAX66/OJ4dKmbQBkmI Jlzr3yrrZED2Bs4Osd7C9K9Uz/c2MAOp4EU8qRWZDx0lca16pV7cXTAAzKKDjSo42kj5zxaVecy daNiKibVVyF3P3ziCRLjzl9DT8AD7n7rd4ANOnUuJOITDRymMDHSAqC0/zYAms6iNt3JBZtZx2C H4plqzFwELoD8= X-Received: by 2002:a05:6808:1817:b0:37f:a0a5:bbd7 with SMTP id bh23-20020a056808181700b0037fa0a5bbd7mr5917193oib.19.1678726672973; Mon, 13 Mar 2023 09:57:52 -0700 (PDT) X-Received: by 2002:a05:6808:1817:b0:37f:a0a5:bbd7 with SMTP id bh23-20020a056808181700b0037fa0a5bbd7mr5917143oib.19.1678726672584; Mon, 13 Mar 2023 09:57:52 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:57:52 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 07/11] arm64: dts: qcom: sa8540p-ride: Add ethernet nodes Date: Mon, 13 Mar 2023 11:56:16 -0500 Message-Id: <20230313165620.128463-8-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273094367710365?= X-GMAIL-MSGID: =?utf-8?q?1760273094367710365?= Enable both the MACs found on the board. ethernet0 and ethernet1 both ultimately go to a series of on board switches which aren't managed by this processor. ethernet0 is connected to a Marvell 88EA1512 phy via RGMII. That goes to the series of switches via SGMII on the "media" side of the phy. RGMII_SGMII mode is enabled via devicetree register descriptions. The switch on the "media" side has auto-negotiation disabled, so configuration from userspace similar to: ethtool -s eth0 autoneg off speed 1000 duplex full is necessary to get traffic flowing on that interface. ethernet1 is in a mac2mac/fixed-link configuration going to the same series of switches directly via RGMII. Signed-off-by: Andrew Halaney --- arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 181 ++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts index 8b7555f22528..b874f3909382 100644 --- a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts +++ b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts @@ -28,6 +28,65 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + mtl_rx_setup: rx-queues-config { + snps,rx-queues-to-use = <1>; + snps,rx-sched-sp; + + queue0 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x0>; + snps,route-up; + snps,priority = <0x1>; + }; + + queue1 { + snps,dcb-algorithm; + snps,map-to-dma-channel = <0x1>; + snps,route-ptp; + }; + + queue2 { + snps,avb-algorithm; + snps,map-to-dma-channel = <0x2>; + snps,route-avcp; + }; + + queue3 { + snps,avb-algorithm; + snps,map-to-dma-channel = <0x3>; + snps,priority = <0xc>; + }; + }; + + mtl_tx_setup: tx-queues-config { + snps,tx-queues-to-use = <1>; + snps,tx-sched-sp; + + queue0 { + snps,dcb-algorithm; + }; + + queue1 { + snps,dcb-algorithm; + }; + + queue2 { + snps,avb-algorithm; + snps,send_slope = <0x1000>; + snps,idle_slope = <0x1000>; + snps,high_credit = <0x3e800>; + snps,low_credit = <0xffc18000>; + }; + + queue3 { + snps,avb-algorithm; + snps,send_slope = <0x1000>; + snps,idle_slope = <0x1000>; + snps,high_credit = <0x3e800>; + snps,low_credit = <0xffc18000>; + }; + }; }; &apps_rsc { @@ -151,6 +210,68 @@ vreg_l8g: ldo8 { }; }; +ðernet0 { + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + + max-speed = <1000>; + phy-handle = <&rgmii_phy>; + phy-mode = "rgmii-txid"; + + pinctrl-names = "default"; + pinctrl-0 = <ðernet0_default>; + + status = "okay"; + + mdio { + #address-cells = <0x1>; + #size-cells = <0x0>; + + compatible = "snps,dwmac-mdio"; + + /* Marvell 88EA1512 */ + rgmii_phy: phy@8 { + reg = <0x8>; + + interrupt-parent = <&tlmm>; + interrupts-extended = <&tlmm 127 IRQ_TYPE_EDGE_FALLING>; + + reset-gpios = <&pmm8540c_gpios 1 GPIO_ACTIVE_LOW>; + reset-assert-us = <11000>; + reset-deassert-us = <70000>; + + device_type = "ethernet-phy"; + + /* Set to RGMII_SGMII mode and soft reset. Turn off auto-negotiation + * from userspace to talk to the switch on the SGMII side of things + */ + marvell,reg-init = + /* Set MODE[2:0] to RGMII_SGMII */ + <0x12 0x14 0xfff8 0x4>, + /* Soft reset required after changing MODE[2:0] */ + <0x12 0x14 0x7fff 0x8000>; + }; + }; +}; + +ðernet1 { + snps,mtl-rx-config = <&mtl_rx_setup>; + snps,mtl-tx-config = <&mtl_tx_setup>; + + max-speed = <1000>; + phy-mode = "rgmii-txid"; + + pinctrl-names = "default"; + pinctrl-0 = <ðernet1_default>; + + status = "okay"; + + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_default>; @@ -316,6 +437,66 @@ &xo_board_clk { /* PINCTRL */ &tlmm { + ethernet0_default: ethernet0-default-state { + mdc-pins { + pins = "gpio175"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + mdio-pins { + pins = "gpio176"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-tx-pins { + pins = "gpio183", "gpio184", "gpio185", "gpio186", "gpio187", "gpio188"; + function = "rgmii_0"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-rx-pins { + pins = "gpio177", "gpio178", "gpio179", "gpio180", "gpio181", "gpio182"; + function = "rgmii_0"; + drive-strength = <16>; + bias-disable; + }; + }; + + ethernet1_default: ethernet1-default-state { + mdc-pins { + pins = "gpio97"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + mdio-pins { + pins = "gpio98"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-tx-pins { + pins = "gpio105", "gpio106", "gpio107", "gpio108", "gpio109", "gpio110"; + function = "rgmii_1"; + drive-strength = <16>; + bias-pull-up; + }; + + rgmii-rx-pins { + pins = "gpio99", "gpio100", "gpio101", "gpio102", "gpio103", "gpio104"; + function = "rgmii_1"; + drive-strength = <16>; + bias-disable; + }; + }; + i2c0_default: i2c0-default-state { /* To USB7002T-I/KDXVA0 USB hub (SIP1 only) */ pins = "gpio135", "gpio136"; From patchwork Mon Mar 13 16:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1309081wrd; Mon, 13 Mar 2023 10:21:41 -0700 (PDT) X-Google-Smtp-Source: AK7set9YuPYXqgx194P941JotLJsqe7INHsNbeBOa1z0LqsIpn9g4Eb0ZgWu/3im8RCZFY8tnEib X-Received: by 2002:a05:6a00:1912:b0:594:1f1c:3d3a with SMTP id y18-20020a056a00191200b005941f1c3d3amr12143716pfi.15.1678728100683; Mon, 13 Mar 2023 10:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678728100; cv=none; d=google.com; s=arc-20160816; b=m3wQn6YK4gc3fXaKuT+rffVrlkbJ1sKM2YUN64IKcCKsc80e7V/B0+3QGbkKCUeACj JiDho+4gbRqoE4zcywXdfnyO84+up3eY5NLVmgdaqpjS70ER+0s7tcB0c9iQunfXREeF lMY8KSPFMO52l0EwK3sOgA1kJo1RVMEFem7LiXhJVU8TOwWcEom+8hOnjjmlapxxFXCp CfQvt13kbHOJ6teixctAZUZVFKNgsTxxEOEazpJ5y8l5mlDLHk4pc0hCD51lqU+ZMUHd HyBWVLk5PbOdpHQaRAmwMBgKl4l6X8Ciy12zQ1Ua/iiATgry6LiFrtGqq3P78qJwa24b L7ig== 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=72fQbuBiCOcdQMKHZxQNxv2oj7f/sSYgyJ2RWIuY+e0=; b=otJGimb0Aqxuk8ZTwf6cHfbIBmfGKtKMYogfsbtGeKFN1BYEwR95wXUiBquO0DfMwH /Rqesi153hxtKLFO6VhKCPCsQtRJ4F5ynBh/3ItarNALU9D6+gDnDShjKtEUYwpUzEKc dwBgaFbb4hzeZOhmAi6Fb116ZFBeejBVjatK36VaB9KE4JnhU+89FbPMUDmXnxxbOPue LFiDK7KvAls8WXEmkFkM048Hb3vHFi6OJsmtjO733JLvuR9pHyXsftNVYnZgeY5Z4HwB +YmXeNB6hQFhzAyb2DvpCdoyAVFADDW4uHyZdiVyFI8ZeV3viNQ7rKjLWrv4f6gEFnw1 ESHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FsARfFvL; 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 x12-20020aa78f0c000000b005925d784cc8si6783165pfr.343.2023.03.13.10.21.26; Mon, 13 Mar 2023 10:21:40 -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=FsARfFvL; 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 S230414AbjCMRAi (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231688AbjCMRAG (ORCPT ); Mon, 13 Mar 2023 13:00:06 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C2F44AFD0 for ; Mon, 13 Mar 2023 09:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726686; 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=72fQbuBiCOcdQMKHZxQNxv2oj7f/sSYgyJ2RWIuY+e0=; b=FsARfFvLgG4Qo1ohCua+xL+gEAuR/fQevlUp7DBkrsGLqMTMr6gMo910B2dVQFu/61SZJ0 PReoQVeOY/JrMVzncl5FqRgrpp6uPwf3kTOy3Cquv4srC3b72vvg1SHqun6M7D5j/O338l pugsjS7VSjk+UL3874lPnkHeKes6pog= Received: from mail-oa1-f70.google.com (mail-oa1-f70.google.com [209.85.160.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-0RCUaxFNMYmWPk0GTRTDWg-1; Mon, 13 Mar 2023 12:58:05 -0400 X-MC-Unique: 0RCUaxFNMYmWPk0GTRTDWg-1 Received: by mail-oa1-f70.google.com with SMTP id 586e51a60fabf-17a678c2de9so187931fac.14 for ; Mon, 13 Mar 2023 09:58:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726684; 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=72fQbuBiCOcdQMKHZxQNxv2oj7f/sSYgyJ2RWIuY+e0=; b=g6AKsyzH2s/kwSWlUSREbf0C0ouV7ejixG8J3ZPYiftwnzgDzaLYTnJi+1ZrHkgaYD XiPRHv50CG1loYzfd++OaAmNL9VPBp5xl9+9Og4VmhJi8TLK7KM9r3zbmBhiIsKhrGY3 GtXAvumgP7i5/xHMS47mU93OjmuxxwuZONK9C0wq4niX9YZ7tIgNrnplpd44QQ4zXfd3 CynZreS5Atw7865RolyYc42mamcS6vAPvv7i2uojTp7kLTRs5eeUP5g1fQL4/93np0GE KAVQvAyk43pMRhD567ws0MyCOQNN6bADb1VctzhkUf9PfubMFibDhRpuDw1dhtU8azuZ yhKg== X-Gm-Message-State: AO0yUKXNrIKgugNPHiG3u3K1pRl3bSTgWN8ra6XVCbLahfhRSkuxMhe5 9DNlFyr7XzVjF8Z3uMDM9F+JJ5afk7Z43Q6iWyUKh8jxBzBQmfAQIhWLwKJglp6skkMT89ofILX BXwLbF3Z2H5Zl+UHZMygWSikmGMPUmftAizq05nxJxkHk0dpzyuvMFFvX5z/TJB62GM2oPDq0+j i1B7OsFPtVXI0= X-Received: by 2002:a05:6808:21a2:b0:37a:2bf0:5024 with SMTP id be34-20020a05680821a200b0037a2bf05024mr6110501oib.18.1678726683531; Mon, 13 Mar 2023 09:58:03 -0700 (PDT) X-Received: by 2002:a05:6808:21a2:b0:37a:2bf0:5024 with SMTP id be34-20020a05680821a200b0037a2bf05024mr6110444oib.18.1678726682438; Mon, 13 Mar 2023 09:58:02 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:58:02 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 08/11] net: stmmac: Add EMAC3 variant of dwmac4 Date: Mon, 13 Mar 2023 11:56:17 -0500 Message-Id: <20230313165620.128463-9-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273996816042875?= X-GMAIL-MSGID: =?utf-8?q?1760273996816042875?= From: Brian Masney EMAC3 is a Qualcomm variant of dwmac4 that functions the same, but has a different address space layout for MTL and DMA registers. This makes the patch a bit more complicated than we would like so let's explain why the current approach was used. The different address ranges between the two variants can be represented with 7 different sets of #ifdefs like the following: #if IS_ENABLED(CONFIG_DWMAC_QCOM_VER3) # define MTL_CHAN_BASE_ADDR 0x00008000 # define MTL_CHAN_BASE_OFFSET 0x1000 #else # define MTL_CHAN_BASE_ADDR 0x00000d00 # define MTL_CHAN_BASE_OFFSET 0x40 #endif This won't be acceptable for upstream inclusion since it would be nice to enable both variants simultaneously without recompiling. The next approach that was checked was to have a function pointer embedded inside a structure that does the appropriate conversion based on the variant that's in use. However, some of the function definitions are like the following: void emac3_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) We can't do a container_of() with an __iomem address. Changing these functions to pass in an extra regular structure had a cascading effect across the different variants, and the change was quickly becoming large. It would also be hard to test and review. So the approach that was decided to go with here is to take the existing dwmac4_XXX callbacks, rename it to do_XXX, and do the following: static void do_XXX(..., int addr_offset) { // Code from existing dwmac4 implementation. } static inline void emac3_XXX(...) { do_XXX(..., EMAC3_ADDR_OFFSET(...)); } static inline void dwmac4_XXX(...) { do_XXX(..., DWMAC4_ADDR_OFFSET(...)); } Prior to the introduction of this patch, dwmac4_dma_init_channel() and dwmac410_dma_init_channel() already had the problem of copy and paste with trivial changes made. While changes are being made here, this patch also fixes a bad comment that was in dwmac4_config_cbs (s/high/low). Signed-off-by: Brian Masney Co-developed-by: Andrew Halaney Signed-off-by: Andrew Halaney --- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 32 +- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 190 ++++++++-- .../net/ethernet/stmicro/stmmac/dwmac4_dma.c | 336 ++++++++++++++---- .../net/ethernet/stmicro/stmmac/dwmac4_dma.h | 38 ++ .../net/ethernet/stmicro/stmmac/dwmac4_lib.c | 144 ++++++-- drivers/net/ethernet/stmicro/stmmac/hwif.c | 29 +- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 + .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 17 +- .../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 9 +- .../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 +- include/linux/stmmac.h | 1 + 12 files changed, 672 insertions(+), 136 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index ccd49346d3b3..56355d65fa4b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -333,7 +333,16 @@ enum power_event { #define MTL_RXQ_DMA_MAP1 0x00000c34 /* queue 4 to 7 */ #define MTL_RXQ_DMA_QXMDMACH_MASK(x) (0xf << 8 * (x)) #define MTL_RXQ_DMA_QXMDMACH(chan, q) ((chan) << (8 * (q))) - +#define EMAC3_MTL_CHAN_BASE_ADDR 0x00008000 +#define EMAC3_MTL_CHAN_BASE_OFFSET 0x1000 +#define EMAC3_MTL_CHANX_BASE_ADDR(x) (EMAC3_MTL_CHAN_BASE_ADDR + \ + ((x) * EMAC3_MTL_CHAN_BASE_OFFSET)) + +#define EMAC3_MTL_CHAN_TX_OP_MODE(x) EMAC3_MTL_CHANX_BASE_ADDR(x) +#define EMAC3_MTL_CHAN_TX_DEBUG(x) (EMAC3_MTL_CHANX_BASE_ADDR(x) + 0x8) +#define EMAC3_MTL_CHAN_INT_CTRL(x) (EMAC3_MTL_CHANX_BASE_ADDR(x) + 0x2c) +#define EMAC3_MTL_CHAN_RX_OP_MODE(x) (EMAC3_MTL_CHANX_BASE_ADDR(x) + 0x30) +#define EMAC3_MTL_CHAN_RX_DEBUG(x) (EMAC3_MTL_CHANX_BASE_ADDR(x) + 0x38) #define MTL_CHAN_BASE_ADDR 0x00000d00 #define MTL_CHAN_BASE_OFFSET 0x40 #define MTL_CHANX_BASE_ADDR(x) (MTL_CHAN_BASE_ADDR + \ @@ -386,6 +395,10 @@ enum power_event { #define MTL_OP_MODE_RTC_128 (3 << MTL_OP_MODE_RTC_SHIFT) /* MTL ETS Control register */ +#define EMAC3_MTL_ETS_CTRL_BASE_ADDR 0x00008010 +#define EMAC3_MTL_ETS_CTRL_BASE_OFFSET 0x1000 +#define EMAC3_MTL_ETSX_CTRL_BASE_ADDR(x) (EMAC3_MTL_ETS_CTRL_BASE_ADDR + \ + ((x) * EMAC3_MTL_ETS_CTRL_BASE_OFFSET)) #define MTL_ETS_CTRL_BASE_ADDR 0x00000d10 #define MTL_ETS_CTRL_BASE_OFFSET 0x40 #define MTL_ETSX_CTRL_BASE_ADDR(x) (MTL_ETS_CTRL_BASE_ADDR + \ @@ -395,6 +408,10 @@ enum power_event { #define MTL_ETS_CTRL_AVALG BIT(2) /* MTL Queue Quantum Weight */ +#define EMAC3_MTL_TXQ_WEIGHT_BASE_ADDR 0x00008018 +#define EMAC3_MTL_TXQ_WEIGHT_BASE_OFFSET 0x1000 +#define EMAC3_MTL_TXQX_WEIGHT_BASE_ADDR(x) (EMAC3_MTL_TXQ_WEIGHT_BASE_ADDR + \ + ((x) * EMAC3_MTL_TXQ_WEIGHT_BASE_OFFSET)) #define MTL_TXQ_WEIGHT_BASE_ADDR 0x00000d18 #define MTL_TXQ_WEIGHT_BASE_OFFSET 0x40 #define MTL_TXQX_WEIGHT_BASE_ADDR(x) (MTL_TXQ_WEIGHT_BASE_ADDR + \ @@ -402,6 +419,11 @@ enum power_event { #define MTL_TXQ_WEIGHT_ISCQW_MASK GENMASK(20, 0) /* MTL sendSlopeCredit register */ + +#define EMAC3_MTL_SEND_SLP_CRED_BASE_ADDR 0x0000801c +#define EMAC3_MTL_SEND_SLP_CRED_OFFSET 0x1000 +#define EMAC3_MTL_SEND_SLP_CREDX_BASE_ADDR(x) (EMAC3_MTL_SEND_SLP_CRED_BASE_ADDR + \ + ((x) * EMAC3_MTL_SEND_SLP_CRED_OFFSET)) #define MTL_SEND_SLP_CRED_BASE_ADDR 0x00000d1c #define MTL_SEND_SLP_CRED_OFFSET 0x40 #define MTL_SEND_SLP_CREDX_BASE_ADDR(x) (MTL_SEND_SLP_CRED_BASE_ADDR + \ @@ -410,6 +432,10 @@ enum power_event { #define MTL_SEND_SLP_CRED_SSC_MASK GENMASK(13, 0) /* MTL hiCredit register */ +#define EMAC3_MTL_HIGH_CRED_BASE_ADDR 0x00008020 +#define EMAC3_MTL_HIGH_CRED_OFFSET 0x1000 +#define EMAC3_MTL_HIGH_CREDX_BASE_ADDR(x) (EMAC3_MTL_HIGH_CRED_BASE_ADDR + \ + ((x) * EMAC3_MTL_HIGH_CRED_OFFSET)) #define MTL_HIGH_CRED_BASE_ADDR 0x00000d20 #define MTL_HIGH_CRED_OFFSET 0x40 #define MTL_HIGH_CREDX_BASE_ADDR(x) (MTL_HIGH_CRED_BASE_ADDR + \ @@ -418,6 +444,10 @@ enum power_event { #define MTL_HIGH_CRED_HC_MASK GENMASK(28, 0) /* MTL loCredit register */ +#define EMAC3_MTL_LOW_CRED_BASE_ADDR 0x00008024 +#define EMAC3_MTL_LOW_CRED_OFFSET 0x1000 +#define EMAC3_MTL_LOW_CREDX_BASE_ADDR(x) (EMAC3_MTL_LOW_CRED_BASE_ADDR + \ + ((x) * EMAC3_MTL_LOW_CRED_OFFSET)) #define MTL_LOW_CRED_BASE_ADDR 0x00000d24 #define MTL_LOW_CRED_OFFSET 0x40 #define MTL_LOW_CREDX_BASE_ADDR(x) (MTL_LOW_CRED_BASE_ADDR + \ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 8c7a0b7c9952..88df064b52ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -198,15 +198,28 @@ static void dwmac4_prog_mtl_tx_algorithms(struct mac_device_info *hw, writel(value, ioaddr + MTL_OPERATION_MODE); } -static void dwmac4_set_mtl_tx_queue_weight(struct mac_device_info *hw, - u32 weight, u32 queue) +static void do_set_mtl_tx_queue_weight(struct mac_device_info *hw, + u32 addr_offset, u32 weight) { void __iomem *ioaddr = hw->pcsr; - u32 value = readl(ioaddr + MTL_TXQX_WEIGHT_BASE_ADDR(queue)); + u32 value = readl(ioaddr + addr_offset); value &= ~MTL_TXQ_WEIGHT_ISCQW_MASK; value |= weight & MTL_TXQ_WEIGHT_ISCQW_MASK; - writel(value, ioaddr + MTL_TXQX_WEIGHT_BASE_ADDR(queue)); + writel(value, ioaddr + addr_offset); +} + +static inline void emac3_set_mtl_tx_queue_weight(struct mac_device_info *hw, + u32 weight, u32 queue) +{ + do_set_mtl_tx_queue_weight(hw, EMAC3_MTL_TXQX_WEIGHT_BASE_ADDR(queue), + weight); +} + +static inline void dwmac4_set_mtl_tx_queue_weight(struct mac_device_info *hw, + u32 weight, u32 queue) +{ + do_set_mtl_tx_queue_weight(hw, MTL_TXQX_WEIGHT_BASE_ADDR(queue), weight); } static void dwmac4_map_mtl_dma(struct mac_device_info *hw, u32 queue, u32 chan) @@ -227,9 +240,13 @@ static void dwmac4_map_mtl_dma(struct mac_device_info *hw, u32 queue, u32 chan) } } -static void dwmac4_config_cbs(struct mac_device_info *hw, - u32 send_slope, u32 idle_slope, - u32 high_credit, u32 low_credit, u32 queue) +static void do_config_cbs(struct mac_device_info *hw, u32 send_slope, + u32 idle_slope, u32 high_credit, u32 low_credit, + u32 queue, u32 etsx_ctrl_base_addr, + u32 send_slp_credx_base_addr, + u32 high_credx_base_addr, u32 low_credx_base_addr, + void (*set_mtl_tx_queue_weight)(struct mac_device_info *hw, + u32 weight, u32 queue)) { void __iomem *ioaddr = hw->pcsr; u32 value; @@ -241,31 +258,55 @@ static void dwmac4_config_cbs(struct mac_device_info *hw, pr_debug("\tlow_credit: 0x%08x\n", low_credit); /* enable AV algorithm */ - value = readl(ioaddr + MTL_ETSX_CTRL_BASE_ADDR(queue)); + value = readl(ioaddr + etsx_ctrl_base_addr); value |= MTL_ETS_CTRL_AVALG; value |= MTL_ETS_CTRL_CC; - writel(value, ioaddr + MTL_ETSX_CTRL_BASE_ADDR(queue)); + writel(value, ioaddr + etsx_ctrl_base_addr); /* configure send slope */ - value = readl(ioaddr + MTL_SEND_SLP_CREDX_BASE_ADDR(queue)); + value = readl(ioaddr + send_slp_credx_base_addr); value &= ~MTL_SEND_SLP_CRED_SSC_MASK; value |= send_slope & MTL_SEND_SLP_CRED_SSC_MASK; - writel(value, ioaddr + MTL_SEND_SLP_CREDX_BASE_ADDR(queue)); + writel(value, ioaddr + send_slp_credx_base_addr); /* configure idle slope (same register as tx weight) */ - dwmac4_set_mtl_tx_queue_weight(hw, idle_slope, queue); + set_mtl_tx_queue_weight(hw, idle_slope, queue); /* configure high credit */ - value = readl(ioaddr + MTL_HIGH_CREDX_BASE_ADDR(queue)); + value = readl(ioaddr + high_credx_base_addr); value &= ~MTL_HIGH_CRED_HC_MASK; value |= high_credit & MTL_HIGH_CRED_HC_MASK; - writel(value, ioaddr + MTL_HIGH_CREDX_BASE_ADDR(queue)); + writel(value, ioaddr + high_credx_base_addr); - /* configure high credit */ - value = readl(ioaddr + MTL_LOW_CREDX_BASE_ADDR(queue)); + /* configure low credit */ + value = readl(ioaddr + low_credx_base_addr); value &= ~MTL_HIGH_CRED_LC_MASK; value |= low_credit & MTL_HIGH_CRED_LC_MASK; - writel(value, ioaddr + MTL_LOW_CREDX_BASE_ADDR(queue)); + writel(value, ioaddr + low_credx_base_addr); +} + +static inline void emac3_config_cbs(struct mac_device_info *hw, u32 send_slope, + u32 idle_slope, u32 high_credit, + u32 low_credit, u32 queue) +{ + do_config_cbs(hw, send_slope, idle_slope, high_credit, low_credit, + queue, EMAC3_MTL_ETSX_CTRL_BASE_ADDR(queue), + EMAC3_MTL_SEND_SLP_CREDX_BASE_ADDR(queue), + EMAC3_MTL_HIGH_CREDX_BASE_ADDR(queue), + EMAC3_MTL_LOW_CREDX_BASE_ADDR(queue), + emac3_set_mtl_tx_queue_weight); +} + +static inline void dwmac4_config_cbs(struct mac_device_info *hw, u32 send_slope, + u32 idle_slope, u32 high_credit, + u32 low_credit, u32 queue) +{ + do_config_cbs(hw, send_slope, idle_slope, high_credit, low_credit, + queue, MTL_ETSX_CTRL_BASE_ADDR(queue), + MTL_SEND_SLP_CREDX_BASE_ADDR(queue), + MTL_HIGH_CREDX_BASE_ADDR(queue), + MTL_LOW_CREDX_BASE_ADDR(queue), + dwmac4_set_mtl_tx_queue_weight); } static void dwmac4_dump_regs(struct mac_device_info *hw, u32 *reg_space) @@ -814,7 +855,8 @@ static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x) } } -static int dwmac4_irq_mtl_status(struct mac_device_info *hw, u32 chan) +static int do_irq_mtl_status(struct mac_device_info *hw, u32 chan, + u32 addr_offset) { void __iomem *ioaddr = hw->pcsr; u32 mtl_int_qx_status; @@ -825,12 +867,12 @@ static int dwmac4_irq_mtl_status(struct mac_device_info *hw, u32 chan) /* Check MTL Interrupt */ if (mtl_int_qx_status & MTL_INT_QX(chan)) { /* read Queue x Interrupt status */ - u32 status = readl(ioaddr + MTL_CHAN_INT_CTRL(chan)); + u32 status = readl(ioaddr + addr_offset); if (status & MTL_RX_OVERFLOW_INT) { /* clear Interrupt */ writel(status | MTL_RX_OVERFLOW_INT, - ioaddr + MTL_CHAN_INT_CTRL(chan)); + ioaddr + addr_offset); ret = CORE_IRQ_MTL_RX_OVERFLOW; } } @@ -838,6 +880,16 @@ static int dwmac4_irq_mtl_status(struct mac_device_info *hw, u32 chan) return ret; } +static inline int emac3_irq_mtl_status(struct mac_device_info *hw, u32 chan) +{ + return do_irq_mtl_status(hw, chan, EMAC3_MTL_CHAN_INT_CTRL(chan)); +} + +static inline int dwmac4_irq_mtl_status(struct mac_device_info *hw, u32 chan) +{ + return do_irq_mtl_status(hw, chan, MTL_CHAN_INT_CTRL(chan)); +} + static int dwmac4_irq_status(struct mac_device_info *hw, struct stmmac_extra_stats *x) { @@ -888,14 +940,16 @@ static int dwmac4_irq_status(struct mac_device_info *hw, return ret; } -static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, - u32 rx_queues, u32 tx_queues) +static void do_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, + u32 rx_queues, u32 tx_queues, + u32 (*rx_addr_offset)(u32 queue), + u32 (*tx_addr_offset)(u32 queue)) { u32 value; u32 queue; for (queue = 0; queue < tx_queues; queue++) { - value = readl(ioaddr + MTL_CHAN_TX_DEBUG(queue)); + value = readl(ioaddr + tx_addr_offset(queue)); if (value & MTL_DEBUG_TXSTSFSTS) x->mtl_tx_status_fifo_full++; @@ -920,7 +974,7 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, } for (queue = 0; queue < rx_queues; queue++) { - value = readl(ioaddr + MTL_CHAN_RX_DEBUG(queue)); + value = readl(ioaddr + rx_addr_offset(queue)); if (value & MTL_DEBUG_RXFSTS_MASK) { u32 rxfsts = (value & MTL_DEBUG_RXFSTS_MASK) @@ -977,6 +1031,42 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x, x->mac_gmii_rx_proto_engine++; } +static inline u32 emac3_debug_rx_addr_offset(u32 queue) +{ + return EMAC3_MTL_CHAN_RX_DEBUG(queue); +} + +static inline u32 emac3_debug_tx_addr_offset(u32 queue) +{ + return EMAC3_MTL_CHAN_TX_DEBUG(queue); +} + +static inline void emac3_debug(void __iomem *ioaddr, + struct stmmac_extra_stats *x, u32 rx_queues, + u32 tx_queues) +{ + do_debug(ioaddr, x, rx_queues, tx_queues, emac3_debug_rx_addr_offset, + emac3_debug_tx_addr_offset); +} + +static inline u32 dwmac4_debug_rx_addr_offset(u32 queue) +{ + return MTL_CHAN_RX_DEBUG(queue); +} + +static inline u32 dwmac4_debug_tx_addr_offset(u32 queue) +{ + return MTL_CHAN_TX_DEBUG(queue); +} + +static inline void dwmac4_debug(void __iomem *ioaddr, + struct stmmac_extra_stats *x, u32 rx_queues, + u32 tx_queues) +{ + do_debug(ioaddr, x, rx_queues, tx_queues, dwmac4_debug_rx_addr_offset, + dwmac4_debug_tx_addr_offset); +} + static void dwmac4_set_mac_loopback(void __iomem *ioaddr, bool enable) { u32 value = readl(ioaddr + GMAC_CONFIG); @@ -1309,6 +1399,58 @@ const struct stmmac_ops dwmac510_ops = { .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, }; +const struct stmmac_ops emac3_ops = { + .core_init = dwmac4_core_init, + .set_mac = stmmac_dwmac4_set_mac, + .rx_ipc = dwmac4_rx_ipc_enable, + .rx_queue_enable = dwmac4_rx_queue_enable, + .rx_queue_prio = dwmac4_rx_queue_priority, + .tx_queue_prio = dwmac4_tx_queue_priority, + .rx_queue_routing = dwmac4_rx_queue_routing, + .prog_mtl_rx_algorithms = dwmac4_prog_mtl_rx_algorithms, + .prog_mtl_tx_algorithms = dwmac4_prog_mtl_tx_algorithms, + .set_mtl_tx_queue_weight = emac3_set_mtl_tx_queue_weight, + .map_mtl_to_dma = dwmac4_map_mtl_dma, + .config_cbs = emac3_config_cbs, + .dump_regs = dwmac4_dump_regs, + .host_irq_status = dwmac4_irq_status, + .host_mtl_irq_status = emac3_irq_mtl_status, + .flow_ctrl = dwmac4_flow_ctrl, + .pmt = dwmac4_pmt, + .set_umac_addr = dwmac4_set_umac_addr, + .get_umac_addr = dwmac4_get_umac_addr, + .set_eee_mode = dwmac4_set_eee_mode, + .reset_eee_mode = dwmac4_reset_eee_mode, + .set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer, + .set_eee_timer = dwmac4_set_eee_timer, + .set_eee_pls = dwmac4_set_eee_pls, + .pcs_ctrl_ane = dwmac4_ctrl_ane, + .pcs_rane = dwmac4_rane, + .pcs_get_adv_lp = dwmac4_get_adv_lp, + .debug = emac3_debug, + .set_filter = dwmac4_set_filter, + .safety_feat_config = dwmac5_safety_feat_config, + .safety_feat_irq_status = dwmac5_safety_feat_irq_status, + .safety_feat_dump = dwmac5_safety_feat_dump, + .rxp_config = dwmac5_rxp_config, + .flex_pps_config = dwmac5_flex_pps_config, + .set_mac_loopback = dwmac4_set_mac_loopback, + .update_vlan_hash = dwmac4_update_vlan_hash, + .sarc_configure = dwmac4_sarc_configure, + .enable_vlan = dwmac4_enable_vlan, + .set_arp_offload = dwmac4_set_arp_offload, + .config_l3_filter = dwmac4_config_l3_filter, + .config_l4_filter = dwmac4_config_l4_filter, + .est_configure = dwmac5_est_configure, + .est_irq_status = dwmac5_est_irq_status, + .fpe_configure = dwmac5_fpe_configure, + .fpe_send_mpacket = dwmac5_fpe_send_mpacket, + .fpe_irq_status = dwmac5_fpe_irq_status, + .add_hw_vlan_rx_fltr = dwmac4_add_hw_vlan_rx_fltr, + .del_hw_vlan_rx_fltr = dwmac4_del_hw_vlan_rx_fltr, + .restore_hw_vlan_rx_fltr = dwmac4_restore_hw_vlan_rx_fltr, +}; + static u32 dwmac4_get_num_vlan(void __iomem *ioaddr) { u32 val, num_vlan; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c index d99fa028c646..789657b837fc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c @@ -68,77 +68,127 @@ static void dwmac4_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi) writel(value, ioaddr + DMA_SYS_BUS_MODE); } -static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, - struct stmmac_dma_cfg *dma_cfg, - dma_addr_t dma_rx_phy, u32 chan) +static void do_dma_init_rx_chan(void __iomem *ioaddr, u32 rx_ctl_offset, + u32 rx_high_offset, u32 rx_base_offset, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_rx_phy) { u32 value; u32 rxpbl = dma_cfg->rxpbl ?: dma_cfg->pbl; - value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan)); + value = readl(ioaddr + rx_ctl_offset); value = value | (rxpbl << DMA_BUS_MODE_RPBL_SHIFT); - writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan)); + writel(value, ioaddr + rx_ctl_offset); if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) && likely(dma_cfg->eame)) - writel(upper_32_bits(dma_rx_phy), - ioaddr + DMA_CHAN_RX_BASE_ADDR_HI(chan)); + writel(upper_32_bits(dma_rx_phy), ioaddr + rx_high_offset); - writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_CHAN_RX_BASE_ADDR(chan)); + writel(lower_32_bits(dma_rx_phy), ioaddr + rx_base_offset); } -static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, - struct stmmac_dma_cfg *dma_cfg, - dma_addr_t dma_tx_phy, u32 chan) +static inline void emac3_dma_init_rx_chan(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_rx_phy, u32 chan) +{ + do_dma_init_rx_chan(ioaddr, EMAC3_DMA_CHAN_RX_CONTROL(chan), + EMAC3_DMA_CHAN_RX_BASE_ADDR_HI(chan), + EMAC3_DMA_CHAN_RX_BASE_ADDR(chan), + dma_cfg, dma_rx_phy); +} + +static inline void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_rx_phy, u32 chan) +{ + do_dma_init_rx_chan(ioaddr, DMA_CHAN_RX_CONTROL(chan), + DMA_CHAN_RX_BASE_ADDR_HI(chan), + DMA_CHAN_RX_BASE_ADDR(chan), + dma_cfg, dma_rx_phy); +} + +static void do_dma_init_tx_chan(void __iomem *ioaddr, u32 tx_ctl_offset, + u32 tx_high_offset, u32 tx_base_offset, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_tx_phy) { u32 value; u32 txpbl = dma_cfg->txpbl ?: dma_cfg->pbl; - value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); + value = readl(ioaddr + tx_ctl_offset); value = value | (txpbl << DMA_BUS_MODE_PBL_SHIFT); /* Enable OSP to get best performance */ value |= DMA_CONTROL_OSP; - writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); + writel(value, ioaddr + tx_ctl_offset); if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) && likely(dma_cfg->eame)) - writel(upper_32_bits(dma_tx_phy), - ioaddr + DMA_CHAN_TX_BASE_ADDR_HI(chan)); + writel(upper_32_bits(dma_tx_phy), ioaddr + tx_high_offset); + + writel(lower_32_bits(dma_tx_phy), ioaddr + tx_base_offset); +} - writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_CHAN_TX_BASE_ADDR(chan)); +static inline void emac3_dma_init_tx_chan(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_tx_phy, u32 chan) +{ + do_dma_init_tx_chan(ioaddr, EMAC3_DMA_CHAN_TX_CONTROL(chan), + EMAC3_DMA_CHAN_TX_BASE_ADDR_HI(chan), + EMAC3_DMA_CHAN_TX_BASE_ADDR(chan), + dma_cfg, dma_tx_phy); } -static void dwmac4_dma_init_channel(void __iomem *ioaddr, - struct stmmac_dma_cfg *dma_cfg, u32 chan) +static inline void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + dma_addr_t dma_tx_phy, u32 chan) +{ + do_dma_init_tx_chan(ioaddr, DMA_CHAN_TX_CONTROL(chan), + DMA_CHAN_TX_BASE_ADDR_HI(chan), + DMA_CHAN_TX_BASE_ADDR(chan), + dma_cfg, dma_tx_phy); +} + +static void do_dma_init_channel(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + u32 addr_offset, u32 intr_addr_offset, + u32 intr_addr_mask) { u32 value; /* common channel control register config */ - value = readl(ioaddr + DMA_CHAN_CONTROL(chan)); + value = readl(ioaddr + addr_offset); if (dma_cfg->pblx8) value = value | DMA_BUS_MODE_PBL; - writel(value, ioaddr + DMA_CHAN_CONTROL(chan)); + writel(value, ioaddr + addr_offset); /* Mask interrupts by writing to CSR7 */ - writel(DMA_CHAN_INTR_DEFAULT_MASK, - ioaddr + DMA_CHAN_INTR_ENA(chan)); + writel(intr_addr_mask, ioaddr + intr_addr_offset); } -static void dwmac410_dma_init_channel(void __iomem *ioaddr, - struct stmmac_dma_cfg *dma_cfg, u32 chan) +static inline void emac3_dma_init_channel(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + u32 chan) { - u32 value; - - /* common channel control register config */ - value = readl(ioaddr + DMA_CHAN_CONTROL(chan)); - if (dma_cfg->pblx8) - value = value | DMA_BUS_MODE_PBL; + do_dma_init_channel(ioaddr, dma_cfg, EMAC3_DMA_CHAN_CONTROL(chan), + EMAC3_DMA_CHAN_INTR_ENA(chan), + DMA_CHAN_INTR_DEFAULT_MASK_4_10); +} - writel(value, ioaddr + DMA_CHAN_CONTROL(chan)); +static inline void dwmac4_dma_init_channel(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, + u32 chan) +{ + do_dma_init_channel(ioaddr, dma_cfg, DMA_CHAN_CONTROL(chan), + DMA_CHAN_INTR_ENA(chan), + DMA_CHAN_INTR_DEFAULT_MASK); +} - /* Mask interrupts by writing to CSR7 */ - writel(DMA_CHAN_INTR_DEFAULT_MASK_4_10, - ioaddr + DMA_CHAN_INTR_ENA(chan)); +static void dwmac410_dma_init_channel(void __iomem *ioaddr, + struct stmmac_dma_cfg *dma_cfg, u32 chan) +{ + do_dma_init_channel(ioaddr, dma_cfg, DMA_CHAN_CONTROL(chan), + DMA_CHAN_INTR_ENA(chan), + DMA_CHAN_INTR_DEFAULT_MASK_4_10); } static void dwmac4_dma_init(void __iomem *ioaddr, @@ -176,6 +226,46 @@ static void dwmac4_dma_init(void __iomem *ioaddr, } +static void _emac3_dump_dma_regs(void __iomem *ioaddr, u32 channel, + u32 *reg_space) +{ + /* Use dwmac4's reg_space offsets to reuse common stmmac_ethtool code */ + reg_space[DMA_CHAN_CONTROL(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_CONTROL(channel)); + reg_space[DMA_CHAN_TX_CONTROL(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_TX_CONTROL(channel)); + reg_space[DMA_CHAN_RX_CONTROL(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_RX_CONTROL(channel)); + reg_space[DMA_CHAN_TX_BASE_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_TX_BASE_ADDR(channel)); + reg_space[DMA_CHAN_RX_BASE_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_RX_BASE_ADDR(channel)); + reg_space[DMA_CHAN_TX_END_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_TX_END_ADDR(channel)); + reg_space[DMA_CHAN_RX_END_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_RX_END_ADDR(channel)); + reg_space[DMA_CHAN_TX_RING_LEN(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_TX_RING_LEN(channel)); + reg_space[DMA_CHAN_RX_RING_LEN(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_RX_RING_LEN(channel)); + reg_space[DMA_CHAN_INTR_ENA(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_INTR_ENA(channel)); + reg_space[DMA_CHAN_RX_WATCHDOG(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_RX_WATCHDOG(channel)); + reg_space[DMA_CHAN_SLOT_CTRL_STATUS(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_SLOT_CTRL_STATUS(channel)); + reg_space[DMA_CHAN_CUR_TX_DESC(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_CUR_TX_DESC(channel)); + reg_space[DMA_CHAN_CUR_RX_DESC(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_CUR_RX_DESC(channel)); + reg_space[DMA_CHAN_CUR_TX_BUF_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_CUR_TX_BUF_ADDR(channel)); + reg_space[DMA_CHAN_CUR_RX_BUF_ADDR(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_CUR_RX_BUF_ADDR(channel)); + reg_space[DMA_CHAN_STATUS(channel) / 4] = + readl(ioaddr + EMAC3_DMA_CHAN_STATUS(channel)); +} + static void _dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 channel, u32 *reg_space) { @@ -215,6 +305,12 @@ static void _dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 channel, readl(ioaddr + DMA_CHAN_STATUS(channel)); } +static void emac3_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space) +{ + for (int i = 0; i < DMA_CHANNEL_NB_MAX; i++) + _emac3_dump_dma_regs(ioaddr, i, reg_space); +} + static void dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space) { int i; @@ -223,18 +319,23 @@ static void dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 *reg_space) _dwmac4_dump_dma_regs(ioaddr, i, reg_space); } +static void emac3_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 queue) +{ + writel(riwt, ioaddr + EMAC3_DMA_CHAN_RX_WATCHDOG(queue)); +} + static void dwmac4_rx_watchdog(void __iomem *ioaddr, u32 riwt, u32 queue) { writel(riwt, ioaddr + DMA_CHAN_RX_WATCHDOG(queue)); } -static void dwmac4_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode, - u32 channel, int fifosz, u8 qmode) +static void do_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode, int fifosz, + u8 qmode, u32 addr_offset) { unsigned int rqs = fifosz / 256 - 1; u32 mtl_rx_op; - mtl_rx_op = readl(ioaddr + MTL_CHAN_RX_OP_MODE(channel)); + mtl_rx_op = readl(ioaddr + addr_offset); if (mode == SF_DMA_MODE) { pr_debug("GMAC: enable RX store and forward mode\n"); @@ -292,13 +393,27 @@ static void dwmac4_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode, mtl_rx_op |= rfa << MTL_OP_MODE_RFA_SHIFT; } - writel(mtl_rx_op, ioaddr + MTL_CHAN_RX_OP_MODE(channel)); + writel(mtl_rx_op, ioaddr + addr_offset); } -static void dwmac4_dma_tx_chan_op_mode(void __iomem *ioaddr, int mode, +static void emac3_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode, + u32 channel, int fifosz, u8 qmode) +{ + do_dma_rx_chan_op_mode(ioaddr, mode, fifosz, qmode, + EMAC3_MTL_CHAN_RX_OP_MODE(channel)); +} + +static void dwmac4_dma_rx_chan_op_mode(void __iomem *ioaddr, int mode, u32 channel, int fifosz, u8 qmode) { - u32 mtl_tx_op = readl(ioaddr + MTL_CHAN_TX_OP_MODE(channel)); + do_dma_rx_chan_op_mode(ioaddr, mode, fifosz, qmode, + MTL_CHAN_RX_OP_MODE(channel)); +} + +static void do_dma_tx_chan_op_mode(void __iomem *ioaddr, int mode, int fifosz, + u8 qmode, u32 addr_offset) +{ + u32 mtl_tx_op = readl(ioaddr + addr_offset); unsigned int tqs = fifosz / 256 - 1; if (mode == SF_DMA_MODE) { @@ -344,7 +459,21 @@ static void dwmac4_dma_tx_chan_op_mode(void __iomem *ioaddr, int mode, mtl_tx_op &= ~MTL_OP_MODE_TQS_MASK; mtl_tx_op |= tqs << MTL_OP_MODE_TQS_SHIFT; - writel(mtl_tx_op, ioaddr + MTL_CHAN_TX_OP_MODE(channel)); + writel(mtl_tx_op, ioaddr + addr_offset); +} + +static inline void emac3_dma_tx_chan_op_mode(void __iomem *ioaddr, int mode, + u32 channel, int fifosz, u8 qmode) +{ + do_dma_tx_chan_op_mode(ioaddr, mode, fifosz, qmode, + EMAC3_MTL_CHAN_TX_OP_MODE(channel)); +} + +static inline void dwmac4_dma_tx_chan_op_mode(void __iomem *ioaddr, int mode, + u32 channel, int fifosz, u8 qmode) +{ + do_dma_tx_chan_op_mode(ioaddr, mode, fifosz, qmode, + MTL_CHAN_TX_OP_MODE(channel)); } static int dwmac4_get_hw_feature(void __iomem *ioaddr, @@ -442,26 +571,29 @@ static int dwmac4_get_hw_feature(void __iomem *ioaddr, } /* Enable/disable TSO feature and set MSS */ -static void dwmac4_enable_tso(void __iomem *ioaddr, bool en, u32 chan) +static void do_enable_tso(void __iomem *ioaddr, bool en, u32 addr_offset) { - u32 value; + u32 value = readl(ioaddr + addr_offset); - if (en) { - /* enable TSO */ - value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); - writel(value | DMA_CONTROL_TSE, - ioaddr + DMA_CHAN_TX_CONTROL(chan)); - } else { - /* enable TSO */ - value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); - writel(value & ~DMA_CONTROL_TSE, - ioaddr + DMA_CHAN_TX_CONTROL(chan)); - } + if (en) + writel(value | DMA_CONTROL_TSE, ioaddr + addr_offset); + else + writel(value & ~DMA_CONTROL_TSE, ioaddr + addr_offset); } -static void dwmac4_qmode(void __iomem *ioaddr, u32 channel, u8 qmode) +static inline void emac3_enable_tso(void __iomem *ioaddr, bool en, u32 chan) { - u32 mtl_tx_op = readl(ioaddr + MTL_CHAN_TX_OP_MODE(channel)); + do_enable_tso(ioaddr, en, EMAC3_DMA_CHAN_TX_CONTROL(chan)); +} + +static inline void dwmac4_enable_tso(void __iomem *ioaddr, bool en, u32 chan) +{ + do_enable_tso(ioaddr, en, DMA_CHAN_TX_CONTROL(chan)); +} + +static void do_qmode(void __iomem *ioaddr, u8 qmode, u32 addr_offset) +{ + u32 mtl_tx_op = readl(ioaddr + addr_offset); mtl_tx_op &= ~MTL_OP_MODE_TXQEN_MASK; if (qmode != MTL_QUEUE_AVB) @@ -469,20 +601,40 @@ static void dwmac4_qmode(void __iomem *ioaddr, u32 channel, u8 qmode) else mtl_tx_op |= MTL_OP_MODE_TXQEN_AV; - writel(mtl_tx_op, ioaddr + MTL_CHAN_TX_OP_MODE(channel)); + writel(mtl_tx_op, ioaddr + addr_offset); +} + +static inline void emac3_qmode(void __iomem *ioaddr, u32 channel, u8 qmode) +{ + do_qmode(ioaddr, qmode, EMAC3_MTL_CHAN_TX_OP_MODE(channel)); +} + +static inline void dwmac4_qmode(void __iomem *ioaddr, u32 channel, u8 qmode) +{ + do_qmode(ioaddr, qmode, MTL_CHAN_TX_OP_MODE(channel)); } -static void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan) +static void do_set_bfsize(void __iomem *ioaddr, int bfsize, u32 addr_offset) { - u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan)); + u32 value = readl(ioaddr + addr_offset); value &= ~DMA_RBSZ_MASK; value |= (bfsize << DMA_RBSZ_SHIFT) & DMA_RBSZ_MASK; - writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); +} + +static inline void emac3_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan) +{ + do_set_bfsize(ioaddr, bfsize, EMAC3_DMA_CHAN_RX_CONTROL(chan)); +} + +static inline void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan) +{ + do_set_bfsize(ioaddr, bfsize, DMA_CHAN_RX_CONTROL(chan)); } -static void dwmac4_enable_sph(void __iomem *ioaddr, bool en, u32 chan) +static void do_enable_sph(void __iomem *ioaddr, bool en, u32 addr_offset) { u32 value = readl(ioaddr + GMAC_EXT_CONFIG); @@ -490,26 +642,36 @@ static void dwmac4_enable_sph(void __iomem *ioaddr, bool en, u32 chan) value |= GMAC_CONFIG_HDSMS_256; /* Segment max 256 bytes */ writel(value, ioaddr + GMAC_EXT_CONFIG); - value = readl(ioaddr + DMA_CHAN_CONTROL(chan)); + value = readl(ioaddr + addr_offset); if (en) value |= DMA_CONTROL_SPH; else value &= ~DMA_CONTROL_SPH; - writel(value, ioaddr + DMA_CHAN_CONTROL(chan)); + writel(value, ioaddr + addr_offset); } -static int dwmac4_enable_tbs(void __iomem *ioaddr, bool en, u32 chan) +static inline void emac3_enable_sph(void __iomem *ioaddr, bool en, u32 chan) { - u32 value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); + do_enable_sph(ioaddr, en, EMAC3_DMA_CHAN_CONTROL(chan)); +} + +static inline void dwmac4_enable_sph(void __iomem *ioaddr, bool en, u32 chan) +{ + do_enable_sph(ioaddr, en, DMA_CHAN_CONTROL(chan)); +} + +static int do_enable_tbs(void __iomem *ioaddr, bool en, u32 addr_offset) +{ + u32 value = readl(ioaddr + addr_offset); if (en) value |= DMA_CONTROL_EDSE; else value &= ~DMA_CONTROL_EDSE; - writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); - value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)) & DMA_CONTROL_EDSE; + value = readl(ioaddr + addr_offset) & DMA_CONTROL_EDSE; if (en && !value) return -EIO; @@ -517,6 +679,16 @@ static int dwmac4_enable_tbs(void __iomem *ioaddr, bool en, u32 chan) return 0; } +static inline int emac3_enable_tbs(void __iomem *ioaddr, bool en, u32 chan) +{ + return do_enable_tbs(ioaddr, en, EMAC3_DMA_CHAN_TX_CONTROL(chan)); +} + +static inline int dwmac4_enable_tbs(void __iomem *ioaddr, bool en, u32 chan) +{ + return do_enable_tbs(ioaddr, en, DMA_CHAN_TX_CONTROL(chan)); +} + const struct stmmac_dma_ops dwmac4_dma_ops = { .reset = dwmac4_dma_reset, .init = dwmac4_dma_init, @@ -575,3 +747,33 @@ const struct stmmac_dma_ops dwmac410_dma_ops = { .enable_sph = dwmac4_enable_sph, .enable_tbs = dwmac4_enable_tbs, }; + +const struct stmmac_dma_ops emac3_dma_ops = { + .reset = dwmac4_dma_reset, + .init = dwmac4_dma_init, + .init_chan = emac3_dma_init_channel, + .init_rx_chan = emac3_dma_init_rx_chan, + .init_tx_chan = emac3_dma_init_tx_chan, + .axi = dwmac4_dma_axi, + .dump_regs = emac3_dump_dma_regs, + .dma_rx_mode = emac3_dma_rx_chan_op_mode, + .dma_tx_mode = emac3_dma_tx_chan_op_mode, + .enable_dma_irq = emac3_enable_dma_irq, + .disable_dma_irq = emac3_disable_dma_irq, + .start_tx = emac3_dma_start_tx, + .stop_tx = emac3_dma_stop_tx, + .start_rx = emac3_dma_start_rx, + .stop_rx = emac3_dma_stop_rx, + .dma_interrupt = emac3_dma_interrupt, + .get_hw_feature = dwmac4_get_hw_feature, + .rx_watchdog = emac3_rx_watchdog, + .set_rx_ring_len = emac3_set_rx_ring_len, + .set_tx_ring_len = emac3_set_tx_ring_len, + .set_rx_tail_ptr = emac3_set_rx_tail_ptr, + .set_tx_tail_ptr = emac3_set_tx_tail_ptr, + .enable_tso = emac3_enable_tso, + .qmode = emac3_qmode, + .set_bfsize = emac3_set_bfsize, + .enable_sph = emac3_enable_sph, + .enable_tbs = emac3_enable_tbs, +}; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h index 9321879b599c..c9899eefba6c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h @@ -93,8 +93,11 @@ #define DMA_TBS_DEF_FTOS (DMA_TBS_FTOS | DMA_TBS_FTOV) /* Following DMA defines are chanels oriented */ +#define EMAC3_DMA_CHAN_BASE_ADDR 0x00008100 +#define EMAC3_DMA_CHAN_BASE_OFFSET 0x1000 #define DMA_CHAN_BASE_ADDR 0x00001100 #define DMA_CHAN_BASE_OFFSET 0x80 + #define DMA_CHANX_BASE_ADDR(x) (DMA_CHAN_BASE_ADDR + \ (x * DMA_CHAN_BASE_OFFSET)) #define DMA_CHAN_REG_NUMBER 17 @@ -119,6 +122,29 @@ #define DMA_CHAN_CUR_RX_BUF_ADDR(x) (DMA_CHANX_BASE_ADDR(x) + 0x5c) #define DMA_CHAN_STATUS(x) (DMA_CHANX_BASE_ADDR(x) + 0x60) +#define EMAC3_DMA_CHANX_BASE_ADDR(x) (EMAC3_DMA_CHAN_BASE_ADDR + \ + ((x) * EMAC3_DMA_CHAN_BASE_OFFSET)) + +#define EMAC3_DMA_CHAN_CONTROL(x) EMAC3_DMA_CHANX_BASE_ADDR(x) +#define EMAC3_DMA_CHAN_TX_CONTROL(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x4) +#define EMAC3_DMA_CHAN_RX_CONTROL(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x8) +#define EMAC3_DMA_CHAN_TX_BASE_ADDR_HI(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x10) +#define EMAC3_DMA_CHAN_TX_BASE_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x14) +#define EMAC3_DMA_CHAN_RX_BASE_ADDR_HI(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x18) +#define EMAC3_DMA_CHAN_RX_BASE_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x1c) +#define EMAC3_DMA_CHAN_TX_END_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x20) +#define EMAC3_DMA_CHAN_RX_END_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x28) +#define EMAC3_DMA_CHAN_TX_RING_LEN(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x2c) +#define EMAC3_DMA_CHAN_RX_RING_LEN(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x30) +#define EMAC3_DMA_CHAN_INTR_ENA(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x34) +#define EMAC3_DMA_CHAN_RX_WATCHDOG(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x38) +#define EMAC3_DMA_CHAN_SLOT_CTRL_STATUS(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x3c) +#define EMAC3_DMA_CHAN_CUR_TX_DESC(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x44) +#define EMAC3_DMA_CHAN_CUR_RX_DESC(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x4c) +#define EMAC3_DMA_CHAN_CUR_TX_BUF_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x54) +#define EMAC3_DMA_CHAN_CUR_RX_BUF_ADDR(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x5c) +#define EMAC3_DMA_CHAN_STATUS(x) (EMAC3_DMA_CHANX_BASE_ADDR(x) + 0x60) + /* DMA Control X */ #define DMA_CONTROL_SPH BIT(24) #define DMA_CONTROL_MSS_MASK GENMASK(13, 0) @@ -220,19 +246,31 @@ #define DMA_CHAN0_DBG_STAT_RPS_SHIFT 8 int dwmac4_dma_reset(void __iomem *ioaddr); +void emac3_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); +void emac3_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx); +void emac3_dma_start_tx(void __iomem *ioaddr, u32 chan); void dwmac4_dma_start_tx(void __iomem *ioaddr, u32 chan); +void emac3_dma_stop_tx(void __iomem *ioaddr, u32 chan); void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan); +void emac3_dma_start_rx(void __iomem *ioaddr, u32 chan); void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan); +void emac3_dma_stop_rx(void __iomem *ioaddr, u32 chan); void dwmac4_dma_stop_rx(void __iomem *ioaddr, u32 chan); +int emac3_dma_interrupt(void __iomem *ioaddr, struct stmmac_extra_stats *x, + u32 chan, u32 dir); int dwmac4_dma_interrupt(void __iomem *ioaddr, struct stmmac_extra_stats *x, u32 chan, u32 dir); +void emac3_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan); void dwmac4_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan); +void emac3_set_tx_ring_len(void __iomem *ioaddr, u32 len, u32 chan); void dwmac4_set_tx_ring_len(void __iomem *ioaddr, u32 len, u32 chan); +void emac3_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan); void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan); +void emac3_set_tx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan); void dwmac4_set_tx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan); #endif /* __DWMAC4_DMA_H__ */ diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c index d1c605777985..3cbcc595bdfc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c @@ -25,55 +25,110 @@ int dwmac4_dma_reset(void __iomem *ioaddr) 10000, 1000000); } +void emac3_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan) +{ + writel(tail_ptr, ioaddr + EMAC3_DMA_CHAN_RX_END_ADDR(chan)); +} + void dwmac4_set_rx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan) { writel(tail_ptr, ioaddr + DMA_CHAN_RX_END_ADDR(chan)); } +void emac3_set_tx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan) +{ + writel(tail_ptr, ioaddr + EMAC3_DMA_CHAN_TX_END_ADDR(chan)); +} + void dwmac4_set_tx_tail_ptr(void __iomem *ioaddr, u32 tail_ptr, u32 chan) { writel(tail_ptr, ioaddr + DMA_CHAN_TX_END_ADDR(chan)); } -void dwmac4_dma_start_tx(void __iomem *ioaddr, u32 chan) +static void do_dma_start_tx(void __iomem *ioaddr, u32 addr_offset) { - u32 value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); + u32 value = readl(ioaddr + addr_offset); value |= DMA_CONTROL_ST; - writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); value = readl(ioaddr + GMAC_CONFIG); value |= GMAC_CONFIG_TE; writel(value, ioaddr + GMAC_CONFIG); } -void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan) +void emac3_dma_start_tx(void __iomem *ioaddr, u32 chan) +{ + do_dma_start_tx(ioaddr, EMAC3_DMA_CHAN_TX_CONTROL(chan)); +} + +void dwmac4_dma_start_tx(void __iomem *ioaddr, u32 chan) { - u32 value = readl(ioaddr + DMA_CHAN_TX_CONTROL(chan)); + do_dma_start_tx(ioaddr, DMA_CHAN_TX_CONTROL(chan)); +} + +static void do_dma_stop_tx(void __iomem *ioaddr, u32 addr_offset) +{ + u32 value = readl(ioaddr + addr_offset); value &= ~DMA_CONTROL_ST; - writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); } -void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan) +void emac3_dma_stop_tx(void __iomem *ioaddr, u32 chan) { - u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan)); + do_dma_stop_tx(ioaddr, EMAC3_DMA_CHAN_TX_CONTROL(chan)); +} + +void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan) +{ + do_dma_stop_tx(ioaddr, DMA_CHAN_TX_CONTROL(chan)); +} + +static void do_dma_start_rx(void __iomem *ioaddr, u32 addr_offset) +{ + u32 value = readl(ioaddr + addr_offset); value |= DMA_CONTROL_SR; - writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); value = readl(ioaddr + GMAC_CONFIG); value |= GMAC_CONFIG_RE; writel(value, ioaddr + GMAC_CONFIG); } -void dwmac4_dma_stop_rx(void __iomem *ioaddr, u32 chan) +void emac3_dma_start_rx(void __iomem *ioaddr, u32 chan) { - u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan)); + do_dma_start_rx(ioaddr, EMAC3_DMA_CHAN_RX_CONTROL(chan)); +} + +void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan) +{ + do_dma_start_rx(ioaddr, DMA_CHAN_RX_CONTROL(chan)); +} + +static void do_dma_stop_rx(void __iomem *ioaddr, u32 addr_offset) +{ + u32 value = readl(ioaddr + addr_offset); value &= ~DMA_CONTROL_SR; - writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan)); + writel(value, ioaddr + addr_offset); +} + +void emac3_dma_stop_rx(void __iomem *ioaddr, u32 chan) +{ + do_dma_stop_rx(ioaddr, EMAC3_DMA_CHAN_RX_CONTROL(chan)); +} + +void dwmac4_dma_stop_rx(void __iomem *ioaddr, u32 chan) +{ + do_dma_stop_rx(ioaddr, DMA_CHAN_RX_CONTROL(chan)); +} + +void emac3_set_tx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) +{ + writel(len, ioaddr + EMAC3_DMA_CHAN_TX_RING_LEN(chan)); } void dwmac4_set_tx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) @@ -81,6 +136,11 @@ void dwmac4_set_tx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) writel(len, ioaddr + DMA_CHAN_TX_RING_LEN(chan)); } +void emac3_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) +{ + writel(len, ioaddr + EMAC3_DMA_CHAN_RX_RING_LEN(chan)); +} + void dwmac4_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) { writel(len, ioaddr + DMA_CHAN_RX_RING_LEN(chan)); @@ -98,16 +158,27 @@ void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) writel(value, ioaddr + DMA_CHAN_INTR_ENA(chan)); } -void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) +static void do_enable_dma_irq(void __iomem *ioaddr, bool rx, bool tx, + u32 addr_offset) { - u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan)); + u32 value = readl(ioaddr + addr_offset); if (rx) value |= DMA_CHAN_INTR_DEFAULT_RX_4_10; if (tx) value |= DMA_CHAN_INTR_DEFAULT_TX_4_10; - writel(value, ioaddr + DMA_CHAN_INTR_ENA(chan)); + writel(value, ioaddr + addr_offset); +} + +void emac3_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) +{ + do_enable_dma_irq(ioaddr, rx, tx, EMAC3_DMA_CHAN_INTR_ENA(chan)); +} + +void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) +{ + do_enable_dma_irq(ioaddr, rx, tx, DMA_CHAN_INTR_ENA(chan)); } void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) @@ -122,23 +193,35 @@ void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) writel(value, ioaddr + DMA_CHAN_INTR_ENA(chan)); } -void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) +static void do_disable_dma_irq(void __iomem *ioaddr, bool rx, bool tx, + u32 addr_offset) { - u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan)); + u32 value = readl(ioaddr + addr_offset); if (rx) value &= ~DMA_CHAN_INTR_DEFAULT_RX_4_10; if (tx) value &= ~DMA_CHAN_INTR_DEFAULT_TX_4_10; - writel(value, ioaddr + DMA_CHAN_INTR_ENA(chan)); + writel(value, ioaddr + addr_offset); } -int dwmac4_dma_interrupt(void __iomem *ioaddr, - struct stmmac_extra_stats *x, u32 chan, u32 dir) +void emac3_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) { - u32 intr_status = readl(ioaddr + DMA_CHAN_STATUS(chan)); - u32 intr_en = readl(ioaddr + DMA_CHAN_INTR_ENA(chan)); + do_disable_dma_irq(ioaddr, rx, tx, EMAC3_DMA_CHAN_INTR_ENA(chan)); +} + +void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx) +{ + do_disable_dma_irq(ioaddr, rx, tx, DMA_CHAN_INTR_ENA(chan)); +} + +static int do_dma_interrupt(void __iomem *ioaddr, struct stmmac_extra_stats *x, + u32 chan, u32 dir, u32 addr_offset, + u32 intr_addr_offset) +{ + u32 intr_status = readl(ioaddr + addr_offset); + u32 intr_en = readl(ioaddr + intr_addr_offset); int ret = 0; if (dir == DMA_DIR_RX) @@ -183,10 +266,25 @@ int dwmac4_dma_interrupt(void __iomem *ioaddr, if (unlikely(intr_status & DMA_CHAN_STATUS_ERI)) x->rx_early_irq++; - writel(intr_status & intr_en, ioaddr + DMA_CHAN_STATUS(chan)); + writel(intr_status & intr_en, ioaddr + addr_offset); return ret; } +int emac3_dma_interrupt(void __iomem *ioaddr, struct stmmac_extra_stats *x, + u32 chan, u32 dir) +{ + return do_dma_interrupt(ioaddr, x, chan, dir, + EMAC3_DMA_CHAN_STATUS(chan), + EMAC3_DMA_CHAN_INTR_ENA(chan)); +} + +int dwmac4_dma_interrupt(void __iomem *ioaddr, struct stmmac_extra_stats *x, + u32 chan, u32 dir) +{ + return do_dma_interrupt(ioaddr, x, chan, dir, DMA_CHAN_STATUS(chan), + DMA_CHAN_INTR_ENA(chan)); +} + void stmmac_dwmac4_set_mac_addr(void __iomem *ioaddr, const u8 addr[6], unsigned int high, unsigned int low) { diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index bb7114f970f8..7d8aa5e316cf 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -91,6 +91,7 @@ static const struct stmmac_hwif_entry { bool gmac; bool gmac4; bool xgmac; + bool emac3; u32 min_id; u32 dev_id; const struct stmmac_regs_off regs; @@ -251,6 +252,25 @@ static const struct stmmac_hwif_entry { .mmc = &dwxgmac_mmc_ops, .setup = dwxlgmac2_setup, .quirks = stmmac_dwxlgmac_quirks, + }, { + .gmac = false, + .gmac4 = false, + .xgmac = false, + .emac3 = true, + .min_id = DWMAC_CORE_5_10, + .regs = { + .ptp_off = PTP_GMAC4_OFFSET, + .mmc_off = MMC_GMAC4_OFFSET, + }, + .desc = &dwmac4_desc_ops, + .dma = &emac3_dma_ops, + .mac = &emac3_ops, + .hwtimestamp = &stmmac_ptp, + .mode = &dwmac4_ring_mode_ops, + .tc = &dwmac510_tc_ops, + .mmc = &dwmac_mmc_ops, + .setup = dwmac4_setup, + .quirks = NULL, }, }; @@ -259,6 +279,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv) bool needs_xgmac = priv->plat->has_xgmac; bool needs_gmac4 = priv->plat->has_gmac4; bool needs_gmac = priv->plat->has_gmac; + bool needs_emac3 = priv->plat->has_emac3; const struct stmmac_hwif_entry *entry; struct mac_device_info *mac; bool needs_setup = true; @@ -267,7 +288,7 @@ int stmmac_hwif_init(struct stmmac_priv *priv) if (needs_gmac) { id = stmmac_get_id(priv, GMAC_VERSION); - } else if (needs_gmac4 || needs_xgmac) { + } else if (needs_gmac4 || needs_xgmac || needs_emac3) { id = stmmac_get_id(priv, GMAC4_VERSION); if (needs_xgmac) dev_id = stmmac_get_dev_id(priv, GMAC4_VERSION); @@ -280,9 +301,9 @@ int stmmac_hwif_init(struct stmmac_priv *priv) /* Lets assume some safe values first */ priv->ptpaddr = priv->ioaddr + - (needs_gmac4 ? PTP_GMAC4_OFFSET : PTP_GMAC3_X_OFFSET); + ((needs_gmac4 || needs_emac3) ? PTP_GMAC4_OFFSET : PTP_GMAC3_X_OFFSET); priv->mmcaddr = priv->ioaddr + - (needs_gmac4 ? MMC_GMAC4_OFFSET : MMC_GMAC3_X_OFFSET); + ((needs_gmac4 || needs_emac3) ? MMC_GMAC4_OFFSET : MMC_GMAC3_X_OFFSET); /* Check for HW specific setup first */ if (priv->plat->setup) { @@ -305,6 +326,8 @@ int stmmac_hwif_init(struct stmmac_priv *priv) continue; if (needs_xgmac ^ entry->xgmac) continue; + if (needs_emac3 ^ entry->emac3) + continue; /* Use synopsys_id var because some setups can override this */ if (priv->synopsys_id < entry->min_id) continue; diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index 16a7421715cb..44d77ced27cc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -620,6 +620,8 @@ struct stmmac_regs_off { u32 mmc_off; }; +extern const struct stmmac_ops emac3_ops; +extern const struct stmmac_dma_ops emac3_dma_ops; extern const struct stmmac_ops dwmac100_ops; extern const struct stmmac_dma_ops dwmac100_dma_ops; extern const struct stmmac_ops dwmac1000_ops; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index 35c8dd92d369..0f62e5f85b60 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -286,7 +286,7 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev, { struct stmmac_priv *priv = netdev_priv(dev); - if (priv->plat->has_gmac || priv->plat->has_gmac4) + if (priv->plat->has_gmac || priv->plat->has_gmac4 || priv->plat->has_emac3) strscpy(info->driver, GMAC_ETHTOOL_NAME, sizeof(info->driver)); else if (priv->plat->has_xgmac) strscpy(info->driver, XGMAC_ETHTOOL_NAME, sizeof(info->driver)); @@ -442,7 +442,7 @@ static int stmmac_ethtool_get_regs_len(struct net_device *dev) if (priv->plat->has_xgmac) return XGMAC_REGSIZE * 4; - else if (priv->plat->has_gmac4) + else if (priv->plat->has_gmac4 || priv->plat->has_emac3) return GMAC4_REG_SPACE_SIZE; return REG_SPACE_SIZE; } @@ -457,7 +457,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev, stmmac_dump_dma_regs(priv, priv->ioaddr, reg_space); /* Copy DMA registers to where ethtool expects them */ - if (priv->plat->has_gmac4) { + if (priv->plat->has_gmac4 || priv->plat->has_emac3) { /* GMAC4 dumps its DMA registers at its DMA_CHAN_BASE_ADDR */ memcpy(®_space[ETHTOOL_DMA_OFFSET], ®_space[GMAC4_DMA_CHAN_BASE_ADDR / 4], diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 8f543c3ab5c5..d086fe811b67 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -509,7 +509,8 @@ bool stmmac_eee_init(struct stmmac_priv *priv) true); } - if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) { + if ((priv->plat->has_gmac4 || priv->plat->has_emac3) && + priv->tx_lpi_timer <= STMMAC_ET_MAX) { del_timer_sync(&priv->eee_ctrl_timer); priv->tx_path_in_lpi_mode = false; stmmac_lpi_entry_timer_config(priv, 1); @@ -585,7 +586,7 @@ static void stmmac_get_rx_hwtstamp(struct stmmac_priv *priv, struct dma_desc *p, if (!priv->hwts_rx_en) return; /* For GMAC4, the valid timestamp is from CTX next desc. */ - if (priv->plat->has_gmac4 || priv->plat->has_xgmac) + if (priv->plat->has_gmac4 || priv->plat->has_emac3 || priv->plat->has_xgmac) desc = np; /* Check if timestamp is available */ @@ -833,7 +834,7 @@ static int stmmac_hwtstamp_get(struct net_device *dev, struct ifreq *ifr) */ int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags) { - bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac; + bool xmac = priv->plat->has_gmac4 || priv->plat->has_emac3 || priv->plat->has_xgmac; struct timespec64 now; u32 sec_inc = 0; u64 temp = 0; @@ -881,7 +882,7 @@ EXPORT_SYMBOL_GPL(stmmac_init_tstamp_counter); */ static int stmmac_init_ptp(struct stmmac_priv *priv) { - bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac; + bool xmac = priv->plat->has_gmac4 || priv->plat->has_emac3 || priv->plat->has_xgmac; int ret; if (priv->plat->ptp_clk_freq_config) @@ -1207,7 +1208,7 @@ static int stmmac_phy_setup(struct stmmac_priv *priv) if (!max_speed || max_speed >= 1000) priv->phylink_config.mac_capabilities |= MAC_1000; - if (priv->plat->has_gmac4) { + if (priv->plat->has_gmac4 || priv->plat->has_emac3) { if (!max_speed || max_speed >= 2500) priv->phylink_config.mac_capabilities |= MAC_2500FD; } else if (priv->plat->has_xgmac) { @@ -4343,7 +4344,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) if (skb_is_gso(skb) && priv->tso) { if (gso & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) return stmmac_tso_xmit(skb, dev); - if (priv->plat->has_gmac4 && (gso & SKB_GSO_UDP_L4)) + if ((priv->plat->has_gmac4 || priv->plat->has_emac3) && (gso & SKB_GSO_UDP_L4)) return stmmac_tso_xmit(skb, dev); } @@ -5721,7 +5722,7 @@ static void stmmac_common_interrupt(struct stmmac_priv *priv) u32 queue; bool xmac; - xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac; + xmac = priv->plat->has_gmac4 || priv->plat->has_emac3 || priv->plat->has_xgmac; queues_count = (rx_cnt > tx_cnt) ? rx_cnt : tx_cnt; if (priv->irq_wake) @@ -7165,7 +7166,7 @@ int stmmac_dvr_probe(struct device *device, if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) { ndev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6; - if (priv->plat->has_gmac4) + if (priv->plat->has_gmac4 || priv->plat->has_emac3) ndev->hw_features |= NETIF_F_GSO_UDP_L4; priv->tso = true; dev_info(priv->device, "TSO feature enabled\n"); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index 21aaa2730ac8..9e3d8e1202bd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -281,9 +281,8 @@ static int stmmac_mdio_read_c22(struct mii_bus *bus, int phyaddr, int phyreg) value |= (phyreg << priv->hw->mii.reg_shift) & priv->hw->mii.reg_mask; value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) & priv->hw->mii.clk_csr_mask; - if (priv->plat->has_gmac4) { + if (priv->plat->has_gmac4 || priv->plat->has_emac3) value |= MII_GMAC4_READ; - } data = stmmac_mdio_read(priv, data, value); @@ -382,7 +381,7 @@ static int stmmac_mdio_write_c22(struct mii_bus *bus, int phyaddr, int phyreg, value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) & priv->hw->mii.clk_csr_mask; - if (priv->plat->has_gmac4) + if (priv->plat->has_gmac4 || priv->plat->has_emac3) value |= MII_GMAC4_WRITE; else value |= MII_WRITE; @@ -483,7 +482,7 @@ int stmmac_mdio_reset(struct mii_bus *bus) * on MDC, so perform a dummy mdio read. To be updated for GMAC4 * if needed. */ - if (!priv->plat->has_gmac4) + if (!priv->plat->has_gmac4 && !priv->plat->has_emac3) writel(0, priv->ioaddr + mii_address); #endif return 0; @@ -569,7 +568,7 @@ int stmmac_mdio_register(struct net_device *ndev) } else { new_bus->read = &stmmac_mdio_read_c22; new_bus->write = &stmmac_mdio_write_c22; - if (priv->plat->has_gmac4) { + if (priv->plat->has_gmac4 || priv->plat->has_emac3) { new_bus->read_c45 = &stmmac_mdio_read_c45; new_bus->write_c45 = &stmmac_mdio_write_c45; } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index b4388ca8d211..9a8f9630d6af 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -56,7 +56,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta) bool xmac, est_rst = false; int ret; - xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac; + xmac = priv->plat->has_gmac4 || priv->plat->has_emac3 || priv->plat->has_xgmac; if (delta < 0) { neg_adj = 1; @@ -292,7 +292,7 @@ void stmmac_ptp_register(struct stmmac_priv *priv) /* Calculate the clock domain crossing (CDC) error if necessary */ priv->plat->cdc_error_adj = 0; - if (priv->plat->has_gmac4 && priv->plat->clk_ptp_rate) + if ((priv->plat->has_gmac4 || priv->plat->has_emac3) && priv->plat->clk_ptp_rate) priv->plat->cdc_error_adj = (2 * NSEC_PER_SEC) / priv->plat->clk_ptp_rate; stmmac_ptp_clock_ops.n_per_out = priv->dma_cap.pps_out_num; diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index a152678b82b7..de2d0a8693c8 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -248,6 +248,7 @@ struct plat_stmmacenet_data { struct stmmac_axi *axi; int has_gmac4; bool has_sun8i; + bool has_emac3; bool tso_en; int rss_en; int mac_port_sel_speed; From patchwork Mon Mar 13 16:56:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1307814wrd; Mon, 13 Mar 2023 10:18:43 -0700 (PDT) X-Google-Smtp-Source: AK7set+c2DIZQ6dPaU7rMNTjGvK+2bNFHuPM5zW8pmrAOwbc/ufBWysl5eqrIc0rWYW2KpHTJwGM X-Received: by 2002:a17:902:e801:b0:19e:839e:49d8 with SMTP id u1-20020a170902e80100b0019e839e49d8mr42406727plg.59.1678727923625; Mon, 13 Mar 2023 10:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727923; cv=none; d=google.com; s=arc-20160816; b=FfnjVXYpsgR0iD8I7nihRQz+0BBwCIUule1EygATCpSKpMyw/Qkip1CABJF5EFPwsC BtMU9+GJaVFMYGYCnjke3Qx5X8x8SeiZalgs7SFzJBEOrljkobY45ngcfSTI2n4cYizj 2KiuExigBpx/OaHffPIVXL8SNnu7kGUpL0Ny2AO1URKWZNqXKsfW2HKpdsJNEir53+R+ itR+hK9UgAjLnojuhsJgoZNpTZr2eKfTuUbyBX3Gd4F0a7HBkD0y22rSkGeT1nhlh+dW AnySL+/8ZfdlzS3UNhbJiUCHZ/BkhBNXehYPGEJhFg3wvDgxmCFpIvcMtiR0LVIcO5RX HmmQ== 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=UvT8dewLuU3QnqVEc1CXfBrmN1ZPxzVWkwUJz3YT87Y=; b=0WD1wtGNa9CSjk0NqQsor9cQ6rij/xjJJBGDWlTalxco8lFp/+Mv9nT/aaiJpx3Uym xbEG7YdwgtBydJ25faDMNj1YXG0BI4YYh8lbZvWjBEc5D7gqdNt7OluNT8xiUeTqdhhZ CEZZ6rRRkerS0t/yZPAebSOI9ucAE8QzaswKJ5W3L8yp62MuzKVbqvZ8o8/+fsbGcNT0 ELeOQ9OPAdBTLKrKSWiRAZ6Gai8Gd4VVGd0UxyJH5DkNfK6KYeFGfITL8an0TjIQTY6d o1Nt90guzB9ZWoOzat/1FFWGjw7sVIN76cwITqdnnhbgV2HsLSnxsw6JR5sUzhqW3IH5 QoAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=b3P+dH06; 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 p2-20020a170902780200b0019e8928b3besi216164pll.248.2023.03.13.10.18.30; Mon, 13 Mar 2023 10:18:43 -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=b3P+dH06; 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 S231207AbjCMRA2 (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231666AbjCMRAE (ORCPT ); Mon, 13 Mar 2023 13:00:04 -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 16C207202B for ; Mon, 13 Mar 2023 09:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726688; 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=UvT8dewLuU3QnqVEc1CXfBrmN1ZPxzVWkwUJz3YT87Y=; b=b3P+dH06PwygBUVFaUNGL/Enq1w7dAm2+WqgTSt3jBYWQiUlsAcb6PybV6qvgP8kz2U4iV ECC8UndJaNravCiS0oB2rnykAwtCjK0coXDhsQSEDs8YC3Obn6OT0qW7tOzlcb7u4a91r3 Y1D4rv3Ka7Fdizdu26RBHCaCh+5P65M= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-67-Z4Z04nNENj2zczoMRyj5eg-1; Mon, 13 Mar 2023 12:58:07 -0400 X-MC-Unique: Z4Z04nNENj2zczoMRyj5eg-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-1779d667819so3066860fac.19 for ; Mon, 13 Mar 2023 09:58:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726686; 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=UvT8dewLuU3QnqVEc1CXfBrmN1ZPxzVWkwUJz3YT87Y=; b=o+09grFn2hCqZq1S+pv12fHPoj1qkMQB9Kd/HEEwL09Vj5Cb+NLYPBxc8OXevGvw+5 8+1JXF91EGXJbLNFcd2rUKA+it2dE+WWZvCDzNDNsMAS5HIUNSuqm9Q+TokbjTRuiXl1 NLT6pMbfzScmZdq2hivtfBcp4OrSpjvGbdppUSs2+guakafU5LLt23Ja1Q/H+4LmeeFL EFEWtCID/EbP+Nu0klgmsy9520+8Es+ppR+0DEEllqHBlJ9aO8jnk6G/YBlX7XCfqg1O zXZ80RQ+C7bKyZMDodTSkgr/xpqkQzBlkdgrV1V/aBDw+P1RwwNlqnWEJBGzQCi19eLt cZUA== X-Gm-Message-State: AO0yUKV1BU6oBWYAHb1EzvKbEgzExGG7bQxqUjGGmU5Lt9J8eRyrcgJY QOGeaWS8lFJi7UlpZxigfY2jMl1Nrfip0e7se1TOoYm0kr8ZopR3z38HHbwXos7XAHZ8LqCOzv9 bZmxAW3r8987tRGX6hqEDV1gk7TAHvrTirsAfjPlINuMssTd41PeCfqHoJBCCpxkuOXwhJXH5Rt LTfmYLECIyshs= X-Received: by 2002:a05:6808:a19:b0:37f:8776:7fb with SMTP id n25-20020a0568080a1900b0037f877607fbmr15913867oij.24.1678726686642; Mon, 13 Mar 2023 09:58:06 -0700 (PDT) X-Received: by 2002:a05:6808:a19:b0:37f:8776:7fb with SMTP id n25-20020a0568080a1900b0037f877607fbmr15913817oij.24.1678726686349; Mon, 13 Mar 2023 09:58:06 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:58:06 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 09/11] net: ethernet: stmmac: dwmac-qcom-ethqos: Respect phy-mode and TX delay Date: Mon, 13 Mar 2023 11:56:18 -0500 Message-Id: <20230313165620.128463-10-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273810858347116?= X-GMAIL-MSGID: =?utf-8?q?1760273810858347116?= 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 --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 19 ++++++++++++++----- 1 file changed, 14 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 732774645c1a..6f272cae330d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -279,6 +279,16 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos) static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) { + int phy_mode; + int phase_shift; + + /* 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 +310,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 +346,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 +384,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); From patchwork Mon Mar 13 16:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68959 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1307086wrd; Mon, 13 Mar 2023 10:17:19 -0700 (PDT) X-Google-Smtp-Source: AK7set9a2Dh4asz/TIjBPtru2h+bdRVcy+4q8Q7MAOrl8cv6ngIhiK2PwX6xw1ZZHfLFpkFwQ0co X-Received: by 2002:a62:17c4:0:b0:624:673f:aae8 with SMTP id 187-20020a6217c4000000b00624673faae8mr2701937pfx.3.1678727838679; Mon, 13 Mar 2023 10:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727838; cv=none; d=google.com; s=arc-20160816; b=TYswYC5nFssDwXCPKpFRXk7yMBavk3gCNqSh90ZO70bO0szMP3pQNgauM63rALCSe+ PgdaqUC1JBmxsYoHy3hFs+utgTFrAiOPScxB3k6zRP26y2W0P9Yjsx09V0jsYbd38a55 +dOA0eU9wEHPRRw+I+LjCGHzCcGRyOu30aHdVrmOLLIYFUZuuZEhtAWiuVI1Hca0a8Tf C6vYDY1B/03uUgT4796bkSESiYGTSQtO32SOwMJyEojybMjxUnONvLmHvorv197e7rkh KC0veA8ZZwKHpDTJKGtIxQP7+9oPVNTcCt9zplI/K9oVlUy3K4a2wRk+HW6tbQeoNTtE ATvA== 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=froEIgd/jTK8vMet67sF4Svy58nAbygAJuDZdwZXRoo=; b=fnMx/BX9znKFdHzxmCXeUSIgGoGGmUpDs9umJLeDUdEi/000eVK7HEIH7/gtX69lKh OkzIpD8SgILB3I10WypNcOni7j9D/X1H9iVyhBNLjmjkWepznSOfNRLZcSP/zfRBbEJS qWdB4Hvv3PQDB+hX8Hzncq5drx45mMX/AEjUrrR5P8aQFpjU0F9WP0O6m/GWa04okBYX EaxZ2tICXloly3E3ywdkkMkKmwsQPyhZat6oRZo+6JkmOQAYxN/t+LQpFKR01xP4lqAr +EmlEDpdh4pdRyF4B0f4m3K9tdQFxKy66z16rwDfHKYHgY5mNyeSdseJBmZz75+mCEjW h3Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bUXgj8S8; 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 f21-20020a635115000000b004fb9330dcfcsi7087775pgb.323.2023.03.13.10.17.05; Mon, 13 Mar 2023 10:17:18 -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=bUXgj8S8; 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 S231517AbjCMRAe (ORCPT + 99 others); Mon, 13 Mar 2023 13:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231695AbjCMRAG (ORCPT ); Mon, 13 Mar 2023 13:00:06 -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 20A827C3F8 for ; Mon, 13 Mar 2023 09:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726693; 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=froEIgd/jTK8vMet67sF4Svy58nAbygAJuDZdwZXRoo=; b=bUXgj8S8YumsAln3yZzgCEgIc9ixPEjmLDbxyT1T+pE/MNCqP0R5eW0GO1Ia04Ija7rR39 7Q55D/ANfaJLg5g7zHnRTYxtsUzAqrdO/LMqoWYdj0jPnT5jjXzAQ8N2h0inVjVArqBZIg AfiVK7a27CXARRZZ1GgR5cJp6IztJK0= Received: from mail-oa1-f71.google.com (mail-oa1-f71.google.com [209.85.160.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-ghklsQMvOZufFERA1Dsbmg-1; Mon, 13 Mar 2023 12:58:12 -0400 X-MC-Unique: ghklsQMvOZufFERA1Dsbmg-1 Received: by mail-oa1-f71.google.com with SMTP id 586e51a60fabf-17268e44df1so7500639fac.9 for ; Mon, 13 Mar 2023 09:58:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726691; 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=froEIgd/jTK8vMet67sF4Svy58nAbygAJuDZdwZXRoo=; b=yUKbA3VKaJ/6aaRDhoh39PMseRwizVn0tlChT32e0gd9zdjRVw8Z5hc2FspDuTmpMG o7BEjjBwGVynnQwFX/YrkP0f+4BbQUapC1o83LOzoD9150k4l0SNuTcRCKRn7JildbZx e69hdKRDKuasiN0GytdaWzo0W0cYhDVWZf/SLPc+pl9XDr7gmdNx18LkgH80P7jbZ0EP /Mi57K+id0Qtd/YE55m/g6lE0aUWQKl05N808AT4OI6sWRz7vY+gBscYilhZxx5yYxvX 6Yr7ltjcr8/upKo+ZetSyTv8CVpqM3j+RmuI5VwwAOj91BnVJrqngTh/Pt+7BZsmXRXN BxlQ== X-Gm-Message-State: AO0yUKUQx73oShNetwBudMVGglif4ew6vOw0v2pb7tge7BVOy5JGw9eG XWzcxaFuyFZQTQ7+bFoaNk8d++DV+bL5SRoNTz6r+Tp/KWMYoPXK3QWInG7q9VtHYbGuJxl+0hA e0hmWOo2ylBMAcGwcHny2QNpIfZUHCQe6WKtMYFXDQqZzw27NpTeUTCvxGiPUpeEEhLOdbppBTx h3zFYHCG5g1f8= X-Received: by 2002:a54:4581:0:b0:378:2e00:6059 with SMTP id z1-20020a544581000000b003782e006059mr15770446oib.1.1678726690991; Mon, 13 Mar 2023 09:58:10 -0700 (PDT) X-Received: by 2002:a54:4581:0:b0:378:2e00:6059 with SMTP id z1-20020a544581000000b003782e006059mr15770404oib.1.1678726690652; Mon, 13 Mar 2023 09:58:10 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:58:10 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 10/11] net: ethernet: stmmac: dwmac-qcom-ethqos: Use loopback_en for all speeds Date: Mon, 13 Mar 2023 11:56:19 -0500 Message-Id: <20230313165620.128463-11-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273722128515944?= X-GMAIL-MSGID: =?utf-8?q?1760273722128515944?= It seems that this variable should be used for all speeds, not just 1000/100. While at it refactor it slightly to be more readable, including fixing the typo in the variable name. Signed-off-by: Andrew Halaney --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 6f272cae330d..778852934e36 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -78,7 +78,7 @@ struct ethqos_emac_por { struct ethqos_emac_driver_data { const struct ethqos_emac_por *por; unsigned int num_por; - bool rgmii_config_looback_en; + bool rgmii_config_loopback_en; }; struct qcom_ethqos { @@ -91,7 +91,7 @@ struct qcom_ethqos { const struct ethqos_emac_por *por; unsigned int num_por; - bool rgmii_config_looback_en; + bool rgmii_config_loopback_en; }; static int rgmii_readl(struct qcom_ethqos *ethqos, unsigned int offset) @@ -183,7 +183,7 @@ static const struct ethqos_emac_por emac_v2_3_0_por[] = { static const struct ethqos_emac_driver_data emac_v2_3_0_data = { .por = emac_v2_3_0_por, .num_por = ARRAY_SIZE(emac_v2_3_0_por), - .rgmii_config_looback_en = true, + .rgmii_config_loopback_en = true, }; static const struct ethqos_emac_por emac_v2_1_0_por[] = { @@ -198,7 +198,7 @@ static const struct ethqos_emac_por emac_v2_1_0_por[] = { static const struct ethqos_emac_driver_data emac_v2_1_0_data = { .por = emac_v2_1_0_por, .num_por = ARRAY_SIZE(emac_v2_1_0_por), - .rgmii_config_looback_en = false, + .rgmii_config_loopback_en = false, }; static int ethqos_dll_configure(struct qcom_ethqos *ethqos) @@ -281,6 +281,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) { int phy_mode; int phase_shift; + int loopback; /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */ phy_mode = device_get_phy_mode(ðqos->pdev->dev); @@ -293,6 +294,12 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, RGMII_CONFIG2_TX_TO_RX_LOOPBACK_EN, 0, RGMII_IO_MACRO_CONFIG2); + /* Determine if this platform wants loopback enabled after programming */ + if (ethqos->rgmii_config_loopback_en) + loopback = RGMII_CONFIG_LOOPBACK_EN; + else + loopback = 0; + /* Select RGMII, write 0 to interface select */ rgmii_updatel(ethqos, RGMII_CONFIG_INTF_SEL, 0, RGMII_IO_MACRO_CONFIG); @@ -325,12 +332,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN, SDCC_DDR_CONFIG_PRG_DLY_EN, SDCC_HC_REG_DDR_CONFIG); - if (ethqos->rgmii_config_looback_en) - rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, - RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG); - else - rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, - 0, RGMII_IO_MACRO_CONFIG); + rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, + loopback, RGMII_IO_MACRO_CONFIG); break; case SPEED_100: @@ -362,13 +365,8 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN, SDCC_HC_REG_DDR_CONFIG); - if (ethqos->rgmii_config_looback_en) - rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, - RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG); - else - rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, - 0, RGMII_IO_MACRO_CONFIG); - + rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, + loopback, RGMII_IO_MACRO_CONFIG); break; case SPEED_10: @@ -402,7 +400,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN, SDCC_HC_REG_DDR_CONFIG); rgmii_updatel(ethqos, RGMII_CONFIG_LOOPBACK_EN, - RGMII_CONFIG_LOOPBACK_EN, RGMII_IO_MACRO_CONFIG); + loopback, RGMII_IO_MACRO_CONFIG); break; default: dev_err(ðqos->pdev->dev, @@ -547,7 +545,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) data = of_device_get_match_data(&pdev->dev); ethqos->por = data->por; ethqos->num_por = data->num_por; - ethqos->rgmii_config_looback_en = data->rgmii_config_looback_en; + ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii"); if (IS_ERR(ethqos->rgmii_clk)) { From patchwork Mon Mar 13 16:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Halaney X-Patchwork-Id: 68952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1302139wrd; Mon, 13 Mar 2023 10:07:46 -0700 (PDT) X-Google-Smtp-Source: AK7set8nh7UUO5Ik6eBJvuB9I6HvLMGJFnLfBP4tjrWDC6UxdlEGEhQAiyvJ5+lB0pbrFhKcJ3ye X-Received: by 2002:a17:90b:e85:b0:23b:4f1d:f5d9 with SMTP id fv5-20020a17090b0e8500b0023b4f1df5d9mr6286416pjb.30.1678727265950; Mon, 13 Mar 2023 10:07:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678727265; cv=none; d=google.com; s=arc-20160816; b=ixYx3Y/h2h1G9dVi67iWBfGJYgT6HO7N96r7r9aQ3MIAo4ZWMwLcNgHW3TL6n3chAy ZU7tNTB7Q5ijPYW8Er/0JOssi0NiZnQnzlMspvxVTrgPGOuj0SX1F41dpUQXyOXIIB4i ZUkzuO53Fufqr842E44U4xPErEYU7CCCcrawdYDGslO8bav7AFiBHZx5LEB3yMwJ9+SL zgZ8jhukVCx3U6L6gXNw6rTg0PIscRT2Ci2iG/k4OkULX3UhdzzsTs9rGjlryaQiaYUk zfu7X2eZI5Al9JPjMe1N8mIBKyXFnAjikk65WApximFVNC+lRKUqWl8b5Omu2f1nFgjB 9Z+A== 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=WVl6orxzuvHm+XLKzWjqWDvJoROxMGFFnqYcN6mqTg0=; b=pRBocZ/vQ0rP8n92bgVjKCyfSsvvBGk+92D0qCC132D0lUXPlgEIGFsPpq5IzQcS3A sj2XylDpkii3sjzUUPNsAdK6pyFPolg24Pbjdf9EIOZVqDJeblKaSGG9p2VkL4zNZ/vT k1eXuLfGH7Ixf+iNwjZROMNF4KDt5Mf0OaNnPVWaI5htLu1P7VwrxcoLwd+3VsQ3L+jS OJ8C19sMoqOFmFZVtLPQNxsvkoTWQRH2GXxUpHJguDlollv6Hxvb6fgAITmDvwayasyS 7YMaT1Y9qbdJjzimE+82CkMfz8Gr3sw+UhqEX8ZSwBBlJ6rjdofC0yNLYMtiqVlor3La gYxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QxwCjvDD; 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 i8-20020a17090ad34800b00234ba949302si182875pjx.91.2023.03.13.10.07.30; Mon, 13 Mar 2023 10:07:45 -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=QxwCjvDD; 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 S230231AbjCMRB1 (ORCPT + 99 others); Mon, 13 Mar 2023 13:01:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231724AbjCMRAK (ORCPT ); Mon, 13 Mar 2023 13:00:10 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 804D82915D for ; Mon, 13 Mar 2023 09:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678726702; 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=WVl6orxzuvHm+XLKzWjqWDvJoROxMGFFnqYcN6mqTg0=; b=QxwCjvDD8jlJuHUy++WtA+mKzojZVAHhcA8kvY0ltL7bexnUSxeiccRl5Rm7L1DCi4rKv+ ssGEyl4POCzTeviB99c5o031snojMz2Pa63C8SSctlBiPiLratqoq8m9vk8bSILTqzKc/h zVNy10M6ORXvU2usv5VfD7XcokmIZ3Y= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-t8G6F9zmMXOWix7WBRdfhw-1; Mon, 13 Mar 2023 12:58:21 -0400 X-MC-Unique: t8G6F9zmMXOWix7WBRdfhw-1 Received: by mail-oi1-f199.google.com with SMTP id s10-20020a056808208a00b0038445b695f9so5703057oiw.15 for ; Mon, 13 Mar 2023 09:58:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678726700; 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=WVl6orxzuvHm+XLKzWjqWDvJoROxMGFFnqYcN6mqTg0=; b=w3FQOV/KybjTSnzJIi646JZYA0GG4PAIZtJyfcIESV8eyrNDRY2QTXrtSmyLnZjQDX HC43iZd9Eu8MxjeiG7iHwtovF+nBPGB7iHUbGHvO0Mpaa0xHgsaKqGzk8nzwYSezZm1L 6QOcsBuSvHer6JYKwrhm12qJ+kWUrAzFxqZIOpkBicPIr74tsO2Mo3Vu4FvwtFCrAAk2 5p7HTAaTh30e6Tgj910PXTkm+DAPJjPCeIyF0MFCgYnJMv4Evpcdg0mALYyOe3Hnvw+S r6qTgfY3uU88dywJdsv/BGh4RXv3XkPrbs7l7e0mFMgGszJ2BHWWVTepkn+PS3U3oAPo DFpw== X-Gm-Message-State: AO0yUKWhhRWWGIEtfKOpyuT+pCHo1QmfuDTE7VZi/zrwDcsRmp4w1dKL m9TCQKdGTw5z7UjwQSS8+H+SATdspf36mKPTO9DflWvkQCekKzbpQFBnt3oQ5b6wAoq+5uzEcsi UIR7788SvilUKV9fNnYkzR4XTA2EAJbv075v+7pbEvczk8epXAlDNmMhkl0v9zFPmfZMskNxqIW PpmZlVihFDm4A= X-Received: by 2002:aca:f0f:0:b0:378:2270:8876 with SMTP id 15-20020aca0f0f000000b0037822708876mr16119590oip.29.1678726700302; Mon, 13 Mar 2023 09:58:20 -0700 (PDT) X-Received: by 2002:aca:f0f:0:b0:378:2270:8876 with SMTP id 15-20020aca0f0f000000b0037822708876mr16119547oip.29.1678726699920; Mon, 13 Mar 2023 09:58:19 -0700 (PDT) Received: from halaney-x13s.attlocal.net ([2600:1700:1ff0:d0e0::21]) by smtp.gmail.com with ESMTPSA id o2-20020acad702000000b00384d3003fa3sm3365273oig.26.2023.03.13.09.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 09:58:19 -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, mturquette@baylibre.com, sboyd@kernel.org, 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-clk@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, Andrew Halaney Subject: [PATCH net-next 11/11] net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support Date: Mon, 13 Mar 2023 11:56:20 -0500 Message-Id: <20230313165620.128463-12-ahalaney@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313165620.128463-1-ahalaney@redhat.com> References: <20230313165620.128463-1-ahalaney@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,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?1760273121654181154?= X-GMAIL-MSGID: =?utf-8?q?1760273121654181154?= Add the new programming sequence needed for EMAC3 based platforms such as the sc8280xp family. Signed-off-by: Andrew Halaney --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 106 ++++++++++++++---- 1 file changed, 84 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 778852934e36..2b22469c59cf 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -11,6 +11,7 @@ #define RGMII_IO_MACRO_CONFIG 0x0 #define SDCC_HC_REG_DLL_CONFIG 0x4 +#define SDCC_TEST_CTL 0x8 #define SDCC_HC_REG_DDR_CONFIG 0xC #define SDCC_HC_REG_DLL_CONFIG2 0x10 #define SDC4_STATUS 0x14 @@ -49,6 +50,7 @@ #define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY GENMASK(26, 21) #define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE GENMASK(29, 27) #define SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_EN BIT(30) +#define SDCC_DDR_CONFIG_TCXO_CYCLES_CNT GENMASK(11, 9) #define SDCC_DDR_CONFIG_PRG_RCLK_DLY GENMASK(8, 0) /* SDCC_HC_REG_DLL_CONFIG2 fields */ @@ -79,6 +81,7 @@ struct ethqos_emac_driver_data { const struct ethqos_emac_por *por; unsigned int num_por; bool rgmii_config_loopback_en; + bool has_emac3; }; struct qcom_ethqos { @@ -92,6 +95,7 @@ struct qcom_ethqos { const struct ethqos_emac_por *por; unsigned int num_por; bool rgmii_config_loopback_en; + bool has_emac3; }; static int rgmii_readl(struct qcom_ethqos *ethqos, unsigned int offset) @@ -184,6 +188,7 @@ static const struct ethqos_emac_driver_data emac_v2_3_0_data = { .por = emac_v2_3_0_por, .num_por = ARRAY_SIZE(emac_v2_3_0_por), .rgmii_config_loopback_en = true, + .has_emac3 = false, }; static const struct ethqos_emac_por emac_v2_1_0_por[] = { @@ -199,6 +204,23 @@ static const struct ethqos_emac_driver_data emac_v2_1_0_data = { .por = emac_v2_1_0_por, .num_por = ARRAY_SIZE(emac_v2_1_0_por), .rgmii_config_loopback_en = false, + .has_emac3 = false, +}; + +static const struct ethqos_emac_por emac_v3_0_0_por[] = { + { .offset = RGMII_IO_MACRO_CONFIG, .value = 0x40c01343 }, + { .offset = SDCC_HC_REG_DLL_CONFIG, .value = 0x2004642c }, + { .offset = SDCC_HC_REG_DDR_CONFIG, .value = 0x80040800 }, + { .offset = SDCC_HC_REG_DLL_CONFIG2, .value = 0x00200000 }, + { .offset = SDCC_USR_CTL, .value = 0x00010800 }, + { .offset = RGMII_IO_MACRO_CONFIG2, .value = 0x00002060 }, +}; + +static const struct ethqos_emac_driver_data emac_v3_0_0_data = { + .por = emac_v3_0_0_por, + .num_por = ARRAY_SIZE(emac_v3_0_0_por), + .rgmii_config_loopback_en = false, + .has_emac3 = true, }; static int ethqos_dll_configure(struct qcom_ethqos *ethqos) @@ -222,11 +244,13 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, SDCC_DLL_CONFIG_DLL_EN, SDCC_DLL_CONFIG_DLL_EN, SDCC_HC_REG_DLL_CONFIG); - rgmii_updatel(ethqos, SDCC_DLL_MCLK_GATING_EN, - 0, SDCC_HC_REG_DLL_CONFIG); + if (!ethqos->has_emac3) { + rgmii_updatel(ethqos, SDCC_DLL_MCLK_GATING_EN, + 0, SDCC_HC_REG_DLL_CONFIG); - rgmii_updatel(ethqos, SDCC_DLL_CDR_FINE_PHASE, - 0, SDCC_HC_REG_DLL_CONFIG); + rgmii_updatel(ethqos, SDCC_DLL_CDR_FINE_PHASE, + 0, SDCC_HC_REG_DLL_CONFIG); + } /* Wait for CK_OUT_EN clear */ do { @@ -261,18 +285,20 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_CAL_EN, SDCC_DLL_CONFIG2_DDR_CAL_EN, SDCC_HC_REG_DLL_CONFIG2); - rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DLL_CLOCK_DIS, - 0, SDCC_HC_REG_DLL_CONFIG2); + if (!ethqos->has_emac3) { + rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DLL_CLOCK_DIS, + 0, SDCC_HC_REG_DLL_CONFIG2); - rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_MCLK_FREQ_CALC, - 0x1A << 10, SDCC_HC_REG_DLL_CONFIG2); + rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_MCLK_FREQ_CALC, + 0x1A << 10, SDCC_HC_REG_DLL_CONFIG2); - rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SEL, - BIT(2), SDCC_HC_REG_DLL_CONFIG2); + rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SEL, + BIT(2), SDCC_HC_REG_DLL_CONFIG2); - rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW, - SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW, - SDCC_HC_REG_DLL_CONFIG2); + rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW, + SDCC_DLL_CONFIG2_DDR_TRAFFIC_INIT_SW, + SDCC_HC_REG_DLL_CONFIG2); + } return 0; } @@ -326,9 +352,17 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_CONFIG2_RX_PROG_SWAP, RGMII_IO_MACRO_CONFIG2); - /* Set PRG_RCLK_DLY to 57 for 1.8 ns delay */ - rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY, - 57, SDCC_HC_REG_DDR_CONFIG); + /* PRG_RCLK_DLY = TCXO period * TCXO_CYCLES_CNT / 2 * RX delay ns, + * in practice this becomes PRG_RCLK_DLY = 52 * 4 / 2 * RX delay ns + */ + if (ethqos->has_emac3) + /* 0.9 ns */ + rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY, + 115, SDCC_HC_REG_DDR_CONFIG); + else + /* 1.8 ns */ + rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_RCLK_DLY, + 57, SDCC_HC_REG_DDR_CONFIG); rgmii_updatel(ethqos, SDCC_DDR_CONFIG_PRG_DLY_EN, SDCC_DDR_CONFIG_PRG_DLY_EN, SDCC_HC_REG_DDR_CONFIG); @@ -354,8 +388,15 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) BIT(6), RGMII_IO_MACRO_CONFIG); rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, 0, RGMII_IO_MACRO_CONFIG2); - rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, - 0, RGMII_IO_MACRO_CONFIG2); + + if (ethqos->has_emac3) + rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, + RGMII_CONFIG2_RX_PROG_SWAP, + RGMII_IO_MACRO_CONFIG2); + else + rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, + 0, RGMII_IO_MACRO_CONFIG2); + /* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE, (BIT(29) | BIT(27)), SDCC_HC_REG_DDR_CONFIG); @@ -388,8 +429,13 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) RGMII_IO_MACRO_CONFIG); rgmii_updatel(ethqos, RGMII_CONFIG2_RSVD_CONFIG15, 0, RGMII_IO_MACRO_CONFIG2); - rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, - 0, RGMII_IO_MACRO_CONFIG2); + if (ethqos->has_emac3) + rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, + RGMII_CONFIG2_RX_PROG_SWAP, + RGMII_IO_MACRO_CONFIG2); + else + rgmii_updatel(ethqos, RGMII_CONFIG2_RX_PROG_SWAP, + 0, RGMII_IO_MACRO_CONFIG2); /* Write 0x5 to PRG_RCLK_DLY_CODE */ rgmii_updatel(ethqos, SDCC_DDR_CONFIG_EXT_PRG_RCLK_DLY_CODE, (BIT(29) | BIT(27)), SDCC_HC_REG_DDR_CONFIG); @@ -432,6 +478,17 @@ static int ethqos_configure(struct qcom_ethqos *ethqos) rgmii_updatel(ethqos, SDCC_DLL_CONFIG_PDN, SDCC_DLL_CONFIG_PDN, SDCC_HC_REG_DLL_CONFIG); + if (ethqos->has_emac3) { + if (ethqos->speed == SPEED_1000) { + rgmii_writel(ethqos, 0x1800000, SDCC_TEST_CTL); + rgmii_writel(ethqos, 0x2C010800, SDCC_USR_CTL); + rgmii_writel(ethqos, 0xA001, SDCC_HC_REG_DLL_CONFIG2); + } else { + rgmii_writel(ethqos, 0x40010800, SDCC_USR_CTL); + rgmii_writel(ethqos, 0xA001, SDCC_HC_REG_DLL_CONFIG2); + } + } + /* Clear DLL_RST */ rgmii_updatel(ethqos, SDCC_DLL_CONFIG_DLL_RST, 0, SDCC_HC_REG_DLL_CONFIG); @@ -451,7 +508,9 @@ static int ethqos_configure(struct qcom_ethqos *ethqos) SDCC_HC_REG_DLL_CONFIG); /* Set USR_CTL bit 26 with mask of 3 bits */ - rgmii_updatel(ethqos, GENMASK(26, 24), BIT(26), SDCC_USR_CTL); + if (!ethqos->has_emac3) + rgmii_updatel(ethqos, GENMASK(26, 24), BIT(26), + SDCC_USR_CTL); /* wait for DLL LOCK */ do { @@ -546,6 +605,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ethqos->por = data->por; ethqos->num_por = data->num_por; ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; + ethqos->has_emac3 = data->has_emac3; ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii"); if (IS_ERR(ethqos->rgmii_clk)) { @@ -564,7 +624,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->bsp_priv = ethqos; plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; - plat_dat->has_gmac4 = 1; + plat_dat->has_gmac4 = !data->has_emac3; + plat_dat->has_emac3 = data->has_emac3; plat_dat->pmt = 1; plat_dat->tso_en = of_property_read_bool(np, "snps,tso"); if (of_device_is_compatible(np, "qcom,qcs404-ethqos")) @@ -603,6 +664,7 @@ static int qcom_ethqos_remove(struct platform_device *pdev) static const struct of_device_id qcom_ethqos_match[] = { { .compatible = "qcom,qcs404-ethqos", .data = &emac_v2_3_0_data}, { .compatible = "qcom,sm8150-ethqos", .data = &emac_v2_1_0_data}, + { .compatible = "qcom,sc8280xp-ethqos", &emac_v3_0_0_data}, { } }; MODULE_DEVICE_TABLE(of, qcom_ethqos_match);