From patchwork Wed Sep 27 12:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13400723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 473DAE810D9 for ; Wed, 27 Sep 2023 12:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7QIAgLpJl5CWAbjGe9zJu3fxYD5C3vbk2Qu22cboH1I=; b=ApI+ctfEJl7+IM j6C9r4Ofn7wRtFKQ+isJZMNTAqkhLaFMW6sADuJMZljlWIx7bKDfpDO4aInlCUnjV1mxYx/uKjRzv LD0E8Ks15hm8NQZ57/nKZxzwak5AN0E237S5nIKlMu+/7TambQrcEY2mNGWzsWug+UWNfzIFRkrYX mFMpViSgbnVmF+D353mLl59XSoNLQ42WMgkabHTke0IXzAb8mn4kkTIf2JSp8CpygRvTcn5CML3YA AwFcnxfjfutnyjkfm6aROhI+V24ckJic7+8EFzqGpiw9SYmsWYunV2PGcWJyTRwK+bYsul/AaOKzf JymMm9HY51uFVDzUddHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qlTfh-000tv3-0w; Wed, 27 Sep 2023 12:29:41 +0000 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qlTfc-000tu2-32 for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2023 12:29:39 +0000 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32333fb6beeso3731796f8f.0 for ; Wed, 27 Sep 2023 05:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695817774; x=1696422574; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MqrlAO5sztrD1NimOBbmkaeWGCBRbknzZR3MhxUtqJk=; b=BjRtMx84gkTNiwodM/QVM110SWZ8I5qQaw+957bQ7ZjyxNV8PUT0bYk/jBAuPcg3mU TKwxGdBnrpCXM6ZtBa828lTYLNrL5K9CMco262APqfdwCG8Odu6rT/UN2TEwy6MZ4h08 MwAhgoqE72Q/cSnSclmjCEeBa6t68a9igYmGcjxXUMAO1BTS4k0ZAeeASDGtvlhUUFXl +stIghXH4sXE5oUu5lzsGnS5ayEufgs9313l03m+m2pem1wIJyzlJIJm2heMDV7v+Yex YRfc6+tpol41An33qRSkdXRewvK4iFVoh67KWXFToKZlPXoNz2K7mevG+GmBkez8KGng gq7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695817774; x=1696422574; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MqrlAO5sztrD1NimOBbmkaeWGCBRbknzZR3MhxUtqJk=; b=LTaGtQCBPGEQz71/pBcmQdBm710KLY22imVn6rnxlWaRsUziqt6SWE7F7MMo74kEd8 N4Kgr6pDlCMQKKnZ9EH3/QsXEbe0mnaGXMOT2jOsS2m+HVBqQzbyt8FQlQ+d7xgyDapV h1r8EhwXES5UaU7FBjWZYrx2hJKx5E89UEFyNKK3B7bQMJ9lz0IQLnTkNxk46SY88tqQ TwlS0ZxoIXUmXNn2+eVtuXL/lImZ3yKn5RPdXtj8YcVXPVt7W4cITlROuoNXOB8H4ZY+ AhkMbayYvP98j7pZW2caFFfuPGeCpk+ce5TVW8lkgsu4HA6mSnuzkyghhsPUwVKwjrB2 8RhQ== X-Gm-Message-State: AOJu0Yzt2g90TAqmDad901glozpPFcssvrtexIlOtpqEu8r5J49rFRUO QVSrNd5qsrfccgfACAui9t4= X-Google-Smtp-Source: AGHT+IF5xtLdTh5ebA3MvomjOgILvnz4IhFIHGw6vrUOiVXXmVjun0KXM08k7tob5hnd5+T2RFQvmA== X-Received: by 2002:a5d:5348:0:b0:315:8a13:ef17 with SMTP id t8-20020a5d5348000000b003158a13ef17mr1430106wrv.65.1695817773679; Wed, 27 Sep 2023 05:29:33 -0700 (PDT) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id 8-20020a05600c230800b004042dbb8925sm4521218wmo.38.2023.09.27.05.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 05:29:33 -0700 (PDT) From: Christian Marangi To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Simon Horman , Andrew Halaney , Bartosz Golaszewski , "Russell King (Oracle)" , Shenwei Wang , Jochen Henneberg , Giuseppe Cavallaro , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Cc: Christian Marangi Subject: [net-next PATCH 1/2] dt-bindings: net: snps,dwmac: DMA Arbitration scheme Date: Wed, 27 Sep 2023 14:29:27 +0200 Message-Id: <20230927122928.22033-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_052938_041633_44CCE435 X-CRM114-Status: GOOD ( 10.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Document new binding snps,arbit to program the DMA to use Arbitration scheme. (Rx has priority over Tx) Signed-off-by: Christian Marangi --- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 5c2769dc689a..4499f221c29b 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -442,6 +442,12 @@ properties: description: Use Address-Aligned Beats + snps,arbit: + $ref: /schemas/types.yaml#/definitions/flag + description: + Program the DMA to use Arbitration scheme. + (Rx has priority over Tx) + snps,fixed-burst: $ref: /schemas/types.yaml#/definitions/flag description: From patchwork Wed Sep 27 12:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 13400724 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04897E810D9 for ; Wed, 27 Sep 2023 12:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jNDbP+eLpNmZuJaI7RjxOqCpGIv0eQNTZQTZm90YH6I=; b=deh1SMxzDiB3Pf 96JB6sks9teIXAo7oLgJJqkCMeXuWt+4hHZCIOENX2E21HXz6Ivt0hbbKHPy069UpI71239nhsS+t IvZPrAoAU1jBVmOgFyiGLiekJvoiT//ev5rVMr68rCnQ/QougKiZH8WOBmutpgrxiYBhJzlokLecr HhE2zPQvF7cremi8jBdBSC/yBEC7D/STgyq33uaheThBm+s/nLdHXzF1X26tE0MSwryoV4IC5BNnQ +5bfL0J9C4yZVVCvNPZxl3wSftsfXwE5DKjmtm0gWIEp9KgX90WZAdOFx4x9fs3F/w5vBtjctyY7s Qxcd6jOLh0+VUzANqEbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qlTfh-000tva-2r; Wed, 27 Sep 2023 12:29:41 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qlTfd-000tu5-0W for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2023 12:29:39 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-405497850dbso89774515e9.0 for ; Wed, 27 Sep 2023 05:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695817775; x=1696422575; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=djhGgzEttuBwypRoTD2e7qd8nkSbwt4HcuoP4naClbc=; b=LwsZayYofkk33FyyX9gtOo2jgL5PbS0jXo5GAlA4uxZmyvg2fOeQYjuM5RgHnpT2++ F256DMMZmkj2RtY80g+G57p+Xovo36G57Vs0oiEw7ug2xEHHzJ4BkfAYju/HhyiL402w Nq0BTlpTr3FYhLIHH7s/CuYcwOUlFtw1huU3YX+8SxrpMmJ+q1QawwAAiCLxqyfZIc1z AzGbODFP/F4Hut0aLnoI7+SU0KxwZS0nW+MAQHOoa6yKkX9XTGwfbEeEWJu7m5xsn1wi 87dIrbY8K5GMEL82eh1k7Vc9lBJSz27TS5d5B7KkMiC9KpxI25h2Jb7VfaGEIPwFb+Ub Zgaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695817775; x=1696422575; 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=djhGgzEttuBwypRoTD2e7qd8nkSbwt4HcuoP4naClbc=; b=idkP27UpH81iw77LgPUDtcpwbG+HLe8emKbJkWOqsQSRlMqpEjljdX3RQ2Ze0UUo3t Ql4JQqaV7ivH039wh/Z1JjijczHKPiNSE/SX62b0Dgl1OuPxTfB/IuMXU/08TFliQTGY 5x7tcUzPY8qd72MnD3ujWaugq67cdCOBLIPWznl7tNXErLEwtvt6vEUxOZ2m7Mohm6EP JZ6dPpwsSfaFgJCHxJP1knjvmHTtA1EKnp+vH2uk4b0y8kCYEP2vIIpLJqg6Umg3AzzG pp35ZPCpk7nioGpHGhU6nB4xx4zulIagxswEOMWWDGDI/D/e+hvsj25wBSjUVDE4tYWc FEFA== X-Gm-Message-State: AOJu0YxTl4ffn4yJRE6DVGYJPc/P/2PvTBTbgcQs/yvxbJ9/DTMVphti MDiN01ILAJAQ3osArDsw72w= X-Google-Smtp-Source: AGHT+IHcQL3pFBI02XxvUXVb6GR+GG2cph2JWQp8B1W1KKSu38pGMBYcBmAR8ek1iOZ6aemezFAIAA== X-Received: by 2002:a05:6000:1188:b0:31a:d4e4:4f63 with SMTP id g8-20020a056000118800b0031ad4e44f63mr1488621wrx.18.1695817775087; Wed, 27 Sep 2023 05:29:35 -0700 (PDT) Received: from localhost.localdomain (93-34-89-13.ip49.fastwebnet.it. [93.34.89.13]) by smtp.googlemail.com with ESMTPSA id 8-20020a05600c230800b004042dbb8925sm4521218wmo.38.2023.09.27.05.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 05:29:34 -0700 (PDT) From: Christian Marangi To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Simon Horman , Andrew Halaney , Bartosz Golaszewski , "Russell King (Oracle)" , Shenwei Wang , Jochen Henneberg , Giuseppe Cavallaro , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Cc: Christian Marangi Subject: [net-next PATCH 2/2] net: stmmac: add support for DMA Arbitration Scheme Date: Wed, 27 Sep 2023 14:29:28 +0200 Message-Id: <20230927122928.22033-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230927122928.22033-1-ansuelsmth@gmail.com> References: <20230927122928.22033-1-ansuelsmth@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230927_052938_041679_8821CC05 X-CRM114-Status: GOOD ( 15.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add support for DMA Arbitration Scheme tune up to program the DMA to put priority on Rx instead of applying Round-Robin logic. This special DMA bus mode was defined in the header from a long time but was never actually implemented. This option is used on the original setup on the ipq806x-gmac driver based on DWMAC1000. Signed-off-by: Christian Marangi --- drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 3 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + include/linux/stmmac.h | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c index daf79cdbd3ec..14eb7e8d61ea 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c @@ -104,6 +104,9 @@ static void dwmac1000_dma_init(void __iomem *ioaddr, if (dma_cfg->aal) value |= DMA_BUS_MODE_AAL; + if (dma_cfg->arbit) + value |= DMA_BUS_MODE_DA; + writel(value, ioaddr + DMA_BUS_MODE); /* Mask interrupts by writing to CSR7 */ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 843bd8804bfa..f5791b03b320 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -576,6 +576,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) dma_cfg->pblx8 = !of_property_read_bool(np, "snps,no-pbl-x8"); dma_cfg->aal = of_property_read_bool(np, "snps,aal"); + dma_cfg->arbit = of_property_read_bool(np, "snps,arbit"); dma_cfg->fixed_burst = of_property_read_bool(np, "snps,fixed-burst"); dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst"); diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index c0079a7574ae..04a61f1eba90 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -97,6 +97,7 @@ struct stmmac_dma_cfg { int fixed_burst; int mixed_burst; bool aal; + bool arbit; bool eame; bool multi_msi_en; bool dche;