From patchwork Thu Dec 14 15:09:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493187 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="Ixgs6ACx" Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A217212A; Thu, 14 Dec 2023 07:10:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566601; x=1703171401; i=wahrenst@gmx.net; bh=HoyxGLzh0cWBm1uVhUQ1q4bWwZuGbc3AMgJQ4i+E1BY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=Ixgs6ACxF8LrR0d265JrbotSG7t72LtO4s2uOavyZheBGGOyPHq+uFQCPU7wV+Dp 7Dz0g/XUERAw7VZ4NM7edGDrcHIPbD2VOKyW8FE/3ls7LvNhT6pptYRuRXfHhsb2c 1UwdWheSlAKr+dts0gTeXpCLJN45v3XC5tgnqTCymoTkfkYuv9w5aAF/dI1u1FigM q3++3R4rNtk/QzqtcqmtZh/Vv763A+tZRnxAM+YgN2ixUp2xf3kE6VrGuPGtg3A0y Za+imHIk6o/P15ylkTFhMmgsx77eauhSQqjHj/xzEADPAy9B2UX0MobHaML73aDe2 xmEf6rr9wTuYa2qAqw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MRmfi-1qkjsh25MI-00TGKg; Thu, 14 Dec 2023 16:10:01 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 01/12 net-next] qca_spi: Improve SPI thread creation Date: Thu, 14 Dec 2023 16:09:33 +0100 Message-Id: <20231214150944.55808-2-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:jaa8gBMS39cmQ4HWatPaFvZap0JC8ESz1ahsbUCHepaVFbEMF/N XIC+Z4gW8Cywe+HjypmwPgNHgMira3acuAaskPH6r3krNvXVc8W12txw06fIVeQjdbSXHiO toJzc33bD75HTZYXMDXHXh6RK+Dif6LxLmt6uGSCoK54kCLKB8st1pW1o0Kss11TaPqlwvo klnpDo2tcd6MJEUAwu81Q== UI-OutboundReport: notjunk:1;M01:P0:gjffSHEE4pw=;IVCDy8VgF0WmdAQ82AN4f7TGEyk YGvTSV7Dof0Vre7IV95vjsUTLkeuavaNnA8MZLtxRFtyUvGgD9ywdFjzy7+NVxCOy4zExaRgq 3XLUOyX2NokJIEp+h3lz62lKJtBosi9SLuG8xRk5PcR4Q263MLyMO91ibf/+h/zpBh/t4ULbh rINAJoDFmqkBCKlcbEWYdQi1RED9gWWbzwNMRzebR0lw2guprx8DvUClYxfFcScZdvQ+JeREK 1LVHtdH356lkJX62mBZRal76c0HKcFN5b+PlFTOgjROdsNoGSWapMlSR6lgTx4jlm2PjPVOQK r1SN/WbN/IOfkbjEXc/7aFZsaDbeTO+JSbdukWt6Z0+MWTddJdiiklxBre4nNruCKI0lTOWq3 Pido2yuXoerAnS/MYYf78hoPPwGuozwin46EuedN8/l1jEPEyJbpg9+8wxyOsP0CNgQlhrp5d RtYbav8esbWV71u93vqxpKBT0H3F/2f1EcIr5CwwD5NwMs/UUfQRTl15aI3EizWYqZhNkun7p 5gx1Bs6wGxkZlo8jE300vkrZRLzJzaMHZhL2el0xS7lsVxpeaKZviAYEPmuf4P5gZquY6iyEO lVDPWUiZVkRgmv0v2yXaDazIhw71KbWyWkkrWYa/QGAxcRVerhuxs+08eXKMTb/K6XvDcGd8t Hc/Iqbgrg9w0G8Lnoa80NkaICiO3pBDJWq4S8LxSzseVQnwebrLB0GbtzktYsE3OJ5buK2ZHQ Sp96bTD8zKQqrPuCJKIMG4Me1WbM8In9sJXnifrX5Sb9GhRBOFn9KgwFziMc6WEZoBWeqbjtq TS0TEzGetyGvrECa2Jsjz6F1yf7RRhgc967M/EVXJcl4qQ2t/hApUWhSrScWR4HT8LfWXV2TQ 0GLBw51cWw7fBGroIbKttAqVUISAK/Cp3Cq6ZCyvw31xLRbAEEFMG3eBSj2WF2tNM0kaKnBmj Vj/COw== X-Patchwork-Delegate: kuba@kernel.org The qca_spi driver create/stop the SPI kernel thread in case of netdev_open/close. This isn't optimal because there is no need for such an expensive operation. So improve this by moving create/stop of the SPI kernel into the init/uninit ops. The open/close ops could just 'park/unpark' the SPI kernel thread. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 33 ++++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index bec723028e96..a9f01fb3455a 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -679,25 +679,17 @@ qcaspi_netdev_open(struct net_device *dev) qca->sync = QCASPI_SYNC_UNKNOWN; qcafrm_fsm_init_spi(&qca->frm_handle); - qca->spi_thread = kthread_run((void *)qcaspi_spi_thread, - qca, "%s", dev->name); - - if (IS_ERR(qca->spi_thread)) { - netdev_err(dev, "%s: unable to start kernel thread.\n", - QCASPI_DRV_NAME); - return PTR_ERR(qca->spi_thread); - } - ret = request_irq(qca->spi_dev->irq, qcaspi_intr_handler, 0, dev->name, qca); if (ret) { netdev_err(dev, "%s: unable to get IRQ %d (irqval=%d).\n", QCASPI_DRV_NAME, qca->spi_dev->irq, ret); - kthread_stop(qca->spi_thread); return ret; } /* SPI thread takes care of TX queue */ + kthread_unpark(qca->spi_thread); + wake_up_process(qca->spi_thread); return 0; } @@ -707,15 +699,11 @@ qcaspi_netdev_close(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); - netif_stop_queue(dev); + kthread_park(qca->spi_thread); qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0, wr_verify); free_irq(qca->spi_dev->irq, qca); - kthread_stop(qca->spi_thread); - qca->spi_thread = NULL; - qcaspi_flush_tx_ring(qca); - return 0; } @@ -807,6 +795,7 @@ static int qcaspi_netdev_init(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); + struct task_struct *thread; dev->mtu = QCAFRM_MAX_MTU; dev->type = ARPHRD_ETHER; @@ -830,6 +819,15 @@ qcaspi_netdev_init(struct net_device *dev) return -ENOBUFS; } + thread = kthread_create(qcaspi_spi_thread, qca, "%s", dev->name); + if (IS_ERR(thread)) { + netdev_err(dev, "%s: unable to start kernel thread.\n", + QCASPI_DRV_NAME); + return PTR_ERR(thread); + } + + qca->spi_thread = thread; + return 0; } @@ -838,6 +836,11 @@ qcaspi_netdev_uninit(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); + if (qca->spi_thread) { + kthread_stop(qca->spi_thread); + qca->spi_thread = NULL; + } + kfree(qca->rx_buffer); qca->buffer_size = 0; dev_kfree_skb(qca->rx_skb); From patchwork Thu Dec 14 15:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493183 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="Byguehe8" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB88F126; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566602; x=1703171402; i=wahrenst@gmx.net; bh=V3wYXbngbRFmmwchd5FBtOyVigPT9ypB8NTZpDN56xI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=Byguehe855YtsPlLbH0X0gbIQ58CIz9KwrT3Z11a6HuSQyqnCA9VgDKwVb+s5Pmh Gp1H9AAD7kEQ9mxhkxflWVjFiBkbif3qHoVx7YOTVNujWKT61LgiiIKpYLnnLxzhd hhPdV02LLag4ObXySq3ADXrSZLqMjjUfklm+gXmzjMyIMWBml2DUfm9pBkA7TBTmH WouGtDpeKXSwTjofEyfA+zERqSFexpJBucBNpUu2AtUrNr6Ap2cpy6TpUX6bQ9Xte JLxOYi3GXIm1PG6yHktpyztRmOQbMTlLb6Siy+SRbo15mTr6eDooDwwzWyOLMKwt5 YO//PUxVkrxYp5fKpg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MPokN-1qr1PG3Zel-00MuXr; Thu, 14 Dec 2023 16:10:01 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 02/12 net-next] qca_spi: Improve SPI IRQ handling Date: Thu, 14 Dec 2023 16:09:34 +0100 Message-Id: <20231214150944.55808-3-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:vm0GesJonugTpeWp17ebjJeKxm2FnShj+b/T0LVQaETbb+RmmGl CWA9h5diYX4y1N/5DGcJzHZK6i9J67EWi8Rg9pJKDC38MmXIY7FfVYOJOjnGgQ42MY1EgR0 ogMv1NDMqNlVonzayr/YAjxVeqbdORbV8CGIapdjYXF4SCihOmKtISNabPhVqDaVjf15k+w PltSHYvADlYgspmsvz+Iw== UI-OutboundReport: notjunk:1;M01:P0:LcN40jitl68=;RPSsSXJq+D0d//QKuagK48M/Wws Q6/I5nmtKXzPGHIpy0oLqO3kxBr8oUrNER+AM5rboqqRlnSczcqmvkltRrWs4qmlFqabzw3gp cSdZ+xaPvdyqmUpQME942G5o+bOrlGEse4NjP6xuArmHIpvsb732q21hxxEG5GipeP8lPr+F/ EFWGN9NBhBUxWx6sL40jtOTyXZCWybsuf7phtjy84g/pvSYbw/MyhpjQnDkkTH+0mrnHFOBVy T8xl62Y/Xhu9O+W9ZRcTQ31hTtJVcj369MdwrgcpXHxlnSaCvAKRUtbT2BsoDWwUXRe07sfx3 JvVMb1zF1ybG6SgePlG85yJkDNL5Hhc5B3He5VfBtEXOwD4mfpiB7I70JXyq2XVw0nMtuiNqq fKXHSbxKN+gdBb8EtO7+ZnXXkDA1zOy12fhGVo9ud1f/mIooqz+DjCZSmJdWz4iBGoLGDtPWe 2KGznctQIdHiwMbYHohGTRptUrQZ3CJiLMxB0n+ZDsCZ1wIblgIwqUwNhE5gOj1lNAgPG4si7 XitMbLHHvWHyYMC5ApKjDXIoJsB1yvhAHGzkfb5oRDEi8Moh9d6SnJTIJwQXhbJTcPEEw+4L7 a7Pyttk5Qlwc9lz+JiNCZLX9D5vs0B8bcYcqavJR/e+HBtbamnodp8wcN8ufDGCGvFfm99IUM 7VtUdCkhCS8H8MCgZaaw8MpueJgtxr/bdba30EbRw/pwJmijw4byRtnkRw5/PLLZ84WyZ8CB/ 65OHxCp/cj66RzPTEg/uTZbWnGDf4Dn++g+5c3pqEbCxce1ePqW07gTIRMGqJv9yS5xxovFzn ruHBrGtrTbFN08YjCK7BpR0bbyajFIBT5GKBv4q3KihHhinoZrUydrukklAQg893Y3+L9CGt9 vRQP/vKuTGY/TaBEVtw/LKIIsFL6I22Id1eO/ZXeeuxkIslfx/9jjikCdLfdTUF5f6VoKxJxG Xl7ufg== X-Patchwork-Delegate: kuba@kernel.org The functions qcaspi_netdev_open/close are responsible of request & free of the SPI interrupt, which wasn't the best choice because allocation problems are discovered not during probe. So let us split IRQ allocation & enabling, so we can take advantage of a device managed IRQ. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index a9f01fb3455a..88f2468ba676 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -669,7 +669,6 @@ static int qcaspi_netdev_open(struct net_device *dev) { struct qcaspi *qca = netdev_priv(dev); - int ret = 0; if (!qca) return -EINVAL; @@ -679,13 +678,7 @@ qcaspi_netdev_open(struct net_device *dev) qca->sync = QCASPI_SYNC_UNKNOWN; qcafrm_fsm_init_spi(&qca->frm_handle); - ret = request_irq(qca->spi_dev->irq, qcaspi_intr_handler, 0, - dev->name, qca); - if (ret) { - netdev_err(dev, "%s: unable to get IRQ %d (irqval=%d).\n", - QCASPI_DRV_NAME, qca->spi_dev->irq, ret); - return ret; - } + enable_irq(qca->spi_dev->irq); /* SPI thread takes care of TX queue */ kthread_unpark(qca->spi_thread); @@ -702,7 +695,7 @@ qcaspi_netdev_close(struct net_device *dev) kthread_park(qca->spi_thread); qcaspi_write_register(qca, SPI_REG_INTR_ENABLE, 0, wr_verify); - free_irq(qca->spi_dev->irq, qca); + disable_irq(qca->spi_dev->irq); return 0; } @@ -969,6 +962,15 @@ qca_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, qcaspi_devs); + ret = devm_request_irq(&spi->dev, spi->irq, qcaspi_intr_handler, + IRQF_NO_AUTOEN, qca->net_dev->name, qca); + if (ret) { + dev_err(&spi->dev, "Unable to get IRQ %d (irqval=%d).\n", + spi->irq, ret); + free_netdev(qcaspi_devs); + return ret; + } + ret = of_get_ethdev_address(spi->dev.of_node, qca->net_dev); if (ret) { eth_hw_addr_random(qca->net_dev); From patchwork Thu Dec 14 15:09:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493175 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="rnjkgg5o" Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 259B311D; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566602; x=1703171402; i=wahrenst@gmx.net; bh=SdG5JZGe1SUnpzceGIn1uNATbX/L+NGxavKwWZ5qQwY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=rnjkgg5o0xk1tdiGaiIae7Ny9xtbNA/MuWfZOIkADZQ6G+Jj6A5z9GvLgqKczWNs oEFFtxnOGFiwOdf284nvA/vxF6oITUTaHCfQwxNH+jJC2rz5nv1LTVgLX0+0UI1sb D905qM34i4A/2bvHUxxfeMUKS1UB00OkXqFpKNW3450+B/3JEDs1WkpgLvVmSaNP4 Z8B98+pSo50RkYCrdQx3iXCgkHVTWodcmUHHYzF+DSsoS5DUMMkAoyU1+e+8hxw2z /cIvW/euchEaY1eyEc38A9qGHg48hCId5tkuZWj7NnyND1XbDXhBdZ+kIC/ORFjtN RaWNAx9dGbVUIDHWxw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MirjY-1rjoic0quq-00erCe; Thu, 14 Dec 2023 16:10:02 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 03/12 net-next] qca_spi: Avoid skb_copy_expand in TX path Date: Thu, 14 Dec 2023 16:09:35 +0100 Message-Id: <20231214150944.55808-4-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:CxcXeQyPbzMOKEARp7hridvQcOuDtfTlK8rzBiMHXcAv0Nl/iBR C6GE2LFL20clk5gv3G7a9U23SmOhhR08OYxzuz8I17wEXQaKzjYA6v1i71JnNbnH9eJszG1 p2E5XuGEPR1W0KU8w4xesla0rijqmrE8+7e2wEbToGaA6tmyw6c+MNDfSNKbc1+Nj0CWpQC PwGErQ24m9qUs8UGjP0Fg== UI-OutboundReport: notjunk:1;M01:P0:d1QZxsP7/vE=;WgD8AYmF8FaDICVVm4LDQofmLj3 Jps9N7g4huwPz70xAx86OdpnKx4ZPIEUXsfwxfyKUymUZ2YaAdxs8OyYpTVrfd8oU824wDbUg +jNpYXRIUFx1k+GfXGkApSl9QnK33M/ojJU2OT0J82moBSfyqzfiADch+pHMt9rdNfV2xVRI3 kDTTUR0mgla6AFthgWdhSqDmezu7yiJOIIxiKToRihpehCmd/wg26RysNOTWQTfLE5q9b8ILy JA7YiqmuF+tan2q4P/yk0RNOlIUrRMYh0oRll4H/K2kbYbxYCnUNlgU737/sq5w1Mcp5XkEGy xofOtq5hN1cQ2mqg3lhoV2MBXyI5+rQyKSH7AMQcyy0aM0oFIaEFuiwok/rlXodd59f78Zb4D bT19uY65hvIteUWYWo8yXQJ6mx3v+qwUtPQqreiUbMHD0BI/TTnYgYJvlfMS91TIzs0jIbI0x +qrgiNrkEVmNrX8PwDNLrndSF5Ifa59dweeZaYCC7GqCyeITpTjC19e9WehMP7V6IrZrJmevv 8YarZtaU2tQ8fZ4mCGJw+wQJ0gy1TdMKCBlxGITAnLthjU74iwPTmJKvZH0OuVrp8jp4YUCF6 t5Jz7oNt9pzBMmRCweyWwrxPCvXM+4MoG9H+nXE1Ym6yTZd9erjbwNaxeo5mx+1AfI7Ir/+Nk CHlQQ/zplWozZkErQ1BUi/gvx2QcWkpH9xdg+GvizdzDIynCpCGltNcxi/QwjELiRekEIgoE/ sSGcjpoIavQa5PV8/LjhsnEfUicPiKexSF/rrhD6kozOg1bRwXxVJEg3sNuhoD+QqOPHsz8QX XU0bbao1dzoHbiq9H0u7C4x5VHeFekTrvAsYiG9S9mvfbhAgQZXgOO1mVmT8JY+LihvR7mxOK nNR1KUHBjvyWk1z+EH1ibHGPMpI+lDG+rLw27YbNZwyosBYYLDonzofDYW5g0jZj0MBnoYRpP ohyURA== X-Patchwork-Delegate: kuba@kernel.org The skb spare room needs to be expanded for SPI header, footer and possible padding within the TX path. So announce the necessary space in order to avoid expensive skb_copy_expand calls. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 88f2468ba676..f0c99ac8d73d 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -859,6 +859,8 @@ qcaspi_netdev_setup(struct net_device *dev) qcaspi_set_ethtool_ops(dev); dev->watchdog_timeo = QCASPI_TX_TIMEOUT; dev->priv_flags &= ~IFF_TX_SKB_SHARING; + dev->needed_tailroom = ALIGN(QCAFRM_FOOTER_LEN + QCAFRM_MIN_LEN, 4); + dev->needed_headroom = ALIGN(QCAFRM_HEADER_LEN, 4); dev->tx_queue_len = 100; /* MTU range: 46 - 1500 */ From patchwork Thu Dec 14 15:09:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493180 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="ZUZX87KY" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 238AF129; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566602; x=1703171402; i=wahrenst@gmx.net; bh=rYispb63UqZXzgy62A/1FZAm7a2jT8FXIlaZMoImlD8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=ZUZX87KY8FoSmaFhn5n+Qn9Qh6mx8MOOXSaBGMhR8LyCS1Iy1kTb/DIspdWnjjWX Npzo+3saTa5Eh8blJxOZMEbui9OYSBolpT3hRtwGh3JG4F4a5ev9ooGivTscMbS/j fXKA34UD8dK2bwXsmedhAD+DSH6wjOXWt11uMYFB3QVVUlPYeI3fUN19p89WS8LVA UNdQ47dQV65kdw/Ljw/0Zlk/jNlg/FWgzmQIEeCkQPQwcBOO91JMpWndKXVMmvFNg rPnYXDoMH1e2lJa6YGY8R5yEnDj/7Vf8uG04k2ro7gndVmOHukQ7RJHW2n8ugGZzi ZMC9mOfZ8aLHBIGBjg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MJE6F-1qtEK927kR-00Khcx; Thu, 14 Dec 2023 16:10:02 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 04/12 net-next] qca_7k_common: Drop unnecessary function description Date: Thu, 14 Dec 2023 16:09:36 +0100 Message-Id: <20231214150944.55808-5-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:VbLJpMCe7heODYKKm/sey597xrpchi5RYL2k/QMfRbmopw7sWhZ /McCGcQ2UL4DWjqT60va6Hq+5CBiHZFmwNj8fFctAzoA3cO101RHrVLNkT9TZikTRs688VV gYeHT7kaXHxOFx0xezfhtT+yQjz1QE30JxcMefBk4sUO0K+ZzRxjYdf6LeTfiUy4Or/M51A zFat5e3YMXz+sUcTRb3ww== UI-OutboundReport: notjunk:1;M01:P0:daEqLFpVZd4=;jSL4l2pwog3lveXnlWmwPeU+PfI H3rDsaIdadwdQrstDaeOR6f+hdCzaFLsY9sUCCHVbHpiN9CnpWpr0UkuIBHb4x9MmUUiJG86l luqvR0/gyLmHVRN0fJ4HCdYUKRuY9f66k1ryi5QdIdczt70OquU9VBA1URIQljIlqS73l6TA+ 7ujbZmZEq2lpUTOns0U7UccBpAh94FPKcXlLw8JaABoaX5B2FOlwueXQq3DgDw5VR8e9d6VDy kOsEGgH3l9Lq9ccIWRaCN+CFdff8wdfGdi4Pm1haaphfqvJTRXeM16x9j+oaZm5xIHf0Kvl8V cJVL2EMdKDU60I+Ei1CoUaXJSIRSqd57XZTofUsQVQoqfZRkHcxBrcyUiJIdiCcEasofo+2Bz Vn2BI64155CJvAuXqdkWwMLjDXfleCnpNHcCSctTO4xIMLo4RSi4UqShcISDrRA/N1AWZcNiA OrNZAmm3OJvljw1qfid+NRCHmxwv1XNvOxGy63eY5GM/J1c+r5Pfstlm24jw2mmjPidKcVx3J eer29OhC7s4xEkyodLaMNTGjCra6l7cwGGxZeiliAw6pYjQc8RAd+nXu31janp1bE5JSc1W// x5SUoXvV1XfeqiCDJ0yFD92QKOldpnPrpDHpkO30aWKMbOfkGohk/5/RcYyR1DWMYwTWegmdp SCWmjBAJiGwiYBdj6ZNM9iJUxMx4fTkDQv0jR/cAPu+rNXUWDtluVEzcXcN0DWH9M/zVshqrq GRrOVjHA07cR/DOq0WzrcgcJjMJq4dsbd0WQT7V0V+VTAn0tkaDu1sRe4ncuEkr/pH9XKc7am 9BTj3CvJGlpCwy+bH+v3Bjj9OuKt/rySra6fHH56YqCCqujzeGVc7BsNe7vKmJ5gGpy2Le5hH 4AaShZLoBt8zC33nR62btEFDF+ystkh6oWBo+Fbb23rbcg/lBCZj6hcNltCq7bcrYQx2WoKMa AP4aqA== X-Patchwork-Delegate: kuba@kernel.org qcafrm_fsm_decode has the almost the same function description in qca_7k_common.c. So drop the comment here. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k_common.h | 11 ----------- 1 file changed, 11 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.h b/drivers/net/ethernet/qualcomm/qca_7k_common.h index 928554f11e35..71bdf5d9f8d7 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.h +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.h @@ -128,17 +128,6 @@ static inline void qcafrm_fsm_init_uart(struct qcafrm_handle *handle) handle->state = handle->init; } -/* Gather received bytes and try to extract a full Ethernet frame - * by following a simple state machine. - * - * Return: QCAFRM_GATHER No Ethernet frame fully received yet. - * QCAFRM_NOHEAD Header expected but not found. - * QCAFRM_INVLEN QCA7K frame length is invalid - * QCAFRM_NOTAIL Footer expected but not found. - * > 0 Number of byte in the fully received - * Ethernet frame - */ - s32 qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_byte); #endif /* _QCA_FRAMING_H */ From patchwork Thu Dec 14 15:09:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493179 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="XZlwJWZV" Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA1D310F; Thu, 14 Dec 2023 07:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566603; x=1703171403; i=wahrenst@gmx.net; bh=pMOm0QZ3NBUI5Myevq+RLLh5bsvVZgcSKMIaZJHXflY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=XZlwJWZVAaSYvnQeJz0BF4JWnNHIx+8rlnwXB+87lBGw6jZMPsTGss8tp78jxO50 qFYu2NM7aYMVh0ndZ3jjFV0D00th03jRjUo0srjUZLC+TUSrjTu9JViSnLbunOBqd 3+U2nIQAAdlY8l3ijpAiU/EaspHiV1zjic5aOpnnsDrtRk2x8eJWxD2eWSpfmOoQI l+ynqZv4LasqD7BrLqsMEQ/FBTkD9j/uw83dgo0VEU6FKcsya9u0ETJ+QKWZkNbAf fPde197/XhqVMyL8FB0rmYkREgVokF5/AKQ6Oo0wkBvCpbFVJWTpvzC7T3hI1qcoS 3qurELDDxl0avptAig== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1McpJq-1rmZrs3Ufq-00Zt7y; Thu, 14 Dec 2023 16:10:02 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 05/12 net-next] qca_7k_common: Drop unused len from qcafrm_handle Date: Thu, 14 Dec 2023 16:09:37 +0100 Message-Id: <20231214150944.55808-6-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:aj3sdZ088cqe6EU8y39swPh4At+btcIf51Ev49HT8NQVoVcf6uK Yyvq2I7BodPzA/Qflt+ByvpN5bAIrjETShoTKoL4N0zFQI7wykLZD+0UGlgKfULx/49daki SEWLRMIzBRzix4P3AUP4EYJjlqSn5WBnbC2tE6hitRN+Mr+puHHXr9uqQltOeHjzyNYmEXN QPOIkL+3vzNGN5FVKpCbg== UI-OutboundReport: notjunk:1;M01:P0:5mwPav9rwT4=;MNH26R9Y+oV658BHOMGaVJE4/7d EYn+CemAv4PLo6KcuYwWIZi5c+/J0VIaw6z0Bf5kh1WyqTPmAqWuam2KeAE7XSvfV4IVbQ0b+ mbDc8cixpF51llvQmL3BavbnHCraOmGYS6xZqMzVH/mer8YMzrIt1rIGo94RA2jUFBHoY7cCh G1/LHUhLE4SY9pwpZZnubDaIGpk0z352gLWCaLI/dyT9yt/exFW4Utht9nlR2qrQBrDKEref+ KuvtjoKHar4rJsV4XW/wMYdo7VU6f49VJbHkMKXS+CRGs8lZybh7pYrdNvanBDX5MDVXXiGzD qL8FlUO/YZxKGiR6ib72kVIMaoFwx3pqS6x49iDxU27NoUCf83YV1eXay6MHxrZ1t847EKcEm KDJ+zBht9uRDqou4ZlRhaByDibAg/atlZM4evGxQuxTTBrNrDwqJ2j9ixpklsiIVHi1aArUXs eGPv1xPOv3+U5uYk3PjDZi+s8XczIEgOLP2Pj+tuYkJlxhwRwDUzDxTCYEXycJXf7J+cOeyul WKVivkut6fz/z50YEdf+n+Mcps4XTElx6emuSt946Tc6qxyx6YlKrrG94ovOnEohhRTk/lz9T RHqupNJvkQ8F5GZ4p8nmtp67nyGM+PP2KWUm5uLvbdtgj4s18voQV7b/G14363f+2kg6Bz4Xa 5+AFhmazfhNeuoOV2YDwN74rQe9yxrVazoQnu0LWYm+1X9bdh7Q7Fc4vO7Nc7f7MwGgO4itJE B6DysormbWOvMd25v5zKwtvNIUpHvStKND9K7mOpbzsbThC6zwji4+pECv6ElvmPTTgMUxmhN ABm8VmSKalMDu61OR4JHXlcUKGnsuGLcfDmPFvIGFhfM51vWCjfpXD+kw2o5bb1RNRbKrJKQD 48FJhGbXoWf3YGKBlQtdZCcQxozbS6/YcuWzqsHdUbjrtaGcroA1fdd1Ogg4yGcsFcmiBi6iq Aob7cA== X-Patchwork-Delegate: kuba@kernel.org This member is never used. So drop it. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k_common.h | 3 --- 1 file changed, 3 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.h b/drivers/net/ethernet/qualcomm/qca_7k_common.h index 71bdf5d9f8d7..088cca7f61db 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.h +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.h @@ -107,9 +107,6 @@ struct qcafrm_handle { /* Offset in buffer (borrowed for length too) */ u16 offset; - - /* Frame length as kept by this module */ - u16 len; }; u16 qcafrm_create_header(u8 *buf, u16 len); From patchwork Thu Dec 14 15:09:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493182 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="Te9nOUmS" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64908125; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566603; x=1703171403; i=wahrenst@gmx.net; bh=uRDT1P17rUMa94Pjny3C2uqVoUmM42vy9zD9t/wTjGk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=Te9nOUmS5DV+lamdchh7tlTxpnIZ9N8RWzsLNeWdv29/2iYR+AJoF2oi6iF5FGV+ P7cAsQCofAZA9H5IBFsmwiWCbG5VIH2P6i5R6zp9OiHTdlh+8I8TAA2+M6/bgonD+ nXfAONcBfn5hLzNBq5eDArRNx4a63s+FAOf/41/dSAN81EGwStCq9xz8cNGC1qJYJ RvVJBXfH0Fbc9YuuDy/ZrW90fNEVJzNMZcYtlj1fUzRrFU7wKiPu88GLpSiNisFi6 o9zHZW05Dax/xiZshLF4gKYR8VZro9EPAL6y+o1IP16dNAq1O3NMCsbGz7OMhuD88 a0DoLGXBLotJ2ccSJA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MV63q-1qo3Gn0xEM-00S9ry; Thu, 14 Dec 2023 16:10:03 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 06/12 net-next] qca_spi: Add QCASPI prefix to ring defines Date: Thu, 14 Dec 2023 16:09:38 +0100 Message-Id: <20231214150944.55808-7-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:gt2WAqBmQtUV9umX0eQ4VehFvnkIU8kxOa/49+geh7iqOIfK9wu 4jBKJtteiFHuAlxWBrwPGc7XWnNwv5tWVTUaU2WMl+nlgGrGTGIDHIGYCHFi+k0YMi2CD2I avAP8hdiQL4P9XFRnZ7o/n5ZleMIZYhq2L/bkSjkY1GYsdHl1q5DLkbY0ZjJS+YR5QrY+rW PKvEepFpymKGoEnIag5Ow== UI-OutboundReport: notjunk:1;M01:P0:EpkKNXJVzz0=;RTI8JM35GT/KQRK4nQ5xbnkBLZg yuzqPqL4JDFLkIQwLPb26jAuWAkhwowlffzQBhfot5HF/9B9B3MhMMMy1TKRaOHGUVtDwI3f8 9HbXWtGlIBrxq1M36atL55+IfOfChO7UBnekGK4K6SeDhckqdFyq3kyCpCcd2yn960DQmn5sr KwU1b/eC7X885wKLm1GMAu4zj+TvRvxsPdioQeiXHSMDtdkNhwD9fXr6cFLeAfgVkfLvHL683 yOMcMi0XvGTK2mytPZ9wgbHSKmwhWONYtdLOQb41mm/KU74szwXSRGOB+HH+yrNmxw5okqCR1 QbA+psPbJjy6gLlzLVuNy8CEu9lYPJbSsEjIL5/t80U1qbcAvPBBpQVWjoNsD8TP/yV0uoNVS gi+zna9r9lU5KIU4w8AIbOu5/n5ua5whuqeAf2gFwsryviWKZYtbsICC+ed+4SUImMSZzZyxC SVw3agNhyI+jQhUzs5uySejr6n5QSa6wzBTZFiHWDDTAMIcobEKQUm2jgzVoGkc3GmS6HslH0 Z+VLNCQpEHF/JCjmBZyy5RTf0qe1XmBesx5l2SLjG6yQwtTpvq3meO0xAVfUm4bPlHfFFsQHy npB3Lhb5FXHqcN2cNxT97Wgi2qcP0CKLMZpcpxkJhIOLn1YZw3TNWspa/PD1ciFzYM8AqaP5A LYFuTqt945v6YRkbFTdOeaYT3PtxYNSc2blOiUpy4VHXxzzPK5QG1yGyeDCgXCPdqPOI7ER0X txeB4Trx2fUjm/ku9G1xBQjnPwrBo0C4lbRTurcBPqplwdFjIkAuwi6uIR7KfwW5u4Ffr90Bg QJzFVEQiCOyhEWdEEYGZrYgVdx1I0k5GTQ/kiQ4cikGyjZCXKIA6Vmi+9fPq2CcQUDAYtP71V 0TB8PvVVrFfu1xXsRUp1uYKguKYo1NZyVRqiE3C9jLosD0zE4bcfKpuNpIZlEITQxKwba2/Ma 0uEXlg== X-Patchwork-Delegate: kuba@kernel.org All defines in qca_spi.h except of the two ring limit defines have a QCASPI prefix. Since the name is quite generic add the QCASPI prefix to avoid possible name conflicts. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_debug.c | 6 +++--- drivers/net/ethernet/qualcomm/qca_spi.c | 4 ++-- drivers/net/ethernet/qualcomm/qca_spi.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_debug.c b/drivers/net/ethernet/qualcomm/qca_debug.c index 6f2fa2a42770..12d68fdaad8e 100644 --- a/drivers/net/ethernet/qualcomm/qca_debug.c +++ b/drivers/net/ethernet/qualcomm/qca_debug.c @@ -253,7 +253,7 @@ qcaspi_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, struct qcaspi *qca = netdev_priv(dev); ring->rx_max_pending = 4; - ring->tx_max_pending = TX_RING_MAX_LEN; + ring->tx_max_pending = QCASPI_TX_RING_MAX_LEN; ring->rx_pending = 4; ring->tx_pending = qca->txr.count; } @@ -274,8 +274,8 @@ qcaspi_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ring, if (netif_running(dev)) ops->ndo_stop(dev); - qca->txr.count = max_t(u32, ring->tx_pending, TX_RING_MIN_LEN); - qca->txr.count = min_t(u16, qca->txr.count, TX_RING_MAX_LEN); + qca->txr.count = max_t(u32, ring->tx_pending, QCASPI_TX_RING_MIN_LEN); + qca->txr.count = min_t(u16, qca->txr.count, QCASPI_TX_RING_MAX_LEN); if (netif_running(dev)) ops->ndo_open(dev); diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index f0c99ac8d73d..31ed7a527092 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -476,7 +476,7 @@ qcaspi_flush_tx_ring(struct qcaspi *qca) * has been replaced by netif_tx_lock_bh() and so on. */ netif_tx_lock_bh(qca->net_dev); - for (i = 0; i < TX_RING_MAX_LEN; i++) { + for (i = 0; i < QCASPI_TX_RING_MAX_LEN; i++) { if (qca->txr.skb[i]) { dev_kfree_skb(qca->txr.skb[i]); qca->txr.skb[i] = NULL; @@ -871,7 +871,7 @@ qcaspi_netdev_setup(struct net_device *dev) memset(qca, 0, sizeof(struct qcaspi)); memset(&qca->txr, 0, sizeof(qca->txr)); - qca->txr.count = TX_RING_MAX_LEN; + qca->txr.count = QCASPI_TX_RING_MAX_LEN; } static const struct of_device_id qca_spi_of_match[] = { diff --git a/drivers/net/ethernet/qualcomm/qca_spi.h b/drivers/net/ethernet/qualcomm/qca_spi.h index 3067356106f0..dcecb072b8eb 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.h +++ b/drivers/net/ethernet/qualcomm/qca_spi.h @@ -39,8 +39,8 @@ #define QCASPI_GOOD_SIGNATURE 0xAA55 -#define TX_RING_MAX_LEN 10 -#define TX_RING_MIN_LEN 2 +#define QCASPI_TX_RING_MAX_LEN 10 +#define QCASPI_TX_RING_MIN_LEN 2 /* sync related constants */ #define QCASPI_SYNC_UNKNOWN 0 @@ -54,7 +54,7 @@ #define QCASPI_EVENT_CPUON 1 struct tx_ring { - struct sk_buff *skb[TX_RING_MAX_LEN]; + struct sk_buff *skb[QCASPI_TX_RING_MAX_LEN]; u16 head; u16 tail; u16 size; From patchwork Thu Dec 14 15:09:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493176 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="MhTXXGtg" Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBA09111; Thu, 14 Dec 2023 07:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566603; x=1703171403; i=wahrenst@gmx.net; bh=dtL88b189EQfj8kkwIRgqqLj6oW21NIG/L8Xt1uiUiw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=MhTXXGtgf+zKs+Kl9kzT95qnLDEsaUfx2rq5EgQo3hreaRzhBzt9uWcYHOLPGrfo YWoSwD3f3z4aKlN23XHnK9ivajKIDACDfmQY/+es0xtbaeAbRJVznvOA7qkH/NQ8G lSLJWYpRweOmsEzsw5RVSv0KUNSN+V3J5RwCA3ATs6V7oxa0SoHkSbERs8I1AZWnO 7lMgh3TDd1vb+71C9hgSTxGi7U3QkjuV6/DhGDgcsTG7/6exTGJbyuZOkArv4rT53 6LJLZZ62FH3R89ti6JNssIm2eq/hPASJzjXy4ORQjRlKGacSCTztd7OwJ9BrYmNUW 88N7e8pCgU9RYQrryg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M59C8-1rEtoN2HBc-0016Xc; Thu, 14 Dec 2023 16:10:03 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 07/12 net-next] qca_spi: Introduce QCASPI_RX_MAX_FRAMES Date: Thu, 14 Dec 2023 16:09:39 +0100 Message-Id: <20231214150944.55808-8-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:6/yhf7vZclKY2EkVrwsHMX69cZt80n0/2WhMFI8fNap/UNpkHnu vaNtrm+jLxn+OC7snc2AVK+WGiBTq4zAh8hSEfo6QNuTs36AOxaUoJm8m+z1sbvPuUONAIp u0L11ZmCorR9Hh8C5LFse1ZJVAB5W0JBIKoJU442OI0BJ10DsMW5Z7nNnU5r1uMhbC7C2Nz +5xQ6nd3aFyfyGozv5bpA== UI-OutboundReport: notjunk:1;M01:P0:lSdcSXuP3DM=;ywW1B1ZxhsMnKLkaFgGueDpaBzW XqjtFpUpxGS4C5szE0/g/HUJB3+/2tGQFnEgxtijFR0eS6VESQwoypgCRM5sOsx4yDnh+Zxvl qzYDRfz4HJE/Qg9ymS7tUvpaihk+vcBCafhz8dN6h4NSh28J71rj3ICqPqbphFAc0XGU/shLa F6J1fI+XSrFCFc/6p2N8eODpN408Wr/0/A5CDLfTMaJIyXiAP6IHQT3gOaGoVMIn951RudLpV c/zJRj9Qf5QdSa/HZU4mCBxu+efEATxwtPRN1fV8hGzx1gI3YKnwBTjyr5/t4ngB43ObKMlq9 hgiiHdVBHvALqAt6azPP84vshNvmawHPfa5FbVvULZKlXeAVzRD/kKpnU85Mqc/asoZqutmg1 Id4H6s5LHG6rvBQkK4LelmRLm3teLKrbTq3PNMojYYIZgZrPna88Vn1II5eAn/x6JdXh3PbNZ Rg63SCwJWOF/gTPxcq5vJjGdUVlglcFnEI6n2nGrWW121Il2FaQD6hncJLsiYvA0nC1kLxnTk A5CBR6KFY8zY5et1tZb9aT0urDod0NV0Q/4TpmuQq3NQMkYgElPLyOBpcIQeIG5mODGYA69UG YpGIKyva8M280pp3miAX9ucYJDBpba0gK4EcHr3JiohNYXjy+SaCjGhd5nxmbkTTHAT7u6UZx u3pKn87ytdJ0Sl71OTL4jWwLAX2xVeUhRG0z/PVS7zpNIACWKw+DHoDd2XX9llrwhTMJiS/Ur Yi8vZOeQQQsMVv//eGPIVMxYGECDOhoC1dZBfxEKA4lWKGPkfkTwL5Iu91pcA73Tduj++Bekv xkb/SlpVSQ2o3G/QzPjNc7jEe/oYZAQ6+zyVLmq6eKZZzFC19lnax9GnurTpcAh6Rc+G3y4pY ObzJ/j5NH/luhac1L/Tpf0elG/zXfzj5HHedjiJMWCXyiIOhS2NTAxpFeNYRK9HhCsDFL4s2a m2xXkA== X-Patchwork-Delegate: kuba@kernel.org Currently qca_spi reserves enough space for 4 complete Ethernet over SPI frames in the receive buffer. Unfortunately this is hidden under a magic number. So replace it with a more self explaining define. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- drivers/net/ethernet/qualcomm/qca_spi.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 31ed7a527092..450c3d254075 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -796,7 +796,7 @@ qcaspi_netdev_init(struct net_device *dev) qca->burst_len = qcaspi_burst_len; qca->spi_thread = NULL; qca->buffer_size = (dev->mtu + VLAN_ETH_HLEN + QCAFRM_HEADER_LEN + - QCAFRM_FOOTER_LEN + 4) * 4; + QCAFRM_FOOTER_LEN + 4) * QCASPI_RX_MAX_FRAMES; memset(&qca->stats, 0, sizeof(struct qcaspi_stats)); diff --git a/drivers/net/ethernet/qualcomm/qca_spi.h b/drivers/net/ethernet/qualcomm/qca_spi.h index dcecb072b8eb..f735ad77402f 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.h +++ b/drivers/net/ethernet/qualcomm/qca_spi.h @@ -41,6 +41,7 @@ #define QCASPI_TX_RING_MAX_LEN 10 #define QCASPI_TX_RING_MIN_LEN 2 +#define QCASPI_RX_MAX_FRAMES 4 /* sync related constants */ #define QCASPI_SYNC_UNKNOWN 0 From patchwork Thu Dec 14 15:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493185 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="o91q2t83" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBBD912F; Thu, 14 Dec 2023 07:10:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566604; x=1703171404; i=wahrenst@gmx.net; bh=HLU+z34FZ8agcDi053VDUgfPobQm95h3h305AtqCmHA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=o91q2t83Dh56Y0d5zHgioKxcbNXzdB7oJSseC6i8yzz5fus6azbSkNGgsQMsI+oF y+s33Kxl67uFXFFX+QqtsqF/K5jVbu4cKd8DeP1zI7ddB0Jq+X3Dog+zOg+gFHYSm Ei6T593JvxdVxy1BmXH6Y/eY2KPmYamIFP9oiCYnu7scvuzV/MQHMdYsz137Dcask ejQ0p3l907kyVYzqySc06KcdsiIaX8XwAqqY1QsifAn9GTCabKLE7AosFX4dGlVYt Iq4EPbwv5y12Ny6chstipWkal0s3x5eWBBq44x9hk6rQk4fN2GA2CkgO9sJsiEwAQ Qai/Do3P58rrxcRkKg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MhD2Y-1riA1Z3dCc-00eIyI; Thu, 14 Dec 2023 16:10:03 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 08/12 net-next] qca_spi: Improve calculation of RX buffer size Date: Thu, 14 Dec 2023 16:09:40 +0100 Message-Id: <20231214150944.55808-9-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:QvIXuaxuzVK800Irwo++BOQEZ+wzFUpxIEfKzSA1XNu0VI+mZJL VC5jrD52OKs1EwsMqdP1iu+H5b2rSfbWBpLE4EqqU5rtOE1Nays9clKNEcYdYkA2Q8jlfj/ tYN3SNe47hmLjO0BBR4Bz3BxnVFTCPyTtG/T4H6Sxc9gddn8PgDJ7t7ucGc+EXdBAb1+k1/ LZHOHlZe8oI1Ces8UCwyA== UI-OutboundReport: notjunk:1;M01:P0:nslnRylfnyQ=;jOare3WTyWLYltgGDSocDPwJvlx GXLE6nNb3TBJcj0+ZorXXnY3VWIfnW65No+8/8CCSYKxPLaAHhA/t+xKshsO1gfNaUaIudCOL gIVoWKwjMfpG5I+IUuXIj9q2FQvTZRlZgl1ehI5ayaBtszPSF+hvKcZGbybXF87cQ4B/HrUB6 Vdz9vatjoO3RlTj6k6MFxfmJKyZL5JCS3GDlAHNZZkYRsxjhaYahMfYaN1+r1KJ4/nJNAIK// mqkBhn8IpOsdC+rSszwbZyQO90cm2ubO+nE9fzoUdkTSSbnpTvKmITW9qOCeEFMyJR4/+BBo9 K3Y8kt5+Feh+ErHvRzTpCScaQnK2P7QZJgcEXfdRwjQRqiF5bc8o4ugJWzD0x/sKVnx+PiQTJ ykxVBGLIzCFNUBdQ82wNrdJQB6wUR412t2f/a1ce3rL5EYN35VOeSAybFfhacBy+wNQM8eP7y zA5PFaf65mZHBQ/nLDl0q/XfNrRgKjpw0mLRIt07KZhvGv0epTj2pFUePAM1MeNGoeG6Z7lAp xpjBwTxt581YghgJd9nDvahhwiBLiWtfm1hCqkLU55TpjT8n8eZRqBqo48TGYFFrmvBVAEtLu Vp+FfwgcYWxqFq/vlmcegJQc15gIuBhkWdzLuSzcUggNv0uNjgRNFKU/VE/sIzjsMPkBnnwvm ailk9uZtgAqJQcXRkPs4v3aeOeE4dqJZFCyp2/l6pWcKXCd84B1CHG71Qcs08ECwuUDqCwhE0 XGd4N7C2oOXshcZDdNqFr5ba2N60UtAm9iV0gwUe5O5I2YsMxm//05Kr1ujtn9UlSFWOXQ63f /sYRHJTedjzTOffN0TYLilUukUmZXC/uQapK/sm9eqv3EZtp+GIdaSnIRn3Xg7puJklSG/BNi KvRSjlG43vL0FJm+LjnQjJ/gJx8/hsyHKiebdh+V0apcVb0K59lu8Sb66Fk3fJonq649kQ8ql lBWlYc5adm/kAyqj495YwNqVOp0= X-Patchwork-Delegate: kuba@kernel.org There are two points with the calculation of RX buffer size which are not optimal: 1. mtu is a mutual parameter, but actually we need the maximum possible MTU. So better use the define directly. 2. This magic number 4 represent the hardware generated frame length which is specific to SPI. We better replace this with the suitable define. There is no functional change. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 450c3d254075..50a862a85f1a 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -795,8 +795,8 @@ qcaspi_netdev_init(struct net_device *dev) qca->clkspeed = qcaspi_clkspeed; qca->burst_len = qcaspi_burst_len; qca->spi_thread = NULL; - qca->buffer_size = (dev->mtu + VLAN_ETH_HLEN + QCAFRM_HEADER_LEN + - QCAFRM_FOOTER_LEN + 4) * QCASPI_RX_MAX_FRAMES; + qca->buffer_size = (QCAFRM_MAX_MTU + VLAN_ETH_HLEN + QCAFRM_HEADER_LEN + + QCAFRM_FOOTER_LEN + QCASPI_HW_PKT_LEN) * QCASPI_RX_MAX_FRAMES; memset(&qca->stats, 0, sizeof(struct qcaspi_stats)); From patchwork Thu Dec 14 15:09:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493177 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="G7axTDMb" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3460D121; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566604; x=1703171404; i=wahrenst@gmx.net; bh=4w4fV8/WCKx7Frl/07FVoRBC+dlP5+0w1N8Tetjnf5U=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=G7axTDMb87TwXmQMzrnRCn73mmJZVMTZrjo68NJCKKZ6vlamHZYaC62b5jzZgKKD Mi4t7FuRcEFWnn6RkHVnPsccnVHJQAEIq9oOl62Tfv25QiPmmST2T9JTS5iCUu52j IebKuldOYntI2hiEcW6QXQhMHBinfcaUcSAyd7uWMrIAl4Vw0gUhE7nj4alNbN+fF 4tKaqsC3iQz6+CtHOWtIG7WooipEJ5WtnJbJbirkhH6OPYxlh7Iqvj86hFAcS9UbD ECojJeSZ98iCkrtBee7l/zu/zgoviY6n3iwJzCj+WWVBW6RMx2MX1WKHPxqfYgkjg 4NYtQ3K5ifQL4YR8QQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N6KYb-1rFw2P0kwr-016jkH; Thu, 14 Dec 2023 16:10:04 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 09/12 net-next] qca_spi: Log expected signature in error case Date: Thu, 14 Dec 2023 16:09:41 +0100 Message-Id: <20231214150944.55808-10-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:I4FtcHIGKQ1KMO8qcctQVpRrWx2lfstqeLAuShvPuGje6dgTdsY APzCseQ/2Ry8IIxZwQG0ZveFOhdgVPnU0Tx2kFBa3B8Dq70EZXEzv9BpPvdVDgb8s8MNDbL 3+jdzKRNLIPeCViTj/hguwDjqcDVrVU0HeKnySzZBZIaH5yoBTexcZQIF2uuKHe5qaB5ZWP CohckMqUsPxg8YPXJjMJg== UI-OutboundReport: notjunk:1;M01:P0:wL04cVLQOoo=;7xzT4lG8th9sNhun9U7n4TaBqYx ZULawFsRAPqKoZKndu+qHFb7F5zWR9v1AO+BhOlBqcB1GXz6AfqkytD68VbdpsJITjziUbPF1 TObhfNHnrGonFL6JIRj0FR8oHNmSuVXjHek8DpZb/fYBhBcjq619dnakdp/QI11BDTfbnV2DN fTABC1mFTroaaIXAFQak+BKSezljVODT1WOBJuRT/zI2AvN0eXdh1KGHQRAFZi8rAIU2YKoE3 xVp4B6U6HGGAupeApKe7Kgc7V9yLmaESsJVbKJXV7hEYt7Pr/isPqHUkqWbHz5HzwYN5p+a+s SY1Mc/pFpYr4U4dpz+fNnGhsA4JqyP25EnM4bsYL7XffuDNU61OvzNBl+dbApyKaFm4mXiajG Sc/Fi1BULGOqRiVNFV+OIKSLcRuFL4l0VUw2ad8KBlry3gLy+hOb92jvjIoxWIFw/mMDQrqif ccJ5/JAmXH9xzSrPgGMJF55YWZdCfBaUzDscafmv+VR0SNadEq14mmbueM0gEXsjCLJJ5giil 68e4EQi2EbDTiNSVsvfDV0y0Nze20kwqFzdlRUTgi/wc6sMKGC40lk0iu4/HyGQ7Y3kkP71cs Jn31AUZzjy8lXPLAtVaNgcYRNWNSrrq4OCuWR2ZkNOSFQ4y2fDz6OXd1OWv4gIUB7PQlmJhpm i1i0eSY7eikJ+FEwmFrkgBlhy/rZ3mkdTe70S4a9wq/9cA2whNnfX9pUZJvM9fRlkeZrZBdMo Nl4YnHvLlNK6KB9rCGbTivP7nABHf2yqguCfV3hktrRGogTFQ7EqS3qPeND0wmna+SlO2EVKm dlo1UrvXVNeWiA+akAKJi5vLbDGLLdTcKjYKOyQ4DCDV2iQTWYeFdiDmrQLZOMsC+HllYYsPT IMZVToTOKwpWg59x21JWjmUNUHhjeIvFCC25M+R53T64gV1zFOn8ks+F/LwMChzDZdIIfB6YL bRdifpWTIu28MrnFz4V0P/zxzfY= X-Patchwork-Delegate: kuba@kernel.org Most of the users doesn't know the expected signature of the QCA700x. So provide it within the error message. Btw use lowercase for hex as in the rest of the driver. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 50a862a85f1a..a9188b19d1fb 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -987,8 +987,8 @@ qca_spi_probe(struct spi_device *spi) qcaspi_read_register(qca, SPI_REG_SIGNATURE, &signature); if (signature != QCASPI_GOOD_SIGNATURE) { - dev_err(&spi->dev, "Invalid signature (0x%04X)\n", - signature); + dev_err(&spi->dev, "Invalid signature (expected 0x%04x, read 0x%04x)\n", + QCASPI_GOOD_SIGNATURE, signature); free_netdev(qcaspi_devs); return -EFAULT; } From patchwork Thu Dec 14 15:09:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493181 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="q5IIbZNo" Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43FFB124; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566604; x=1703171404; i=wahrenst@gmx.net; bh=uSq+XXTYVv4fmdVVfmAK8ycHoy9TNiBddJGsI4Vmj4E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=q5IIbZNoReGHhX3QtGKTP7mbI6eKpMFNU5GlgWXJjvUo7hT8oO0yqk609ZA51gEi cyo/3RezAsJUs1rNrDgvY3p+OPX5dLfT94am0JBj9jSmUYc7sTmGYSnX6sxWjqmux BaYm3YTTfy2/nws32t9osC8jq2PAUsytksG2Wo9URCK6I7sGYuLZzCOAoXG/UKi7a 8Dsnoe/Ba6gH0XAQXo4BirkwcyGwds8L8LIuH35P9L05HJOtfWBNr1y5QRMwjBddl keDvNpo5TuADpRWwAc/GBklseH6msBPN6aL0gX1CYUy2skvO/M7zXicVbrXg8fGwz pOfH8N1NaNKU+zEKWQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MVeI8-1qobV226I0-00Rbdc; Thu, 14 Dec 2023 16:10:04 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 10/12 net-next] qca_spi: Adjust log of SPI_REG_RDBUF_BYTE_AVA Date: Thu, 14 Dec 2023 16:09:42 +0100 Message-Id: <20231214150944.55808-11-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:c+A7nN0FN1C8wTnC6p1F3+SEI0HZ3i1L9DXP1LITWrDaII/Uo+V G+nOmQfpAZvKBGgCrTMFuj8nApP7BmU0UqlRFrHz0JkYeCxkD0k402DImQacM6XQUtcPtb4 RA8nOZC40gSFB8lPvs37S/9mKgYICAR6gjB+v9kI2Od2trWgtRokqr1i+1wciwwsBNbzQgX TZ4yVh8v2hKpIBLbAE6Fw== UI-OutboundReport: notjunk:1;M01:P0:6ebsGJKkiuk=;ViXKrX+bsBlqEPVocz4iy5439Qo HRfVCDhaeL5Hjd2bsXWzvw2PAEvddfI/ynzxB9DKbpvKrwuR7A54iuSgLbgen3kstOTIuvyJl /bcFRYfuKedGJG2GNId0tjCTTVV1KL2KyTQqBJ1Y5xRt14ufigeAhQ6RRlwHcwDlLKUrUUFaA 9/UwakDgSFK7sbjI4/Ope8JVuJhcbfppbaidHzPo2ULS4EFMby8oRMTwBevRXsunRmucTk4TS pjVG/yCGFp1ynWJ7EuyojnxfJmHyNbavpXsY189QqUwgrEPyVtoF+ZEwwkSItBjirD6zXrtAr mQ30N36KmNkNq3lXmV8ct933e47+QGdbKyEW7+jhK9NNhFIx6IGJ5UOdaMKRsODnkH32P+BF2 sriB5qKbk7MZQTJneXzK2hj6OkCwKV0j+YMHxbrJlSEd2Gtcc18NJBqBPuTWY/s7JsqoVNHvz cX0kWi5wyedNOjAHYwZB2zA0PUzOw6X0Z9+UHQwBA9swLI8mHXwHZDvsMUDMJvfZw8nkfvmje 49aU2eWtaWXJ4Y/URKgS7LqJK37c02pEncI/VOnFQDJngCbb6gNnQ85acqlf2SNDZoW4dRCBQ llEF36AETiaK84ANXrQFUcyx9czx/cd4J7tb9j6ORN3ZuZWxI3WGX7sK1OzxdwvMeRlajvMQX DJJbsQNCNZt101p/3p3TeKAWr8BKsLcKeooxTf+cN1OSmRzSuCBCZJvyL7SRj25J9/Jh1XY4D GKWLlCOAkL/4AvANVLAS0KAL0yUr8UOwvabGcTlllitpos9wF9O7RHrG8JdNdG04l/DzekubD acA6Pm9G75yZZFrjys3LIib/4xbKtm5WlgfGv8lCoKOtkVe3JEZqPKM2g3oO59RaVKdeFT8XV 0ennFbzCY9wrF3Rem/Ru3EX+BK6r7ibPsplR73FT+rky/P2SXNsO096fyQHz8NXA/oc3q9yCT 1ki3Kw== X-Patchwork-Delegate: kuba@kernel.org All known SPI registers of the QCA700x are 16 bit long. So adjust the formater width accordingly. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index a9188b19d1fb..fc05959ba825 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -359,7 +359,7 @@ qcaspi_receive(struct qcaspi *qca) /* Read the packet size. */ qcaspi_read_register(qca, SPI_REG_RDBUF_BYTE_AVA, &available); - netdev_dbg(net_dev, "qcaspi_receive: SPI_REG_RDBUF_BYTE_AVA: Value: %08x\n", + netdev_dbg(net_dev, "qcaspi_receive: SPI_REG_RDBUF_BYTE_AVA: Value: %04x\n", available); if (available > QCASPI_HW_BUF_LEN + QCASPI_HW_PKT_LEN) { From patchwork Thu Dec 14 15:09:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493184 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="e8pKeY3c" Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1220C8E; Thu, 14 Dec 2023 07:10:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566605; x=1703171405; i=wahrenst@gmx.net; bh=MoAx11XgLr0ouL9US7uE3kzhp+UdCYk0oyan3ug6VsY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=e8pKeY3cqsbQ9o7XQU1uC1SmpDzmfwond6qtJLwY3z/QsklD+/WI3WiFtnPjBmQ3 Q32FMVvGpZuGnlmacQRHEFKJMUjFHNdBO9ZQZDMgNLKg8Ta1Vwo89zW6l/HekVqxg L9cu35Xfn40ahECSQ7BHUt6t3M1ZKXdF8XVPUFPLBgR5gvFCcNbVSzMQkzvsa6cjo W2g3nc/QZNJYCpUY45bo7YXHU+OXmBuq4dqubu3Ax3m8MZhbgU0Yq9beKFPle7qJH +GmhLW3VacbTTb16DYo3Fsbimhgyyjqyg3JJGnEJ8B5M2HiSTUNqGHpn63Nxxvv5i gsXKZ6bTPSaJ/f6mjA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M3UV8-1rDF7O3ktG-000YJG; Thu, 14 Dec 2023 16:10:04 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren , Stefan Wahren Subject: [PATCH 11/12 net-next] qca_7k: Replace BSD boilerplate with SPDX Date: Thu, 14 Dec 2023 16:09:43 +0100 Message-Id: <20231214150944.55808-12-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:hw+SWl3SzyaI8G8Qd4WjAOMmiThtvdfxmBucxvgN4fLMcTHxHr+ eIC4DWwaRsilm1q1iTMiop3IjoW3gBEkOTw027Z86U7EiijUCBvXVz0cEmEZDIXS3uMQLeZ Ip5/n4Q8Xi6IoxBE2CkIXBpw10HGvi/xD66VLga2pomhnJfuHF+csJ+bsn23W8In70z6YGj MuO47NhP2gh7cEp0pZNuA== UI-OutboundReport: notjunk:1;M01:P0:51dXrrmYPrg=;hL4GE5ciazS5pgIBV1Q1JbU8rbU v8oJYwoGz0NfhqleJqVIXKLlDxMqcg4YFQ41kYN7fq/DorSI5ESV/PEPEuAtmp8NvqaYBo7bL 8FkaS/XiW+Kv3dUWnSvztiyqnv34iGQemWn390+SwWdDfD4mjtCiZ0DFZnbnjh1E4jB0BbzAq iFrTRFV7H82QRALL3koLpgRgzc4EM3P4G1ViUF5OstORMBIrU50idZyixUVSbsB+m3Rw6eUGp RFEGmM1vM7bXJIv0l+YcWdBLizxjJGzdcS5QFlK/lSjb1SUn+aqEqauaLJOBpXyXi4pE2YfI9 mdfcxXUvrwLDmdUXDmeYbOsYDx7MljLwezmu4REM+nmTqcFGlmVMvsesOLSMM2jGLjnbOS0gM T3duifib/fkThSdbfXU5VR0MFIb6kptA/p0Ns3hV6dOOVGjh8Qititv7oe1oizWbIynyEAPlB 10YZ2tDuwX5wiwnJdpf1MtCyVXFXe/zyJTCJH3L8HQtMsg00nJ+nD3g3MxhgWUSNaYTRjduKf 12JiHRQm8vJg3j/fSgirwQEtQky25l+DuBmcXlaMsDCXFG1xyUQB5A2F0FtK4lDQOzZfYuaOJ 5Bkn3cdlgvq79g51DKUzLJFRU4/bMxjRi9K2AaRgJ/fprQ8LvykEaOidVT7sNWgTD6JFhJbOX O9fHM3f+3YehukGTDaOQVN5kaFLloTL+UsxIdZmt5mSX/njxgnkAefbVgVGo5GGwMSU5zHQpy 5sqrwfVHDIOWqkNCD0De7nyr6SsxqS2QONUPP9tKE4pvjtvunSWuEoFAZKOStl5i/w0+CEY/5 gfAg6jSrKRY4VMfBr7YM2rQFXigKfFCwppyZyg4BVZSor4fQl7xUI+4oorBqOPIOiMAm4E2pe RrUUsvqH0WJ5vIZ1rc1ZjY/vhBOyCSHfZuCiDOsUyWaY1kiq2TbjI7g9C9lh+dIYVqm23DQPf w9VKyq7M+bdKasRr5E39DZ9RA6U= X-Patchwork-Delegate: kuba@kernel.org From: Stefan Wahren According to MODULE_LICENSE the driver is under a dual license. So replace the BSD license text with the proper SPDX tag. Signed-off-by: Stefan Wahren Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k.c | 17 +---------------- drivers/net/ethernet/qualcomm/qca_7k.h | 16 +--------------- drivers/net/ethernet/qualcomm/qca_7k_common.c | 15 +-------------- drivers/net/ethernet/qualcomm/qca_7k_common.h | 15 +-------------- drivers/net/ethernet/qualcomm/qca_debug.c | 15 +-------------- drivers/net/ethernet/qualcomm/qca_debug.h | 15 +-------------- drivers/net/ethernet/qualcomm/qca_spi.c | 15 +-------------- drivers/net/ethernet/qualcomm/qca_spi.h | 15 +-------------- drivers/net/ethernet/qualcomm/qca_uart.c | 15 +-------------- 9 files changed, 9 insertions(+), 129 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_7k.c b/drivers/net/ethernet/qualcomm/qca_7k.c index 4292c89bd35c..6263e4cf47fa 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k.c +++ b/drivers/net/ethernet/qualcomm/qca_7k.c @@ -1,22 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause /* - * * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * */ /* This module implements the Qualcomm Atheros SPI protocol for diff --git a/drivers/net/ethernet/qualcomm/qca_7k.h b/drivers/net/ethernet/qualcomm/qca_7k.h index 356de8ec5d48..828ee9c27578 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k.h +++ b/drivers/net/ethernet/qualcomm/qca_7k.h @@ -1,21 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * */ /* Qualcomm Atheros SPI register definition. diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.c b/drivers/net/ethernet/qualcomm/qca_7k_common.c index 6b511f05df61..be2f754efd21 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.c +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.c @@ -1,20 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause /* * Copyright (c) 2011, 2012, Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* Atheros ethernet framing. Every Ethernet frame is surrounded diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.h b/drivers/net/ethernet/qualcomm/qca_7k_common.h index 088cca7f61db..44ed66fdb407 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.h +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.h @@ -1,20 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ /* * Copyright (c) 2011, 2012, Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* Atheros Ethernet framing. Every Ethernet frame is surrounded by an atheros diff --git a/drivers/net/ethernet/qualcomm/qca_debug.c b/drivers/net/ethernet/qualcomm/qca_debug.c index 12d68fdaad8e..a011a1c5d427 100644 --- a/drivers/net/ethernet/qualcomm/qca_debug.c +++ b/drivers/net/ethernet/qualcomm/qca_debug.c @@ -1,20 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* This file contains debugging routines for use in the QCA7K driver. diff --git a/drivers/net/ethernet/qualcomm/qca_debug.h b/drivers/net/ethernet/qualcomm/qca_debug.h index 46a785844421..0d98cef3abc4 100644 --- a/drivers/net/ethernet/qualcomm/qca_debug.h +++ b/drivers/net/ethernet/qualcomm/qca_debug.h @@ -1,20 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* This file contains debugging routines for use in the QCA7K driver. diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index fc05959ba825..a075193f3787 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -1,20 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* This module implements the Qualcomm Atheros SPI protocol for diff --git a/drivers/net/ethernet/qualcomm/qca_spi.h b/drivers/net/ethernet/qualcomm/qca_spi.h index f735ad77402f..d59cb2352cee 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.h +++ b/drivers/net/ethernet/qualcomm/qca_spi.h @@ -1,20 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2014, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* Qualcomm Atheros SPI register definition. diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c index 9adec91f35e9..f911effccfe0 100644 --- a/drivers/net/ethernet/qualcomm/qca_uart.c +++ b/drivers/net/ethernet/qualcomm/qca_uart.c @@ -1,20 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause /* * Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc. * Copyright (c) 2017, I2SE GmbH - * - * Permission to use, copy, modify, and/or distribute this software - * for any purpose with or without fee is hereby granted, provided - * that the above copyright notice and this permission notice appear - * in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* This module implements the Qualcomm Atheros UART protocol for From patchwork Thu Dec 14 15:09:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13493186 X-Patchwork-Delegate: kuba@kernel.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=wahrenst@gmx.net header.b="GHuBBxfF" Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D886112E; Thu, 14 Dec 2023 07:10:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1702566605; x=1703171405; i=wahrenst@gmx.net; bh=+V6TWgFQD0QXBTOYOaUZSTtj4sBFwWacPDZFwSXHg/I=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=GHuBBxfFaB6ZyTNo4lRdXOHi63HVIWERahhiNG0k3XpfiM+wWW4kqixq9tV6jI0z yFgDbRHZ0YD0p46ASx8PU6dVNiJRw2KwUF8Yp6qxOkvlW0VnMnKG85ax25QVUDyXz ajz67alULldzIzm32kZ19HpdgE51dDYA74muR+SvVMI2cnvWg0nqp56Feg50XcYD3 iVyVI9jIVCnY3vZ6Zc79xspwUI/huzLrzYvAWggNwylt8Yu1J5RLfSktWd9NUVYBP LDyzDJxI5rgOxSx1l4/sK8IAVYZL4HKq4gFggK9tudv/A+8iWebaPo7jxg/ehUGy+ 97ughMfdCJHC9OTIXQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIwz4-1qtVJ912YE-00KQe2; Thu, 14 Dec 2023 16:10:05 +0100 From: Stefan Wahren To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren , Stefan Wahren Subject: [PATCH 12/12 net-next] qca_7k: Replace old mail address Date: Thu, 14 Dec 2023 16:09:44 +0100 Message-Id: <20231214150944.55808-13-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214150944.55808-1-wahrenst@gmx.net> References: <20231214150944.55808-1-wahrenst@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:uCDwzQ3sQIrP/AtvuPo1Sz9yf6dROMs+l0kalkMuagerhgEeg0s emuIf+WS8z8St0CycyIRf5Y4qeLrKvYSBZiIXzoAyFLYsqijKMtwfvzAkBT/OWLBPlqzOvs gFnWj/U/wxkKAdmmr0AjenvWlxDm2hS7AuuQxzaS/tw5iUkdGAAYX72bBlBNVFfKOPEKGLc LGHKud9KeY6BZmQ8eLvEg== UI-OutboundReport: notjunk:1;M01:P0:6C6IfB+febI=;Upp/2WWO5+IRrWVvZgzBHRipSDv LyO+7rrTcY9lgg1YBiwTV/2Rn5ZDgtgEP9LUVeWSCqjKo7ptjF3FwQgF1kUqeI11TJHrytanE 0QZ8uc9jBS0ybJ75xEfpbulO1tTk+d1D8FHPxKMR5lX9R2qAPMtW2yCc0t4yzF3h3/pYzP+KR 2vD58kryHN0xQk99ZQlZoRlOebeRZfirsmq6hIBQlcO8PAvLbT3hHs6FesgsvfIYJDMNkX+Eg BcVJGEQIz3fMGSChrrwyNBHGcifiezIcXa7/RLxsdKHdFoB9J43MJTEPokb4mFfCOR7FgYFR7 YXLipVb6DLzyneA52QNMIMDKmtQPzwobct8yLmp9lUCjEQzgUcU0wpUA3bi3w1Mm9c7pwnM6e KgIu1DJdG8Eerm/oQMWCDYOlZ6Q9VT5JW5NSr1DRPCIOR/yNLO7rXhi2hMfli6N9BvorTtItA ksoNy7A4ip97yEbNDkO+KTiDHM77GYb6fXAlAQQwsqNvLRVFRurMmWFo46AD2dLxwBinCSgd7 Jp8Ltq11KGtL1/wQSI5BFlSfI8TTfVKyCts2SCaZOEiipjlX5jlT4cokBhVYlYT758TFiFOrr j8kOhGTF0N5sYrolaD/Q7BBEnB03+4tifcOJd9QkHQOpBc+SMXJaqK91r2PrjOHW9ioXpLwoL y1+vQhUTZS62tVCfL2sVykelyIgEFO4GvdFtcHLPsrY7VXoEtZ5fj8smyzddPsgnfPueimFgo IC9JJ/DqxzcSYVyvoXME8mskX0Bu0R1qakElTa3ye+TyoK6fQuGGiMknXxjAhhjMlhsk8SKQV FFw9MxqRSwE7MaYf8SkB0SgOUPk6RYiUb47klDaKE1s8ZqwV+s0agAyCJ+PsRQNjOu703PeQb gcuX4a0aAOVsl5CJ7mJJ7rdr7uj9EQgskNZdPqn9ZTfiUYBl8wWj2LuiO7I1+0Q57tGQTNffo UByQ3A== X-Patchwork-Delegate: kuba@kernel.org From: Stefan Wahren The company I2SE has been acquired a long time ago. Switch to my private mail address before the I2SE account is deactivated. Signed-off-by: Stefan Wahren Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_7k_common.c | 2 +- drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/qualcomm/qca_7k_common.c b/drivers/net/ethernet/qualcomm/qca_7k_common.c index be2f754efd21..5302da587620 100644 --- a/drivers/net/ethernet/qualcomm/qca_7k_common.c +++ b/drivers/net/ethernet/qualcomm/qca_7k_common.c @@ -149,5 +149,5 @@ EXPORT_SYMBOL_GPL(qcafrm_fsm_decode); MODULE_DESCRIPTION("Qualcomm Atheros QCA7000 common"); MODULE_AUTHOR("Qualcomm Atheros Communications"); -MODULE_AUTHOR("Stefan Wahren "); +MODULE_AUTHOR("Stefan Wahren "); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index a075193f3787..ccf9a9d7ecb0 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -1024,6 +1024,6 @@ module_spi_driver(qca_spi_driver); MODULE_DESCRIPTION("Qualcomm Atheros QCA7000 SPI Driver"); MODULE_AUTHOR("Qualcomm Atheros Communications"); -MODULE_AUTHOR("Stefan Wahren "); +MODULE_AUTHOR("Stefan Wahren "); MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(QCASPI_DRV_VERSION); diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c index f911effccfe0..fb53a0c32898 100644 --- a/drivers/net/ethernet/qualcomm/qca_uart.c +++ b/drivers/net/ethernet/qualcomm/qca_uart.c @@ -398,6 +398,6 @@ module_serdev_device_driver(qca_uart_driver); MODULE_DESCRIPTION("Qualcomm Atheros QCA7000 UART Driver"); MODULE_AUTHOR("Qualcomm Atheros Communications"); -MODULE_AUTHOR("Stefan Wahren "); +MODULE_AUTHOR("Stefan Wahren "); MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(QCAUART_DRV_VERSION);