From patchwork Tue Oct 26 20:59:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 12585685 X-Patchwork-Delegate: kuba@kernel.org 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B1C1C433F5 for ; Tue, 26 Oct 2021 20:59:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E84B6103B for ; Tue, 26 Oct 2021 20:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237004AbhJZVBs (ORCPT ); Tue, 26 Oct 2021 17:01:48 -0400 Received: from mx4.wp.pl ([212.77.101.12]:51109 "EHLO mx4.wp.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235572AbhJZVBs (ORCPT ); Tue, 26 Oct 2021 17:01:48 -0400 Received: (wp-smtpd smtp.wp.pl 32638 invoked from network); 26 Oct 2021 22:59:18 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1635281958; bh=WgW57u+5yEbJUHlDaeErLMbW3u24lbfeHj4ACnB7IUw=; h=From:To:Cc:Subject; b=Wugg7n9O/oDiE6acVmuSQ/SMjOvtm4JeOIKpMT2xGoxbVrlitjbm76N4FMj0oaCOl UgVwf+enWFmng1S3YoMNlPNv+gah/cUTMYRDRpuQCp9fv1+c+xIr1trEA4IYmswp61 qzXaneeTrWD+K8Ota6xXbBmLvTwH5pbovp8MHhm8= Received: from riviera.nat.ds.pw.edu.pl (HELO LAPTOP-OLEK.lan) (olek2@wp.pl@[194.29.137.1]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 26 Oct 2021 22:59:18 +0200 From: Aleksander Jan Bajkowski To: hauke@hauke-m.de, davem@davemloft.net, kuba@kernel.org, robh+dt@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Aleksander Jan Bajkowski Subject: [PATCH 1/2] net: lantiq_xrx200: Hardcode the burst length value Date: Tue, 26 Oct 2021 22:59:01 +0200 Message-Id: <20211026205902.335936-1-olek2@wp.pl> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-WP-DKIM-Status: good (id: wp.pl) X-WP-MailID: 43aa16e0fb2cd16703b4d22842b9e459 X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 0000000 [kaNk] Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org All SoCs with this IP core support 8 burst length. Hauke suggested to hardcode this value and simplify the driver. Link: https://lkml.org/lkml/2021/9/14/1533 Signed-off-by: Aleksander Jan Bajkowski --- drivers/net/ethernet/lantiq_xrx200.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c index ecf1e11d9b91..0da09ea81980 100644 --- a/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -25,6 +25,7 @@ #define XRX200_DMA_DATA_LEN (SZ_64K - 1) #define XRX200_DMA_RX 0 #define XRX200_DMA_TX 1 +#define XRX200_DMA_BURST_LEN 8 /* cpu port mac */ #define PMAC_RX_IPG 0x0024 @@ -73,9 +74,6 @@ struct xrx200_priv { struct net_device *net_dev; struct device *dev; - int tx_burst_len; - int rx_burst_len; - __iomem void *pmac_reg; }; @@ -323,7 +321,7 @@ static netdev_tx_t xrx200_start_xmit(struct sk_buff *skb, goto err_drop; /* dma needs to start on a burst length value aligned address */ - byte_offset = mapping % (priv->tx_burst_len * 4); + byte_offset = mapping % (XRX200_DMA_BURST_LEN * 4); desc->addr = mapping - byte_offset; /* Make sure the address is written before we give it to HW */ @@ -422,7 +420,8 @@ static int xrx200_dma_init(struct xrx200_priv *priv) int ret = 0; int i; - ltq_dma_init_port(DMA_PORT_ETOP, priv->tx_burst_len, rx_burst_len); + ltq_dma_init_port(DMA_PORT_ETOP, XRX200_DMA_BURST_LEN, + XRX200_DMA_BURST_LEN); ch_rx->dma.nr = XRX200_DMA_RX; ch_rx->dma.dev = priv->dev; @@ -531,18 +530,6 @@ static int xrx200_probe(struct platform_device *pdev) if (err) eth_hw_addr_random(net_dev); - err = device_property_read_u32(dev, "lantiq,tx-burst-length", &priv->tx_burst_len); - if (err < 0) { - dev_err(dev, "unable to read tx-burst-length property\n"); - return err; - } - - err = device_property_read_u32(dev, "lantiq,rx-burst-length", &priv->rx_burst_len); - if (err < 0) { - dev_err(dev, "unable to read rx-burst-length property\n"); - return err; - } - /* bring up the dma engine and IP core */ err = xrx200_dma_init(priv); if (err) From patchwork Tue Oct 26 20:59:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 12585687 X-Patchwork-Delegate: kuba@kernel.org 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ED88C433EF for ; Tue, 26 Oct 2021 20:59:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61B3E60FE8 for ; Tue, 26 Oct 2021 20:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239340AbhJZVBt (ORCPT ); Tue, 26 Oct 2021 17:01:49 -0400 Received: from mx3.wp.pl ([212.77.101.9]:47737 "EHLO mx3.wp.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239338AbhJZVBs (ORCPT ); Tue, 26 Oct 2021 17:01:48 -0400 Received: (wp-smtpd smtp.wp.pl 34036 invoked from network); 26 Oct 2021 22:59:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1635281961; bh=ciiSD8e3sFSvv6OQDD+kH7vzEjtJ0FSP62EAVw0lZEI=; h=From:To:Cc:Subject; b=V/M8xH68E+maE3K/AV/TpdvEXncEYbL/gZbEAs6RgE6j9hVIyYosLISRVOArdYYXB 32bidD6+xLl0/GTuijfjxHH0YkeF2kMXoVHT5NnhONF5faXJCk7z9THasz55JjMoA2 6VAvX/1so1Yxd0jXY5BzErcuqJOMHCeyM+ZfWaPU= Received: from riviera.nat.ds.pw.edu.pl (HELO LAPTOP-OLEK.lan) (olek2@wp.pl@[194.29.137.1]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 26 Oct 2021 22:59:21 +0200 From: Aleksander Jan Bajkowski To: hauke@hauke-m.de, davem@davemloft.net, kuba@kernel.org, robh+dt@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Aleksander Jan Bajkowski Subject: [PATCH 2/2] dt-bindings: net: lantiq-xrx200-net: Remove the burst length properties Date: Tue, 26 Oct 2021 22:59:02 +0200 Message-Id: <20211026205902.335936-2-olek2@wp.pl> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211026205902.335936-1-olek2@wp.pl> References: <20211026205902.335936-1-olek2@wp.pl> MIME-Version: 1.0 X-WP-DKIM-Status: good (id: wp.pl) X-WP-MailID: 83750962c7877fb74c247c2fcd4d4a37 X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 0000000 [0YMB] Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org All SoCs with this IP core support 8 burst length. Hauke suggested to hardcode this value and simplify the driver. Link: https://lkml.org/lkml/2021/9/14/1533 Signed-off-by: Aleksander Jan Bajkowski --- .../bindings/net/lantiq,xrx200-net.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml b/Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml index 16d831f22063..7bc074a42369 100644 --- a/Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml +++ b/Documentation/devicetree/bindings/net/lantiq,xrx200-net.yaml @@ -29,18 +29,6 @@ properties: - const: tx - const: rx - lantiq,tx-burst-length: - $ref: /schemas/types.yaml#/definitions/uint32 - description: | - TX programmable burst length. - enum: [2, 4, 8] - - lantiq,rx-burst-length: - $ref: /schemas/types.yaml#/definitions/uint32 - description: | - RX programmable burst length. - enum: [2, 4, 8] - '#address-cells': const: 1 @@ -53,8 +41,6 @@ required: - interrupt-parent - interrupts - interrupt-names - - lantiq,tx-burst-length - - lantiq,rx-burst-length - "#address-cells" - "#size-cells" @@ -70,6 +56,4 @@ examples: interrupt-parent = <&icu0>; interrupts = <73>, <72>; interrupt-names = "tx", "rx"; - lantiq,tx-burst-length = <8>; - lantiq,rx-burst-length = <8>; };