From patchwork Sat Nov 2 13:41:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188367 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Zluhl/HQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750d53ck7z9sPJ for ; Sun, 3 Nov 2019 00:43:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726823AbfKBNmX (ORCPT ); Sat, 2 Nov 2019 09:42:23 -0400 Received: from mout.gmx.net ([212.227.17.20]:48529 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKBNmW (ORCPT ); Sat, 2 Nov 2019 09:42:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702114; bh=Gt8mtaRoWgef35XMJ2bznCxioijqTL1JeO9yIP8m0jk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Zluhl/HQN/QJi8FpCGnsv3PiWab2FfFsaZFJYue2XZUDutAZF0s9dPtXFWBY8anxo cEo/GLhNmvRcqmFof0fI7tnotkXNjyd2q+8ajBh4oXjKP/IMu2ZxkLUKgM4mtNjLsZ bSIx3yJLWT0FF0rX+OhjTxlveNJLjkoPHdJ3zZxg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MIdeX-1iCMvk3Ent-00EbY9; Sat, 02 Nov 2019 14:41:53 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC V2 1/6] net: bcmgenet: Fix error handling on IRQ retrieval Date: Sat, 2 Nov 2019 14:41:28 +0100 Message-Id: <1572702093-18261-2-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:4KOkdHKpqwUQBL+sP9jFmD/wRZEjL6GMtTHhcX3nDLnL4Y5dcZd U7Um4XjIfonOnK7J34g2rQh/EK1hD2iUFPp4PQS+ct8tqMFN7vA1M2Ht346gAXF15OSP0LR 0li69YNIZaGqrhekDHg7VnT+xA5LBqhh0yShLZ1WdGXn3MULzo4O8eGXoZPF13X3V/QBuxr 6nmBp24Wg/3ZBMYm7zu6Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:jUH8TvmwCkk=:rYJhhWDaD6/v9EYrP+WEkI 2wQhuOuc+u5FT6fyBXrx5yVKOLVsTmFiTWK7rzFsnwcGJzo5Y4b5zuO55AmBM8V9nKBuyymdr oYPPPMegpVyEp7zcaz9fvPQIDMsw1a5a5TFHbiBTC1NVsEDoAifGJuIEjAitygwcGJJt1cFgE MGad+QfmPfl2OvdFtfI4+GmYUdUQNlEIEf6dzDybIqPVKEhpGacOqRq/PWgUq8ATbHrOvjbaw Wb5djpkbh/ui9Rb+T5Q4Ai2PMq38da0ZDrnyDiSpHTEXtXc+7Fn+Suct9XBsNTTXpTQ6M7cgl 3+111cwcgAXJEiY5aRAWGhPJiFgUdHV1o6ozMBTN235fVZZ0Nh5AjJtpmTu8DOc45bgA8NLRy DDv92somX1T+n2PSgO12FR1areNNYVIMydXsa7BTnbL6ToZQZTiatVcK9CIWGu0BTi/FdK4Lr rkmgpBzeCV4bOJP1QzKyvoIiSXH8k/fGVtM8lfeSU3rHfeXfHbZVBzMcQGmuhPYvXYUlQOnho JZgT+OHImyjzpJJ8VA4kYpw1aK/mZ17gxbI9mEjS7bR5VkpeIW2WJ/5veewfo77G1DL3QMnD6 j8by582hlVXwPBrQfphM3ZkJxdv99ETr7GcLhPFPq+1GONr+d6rnMrgmEA62s4U4jg41ZDrZA Q/v4XuOzIX5Yu6suSuplYg0gOY3XvOaI5FYAMYWS8rpAMOCohEL2G5aUW6Zt5a8CJBkkeL8e3 3TC0280zjKIf5X61elDCe4l1zd5CnEf4lRdCv5Ym+oa/SEqmqEODw3MkBj0nExvHG3ST8f8rc 7TJsAw3lnTPFAjVxZJBt5F5ejF00T5PwPDdFvFlLeiPcwG7GJmg/SzCnVjESlXHmroFcAoqnV anU6JGxqvLBICJ4xpAMSjcjkSVF0pdKxsj0UqLvXTseQ+q8jBEDw/OLJN7aJhQvvkZ61//AY0 F+hEW2wjWTB4zrejq+zF0PvuN3pg413NCtUKX80CMaC5IL8BhutDzzh32/S96sNHAPiiuCMyg 5FrucD0SWpksEI2yggz5ORYIOY2UpCNX0sE9UasftU7ay88FB4j+TFpIdOmui29YDj0N/YjNm JMEllR6rYUivjsP1lJTOMxlanwMDY+J5bxMMPLVsc58DgHvrOs1Brggx3S80ywWP+brHs68EI 1cbMRZSB6ugrKAlifwY9m/EGtI3tFnn1GCBjVeshTsfpz5mZTtkFpl2huZxywOTzZ8DtqnHpx x4JVjrhUcbLDCf9kWDTBxov+AmwMytHWpJoTE5Q== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fixes the error handling for the mandatory IRQs. There is no need for the error message anymore, this is now handled by platform_get_irq. Fixes: 1c1008c793fa ("net: bcmgenet: add main driver file") Signed-off-by: Stefan Wahren --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 4f689fb..105b3be 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3464,13 +3464,16 @@ static int bcmgenet_probe(struct platform_device *pdev) priv = netdev_priv(dev); priv->irq0 = platform_get_irq(pdev, 0); + if (priv->irq0 < 0) { + err = priv->irq0; + goto err; + } priv->irq1 = platform_get_irq(pdev, 1); - priv->wol_irq = platform_get_irq(pdev, 2); - if (!priv->irq0 || !priv->irq1) { - dev_err(&pdev->dev, "can't find IRQs\n"); - err = -EINVAL; + if (priv->irq1 < 0) { + err = priv->irq1; goto err; } + priv->wol_irq = platform_get_irq(pdev, 2); if (dn) macaddr = of_get_mac_address(dn); From patchwork Sat Nov 2 13:41:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188368 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="RkWQLl7a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750d75bb5z9sPK for ; Sun, 3 Nov 2019 00:43:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726902AbfKBNmY (ORCPT ); Sat, 2 Nov 2019 09:42:24 -0400 Received: from mout.gmx.net ([212.227.17.20]:39781 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726554AbfKBNmX (ORCPT ); Sat, 2 Nov 2019 09:42:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702114; bh=t37Bbd37Ccjo2tsA8xcaxuE8pZbiD+UMaXKQ1I8p+k0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RkWQLl7ajsSGAWppXkAWFfzu/FRxiVAX0iYeu6TYy18syol733oP5k79lM1zj5uqa muXwOjqwsOiCCByny10bR2m4w+c7MmnNzImA/dX+/wuTxxJS6F3CZfehFhdnxT2TGP tvETtUZhCvBxxfyh0BO+zeboivi7B+sX2/Hyrumw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MdNcG-1hrYqQ0udk-00ZNVM; Sat, 02 Nov 2019 14:41:54 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC V2 2/6] net: bcmgenet: Avoid touching non-existent interrupt Date: Sat, 2 Nov 2019 14:41:29 +0100 Message-Id: <1572702093-18261-3-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:m70ZrcwjQDnPhyAoISCZwujzpEcNMroE6UD6xkpYQpJr0Stf0e1 U/xs+b03It1McpME+nIS0a1tNlbl9VYbgBwyYENB7ug+O0x/3HfWu1QwhfBymzLB/CHFpJr 4t+I6At5JhECJ9jAPQxPral/jbWZM+y3OGAc62QzDOIMhGY66/LCZ1hXsnGFTZQvmtNXaYH 9BvIaHuqz0PMVExPlWRMA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:a2cd4/ZezW8=:INoGZaVH+y9KSWDZV4bTvI ezpJhyU/brrpwp318wl44izLQT+wF481cufb4kP3o28qR2QnNX9AAii2UcZdYU290y3m5PdBD Ty2AAk/oqiEceKF5JuTLEmUmfGru1JxZlxLxBvDAymZmxbtNBN1vgFpU31YK2fLecyvImimNK KZjDP0LmkM4kGLj+3o0hbAs9E2K07pYrYy1Us+XqTgAbi+eIKrwXQSUPWG+5iGcHL8RhHT63V mb1UNlIu+AsGQDvyFrcy9tJCsa9OPAdsCV0XKfebxlbAfO6qgi7J6xSqZruFVULv9eEtanTxH Ji/JuMjFbayCQTW0QvfG1w3JhYEyWd7UWX65a2Z6mmnfFNxuc7c3dg/AbWHbHN+xQ98oaRGoD dYGinTYafFLS30jjvFrJK60QVLT9ZKMwRXJZgIFSEKBnrt4p2jBWJfm+iVQBMa7HvJj0oiO9D 8VV+4Z6Sp4W2X1qcF3DFI+zCLv97C/vVMBxDZ+cxJ9QENhiWK0dukpBMDolpQEzKwVZnDf1Gu wcv1ieQRaHOXr5D95VF/3PILKs1wX7oRzMSMkL3h8z7xFqeChl1BC+nt6QJpxh3cRNP3xATs+ YIvK0Xit1gA0AET9HyzakvkQK4Je/nxJ5QfaBcjvzk0nJmtX3068djY7tjnEQfaJNXosoIHWF 3hVjoVVZ2z84z4OoyQHua46Z8703azIk2LTJMVHwxH/o6HDfMaVWUI9bYuWBn/EOnCm6j4USm 7G4KJksgUbYmlYaPWnAesyMuodsbsmNNepfC+5jGNrWb36Va+NS407BTgCEzHGhdSM0KSaaiY yea7A8jTGX9T+Nl/uSfhzSr2ZIEB7/eWQsYJc/RV3rECpkwVOXTzKeXlfsL1BTcXmr7cchfRy K6nc2n7xoixrnNqpgaOuYrXvvOp1e7ROYLw4uBFWYVj14azuLT+8UGCe3G9iJCN1haypTPqO2 XRKZYpBXqObCHBTdxdxBpDlC58P7kInUurBvipOla8M+XKTwPyK20E0v6kknYMPI+WTXA4yYu 0nTcD/a4hi7pLB9mlFLRY9tJkXeogmKy0QA2SpqlL1P1LFGFXC3VslK7pY5D/eH32LRPhvc6Y rA0rAe75XV9XBMVcJ1GPTVx58ffn471sypWJIeVx9ds22tgC82gM3jtdQjInVD084okx0O5Mz +E1NHOBSEmp8AYJx8wNCnp6mmr21n6DdXaDPx0lekh4N8BSX5pdqOK2MZar/zjQeNPOKv+N4j OqU+Pr+QXEhooQAJwaKojNK1cdY/7DqPgtP5QMw== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As platform_get_irq() now prints an error when the interrupt does not exist, we are getting a confusing error message in case the optional WOL IRQ is not defined: bcmgenet fd58000.ethernet: IRQ index 2 not found Fix this by using the platform_irq_count() helper to avoid touching a non-existent interrupt. Fixes: 7723f4c5ecdb8d83 ("driver core: platform: Add an error message to platform_get_irq*()") Signed-off-by: Stefan Wahren --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 105b3be..ac554a6 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3473,7 +3473,8 @@ static int bcmgenet_probe(struct platform_device *pdev) err = priv->irq1; goto err; } - priv->wol_irq = platform_get_irq(pdev, 2); + if (platform_irq_count(pdev) > 2) + priv->wol_irq = platform_get_irq(pdev, 2); if (dn) macaddr = of_get_mac_address(dn); From patchwork Sat Nov 2 13:41:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188371 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Ht3ka2QP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750dG5d0zz9sNx for ; Sun, 3 Nov 2019 00:43:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726985AbfKBNm3 (ORCPT ); Sat, 2 Nov 2019 09:42:29 -0400 Received: from mout.gmx.net ([212.227.17.20]:55919 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbfKBNm2 (ORCPT ); Sat, 2 Nov 2019 09:42:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702114; bh=Kq8jVv4KTT/YEFqTzeDy0DyjuJ0jO8lh0ibZKH2OXh8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ht3ka2QPxdW/avugLVP1F7v4AW/+qWpbLD0OytfiCkbj8XSZ2rltSa6EVUOdAWAjf zP14DGeXFAEQmZOw/oRdp5fW0Joc7Q8uUc+/3gL1tH2NxjHbr+uFL24+qoypJIkptB RgCKcoi/t80fyg7t9vvFybEeV41glDeUt1yqGzRs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvbG2-1i8fky2rna-00shZa; Sat, 02 Nov 2019 14:41:54 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH RFC V2 3/6] net: bcmgenet: use optional max DMA burst size property Date: Sat, 2 Nov 2019 14:41:30 +0100 Message-Id: <1572702093-18261-4-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:+ydjqLwQaCCuVahtqEKzjJXqL9Ne/Q5iMTBvbfN3R6S2K5c4hwX LNswrb190cgkUxjuUhHIFTydQtBZ8LWWMYKqv8EOInLc1r1AeEsfxWF96SOlC3Sm+2pZr6u mEveIih2H+AOE0vf31YY7Eur3dLhwqac0AbgNss4wW5TG58b5p3EhyH4nS4q7DTKiJvgL/K qud2WqYF5i9ywzH7eSorw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:L3iBkhP8wEs=:1HEfBsxwIJyRLUPTQwuZdE yu/JLTUKkKDKmfPEVXNPdWQtR5mTbVB/B9p/OzXrKTJ1gqRx4s2ntufda6vIZ2scJXfgjA5Qy Sx+DxH8ReMTubbCVe2iuaUfd4dDAa0NBUSBTa0JZzQRI97r3T0S/mmah6LFQ1tPOal5rccktD 46VJpLK750FxqPwj+CQaXBftYHDSlKBFF6+Esesfx2g83x2D9T/NiGYpz85Q+UnLCMtDfejLE Dhujx5lxszeBrNzYdIUdDnRlt5Hj48EP1ko+7XN+w90kpqo89mYUKCyWBSl3+kju0tsDKUJdZ RXsH2bvnA2Vov/mabjidqRAKnwxlpZgMEZEU+5Gf6DQTUiLV2uJS71Fe8hkM0HO1RQaLUfJAQ 4FEij54Et+Hyf96oh7P852ZRi56T6pF7oa46iHME/+/77r7Hq8PDksaSlNJhVFhtv2aQLPy3R Vh91kc42wceZImPJFg9otqlrLK69a6K3Gwo0qtfjwoTM97BPosNhhndW0muNsEk0KBx2y+m48 1n3G1bsKk5HRlWiDdj9wQNkBJa6yuRMsJHRjhVPZBLoimk1glqSo0JuPcWur/JWbpQ9R2NCWy kCCrhH4LYPc8/Ydl/naTvEY971yhCVrlWqtD8/2x/055HQ23o/v+5wm/nlIlsr5bOJ2UQrPS9 o+u0wuqwG/9yTGJIp8Jzt79bcvvveupUwwIv2QLDzUm57kLAGBQx81Bnt47NmMdaXhC3GJHIi 2xJfuOt4cfQvajpAHFfd5SPNlx2Kf3842KGDJo3ExgAuj8mAfxPNS1Zo1IoCHFW+BAZO+bAAV Cl/Wcv4lNr1VA90iT7Utwz1gkP+9CGM/I2QWtb+u5/+mikE9IxzkANJJ4/5v6V4Jukz/fsRnn 6GrteYFSLBII493Hd/Ppks5xM+Sy3l6v5Pp/6U0PMfS6EwNJjgghUp/3VHu/jry8RWj850n0u QIpKBvlfVwVr9pX3l3KtqtGOzRkbkIVl+Ct+V92sei/+3TpehzjsBBGyafL1O0/4NgVzDUFtt biE9O04Bd2dellqA8HiQ1xnOJZ/GAraLR3Sqcat9n5+PHGkoJ8RK1sIFd/hVHWK2Deu+Kwic1 E5z2zaKaAuQuUEfyiWkWQCzifsaLGRY+Iby65/5Eto3+Kys3DvBPDRzzhDEy5Cfn1Mls0FRYx SFJGGzYiaXMXl8hKMIBnESEApFPYBWotRKUi3wVlM1TozpKhaaSNmSk3L7WGy/RrUdLZjqENN 03aiCxg5n2WPcrWoiA8tUc4sy31/RXJ+V5VXwVQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matthias Brugger Depending on the HW, the maximal usable DMA burst size can vary. If not set accordingly a timeout in the transmit queue happens and no package can be sent. Read to optional max-burst-sz property, if not present, fallback to the standard value. Signed-off-by: Matthias Brugger --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 13 +++++++++++-- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index ac554a6..8d0093b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2578,7 +2578,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv) } /* Init rDma */ - bcmgenet_rdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE); + bcmgenet_rdma_writel(priv, priv->dma_max_burst_length, + DMA_SCB_BURST_SIZE); /* Initialize Rx queues */ ret = bcmgenet_init_rx_queues(priv->dev); @@ -2591,7 +2592,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv) } /* Init tDma */ - bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE); + bcmgenet_tdma_writel(priv, priv->dma_max_burst_length, + DMA_SCB_BURST_SIZE); /* Initialize Tx queues */ bcmgenet_init_tx_queues(priv->dev); @@ -3536,6 +3538,13 @@ static int bcmgenet_probe(struct platform_device *pdev) clk_prepare_enable(priv->clk); + if (dn) { + of_property_read_u32(dn, "dma-burst-sz", + &priv->dma_max_burst_length); + } else { + priv->dma_max_burst_length = DMA_MAX_BURST_LENGTH; + } + bcmgenet_set_hw_params(priv); /* Mii wait queue */ diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index 7fbf573..22cde8c 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -664,6 +664,7 @@ struct bcmgenet_priv { bool crc_fwd_en; unsigned int dma_rx_chk_bit; + unsigned int dma_max_burst_length; u32 msg_enable; From patchwork Sat Nov 2 13:41:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188369 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="NSR4jjTc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750dB1Pfpz9sNx for ; Sun, 3 Nov 2019 00:43:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726916AbfKBNmZ (ORCPT ); Sat, 2 Nov 2019 09:42:25 -0400 Received: from mout.gmx.net ([212.227.17.21]:33617 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726900AbfKBNmY (ORCPT ); Sat, 2 Nov 2019 09:42:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702115; bh=B+2ielFzQfrNXcrr2rG7ypa++YSnuxddRmAyBorL8W4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=NSR4jjTcIbME/Mma0/vrjDQ+Eq3suj0eYWC2h6wu4yIE0LvpkpivqvCIDGhoP3C6k /U+tHPPbqW0FXoALDJRW/kuAGojfAj2N27bdshkDhjuIha9odbN3fhAhAdsMGqRoOF DilHEi9bqqLCG/vkKJdZkGSlxXDFRsqLOrZMA7/E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mzyyk-1i4I2n2Zp0-00x7Pu; Sat, 02 Nov 2019 14:41:55 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC V2 5/6] net: bcmgenet: Add RGMII_RXID and RGMII_ID support Date: Sat, 2 Nov 2019 14:41:32 +0100 Message-Id: <1572702093-18261-6-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:YlD3liMtwTM1X67+rhs9J6Xk/Cwvcrk77ukSyY9OTn1dfuB9FOI jGgd8VLi90xpNxuWu39vsNO/fDPMETXQaHn/LQ0rxh4yN3JzG/tghvPlRTtjrljUZz4jli+ dgqVIhFlwAGcgjmEE5WI3jcMtJucbB4+A8RncLYtMLOR4thjYNj+pGpFuzg1/hTuTENjelm gyyGdF+qvraFwknJbwQ+g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:DRhM9sgeMiE=:LAjnbh1+DHmkNZE9H6ptZL PXjAVZevOKt0vCnIVyFIposySYFwMZSTZhGyXfF7iojc+aWi9tNJokwTvSkQmzMegNME6K1hD 1o60RlcmJvisrRDaoCAnSchJb8zi/Kp05OMqc8PcIjNQ4MC580fXXkVNFM9je5zIPOQaslK3O jHNzv4GTNGiT5b+lnr9qqc1/bh9cwqMp5EY1a3KZLszzOOr0olCVIHkZ2K2oeUz+WVG/n2kzN TTkgKLbPbuYGBU+wurZ0fx+SDBlX9N+PYoq385dx0W1rkbkvnGhIXXKMReaeeMKQs9M3A25jR brg4MITtDKRNggRJ5I0ib21CkXZLfBZ+ub+r0GSwpfeDokb694wOcEu2BdPgLrVlK9vyw0S6G up5wzQnTfXzfiP1C34V1bSz4L8QEMcKj1GEuhEcCVJRdc6EPU1nPX2Fxd79tJlLBGNJ5Ffcqp oNobvJq9oTMbB/Ehhnwp5HK4ZpKnoEQOVxddOMOSVu1wEQQdPoYxoWo3irM3p4mrOQV7HGoz5 roUoYE85QHUPBSQ6h4kYDmh2PVN+tNFTvygJ2mfmchG8kRfsQpmjMsMGiEjRb+M9QWxxvOuCg hOoLXnSLptzkxUJ8Bq3CWNnpEWY29pNmOLTVpHEleprbXNVsYlRkk6liHKVmhug9RZObx10Zi 7d0CwQA3cknJWp0aB5pjN+TgzkxwwsfYrJIFaaJeEd4DUhp2yF+nn362//DCZbXKtcQwLPzcD Yxnj+UDbgzdW90+uQpGwcbZf1N1EAmXaeDpfN/2y7UsBTQCeiIaaM1Oej39fIXLl/3MxCt85A tnLy5511X2afbb2F8WYw2Erf0XyY2s7ChLERpvJ1SVRC9bFQ4Mlxydzg5WO3Ru3XymcY1MPLY ZgyaDEqfw4OwCbCbDTVbSKIGnYoSOayVTMuCQx/WhX3lZLobzJNBeZNTu5JznzkmSIBB2naJ7 wE/NEM+kGdTJvXQfxqhg/+8ayhrlyo1zaB9vD2ldMF1WIDe2MmUGl/p1A4PAU0g5APxNxbap3 Qlr2Rb9tXOI2jJapxc4+94pTOfybvPr6fjPli9ZWF7eT449Vsva6mH1mFBuGGqfe05DuuaJyM WrNlP17t+2X9DpqVZsxDSpcJti8ci3VCJfeSfcvlKh3tGkd4vWV1odp2duCgqcwrw8pYjiN8w EQzNWFLgdfccn2WyJTyM3TjQB4ORh+yE8AR1uDEMHUY77M+RgLgC6pFwNJvOXX/5x8nYVgalo DsZuteUHJQ9HPt/SvlteKk58Z4DLnfl0KKuAPBQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds the missing support for the PHY modes RGMII_RXID and RGMII_ID. This is necessary for the Raspberry Pi 4. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 8f7b2c0..9091e5b 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -273,6 +273,16 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) phy_name = "external RGMII (TX delay)"; port_ctrl = PORT_MODE_EXT_GPHY; break; + + case PHY_INTERFACE_MODE_RGMII_RXID: + phy_name = "external RGMII (RX delay)"; + port_ctrl = PORT_MODE_EXT_GPHY; + break; + + case PHY_INTERFACE_MODE_RGMII_ID: + phy_name = "external RGMII (RX/TX delay)"; + port_ctrl = PORT_MODE_EXT_GPHY; + break; default: dev_err(kdev, "unknown phy mode: %d\n", priv->phy_interface); return -EINVAL; From patchwork Sat Nov 2 13:41:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 1188365 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="c80KcgMJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4750d11gXJz9sNx for ; Sun, 3 Nov 2019 00:43:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726523AbfKBNmV (ORCPT ); Sat, 2 Nov 2019 09:42:21 -0400 Received: from mout.gmx.net ([212.227.17.22]:36871 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfKBNmV (ORCPT ); Sat, 2 Nov 2019 09:42:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1572702116; bh=h+XLGZgaXnLBawlPiG/UWpDjzgvkaAmMdoEeD7J3xyg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=c80KcgMJP7AgUKG/w6d+GdeCPFXqmxdehl+zHf+COyPYaUfCxPeG3S+grz0PUYOEU NfhVpH6lePgwjqNojo2OrmcIbySAkSa5Jzx4ZTU3PZDEVhoebi2ht2DE8OFqZUMvtK mXqTCU/Xbs0fjJCQu3hiKWR7YsWvs53f3TEmJBUk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.4.249.112]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MY68T-1iRqTx0JHJ-00YSmX; Sat, 02 Nov 2019 14:41:56 +0100 From: Stefan Wahren To: Matthias Brugger , Matthias Brugger , "David S . Miller" , Florian Fainelli Cc: Eric Anholt , Nicolas Saenz Julienne , Doug Berger , netdev@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC V2 6/6] ARM: dts: bcm2711-rpi-4: Enable GENET support Date: Sat, 2 Nov 2019 14:41:33 +0100 Message-Id: <1572702093-18261-7-git-send-email-wahrenst@gmx.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> References: <1572702093-18261-1-git-send-email-wahrenst@gmx.net> X-Provags-ID: V03:K1:N6m+f5BFnGoJCatvwlFDrW3tbyCRprl/nNngMCQxjVeOZVZUmse crXhNJXNNQvkCLfFuvNH7TSH7iNjlqiwG4NnCz7Y1fxERxRdQgDMGxSJDy8Y9XUOfrHazvR 9GI4tJ23WH4NjLv9vI/dI4SOSmb1taHCpera9yrVB/Xv4kUfrkU3NTJb86vFcV3Yauz6Mxi OPJurtK/qCQsN131mN/mg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:fpdkccpY6cQ=:+Y5/e/UMkB45uES7ufA1zh NTRe3cEbUEVBSAnQz7vmRp4vFnzdv8cIdnuxm+pKTQtIG7vy8w7X9inzCKlNbuJyU3WSZ8/5u OOmTTv9eV9hfjavAPNf5bSdQK9h2B5prvUJvmEu9p7r6hRTcMMhZTb/8IiFB5/qS1ssFGnQTk mjK94BMbfxWwMaU4W+iCbVXc/EEFJ8vXPH/0YGNSDSR/bBeI4gl676GttsOfHxw6eiHreclpE fwUf8r6aOXMpjFHtX6d++DIrrFZE/hSKzJdMyyGtGLl+rtqIXn0u5VEQtNK5arimFykTP4FCG VuMiF6fxX/31Ujya4IwBLzF2vtPtb8VPFi15J7Uou4VXbuzqUXwPviVjh92kI67j8jELCoIgs x7URHxzPm3ZE/w+a0lmAgaNHdqckK192R9tqFD6SkbUV8YALXHqA5vTwc9RTUr0X8Udb6zkTT CMW5hsy2KYoeQd/L628nMwOcSbv02I8R3UBU7khIGm07H3+BNc1mBqwx3SWePPoZRJtMtnE/p V+1O8QOQyzaXWMbcLjYcHbfehQ7MmflZeyESnYTCd1tZzEpvSWHDu9tsYKGrdqGBe/p8b3/Xg o8GYP8iaH2YnBJNuglN9k18ibia/9q5QDbxwZxCqWhzadMwmJQYPV2CyjaMZW/sercPIUC1IT 0mDclnirqgYkwco3uCBp1axXeDTJRpsHof1BqOp1377HETvST+0QwghTlrgm6+pyL3L73156E VzeD62fxXc+ZgjYj+Yauzu4uQJ+2lTncdl12SbSZ4jl6sYmWbL6nPnrSP4ad8rxnpkb9+Q9mX a+TwzxnvnUJL1Na4MqiEAzJmOd6NGxJEXlJjIX+VriCoxg0fpTNfHVHYLNSlz4BiDOt5DzXRH Jv7yoKnaEFkX9JQcEt0KzkyQMSunEZPAxq4IZThrqB9Id/18rlwH9DJSgk9e/s4RofZ+bN7+h TZlGXIMtPNjBT1Ily+MBBvIr7bWnk4kliRNpdRZekFHKmOpKEUw8+CX2Y4ehJA4RE12WZzQUs 8c52jB72jqpegH9oAzRuPvn6KWnzmNsfEtu5HkIP02M1IVcOP2Xsx5ylCLP8MUuQbBllL5YAt ySlqzCo1PtxLfNra40VBMw0Si6nU5fdZzkJmZB1QImhlAnNZN746Q3so5lGVDpc34kFxJYA1f YOpRvkUfsR+RcuLSHPT1ZpwjDkSERZNk78nE8QjDaaa8d73QrJxpmOQ0I0on0z/ptStogYZOW XZFUNXthUeQjrdzDtTBbG24poMqxnxV9IqcGLHA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This enables the Gigabit Ethernet support on the Raspberry Pi 4. The defined PHY mode is equivalent to the default register settings in the downstream tree. Signed-off-by: Stefan Wahren Signed-off-by: Matthias Brugger Reviewed-by: Florian Fainelli --- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 23 +++++++++++++++++++++++ arch/arm/boot/dts/bcm2711.dtsi | 19 +++++++++++++++++++ 2 files changed, 42 insertions(+) -- 2.7.4 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts index cccc1cc..904efe1 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -19,6 +19,10 @@ reg = <0 0 0>; }; + aliases { + ethernet0 = &genet; + }; + leds { act { gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; @@ -97,6 +101,25 @@ status = "okay"; }; +&genet { + phy-handle = <&phy1>; + phy-mode = "rgmii-rxid"; + status = "okay"; + + mdio@e14 { + compatible = "brcm,genet-mdio-v5"; + reg = <0xe14 0x8>; + reg-names = "mdio"; + #address-cells = <0x0>; + #size-cells = <0x1>; + + phy1: ethernet-phy@1 { + /* No PHY interrupt */ + reg = <0x1>; + }; + }; +}; + /* uart0 communicates with the BT module */ &uart0 { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index ac83dac..ff24396 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -305,6 +305,25 @@ cpu-release-addr = <0x0 0x000000f0>; }; }; + + scb { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <1>; + + ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>; + + genet: ethernet@7d580000 { + compatible = "brcm,genet-v5"; + reg = <0x0 0x7d580000 0x10000>; + #address-cells = <0x1>; + #size-cells = <0x1>; + interrupts = , + ; + dma-burst-sz = <0x08>; + status = "disabled"; + }; + }; }; &clk_osc {