From patchwork Wed Jan 12 17:36:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5244C433EF for ; Wed, 12 Jan 2022 17:40:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KEROGRN0cnSlovRmfsM31J98uqrQVUCiGqNGxUx6KaE=; b=Na83rVjdaelSFL F+OdKfYuUVFOEzl3oYzcf49Jap1zWEPyP+EDp1Q2fLTGDkKAUNOdeOQiyTTb374+N+ReNgQm1GXUx nJgzJnXYe4WiRlcgNurIfA6CjuKS68urN1uE9YCAaLTiy8yICDnI+OLtCXtGZHES9xM4Z5E1oDW1+ cOi0KN+WJ/7idffagoDAIaCQDMIvCWHDzTrn3TOHYuPSqJVqwZZAsPWSJ/Jsvdbc32GcWlQeR3fxs nSlWhHrEV9DJWSxh7WP9l+YYOwyWTWhb9MtP/tTau//doy7W5bFl641g2iBojsXK6dHSkoZli4mdY E0FCG/7UGBLfWN2vHFag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7ha6-003I6H-N1; Wed, 12 Jan 2022 17:38:43 +0000 Received: from mx0d-0054df01.pphosted.com ([67.231.150.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZe-003Hx5-Fb for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:16 +0000 Received: from pps.filterd (m0209000.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGT6xY010893; Wed, 12 Jan 2022 12:37:56 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2050.outbound.protection.outlook.com [104.47.61.50]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj2j2g1at-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:37:55 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W4EDMorJalyh2lBmx4YE+SSwzIWLNPZ/ckiv7tQ/AAn76Qmc94tTGpQOT2GhiKguu1gX7GI8kTPLoNZ27L/bTcs9lBaXLowOXZRWJ5oYeKo3aizfdRz6FOO2/bijO4j+ySeWP1aNPXerg1eMO1lp8PE1qldEtBYqawBeJL7FsDnmtWX8GR8xG8Q0CrczraTL9rQwjXQXKJk7CBgi7r7NBZ0QGFESbUKCCfAaFMCB2sJ17drEemhUJI1lcydqFwYuDDtHli+aQPWNbCHJg3Hp6ANuugJdL9WVYi07vJWfD/ZWnpdv0MeSclsNdABxUekBCneJb7eFwOD4zrywiVBnbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TYbWVMZqFSpi6EISAGFgudiLlZEKwZLXENRjQIX62Sw=; b=XiS8f+S6ZdprdVUjJ4e0dTc2k2B/hBSv2RNG/jVXvVkgPuM1z9u1OIHjgwMv4lIRVIX64SyH74kbc5WTYlLGqNs63LCK4oNobD4b5GGKcAP4wTHiyQv2xHKyMbdRGr9384ZfeKm/x0CRIG8/wJXFpQVRpjd8Hz3u6dk8gwg6yuwb8XsWrLLZfZXnhLMrnX0ppZCuSEIEcriRNGfBf8t6GwDctKIiPdQvEeHo/BGSkp9xvzyslIgUuXv5COOn2dAuBD7fI4h6m5itfok3rgU4yuxlT3KEL73iuFNm4iQ4YNcSCjo6sVNeX/wkvzigIoMHST9KbMgOzyREnG6LbiHTwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TYbWVMZqFSpi6EISAGFgudiLlZEKwZLXENRjQIX62Sw=; b=xvDULi/qzDo7iTSDNLnJIBW5qDWERZZ+LNhi7HOPdZRqBYe/8B4jnjX5bagbJJZXvjaTSd1gr0Hng8XKlCqex0Hd6fxXg3Gd9w6cKhoUDdcS8CVGHU5sV3giuL/QgERAb1g0qQ9csu3PnrBPpqY6fjiLdUkdXGSIIJ6vvNL8ACo= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT2PR01MB5789.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Wed, 12 Jan 2022 17:37:54 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:37:54 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 1/9] net: axienet: increase reset timeout Date: Wed, 12 Jan 2022 11:36:52 -0600 Message-Id: <20220112173700.873002-2-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c16744f-7885-4638-3a05-08d9d5f243af X-MS-TrafficTypeDiagnostic: YT2PR01MB5789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:644; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bU/muN6lhMdEFUaKW32Hdh/Bb8VkoOisDCuxxGObGZfAPmHYItwMJAf5BNCC6Pp8937PTyZbxfOFbG0WYBLQeXJottApoQF2KHR3GeH02lZpVT6kdLufIZsm2e59j5jetmRSoEDrUknMGHEN/tqtoijKAa0coNOL7KrFIkk0GMqowg/MFNgGIJxaqbkhC8t515rXziwikIQDhUxbUKtx+hwh7wbEEc+9A7Knzb1njq6dWNONh5BSkoMsDiFioCfr05jhJeJS6Hhvlk+WPxTddDUu3UDVo7EBHDK3gzVbEkY5S0EEdfPMbS9aW7DGGnGE1M7NONEpp+Dzmh0MrgXRCG9rUqAmgeanPwDYWJceIwYJLM+1MYnbhxxPqe1yiLshW5MQVesMQkPyIQB4MDejEbtHYq3nt5GdE46SrpWGQTmdZuYaRSwg2pwh6Q4Wgx7TQNVmU9+yWgmzNpXqjnGfwWKTVxL2c0YNtPoNoQ86VOsTI/hqHsGQQjPmC/R1hR2khY4jWTrPmMwAvnJFq+4SFYvzespCgPdH8HAfTDv7u5OEqN/xzTFu3Lk+feyMj3megOols4N/1gNVMnZdL2KMTWw7nY10sP6KXjtgGEmFpaD0fzqBihq6uU8m9KDVJVj0jWakaf984FO/5PywhxDq7+nN6cB46tm6noOXAHlt5VUJxI62H5tyYAepwADHpIQIlvF0ioUCz+tLSlml/G6clA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(5660300002)(38350700002)(44832011)(86362001)(316002)(83380400001)(36756003)(2906002)(2616005)(6506007)(8676002)(186003)(6512007)(1076003)(6916009)(4326008)(508600001)(107886003)(8936002)(52116002)(26005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uIzPxcdbCE5TMvwwiccxFpqIWkBBzHz1vLirbp6NkNqrXGbtA7mQRZXCwwignGlLdm0I8kgrJ5355SLgJambYeGXMbfASOtdF+Qf5WWZvuUXRL3MrTk27a6kC7+DP6TeXnuRZdT6XNwUtfVFZ6fnO0hyNnfqgoLvsZ7hn7YYGSUiLzI7GddgpqK1IAOcPu3YEHYR6j2y2+qw0FAAXqGbdc6x0r7+X/QTTd8HtMVmCYIDAa9SqVi7CuidlMqi0vkmBMyjPLJA44bDRnWp4K0PopatODuOKwVA2t+IHo5+TcxCG/c5Zr10hvW+vsmIShLxEGDFYnA98vEbHL8+olsoO3gnY6faxDQEDDKKn0sOfK/2kMlzvicKDmxctmvhFaab0H0hfIOFjYuuBL2TwjHJDXPX3KuOp5yqx6Cbm8o0+pr7ONvB7vlg2MkHZ91v9mm0QGPr89a5J65d8XVcHGzSY3nB98UsiQs13MYu2vfT0NEwewvVJtk/6QT8A+4SSf70sHdacKBk5gmTqs2yQbXwOaXId345+X25yW5hJJ+jo9f25E0DDntkiF48dmi3wICgBJjWW9X1lvaVCIoHtZ3COHs8+rHYQs633Uq2ERRNr0SnaBp215p+B4mE3dr3gZY/3NbuIyR7+rYGybi3X17QMGtaNdhg7GEBrsoi6EdAO9qSSIU02B0yJwuV+YJZ6xkxOztdevd4HQAuhI/aeLlom4bbqDQaLKddyfyE8HMJzCn+V2ea4joF+u97zCHy+myiAK/rOYR9GFMGMOfJ6IBFC73C2tKos6u+KQSnJ+42CtuX7hpCYoo/YNOgcNlyKNkyt6vO5dQc0kTZmKhwtf4aLE9Q+6XRhuvGooIk+Al6ek0HCzIqGfSURkjtttp+8ZqkfXNi3zc9pchsa0uW/0FUzIa3T/Y5xVsA+oIREwIo+KaYbXGX2HPCmPQvF5OGFkwLIF1u5jq8f8VMmHn9OOS/pzo1Gmg+rF+jKUf4e9gE2s5pPc9qZ6YvCE96R6d15CjzG+jVY8vFQ2LpWdmu7MoCM+l9R7GFURfDh4UpImcUAkCY/pJ1skcpr6ZcNW2mB5lzvtOyC3fHpYqXH/Mn3UaJzNMVKhidyTF2h0m8lC1zDClvTLk5brx2wV8NauzD/ihc3Yr3z47Viuvmf0iadlo73KybQOR0qecL64v/dmvNdd1e+hX90vsy2P2dZL/jZJcUnbkiXGvtXvxKqDnzkMN4i0F56V1V0dWxbHpdvy/ohYqq2s8pNuqqXrzjmFYr6knnCcFzh24n8rP6oiceMCo1RC5KGLkxC13W+R/PwoGKSno4+63O6hcVQS2kTvVowwjDVSZfp6X6Zhb4BhLBgodfXZHS/R3U6t+KhthdJqTv2c3spSDLtK3Hvf2o8nis72yLGXgMQtMOO2KLYQWX8Fg8Ob4IAU56vczB5DQndMgg5lKqwHZ5dMLMLE5xDzRIbS+N/Sf+rgAUOQ11DXUFUN4Jwdxz0hPV2GF+URP3DDOHvpDgztbvKhibVll6WL6rq4vCnTv72x17JdHtw1YJK17MFS1Q84l/aI7OqFf27IfdRyAcvlyqu4nPhsj7jtL3zIbKjSo2wSabE1ytAP2TdA5/EhJmr81L0U+inT1hSqDm9lHtbeTO7pgqT5lo+p/gn6+CdB4amrulgHd+XYEKPl7IYNTcYgHBIzwX36MtWE7AhWo= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c16744f-7885-4638-3a05-08d9d5f243af X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:37:54.8056 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IuPBx4f6AtkxI6qq2B7ncqqYh4253kYOyK680a08jIHfVRA435oCNBpGdCzyJwFtqdPd2JJyFQrqt7hcVwD9hXwgiz+zwdfkQa9jLdZ5+6o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5789 X-Proofpoint-GUID: uiAKm1FaDGWqYTKn1TisO4-xNnvwm49C X-Proofpoint-ORIG-GUID: uiAKm1FaDGWqYTKn1TisO4-xNnvwm49C X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093814_697488_6A7D1151 X-CRM114-Status: GOOD ( 13.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The previous timeout of 1ms was too short to handle some cases where the core is reset just after the input clocks were started, which will be introduced in an upcoming patch. Increase the timeout to 50ms. Also simplify the reset timeout checking to use read_poll_timeout. Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock Reviewed-by: Andrew Lunn --- .../net/ethernet/xilinx/xilinx_axienet_main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 90144ac7aee8..f950342f6467 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -496,7 +496,8 @@ static void axienet_setoptions(struct net_device *ndev, u32 options) static int __axienet_device_reset(struct axienet_local *lp) { - u32 timeout; + u32 value; + int ret; /* Reset Axi DMA. This would reset Axi Ethernet core as well. The reset * process of Axi DMA takes a while to complete as all pending @@ -506,15 +507,13 @@ static int __axienet_device_reset(struct axienet_local *lp) * they both reset the entire DMA core, so only one needs to be used. */ axienet_dma_out32(lp, XAXIDMA_TX_CR_OFFSET, XAXIDMA_CR_RESET_MASK); - timeout = DELAY_OF_ONE_MILLISEC; - while (axienet_dma_in32(lp, XAXIDMA_TX_CR_OFFSET) & - XAXIDMA_CR_RESET_MASK) { - udelay(1); - if (--timeout == 0) { - netdev_err(lp->ndev, "%s: DMA reset timeout!\n", - __func__); - return -ETIMEDOUT; - } + ret = read_poll_timeout(axienet_dma_in32, value, + !(value & XAXIDMA_CR_RESET_MASK), + DELAY_OF_ONE_MILLISEC, 50000, false, lp, + XAXIDMA_TX_CR_OFFSET); + if (ret) { + dev_err(lp->dev, "%s: DMA reset timeout!\n", __func__); + return ret; } return 0; From patchwork Wed Jan 12 17:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B72D3C433EF for ; Wed, 12 Jan 2022 17:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ak3H9O4D7maYpzr8RToRrWMUvOkmUPKgtHF46bNMeo0=; b=liLhXTNO4TXE4y JxwOOzA9EavSQeezFNABAeltMGtWiMze4PH46/tw2bK2zHF9gfuhU4w/qK8Mk7CNMWw0Sxx8FHnJ2 dyS8tgbpQgmV6N31vnLlf1SDgwKV5Uf18AXnSodseWk6W8TjG8PPEn0a8jAAy0wpbpFWEvw868RH3 fx1TmxTcFaZTvG158XYvf17b/UxnWuzkjZAVoNbBu8a2+tPiD+kLSg8gwL3k3taTxSYmXN6zqkhxG FmDY3mZZ+PBqbh30+vOhccoAteLpZ1eq7AvD39r1X1SlIvsv3piZ+oKVSWTQdhsNlFwQcUUjEo1fm Cqs/2QWL0DSitbwqne2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7haN-003IDS-7O; Wed, 12 Jan 2022 17:38:59 +0000 Received: from mx0d-0054df01.pphosted.com ([67.231.150.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZe-003Hwz-EG for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:16 +0000 Received: from pps.filterd (m0209000.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGTfCs011851; Wed, 12 Jan 2022 12:37:57 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2058.outbound.protection.outlook.com [104.47.61.58]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj2j2g1au-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:37:57 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=noKYD8pso7qyK7ODS03EVwyoCLwxwvB/ufuVQojvD46sT44sB3ujuMUo/68ssNB3lcd3aSmf2P6mnySmUxWPqwfQrP7dU5R6FdnUu5Y8OBS1gXGSKD1fuQQP028b1RKUpGR53Ze/AbcgIFcl7HA8wvV350Dtmfn7Q0CHjaSBxvxDXQKC5cx7xm5jFHROKqpKQfBwj9Y67ZZ2+jnmZnZ5h+BI+lUvhvuVsYd2xyfAld1Y97r76UxEmyGWx5QmckcpzV15g9qdYgsItO6s5w8eR+53/MnuER2Agv1HT9SwQutcZmkEeE+j06tfDdYLEayPN7JKCB/QBA+sYei8fZyKDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UvvdgNfndhGbQgF/mjpBGV6NrF31vEvz+1qAA7Mq0aU=; b=hxVfdqZ791ykMkrSnrAhB1CbMTJM+KTCSLjBVhxbBubv4UUVhcQ3GPO1i2Br6+2uk5gqlJ4Z7mm3lcsmCa5N4JduICztdocX8L/NT8le2UjVQo5xMGx3Kll73BOhhliF5nnJ3kQ13ZQdM1vfkPKP0oo6Ugnw4aVh7uILADgCC/3vBt0aycLJT9+EfiCw0dVgfejsmtxHj6sv4zi4TqZ+ZN/e/mXmMuqVToIPfHZite242gWctzsLIKgvWtN6fLDvWRZn/0o4S3cPN0fpNlEdsv9UCT7kDzpVgOhCX50p6CwFzXFVeK33N6gTx5GhxWsQlyWh7C1+QFhP4l+J4a9B6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UvvdgNfndhGbQgF/mjpBGV6NrF31vEvz+1qAA7Mq0aU=; b=XTfeSEUN0di1bP2fQvrPflUy2yogjp4pyz/CJnziOaP/riJXsvZY5xA8qKnPyO+kGjaQ9mxVUDVEEYhm+Dj2zCasBKfGvTi2bNcEgNaotYsNc2jNJfVODqVuf56wBoGW3rUvd7CN9WpJAdGYQZy+ziyqms5qAWPLacZqr/joYq4= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT2PR01MB5789.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Wed, 12 Jan 2022 17:37:56 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:37:56 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 2/9] net: axienet: Wait for PhyRstCmplt after core reset Date: Wed, 12 Jan 2022 11:36:53 -0600 Message-Id: <20220112173700.873002-3-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f76000e5-47c4-4efc-368f-08d9d5f244a7 X-MS-TrafficTypeDiagnostic: YT2PR01MB5789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gtpRKDn3eybnjNIu9MWJrLxqIHOxHomDdRI3GEomrZauoZuhgge9qnl7eFeiOSnrZntKzqR+M/jTLuPOapsmDGvDpwnu/40KRVjlbxPQLTxgAPGl+Hb1CmsijyRa8bv6YSKEfTjt/WcbneWR5KDedGRd4FAZZ+Xm4NS3Thh4skvhQlwCrfPA/rTvBrEJeCbuR/GP4XO+D0gqiEIFBnGrjuIyOQGbf1Gh2zxK6gJOqJ22dGbnhgU93JI+cdbA+1UDF+Y7r/266bu6F2GHFy2lh9xjJLPW5BmhpBtK14bBa4gN3ZlbslKnMfjVUvcUuBQ0GqNioVBcM/+0liF9+fgTfu4RGpkdcF3lN9Hs3O8+8z3rcV/Z5uHD0n7CtLbz9DaUFklRk5pVZCnsWiUZL0qd/xZ/nUPGDRopmkmaUNvAfAhSKRFWsdgHuacguVu4ifT1MjxQu4+x6fAHjlhRlV7x4o17lB3A0bmYrBs4kESfqT4k+LpeH7nc5pCxm/Xj2adiUg+A4uG367iQ1NNemHQDbPTqemODCf3b/0GRIN3ZTTpDD1EsaPBzLHM546X4dh1hYBE0/xJrxAY/J0Pf9qtItdGEfj1P4yxUgdFpdMIkMETBkBik9R+VjTITonEdVMKFDjJtrEzbIGqvmc+SYrY7aiItRmUVU4MwJA48d2ToClFdbqcDV8RMJ3wrFBWsTqs/FiyDUYZnX4sMdpjaR5lzVw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(5660300002)(38350700002)(44832011)(86362001)(316002)(36756003)(6666004)(2906002)(2616005)(6506007)(8676002)(186003)(6512007)(1076003)(6916009)(4326008)(508600001)(107886003)(8936002)(52116002)(26005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qT1Z82QWrE0VyuSnC7Fhj1H2yGgOhlNl8+mGQUeA8EzyBWLLpdBLTupTAR1MhIlgTeEjeo6g3qN6x0UdKuDaqdV6EZfq3SNkD2abQ7xTL76PyzTcFCi0A+z5rG9S4wslX3c9Qr5P+osu2yLaMXs719r7wZzWCrSaLoZ+pTkhhbUV+5qeEO8L3WkH94WanF8z19YBAnxKnUTl21ZLXjrFhfR1W0nunJ6nX9FZWGnlNsMHgbXhwudFoKbJ58Mj3OJ+QTyHXnI7S0/fmcFdTR5yFpxha5RdrlVzqD+RKvR/Fvm2kKxAzqWuP+ly78cyV+8+aMYXz1/KVB8Mq8TSYh8n47KWuWEZKhet3cDXbtcK54hRZpb/1zXpjWOx1NGfwxx1sdkg5aTX/XK8+lNlqdVPhnUtpQPSv02ccCDzHiX0UksuqhsDZwBlWB7zt5FmgO4iV6lRl197LqJpgfYyfBB5rpRz5SUxaLeAX8muvvptfZm/Y5tfr8xOjulJaxq1/yJ0bFHz34Ymo2gLspeFJqQd1couVGMrm3j/ihsYOFDDlXQnecY1quC85Sx2K4rrsJLfWTuWcPKJbYY7VVFBySxO9/P+BL+s1CfuI1e2AvezR/xdjTXXSF1ap0bs7cDOY0CNERklTJEgKudoVJH6a5h0bsXI84WPqA4krFbiC/e1jzWnL+Yqeo63OHL+kaIS1q/ej8JsxLR/d0mmCH4CnPW+sJU/D9n98o/5WyVdQeA/i8g7kFMJcIMTuYfZPhF9EVbALG71tlWYk1uF7X2OD6kly4SAnkv/g061Udzt1qAbZiDrS3u+TotLVrv+G5xP0PqdPghESGCG6loewStf8lDpciwZTTF8R7W26HWmGPghPSmK/myDcntU0cPsIb7Jq6ORpIV1o4WbG+grxLdnZDobrdErh62Iw2BhkwuxAwVwLNXtg9USXtK3uY1uWW0GNk6DMVxfmJcMNQunQjpM2WlxKsSn05YFpKuWp7mfOklLMsEl3GFgwxQX044KlN2A6UFQEXzuFBotWD7efwXa6bqA5DDLvCXQI3n1OTyQDjNMqebMRcDrYuGDr3mLvNE3Ql/jayUBbMJhFF8PxUxzyicFgNUsMsyCnDWhr2iYcgfCscRmAykEazeK85C+VqpUXKXrklt3j9+VD670yBrSKYZMwtJXYhR/1/ZAy5p02eW/sDfCmK9HvpehGGcuM5dM3Ftr1HaNHF9KBC7G04TuHmaSpZNW23CHyiGEGeFnvoa5IT3sm5IFgLsX6HdYzvncRfWoBEpNzRoykjXN6TNI6amVBRacrxsVV11IflfQbyeOH5GtycN6qiQLNyOU/aG7ySV6dNc0NEuWWfwaFGVjk3kq0TApBkMsnPIoqxAinmNg1v+ZbrEntVu2ZDt7Q7kikjuJDmKWRpb8al/4syk5a6TyQZ8oWgnICU6j0nT1bqjou0XntODfHjDpWnMOUeFKeBcsZ0XpLDksbDIIaVImTllBSdewaCeMFYcCw/8XV0K+xJzbKQTRea/Ba2SOxBcCRpJ4E4RSOBvtmAOp9L6ocJGNlR3muCiGnI79dJq2oz9o8GNDqghSHoWAQ9XtuY9wW8HkX7qAiMwt8VisffeW5k3JBzSCXY2MN55TL1xMbrG0kUnpDhnvyruVYQ6HLnp9nemdX9Jpa9/eWj4pYufnru3buBv/a/cIin7r00xcZLosliQ= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: f76000e5-47c4-4efc-368f-08d9d5f244a7 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:37:56.1184 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RTQ9sIUO8WygmPVSzOtMXaCyzF+fJzdKPFsiOJhwiFxy6nbtXIhMLmLXif3ZHZh/SL5W1L+OXgWj+wqWItjLIUEjnJpTjYphrTBcvy7l8eI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5789 X-Proofpoint-GUID: DpA0gRcPSQStpIy5ZMkT7b2yrG6OhOJ7 X-Proofpoint-ORIG-GUID: DpA0gRcPSQStpIy5ZMkT7b2yrG6OhOJ7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093814_652137_AAA8A7DA X-CRM114-Status: GOOD ( 14.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When resetting the device, wait for the PhyRstCmplt bit to be set in the interrupt status register before continuing initialization, to ensure that the core is actually ready. The MgtRdy bit could also be waited for, but unfortunately when using 7-series devices, the bit does not appear to work as documented (it seems to behave as some sort of link state indication and not just an indication the transceiver is ready) so it can't really be relied on. Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock Reviewed-by: Andrew Lunn --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index f950342f6467..f425a8404a9b 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -516,6 +516,16 @@ static int __axienet_device_reset(struct axienet_local *lp) return ret; } + /* Wait for PhyRstCmplt bit to be set, indicating the PHY reset has finished */ + ret = read_poll_timeout(axienet_ior, value, + value & XAE_INT_PHYRSTCMPLT_MASK, + DELAY_OF_ONE_MILLISEC, 50000, false, lp, + XAE_IS_OFFSET); + if (ret) { + dev_err(lp->dev, "%s: timeout waiting for PhyRstCmplt\n", __func__); + return ret; + } + return 0; } From patchwork Wed Jan 12 17:36:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E794CC433EF for ; Wed, 12 Jan 2022 17:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8lbtIfpYHhflU6NYtjAc09PjWnqJsMZ9m3EPrbDRSnU=; b=V5hdWC6LRptNIL OklGl2RqIqKcfosB+0dI3rXqI8gK6y+zJDbZfmGxY9dd65Ho+a6Pw29RYDWavt1FAGmIJJQDLxy9F QkB9s7nW7j2assUBoX4u0VR2G/jKRKs9H2Ssb9gitWsU/B4c59yQelbck5zxQGTs6fXe8pGjQNoAA DMGQgXgj42NMwcn4mVwjm23lHouqlhn/bmNiQx97zkDxCd8WP9RJfyzfjQq8FOwmLO32el4RdFl7n knu4NeOy92DeWZU80DaqoKlUpHP9UEl88mC2nLsAwxIVrs8YDLnV5Xnfu8Q5gybTI8fUWThzQJ0bn gj78Zne5zH+Z4Pj+4yxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZt-003I3F-Nk; Wed, 12 Jan 2022 17:38:30 +0000 Received: from mx0d-0054df01.pphosted.com ([67.231.150.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZd-003Hx6-R6 for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:15 +0000 Received: from pps.filterd (m0209000.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGT6xZ010893; Wed, 12 Jan 2022 12:37:58 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2050.outbound.protection.outlook.com [104.47.61.50]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj2j2g1av-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:37:58 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6TeKvFhX5HO1q6YhA1mXVrd0TAds/8W6TE0w57azSsbE8/ITI8lJjHmVEq9PZ4IjMdlsGSmCAySjXnR5zjnXdAWTYqJ0+8uCfPqQ2cWgiPScrXgr1o6guJQulPFoEzdk/Pis2nhS29K4msTAtADkLxVNqKk5OmodTxqwQdYcd2RWpc8jzpx9S0wVQuDYsDjH76eK+6jopyLl6F9jVLcmm0nDYntc7ZDJrpX8xwUSXx7HITdsP905flG6N0yX0JaPZ/XhyNGJOQD+VL6NbJfKD+P/a/Qgo5y6hM4T99z5+kiRu3EHdOvKFNt3IV2f9pupDfPlEwOqNrr2J+ywbW6oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=z3dMQGQgmqY6i5JsM9S5Mxn4i/H77WfgCoxjpWZxTMc=; b=nmp+qd/kbrfwakFz4v+CM1YvHjK2SyA7CcCDy84A/LzgwG6E6CYmhbGovCwxRZxli8aZcstXMG3WwgslCCUrwJwMkbc77Bh+iArPwlP0kVEeRxKIYyc8wJtZkSYBnnhrD0l9Vdiwdaw6wBPWRnu2d6rLDCD6r7HizjOClrTc5ch9ellmi6ed/j7AF0NdtzkcAnedzg9G4nkaPZkD6uO9FD8iAmw04odbwYJHUrXmh7PR2FGiIq4/mu/KgneZ5IdNyfvNC5kM3W1EJo1S21CTrZseB4/Ff1Bi3jLuBDSgoqrR4ifF3w0EpjE6U7cIJpM8N8I9K0O1fAlaFv9lNXS0LA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z3dMQGQgmqY6i5JsM9S5Mxn4i/H77WfgCoxjpWZxTMc=; b=zfne/pnwJE2wUkyToWJkPRGwpL1utO6eTfW5ZFQy4fb7CbS7Qwas51j/BzOyaTayhrclNZbg8/PsubzVSWszsybgPNwBW74Hj8a2IliNmiRXW4qO7WPJhK0G8Il8Cj+kunZdt+4knDCYqR6UHVWVHCIDmh0/ifIZqaWQrmr3fc4= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT2PR01MB5789.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Wed, 12 Jan 2022 17:37:57 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:37:57 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 3/9] net: axienet: reset core on initialization prior to MDIO access Date: Wed, 12 Jan 2022 11:36:54 -0600 Message-Id: <20220112173700.873002-4-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c2b12c8-e3da-4742-77fa-08d9d5f2456d X-MS-TrafficTypeDiagnostic: YT2PR01MB5789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JMS5Sm7HUAodhLKcveoCtyQtV0q4gK9bPJ5r6BWIlp3x+06wS5RuVP8O7P0ONFQ40F7n+09uLLEjxkf+cZ7EOWCqVFU5dCLLgnjqaLtfiAQhpz21osonDzUaP1O2GS/R5eHkCltCP+Vo3n12vZv0uqvFxICzueTGIBJNZQehLpCGcThiLBmlbvwdnHypk93yCX5g/5jD4rzLf+GhHYZXbIQM002uJAn+uFzzWDAmDueP40RNu3C5gzG9IoOhRPOGV7CDmHUaC7flYAL3pTn4mfhov0dibIVdpwrVBygnKxjxIe8ZED7zQCnTdaDDuY1mifZ7Jdho+O65Sq78FIPJpSmqTnDwHGjOFg8ywpdSJmQseNTNjmVRcp6ZpkJaN5Rfv9JwhN5CzVbDOBZn3AjyoBPJSiyzHfs69JPE8AP8glq9WbvHQB1/uxtjKbFtt0vpalj0EgQRsWeMdIuEuijrIBbcHRsNqc/ayQ5qMPUhwhhD0cJ0bzTfRJPkyYZLb8yCXTJVnSxTroNWI+zdR+a3J7jpFIdomqRB2LjTKMf/2QTJx7MNvfTvgm2yhkzrfs6ryoI/B4CfY5gMurmaFzeBDy87WbXhipuHjCt6vUUlglXAckwyW1YlCoYCT5mOAC7se5a2yZEkf3WisQw9gK/roboD7EPTLmpjKbQR+Abrp1CaontSITFAgb4S0TtMXBiTesFvgvtN8IQndX4Ixzs/mQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(5660300002)(38350700002)(44832011)(86362001)(316002)(83380400001)(36756003)(6666004)(2906002)(2616005)(6506007)(8676002)(186003)(6512007)(1076003)(6916009)(4326008)(508600001)(107886003)(8936002)(52116002)(26005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GERs7Xp9R4QLgVEgvysJSICAlVH71XiQWw3NnXEnQiuXiARETAwangqNoOrlsfJb+s73fLjcf7LcP+ENWVEbc8mVNgSazM4HlJ5ReHPzo9RN8KjAZE5IL5tzLO/macTYyq1aomqpfP4yIQ2NhwjH9D7edR4+qJpZKtLqo4MqJkb44l4p4NZd4BLEvk+nDFqzsWSRJFqDCqhuCbYJdaZGKUtV29pEj56PT6mhipKeA6n2XXFXSArdRoRZ1Nyxdcf9pu1PcDtfFK+huemP1a7v+vp+xrVZHk0NqiA1MTAtzbIyef4Hik9Owwy6Hnj7LaGK3Y3AOV4I2SB5ZQCCA5/lHzxId+MVfYziTEvv8pUgVNfuwfJVb9bhPmvc9yc1R1BB2TJY6UkRQcYRrrdQCwv6kL/TTxz8+tWo173zELqPu7hTZaUTkk/LWWcvT49EVN69RSYPgC14SFAKi0eXT2DPLFBFyypfKJGf4H0da9CxzMWDYuhCLovhXW4p09SjeodeYtX0SZR5I58Z7GoqkkG+wQio5xIXaLRnWCD3I6lZmRfNwTr+ZTtzdqh//uQSGPICEdSpNrvkjAJdlGLQS/cMdQ3A6HvbGF7hjcOej0cpzvlLPl4N9dtQjyeYfQjiUz5MHAkQuIfYQdTRfrXL/PELSV2SJx0+XoMbF+COxDasN+cw3MCuzhPhRxfrPykZwhkNPUouwVW2IbZscm7/9i8iQUV9Cx48YSe6HxiAaw29hMo3wCAfqUBz3lnUWR82j2bfvKvNXQO+HdDvp43bQDzwhpdOsJf1zIavK2cGUuZxOLRgFvSKao5oPWQKKGpcAtntEF5nnPNmH/+FIEPf4pYirtbvfMM2+iXP0fgebwjS2KqnQOhRwPjQUKTnSaLPVoM7pfFmgLqgOwxRnaf31UXD//W2drCpv2DUGHNWRQ28dvnDkGIa5MN+jEkSM5xOAXDB96S89aeBhYh7kB3gbwQwtBlpC7gijH9yvpfRdKFgXenV7yT1y/ht7JSVQfD/wUhwMwhO9NqKGB7QnB87gJxhpCOhVjxkv9dRS7Wquwh3vBW1LrzrfJaIzguvb0VwF+Lyp9lTDGhqvUzPh31gkHJqB3QRBlNVGGrELXlG5H1LGpoK2hCscngOjCt8vsSx82I2H86wogKbcmByccnbprvuuF8cC/afrd2zGbsKSKOAiRCJ4c9u3VZgAQyohqW7Vbte+7y2cGQOwYonP0Qazs2IIvhVkLeE/G5pWcsC0MfErxweJZGTE8YVQExuQLpIRTofHaLnmNakAD4B5xHpPthDOwFp5V5qijlTcFWovtqjl6UzFvFtBRQYEm29IeekBiR9xbyA0EDSsiqYOkOWTmA0jqPeDnJJFiyLLcmQtIVZ7dIatoCOsFukJcf2AQdI2C6N8cMEi4TBNMibwmpEH4Ji/22g3it7cBtvUpu+3KLlAZXv4aLaN5mP6UetrWc8yaiIvn9OVxC81KJTv0jiO12WiSjCn/1hqV99cAiwtHCWZrFd+xto0lxrj6TAd0hP9+o3wxfhUPfmXve5aD2tkku1euQYSiOUJSnJgGf854QaYcCsXOFnX8byoQ9mfSJIOpqp9P8doD/OFfOn5iKrF9paojXjxGMFMIkrKwodpH49vZB5CrzzyacmbINdrn/yyeRfuVXal071Jv5s8bqU2mTV/K8kvhd3h86DMQlb9Qdyd1A= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c2b12c8-e3da-4742-77fa-08d9d5f2456d X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:37:57.4659 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oX6UeHp7GNBbpDtQ79x7pb/o8FGRvf5nYuoT+2VMlpze0ZTvqBwjQ1zUmZ0q4a3gI54/HAi1RZLumUuxVWgZQW6SK61RHt2pezD9ji8iHVI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5789 X-Proofpoint-GUID: D3RHLHVFxfa3iW4LtEqW_OUg832yskmY X-Proofpoint-ORIG-GUID: D3RHLHVFxfa3iW4LtEqW_OUg832yskmY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093814_058750_FC8283B3 X-CRM114-Status: GOOD ( 15.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In some cases where the Xilinx Ethernet core was used in 1000Base-X or SGMII modes, which use the internal PCS/PMA PHY, and the MGT transceiver clock source for the PCS was not running at the time the FPGA logic was loaded, the core would come up in a state where the PCS could not be found on the MDIO bus. To fix this, the Ethernet core (including the PCS) should be reset after enabling the clocks, prior to attempting to access the PCS using of_mdio_find_device. Fixes: 1a02556086fc (net: axienet: Properly handle PCS/PMA PHY for 1000BaseX mode) Signed-off-by: Robert Hancock Reviewed-by: Andrew Lunn --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index f425a8404a9b..f4ae035bed35 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -2055,6 +2055,11 @@ static int axienet_probe(struct platform_device *pdev) lp->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD; lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD; + /* Reset core now that clocks are enabled, prior to accessing MDIO */ + ret = __axienet_device_reset(lp); + if (ret) + goto cleanup_clk; + lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); if (lp->phy_node) { ret = axienet_mdio_setup(lp); From patchwork Wed Jan 12 17:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711755 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9D9CC433F5 for ; Wed, 12 Jan 2022 17:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AUO8PHZVhHS4FDRDdyzhuy1tCiYMReWTI4F8L0SCjw8=; b=UbBDgjVWFtF0U8 5O44lIrpEvLzOOMqYIRIrgN0fXk6pXMgdcT29aFaPgqA3dcN4h/6tdqdcH0YvTVyXzv3XoLV0LqMv 7rekQiQrwADyzZFxv8ix0LCPrKGI4AA7oy1V+H+DqV/PpMVOound6W14BRcroXgitqN2TdJRMEgBE 19ydN9DqoJZgTCfWzNAmaYtuIHg6vns9ZsGLnEWd2rsNr7uDEUFvCDQ4jNWw8WFZARx0RFImcToCY KIX1Lm4HKrRV6FVCNp3ccx3Tgz7CuMx+5OUBpfzDXd6x/8qRGQ9PWmj6UwcMnzVar4E/UEUnmpbJY sZwFK8Kd4MQsJT9qhpYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hbA-003IYf-12; Wed, 12 Jan 2022 17:39:48 +0000 Received: from mx0c-0054df01.pphosted.com ([67.231.159.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZh-003Hyd-3C for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:18 +0000 Received: from pps.filterd (m0208999.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CE6ssh020480; Wed, 12 Jan 2022 12:38:00 -0500 Received: from can01-qb1-obe.outbound.protection.outlook.com (mail-qb1can01lp2053.outbound.protection.outlook.com [104.47.60.53]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj0fcg53m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:00 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YZOWluWWVNxLQvgCtUbJIU0coxNP1USJWTHLXojNN9AvaONvEIXeNmOCqM5R1/+Rfh9a7iP+mUle+npFpA16AmcbAe/LctJCrze2o6235CI5zlkuaU84im5V7AnA4PuvJXAkcGflNdfGw6jrY17UxX5NZLJAC2A8ew6r5SMnNsEu3W+ATaawAszczJYPnThpmqfmd5bSgmWnKqHFA6rmwkqUcK8kxX2iHNv17M7xKER56t79KknFtfm84dzlIhBY2HUyRf7OTOgt5As0mNf3Z1L/TaMNGZf3gu2vBwn35zx1i+3sX73ce3L2WuSZCkxFRqrtASB5zXGubOzQm6PamA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tPp8Tc5o958at93hIiyc4I29AVhusfEQyWU5KGxFcNg=; b=A1aZkzxZFWdDkoAH0+FpkJnVymj7DHCLo+LS63pwmqXvfOszkmyI5jFlmVoHrblr4AzT79iwojd6PXQ9mHeHaqDcUDNUVB6wH+3x1vB2bDCp0xqROzxKNoTNAQmXfTXqZfivMiattwSqIgbSfjJsr9tdgaAxcLv3c4OV50iM3jydiL8cczTDAKT3jB1itNSK0o3/1sPpwoKWmaJx5jNgx4axMN+dw230USND2xJ9xfcfdE4rnKnZhC3uky96FvH5F8l0hd23NTxSmxce3njC3hrENP8smQD6RA/LuUWkuGUf2uFOz7J29iRm8ANnUo0rN18z0sjnoa8SvXjmSodcCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tPp8Tc5o958at93hIiyc4I29AVhusfEQyWU5KGxFcNg=; b=BvbwNmxlNli7J0X8EPw+iWWbDKXLKkhkKN4RqrinxrUqM+zcLdbLPHHppdt/i5KUvG9vYW5o7wLWmbQ0S3vZ6XUhllr+SPnuAvv603Hzf6lskv2F9X1sp7KZdOuIhumfNqeBNQf6jX5xErRcL+qSod0p6c1qq6fhkm5DChtinnc= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT2PR01MB5789.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Wed, 12 Jan 2022 17:37:58 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:37:58 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 4/9] net: axienet: add missing memory barriers Date: Wed, 12 Jan 2022 11:36:55 -0600 Message-Id: <20220112173700.873002-5-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a574dfa5-533c-4977-c21c-08d9d5f2462e X-MS-TrafficTypeDiagnostic: YT2PR01MB5789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ND4y1aIVp1yUATY0XjgAMEH88GVV9uUhsPNQgmqvf/zUVwN9y/YPMbQ/oVFeu3pNI4hLNXEoYG4gMXFP+B9jvc5k3gMM21C0byeJQEMxdHxm6pSZdBYfLlgwylOG6v4XPUz2sVuLnrmP6X35jrbplNwzf4O+fSUOhabyQRrHSC97rBDidEB3B/7XK0gH6/6/74S1RhdBAo66Z7/FwloSS1Ze0G3TTAeyQQ5cPHmuA1q4q77a+IJRtg+TDnHtybjH85CdfrlDUSoZl8QrrcfwRW0ajACTtduZKAMRGkfRMc6oM6gznxtceSbcMTWR7gCGqtV83Uj6GaiMH34c4vVWmZ6Lxx2pUd1JAOb/zpxuE8W3/sONr10buFeZ5GV+qh5CBcM9PhWLn4Y7uMI7UzQHDzc//I3b+JH/PiicErcoFjNt+MDMp+PVmG7cXjF526VUEsLucHIVFxkdwhPXYdPsECK+C7ZGkYxusPlYKaSz9KkTZfaS+xiHlcmEdjBG0uzJixFAayTQ/SItjjBCbLVxmerLwbMS+pI6gHRmnmoE5qadRAd1h2O8piWZbxhLmChAYdGZNxUS9o1aqUc0Nl8WSllJYMSN006B+LGKbfFjaoUBWioKVWyMOP5DQb3YqqI8rTJcSURJkh15MLj95p9QoyeNiiyGfXdlw4CligciJQUNRK2bvhyIgVwrtSX9V1Ce/pgB8RieSS4NBpI3kmGO+Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(5660300002)(38350700002)(44832011)(86362001)(316002)(83380400001)(36756003)(6666004)(2906002)(2616005)(6506007)(8676002)(186003)(6512007)(1076003)(6916009)(4326008)(508600001)(107886003)(8936002)(52116002)(26005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cHUgQVzFHLhY0HGlX+fg1gGSojJ5qj7DkZYJ4+0W+g9AVOso/hK2gPpvTgH7cbZeiSC2bsv2ZP1Fhb5C5Nu6XJ3p3zKxBDmz+4HCpccgPGwqGXf+QqBnKe7MgL5zzVL/GobRjlUZnKqrM/pQC99xU2MqrHXBL+DNs+qdX+rgQOqIXJfZrJNTFj5MTKhQY/F2Xgj1A37dHuCYiGPWnXq9ncIfxju2LDTsffWANXux1/woA/t330825poqWvjbQ+Wx1SQnYuMh8FrL2dzV7Edz0r31ipsAi3HbPIK8ulYC9yIH6UgfTve18P3/R0IJ8YheUHGelxUhsA64eTc9fJ5oEcClzmDErUvrAbefj2dO0WFEnmQdW35mYCXRJ4Q9OvW3rflMjc9rf7aTsSZMVizL6RkOCrkHW3hZ7Y+SaL0MdO5UigTSbIPQFLHd49B+JFKE9AQwd54L4vQW00Mie4akDgWUkUi9pPZM1DbGz/m59/yqYzUOkzCpFld0AcAFLqjZ9f8NfpMYhxQHapDw5/ouJZkLgIjFQZFjr+mcWwLojwuFIxmCle6mJCgdxMFLsBNA+fO1xSQsJdr6IjRwRJ45j3CvRFJP4J7lH/5R4k0Iep9nW94jIxoSWI+bt2VDp3GnK2y3wIweU19cePb2Xtru6bI3IqJhzWs/7NvKAXjZJNr4dRgQBCl9GgzD7sAsaIQOa5t/hWaKMPPFJVWR4EcwfAiLFjXMoN5V0U9OS2Y1Z5c8k9SwmUX0y7/fCCPMfggBKqwrdQm6gbVW4L8y9TZ2gHIOC1S23Vz02KPsFbVOVbQab+jmL510G3EwaYOQHN0WDRXC1lUXKReZDV4nUUVueeTvyakOvr5m/+qfNMfwuo7h6ie4v2ceAYKnPYv/J4FbN8K10fIQl3vJ6YM8Lism5GMLBvpDHAaBeHGVh8BxdVHM6weAcMPnh5NtTMfx9jCgHz/GBJfZIPPL2qIhirpggrNx/dfYuz7Ixdez8vsUVK1+fYOyi2H1t27y2DqZUJkVl5/6zGbMjAzAl8zF343RNDbL551XTmgXX+bWcUv8Tt1fvnijsc/qpnSOfklEIHIvZnXv1PDfgkuOh28ypOOCG+LKViXoOW7r/SydYs0qCbUHnGjNSQBLfatQx4R51HAF08BrP+kV2omh38zBLCEdZlZQySctkdHvSHmEdVRoniZ5BigcOOJrNG7cODU+wU+DPnBmpxwqGJTt4I0twvGJYfkTEeI5k3qOG3QeG7NWj8XtZkKOmV7O1ubycdVUAKYQKPjbG6irdXLHBRJUwelWa9J5Bhy3MW7fsjqWvqgU4IBKIWNW4edmLwNB7DzZOFyd+oWduWywNSdxeYF/vGdpHhrIezExekCE2ZVOvQ47ZtuyiDhwpXKp7+g5wAXu6+deR8JT4escjrueLU1aF9PKwpA7U6UqR/YszNMImyYILckwEzNYGIjkC5aDgt6ZJtc7bhedoR/4bkUQ6qA8a2Phyn2N4LjrfMbE9yKfn6faAZnLRYsP6MlyxNz9oqY01GPCMxZu2FhgFdfLd+zY0bY/v3Bp1C4FJkvV7Wyqrjz1Jpp+uESmkmt6j/9U6+MoJW3WdLbzQFs7d2JsHXsyRPefoiEoFWUVlKw7dD81uwVZFm+tEOmg0bDl6xAESDONAYZD8xD3vZUd4XNXYnSAPfoVGlNy0kBuv4gDVWo6QdHAXXE= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: a574dfa5-533c-4977-c21c-08d9d5f2462e X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:37:58.7000 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jWGY4/JBychwH5EI9cdHhVqYSPPyDNQW3K5OKKMrfzRQcd/LBZII9PM2JE02xq2nMK529vjQIjYZxM1oK9gH/aKedBUl0bwi3cHMNukt5yk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5789 X-Proofpoint-GUID: jrjFn2xD_5fPfiUNFk8GvnshAyg-3Uqs X-Proofpoint-ORIG-GUID: jrjFn2xD_5fPfiUNFk8GvnshAyg-3Uqs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=658 spamscore=0 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093817_346788_4A1A53F7 X-CRM114-Status: GOOD ( 14.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This driver was missing some required memory barriers: Use dma_rmb to ensure we see all updates to the descriptor after we see that an entry has been completed. Use wmb and rmb to avoid stale descriptor status between the TX path and TX complete IRQ path. Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index f4ae035bed35..de8f85175a6c 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -632,6 +632,8 @@ static int axienet_free_tx_chain(struct net_device *ndev, u32 first_bd, if (nr_bds == -1 && !(status & XAXIDMA_BD_STS_COMPLETE_MASK)) break; + /* Ensure we see complete descriptor update */ + dma_rmb(); phys = desc_get_phys_addr(lp, cur_p); dma_unmap_single(ndev->dev.parent, phys, (cur_p->cntrl & XAXIDMA_BD_CTRL_LENGTH_MASK), @@ -645,8 +647,10 @@ static int axienet_free_tx_chain(struct net_device *ndev, u32 first_bd, cur_p->app1 = 0; cur_p->app2 = 0; cur_p->app4 = 0; - cur_p->status = 0; cur_p->skb = NULL; + /* ensure our transmit path and device don't prematurely see status cleared */ + wmb(); + cur_p->status = 0; if (sizep) *sizep += status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK; @@ -704,6 +708,9 @@ static inline int axienet_check_tx_bd_space(struct axienet_local *lp, int num_frag) { struct axidma_bd *cur_p; + + /* Ensure we see all descriptor updates from device or TX IRQ path */ + rmb(); cur_p = &lp->tx_bd_v[(lp->tx_bd_tail + num_frag) % lp->tx_bd_num]; if (cur_p->status & XAXIDMA_BD_STS_ALL_MASK) return NETDEV_TX_BUSY; @@ -843,6 +850,8 @@ static void axienet_recv(struct net_device *ndev) tail_p = lp->rx_bd_p + sizeof(*lp->rx_bd_v) * lp->rx_bd_ci; + /* Ensure we see complete descriptor update */ + dma_rmb(); phys = desc_get_phys_addr(lp, cur_p); dma_unmap_single(ndev->dev.parent, phys, lp->max_frm_size, DMA_FROM_DEVICE); From patchwork Wed Jan 12 17:36:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711754 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FB5EC433F5 for ; Wed, 12 Jan 2022 17:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v0RwGkPvRKyztKB8OjczN6Ro32/PFN2lRuYm/EAhN30=; b=lFh9a6RWO+Zww2 iu4HGFt1Hv6A9On6w+2lnEhhIyB3O5kCFGzeIOjDKJ9l2w16E+Z0PgH9Me9rJ6D+qNKnom8JU1med oRczHwg4lb8NZYEYaK7Sx/GTj9pxHAoeR/Sse/VsJ1f4qqz0OnNh0jHdvpKwCg1lXJ8Jfb/BQBYPZ aiQnASqHrSdLFEx/iTM7BAnhoMxvvXNjK4a8xKgAVeRtFnw+Z7GrdgBnAU+WfV+U+OJHCULraMrfb ohdSyd0+uWldKGFdsZ4r4Vi3pNIQbFqzzeOcS/XI9mzc5+czaytme9vFcewxRMgI8bmkRC+FL1EZo HEmFhk3J7Wakkvwly6fw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hai-003INS-T8; Wed, 12 Jan 2022 17:39:21 +0000 Received: from mx0c-0054df01.pphosted.com ([67.231.159.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZh-003HyZ-3D for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:18 +0000 Received: from pps.filterd (m0208999.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CE6ssi020480; Wed, 12 Jan 2022 12:38:01 -0500 Received: from can01-qb1-obe.outbound.protection.outlook.com (mail-qb1can01lp2053.outbound.protection.outlook.com [104.47.60.53]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj0fcg53m-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:00 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AqtqD6rdchkvyyGWLAIluSmTB1sZ58Hs8JJ2Y5aSnanV9zoXvxEkTT6oMH1i34bIpjbqAckWsNMspBkk+QsFhm9WV1DYmAKrGi/wSojRfDjYT/0lkk+35F/LdmAWpmFS1R5ij/CdRMCQi7LGV/mEbdtfdn+lcXRQ2IjXdtDK2u0TFo+5AuNQJs54PBsnauBjSjWygxLuFZ2ZwoY1SMp9lMSWIjTjoZbOBd1BHQntyRDUDDonPzoCfIAlmQ8RHAKB+GyhW/k6rpNoGOvkSvoxfR8OIkTwqA4ZGBMWwWwkvVvhtmvzUEJng1HcxybkgzRYg4mJTFjcyEB2ip/E+UK5sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iSV1LcXhDE3eLySVJixtB5wpsPh+VDaIOsTT+RVzZ6Q=; b=JrJ+f0FUaqYutxZMlKvgd6GnjKaWeiITGLDqahachIVLjCVmglTeAXqrKMeMYHYXTuuwXlfvfNcLNVlKuQLproFKkmhGGjBIb4oMMXyXnFHT+E1cxQjBqA9O/NaIGgQmi+xBmHYctLnFUxPetnfb6dxTpTFUrV+iTslRo4+NWMZZW2tcstRmr7zTP8WzhIu/7tXYsvOmOqnD7i66qOK4gugfa3ls8ho6GLXhwuhQYaGcNG8+9ysKVhw5EpnFT9g+8xRjR9FFwJ1JIA5dajJ8uXYmKIinQds1xDno3tz1QkwvgHFPlvQFtj9ED/bw0iOFArdfvw4NUSu9Zr//MAv/Sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iSV1LcXhDE3eLySVJixtB5wpsPh+VDaIOsTT+RVzZ6Q=; b=3NSXsFGnkr8MMm+YLb99FmEHKSwhjwmgKx9sHm3RT/1HaBEGoCnTcGsfsOHLnHirmwuIZhTWKT8IMUS+RHrdBS9s5uJwhavyspszGHBCBQ/pkInE3KBuj8wbnR0OpU6W81xDEcA3XG0i9M0rUOVkzAo9Md000zAEy3kgb9+5QhI= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT2PR01MB5789.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:55::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Wed, 12 Jan 2022 17:38:00 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:38:00 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 5/9] net: axienet: limit minimum TX ring size Date: Wed, 12 Jan 2022 11:36:56 -0600 Message-Id: <20220112173700.873002-6-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1eb429c6-a7f1-4b1a-ae17-08d9d5f246ed X-MS-TrafficTypeDiagnostic: YT2PR01MB5789:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IjPLOV9pQpAYv+l83jIuz/6ODiHZKFkGkX/ZnQD8Bp1XNEk8A7QPfzn949P1qJEMGse8RhhKIhHWUwtcte7SKFHVBc2i34q+FtfEpLwn5oFQSx2u+ZRK2SZsKzMUyeTDi2O9eHDFswutrw/M6I9hlFQD0JHmvQnh6N2Ncn6ymPaG6yLUj4ep0T+efE8j18avp1owvyMKADwkfUZVTiRIAqM+HdRk3FqRWSNa9IbOlH+3hVzLIxUiQoMcHf3Yu3l9jgPAxdNTZSS6pI8LFm508SGVnt3BWCUvENulJq5DREw4vNJggogwaksyu1U7PZWM0OQYWfDhpZkkyMvZCwCArw77fekTGY9bczBpPyxvayEt480LzZsaMuj9WTBzvTkQXlYh0vFPOfyQKKvh33roqyLKjVqvBxoGk/X2WmzZzD5Qunxs5Eccw6++p+IsPcn6xcBoFLcES4HqcBbq2TVt5fRReR9BGON9aOyvzoKbsP9DYsGqgGEYv6BzG6O3HZcqnetUttqfcosSPgbadXUsJxZ+kfhu5E0aaX9na4ZBEz9OYYEfkPZSrN/XXaY3P7xiES3Y1QyrNgXAQf/Wj+Cshs88eW7EIqW1Ln32PQpqm3FqPXIu6LU/iMWyr6w8soECsP6OPm9hnVaIaLGOlWUCct0YIBu/GF4WApU5BfOqmMcp8nhahanVlWJ0f2Dyol5BlSWpUHJYyqDH4wMUpnJ1XA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(5660300002)(38350700002)(44832011)(86362001)(316002)(83380400001)(36756003)(6666004)(2906002)(2616005)(6506007)(8676002)(186003)(6512007)(1076003)(6916009)(4326008)(508600001)(107886003)(8936002)(52116002)(26005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u3+oywEhh4enXqh7jxED1jiaEu3CVqjzTgevJ4+ZAu0H88lzOd7YKbZYJBiHk5dyyZANyjsFudPu/NIowNzM31fDvNqWa3EZozIH8TDVjYBj5LssmzkCbFsW1G6IH0wr0xLn345XJq9ecxRGGoUNk/oUEwFCboplzXNlxBDOSaQFXmyHvhRfgKklRrJUXGbXz2fXjMiSOVsqsfM5Be0s5lgw6pX25qodQBWiOk6sgfpuswDlr+OTzmqdEP9ovIa9JJRP3ARg7dBiy/yaARFKebIh7ZhhksE+ID/xKp5HLO6ZDRK7u+cOTxymR1+NDjYIPcJ1kFGiHtSGPCDiYG7QxOB6b2/PRB/mzpw7m5INVhXiBmOipA42Fu72IsMku9Cs7iQ4foMomt1xR9fqA4DmdyD9f3rjX3Jt9+6F3nqjgwBFJbozmfYVoE/Pq3EAULkuDsjSZ9FSPS2dHo2Ewwta+OzG3rg6Mqjx3emK9wU69hK2T9zJXjSKRqdV2NtYlIo9h28KOCtJyVySoohPYwUwrcmuM/eWmpXvwOW/xog0S2rQd6UzofNtTFbueao1cYvERlEVVHXgjHwZP1HLxCuLEHWGkwulpurMkiTKl6Ol9m6QaW+9DA/cOyHhLjpfomqoKSevGwGh3q56l/nZ/1B6dMwy3Zr8vWCFPnGOWjHsKrNHCGjKUMLGKLTOEuC+67rE3o3onpjGSgMOeEmqlksXxEuzFqeC2vPxgUiNkyjD5QMbBcx/hkw+Hs/t3zJvTMZzvX6a2DSlEuNFKG4gdj8XDe4SsAudv+7qO2oW5jtW2Crw5sgf+zo/wT8WdJctrW8eYbQa7UFc07wQhpWNEeUYFqy+OhFCMOKq7DybGSuKkl87Ode2jCsUkjFl+dzcCPzgzaKQfxdyI8OZPQbJVX/toGxx1JiCHxX4ht91igaIRdOgX56fIgUMg62eRr32kXtVmU+Va1EIB6tGbbgSX08CuIgXim9TfR0uXPNxxP2KVA6sQSTWINK74YM3kawQuAPrKeUsreDMjYx3EvpanPcdY1UldizxESc3UtYsqOnlpPhgVG3zyT6MAUhN/pHo5FsjnP9lIrUmJ6qO4mtQjJ5ttnq3qAug/BAFWIVud96gviFiNrpLC5e//Yf/D/ss0oZtLLuYUFVFAfMGvsqCgO7yN3Fj7bb9FZQ1efGILCZ4y3LNruQWhmbKcFTnEf0Dn7h1p92QGWaLeuJKxiKdbDWONDEgq2rzFiD9u4XCD+n0hR0JYvf5u3w3PW+kAYz2wKiIRndKS82VPCojqxoUgR01+oEHp2GhIZsfzSHJtBX1ZRtTug95ID9pk8f/G1PwHWduQdD3kvAprjFc5LWS/9fN13vj02mn98v5DwJw7GvS/Qc/xyo04a8F0R+mAYZhVsZczxWdfegWdcW2OQ3QIZIof2aMOJxbKO4aHmCJpe1DA4QdfOQ60ADnkfwnB9GME8T0zSTFfonzzdaqsqDcEhk728i5WuKBSr++haydi63puN0PyO3PC/fySWdfgQv5angliBk+jsf2aGqPgumsiiOD8hV53tA2jN0QcAlMQlqozPoL7NeAI/l8D/rpoyUNBm9FAvBKmANr8IDWz9dmdFtkH1FgUfCXABMGr1AryuYJ/JUgPF0WO2GiEcEtZvBkmJCXEkkkYc83gzBLAyGAY3T5s17s3yGfZ7q23p/KyZwNReM= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1eb429c6-a7f1-4b1a-ae17-08d9d5f246ed X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:38:00.0137 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ai8KChlMMmgy8VFLLt4OPr9wl8DM+9VPM7KKjnooFP+Vx+VKqbXXRej6ypLi97bL7fr6x1cUdy6duV4+VOwoFXNjUi3Q8gCYk+f8vCYmFPc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT2PR01MB5789 X-Proofpoint-GUID: cNb9QlBRLFrv3rxQFqWWIIgPnG_1HJWr X-Proofpoint-ORIG-GUID: cNb9QlBRLFrv3rxQFqWWIIgPnG_1HJWr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=710 spamscore=0 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093817_332503_2F32B969 X-CRM114-Status: GOOD ( 13.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The driver will not work properly if the TX ring size is set to below MAX_SKB_FRAGS + 1 since it needs to hold at least one full maximally fragmented packet in the TX ring. Limit setting the ring size to below this value. Fixes: 8b09ca823ffb4 ("net: axienet: Make RX/TX ring sizes configurable") Signed-off-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index de8f85175a6c..8a60219d3bfb 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -43,6 +43,7 @@ /* Descriptors defines for Tx and Rx DMA */ #define TX_BD_NUM_DEFAULT 64 #define RX_BD_NUM_DEFAULT 1024 +#define TX_BD_NUM_MIN (MAX_SKB_FRAGS + 1) #define TX_BD_NUM_MAX 4096 #define RX_BD_NUM_MAX 4096 @@ -1389,7 +1390,8 @@ axienet_ethtools_set_ringparam(struct net_device *ndev, if (ering->rx_pending > RX_BD_NUM_MAX || ering->rx_mini_pending || ering->rx_jumbo_pending || - ering->rx_pending > TX_BD_NUM_MAX) + ering->tx_pending < TX_BD_NUM_MIN || + ering->tx_pending > TX_BD_NUM_MAX) return -EINVAL; if (netif_running(ndev)) From patchwork Wed Jan 12 17:36:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04E91C433F5 for ; Wed, 12 Jan 2022 17:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RLVBqj+2AiUsD47f7GWqi2Z7uuOBzlIj4BtnKqJeSsc=; b=ifCj9eskN0fzgJ vzj/mmptw6fND1SlqkwhtclZhWXYDalrZzvKpuVr1FpAZbNkCuKXX7vfNhR9uv9eDhZvQ1ERYUkB+ U/ppzy0NjTrRuDww6EQI9mQBl0kz67TPcXd6WRH9uWzko4PJyy84I/xDc8LI3ZULSZdbTNCqzbdbu E/h9QWTFcvF+HqJ0QqJ7WaKPErMFoBVXLxs8tIaDXMhVct6rhpq2IfQKe3w/QgVBPXM/FdRHe8N7C BNzBzlH4pzHqOx6DaRa6R2XtW1gd1nxUYcvXYgs6dsi3Xx9JgqvfDlQh3DriSGoiHmqeRorOgRv9g HbipKzbqFC1qSCRRMbFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hcT-003J6c-Ru; Wed, 12 Jan 2022 17:41:10 +0000 Received: from mx0d-0054df01.pphosted.com ([67.231.150.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZh-003Hyx-UL for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:21 +0000 Received: from pps.filterd (m0209000.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGTfCv011851; Wed, 12 Jan 2022 12:38:03 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2056.outbound.protection.outlook.com [104.47.61.56]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj2j2g1b4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KnqL2aDjJt+9E+JXy/To6PSHt0XJE0FjaQv2h1u4s5Q45/yvup5fRSEdqDyPuOW3rK765tATTgOO91k0lx7u90LIqdyUZuVOr2zPoQacnI+UBH/KHgmz8mx6nrvF98fAw1z+jX4ZPsWDaW9f42zWoYFBVR/Sc7X3A0QpXfWgeHtMfwm42dsVDssvdU4EyWclADAFcUn9Zdvy/PatraZEXxXPUyu/blLXmyYvnHmipFY4+m/3nwJGeJpexGnQ1YEBVPvw23hGxT6cUslMcL/WyAYl0CX/I1I6csOPvvh8/029dVnK6S0X8gfk0S7g/0Ju1AMFQIR+9lrzRXn7EDYtig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7l1BjpEmKjjb01dQCnUrTbR43RSa+9MhabIjNqzQ7F8=; b=T3D1bkxtDPtG165R7kQdZSiqQvdIzY28Orc7+HUvTtjCsefaF7JBOiZtsATf41GQ1fKYt1VCT9T63/NPMUaoWq0Y/FRyAHJTgdITYTOJMDE/BhuAruOIo89I5jlpHaf99FY/wXpHKYgqJ4/4WSngSpbuktjucWVQdH9taUfJt3YsuS+vx/kAEcoyEeA4LwGi2sZ3kFJOc+R4iYTfSzq5Zl4ZEJ96DJhayEto1T5b+y3Vs8V8zp/ayYc7wOcpyLy++5wU0SWFGYIGhwXf6tqsJkxMe4+IYc4AIrDHEDrLz0kFFUXn/IdSxKkFIPr0W5gnOC2JIytPUPpjkampQ0V6Tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7l1BjpEmKjjb01dQCnUrTbR43RSa+9MhabIjNqzQ7F8=; b=kqdSvi46l5vIMnpMiCN1DjeDslQkc8m2SnVrChLjQQjePWysbqes4Vu6HW2ZKBJO/jxb9CgAIHts4Fc63bhT5ftFETTHnA1NbRjovbBQmxO8WQ+hE0E8sfL8b50UF+fbHvtRtYBCFTwj2PRF8Uvy7poBGTPawU4KDfMKP/NUfKE= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT3PR01MB5490.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:62::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Wed, 12 Jan 2022 17:38:01 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:38:01 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 6/9] net: axienet: Fix TX ring slot available check Date: Wed, 12 Jan 2022 11:36:57 -0600 Message-Id: <20220112173700.873002-7-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4d9337f6-9654-4696-9bbf-08d9d5f247b3 X-MS-TrafficTypeDiagnostic: YT3PR01MB5490:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VVzP9vBIdXzBk6ENtmH3TqZz2VxiRs4MQBVMf3QMAueUEWFO+NTlI2Z0PZjcoxpbEpIDma7ULAAApUJqxzTHVp2IUbYv/uupGyC8IfPPCt1vF0mPvxSr9F0uv4Q5F395mzFDGB0CgEQi50Rm0xylRuQybfQ4LWrGcasJ8W/nT53DMHPvoRgJAogifZFMeT0iWsK6YBuAPEIY3j5+C6vmZJJtPzttQs7iz91d7+aTwLY3srt2WHqymZES2UN4fxkNQziPjrhYLfZIp4aKa2pmpYIrTlDOB2/70b6MGoGhHubKK6KU3cVt8kixMq+D2h7fgzaZ2ZL6FSD9mFG3gXJGiDROpzlpKhrzAbs137xlapkOK6cP7WimwTQUFuj1BiRaGrxpZ6vSEF6kD8sjhcfyT2q4/fOanlJ7Ic/0mgsDXAy8LF25tRRsT5mjhIYkLrjRkiqklKVmd8U3PkK0UnWa2AmQCxK7+aHwaa3aGHuz/RUq8+scKxP6r9XkiHp85bHGewjCGkkU6VLxGWWhYaZ4jBXgePH4lutiGCnBzuwz6Si0hQoatlBIkOi1xT4ScXJTk3itbOLO/plGtwgumBOrSsy4VPTH69FIaGjAOX7Y1OWgIo5pAhN+N+SMn+VWf2UrLjhy+koUK8Q9D29XSOn93IwR3/bwrxpW9bgkz/qtLL8JiFo7lq0eVx5IV1hOSA+N63eZYdiZdi7t8vzkr4gXVQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(66946007)(66556008)(38350700002)(2906002)(26005)(508600001)(6666004)(83380400001)(66476007)(38100700002)(52116002)(5660300002)(4326008)(86362001)(6512007)(8936002)(8676002)(44832011)(6486002)(36756003)(6916009)(6506007)(107886003)(2616005)(316002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: juGhKSLv4XMY9iljPt8sH2vDxOrUXQRwx+x9aBgbxzBNFDvXxtpcFXpcG5lhABwvJgYtGgvocPs+dmK1WimDlCJVPHWm3Jqro6HS8V/MeH8KclS/HTJsMMNVte9SRLxoL82seHfGIkyRn3DH4cFg9S6SH7yrGcrql8P2GkOpIDSWSEhZd2IpAM3ItWDmiEmIKy520Lg328EZwPsyNW2EJiiuA1maorTO6gYb+v7jMUJrCvCe7hSAyUNeSeJ7xDDvl73krH4LrT87qnvBD5H7YRfUzKZRMTaInpPAltx86oM9zUcponchMdMEDk2QRECW0wkNi8lAmUAz3COwfD8lUFyfZAIZqfXAR6A55gVImWVgbDq8yNqu86heH6RPWw6CyjnSDwlVkUNYCXyoLtGIfan4zlFyHCVZrZkLT2ajdwEVnpw2kZgsfyQxck4X5Q/fPnp5YDk6IfsLqxhu171bow1yaSDj5V8XUyT197zg6XPL8ZY4X1qE8WTfFyS8OHzD9DIzeagueJBDy0M5mI0YkcXsUk1ZfLCNkNyaZIo+1jkY5RXGXr7+tICdIS+JfLPahkvLFeUwa7DYmU5bmb91/yRnLWEy0MFwcu76Kh/O1XHJy2yRs+zuZdruffacVy/7F0Yu8NRGsixau1j3nH0wiL8GzmmNdTWtVklmTVqMeCB6+Cc8EpTN6p8JRrsHiaSAZcKuGpJi5yW1RGXNdIb7ohJ/gBpu0zFp72dBJPJOLaMfC58zPY2vii849maYtmkMwuSlg/7vSABrdmrGH9ukKF+wrIjZBki/j4T6msnvTch9qG3M2UUHXZmYWw0otzXuYVLI5+y+d9Bpc+RY6QAGIYGYBd05MmFEsyLFk7DXhYqADgwD0+9rEJ8hoj+n5Wp0R47stKdGk+9hAA1x/S2RpjgxXyEUT7SmHTCUezphvUlGOpv+GYUXsiC27Y6cwL2IvEuI7kzoA5dvbj88TbVF59Be8dA2/ssIVKSEypZ1TPhPLWFukciVoB/Xd5s0zU5p7+mtr2QzFEPzg7ZubRX9j1Y9mLEdp/sHHPnb9nq44egrMhvkfbWJXy+1nAj9OuvHsy34to/dduPbw8CLXGA1Tth9aO9vB9LD6v2ap+rSAjD6kIXAZKapBWtj+dymJkx3Sy68pcOAiJUuUQ07/q3z2pujS2gyhjS0YLoguQZFYamcT3MnuPhkRfdjlJXCvpIngZ52A2dLRy/SPKyR9+BayZcgcsA141Km/nbqUqFjoGGI0RxO32NVaFT8qW822ALbAPReVgp+ajvXbd31LuH0Rx/7/Ke1wBGUMRPVbYsTNDR8WblOz8h3pMn09orjPb5hY3BHEWT4XmmgFJNewobbjSPJ+0341LI3ql8omcrKONvwOgJ93MfZLZWgl0bATvGPZQcPVNKTh6YPcUm6EHy2lhaBTXQSKClLX1U4K11N0BgEE19rr3Ku7pR2oG+6dPHPwSQyfwJzulcp2iBd3ViIIUcWQiiFdEf1HQjGMDzdBe7Pid7BIqGTTPrS5wfOWRweD9lSwXlS+VIZshaiycvwiw6/6Ft4GVvsiyY5BOz+wlCw83WSkY7gX4CSkj8mU06x1qNeXwaIXPxwxGqPC1Td9kOfZPjlZuWQPovitaEz6f+kWNQxQHqPqvfPA3SunnXXlqmFBa8J9AyaBrXSOj4pcP/yY6tW4In9j0eMySKgHHY= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d9337f6-9654-4696-9bbf-08d9d5f247b3 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:38:01.2796 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5Qq2awboLV68KizjucBEzZF09iFGcf8u5ptToVsvRJI1r7KyGwpbrmT4jqpAvSjzShNh2VWEnDpLADQVQKs93vCykTzbaxNrT/vtdrKxzWQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB5490 X-Proofpoint-GUID: 2dB9fALVW2mGQzLYz8SmiIf_VTDakN-7 X-Proofpoint-ORIG-GUID: 2dB9fALVW2mGQzLYz8SmiIf_VTDakN-7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxlogscore=681 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093818_152038_1F84B84C X-CRM114-Status: GOOD ( 15.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The check for whether a TX ring slot was available was incorrect, since a slot which had been loaded with transmit data but the device had not started transmitting would be treated as available, potentially causing non-transmitted slots to be overwritten. The control field in the descriptor should be checked, rather than the status field (which may only be updated when the device completes the entry). Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 8a60219d3bfb..ee8d656200b8 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -643,7 +643,6 @@ static int axienet_free_tx_chain(struct net_device *ndev, u32 first_bd, if (cur_p->skb && (status & XAXIDMA_BD_STS_COMPLETE_MASK)) dev_consume_skb_irq(cur_p->skb); - cur_p->cntrl = 0; cur_p->app0 = 0; cur_p->app1 = 0; cur_p->app2 = 0; @@ -651,6 +650,7 @@ static int axienet_free_tx_chain(struct net_device *ndev, u32 first_bd, cur_p->skb = NULL; /* ensure our transmit path and device don't prematurely see status cleared */ wmb(); + cur_p->cntrl = 0; cur_p->status = 0; if (sizep) @@ -713,7 +713,7 @@ static inline int axienet_check_tx_bd_space(struct axienet_local *lp, /* Ensure we see all descriptor updates from device or TX IRQ path */ rmb(); cur_p = &lp->tx_bd_v[(lp->tx_bd_tail + num_frag) % lp->tx_bd_num]; - if (cur_p->status & XAXIDMA_BD_STS_ALL_MASK) + if (cur_p->cntrl) return NETDEV_TX_BUSY; return 0; } From patchwork Wed Jan 12 17:36:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711756 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1118FC433F5 for ; Wed, 12 Jan 2022 17:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EEqXgL3lBq0Xt6R+DdfznOkcbArND38aoLSgiGThLvY=; b=MYbqIH54/eLowY YqRJdr77Xop6jkMgbhmhIDVeJY4P3IlLXvnTioQGHXSUFZndON9mjM8HykON5TjWBETo62lBmiCCM G8DmgfeoCKmZAY8ce7vuopyOZLZAO4xQjaAeq0NO7T2VzDbIkvkr2aotKql9Oyx0tqfgwAaM0IEtm r47z7L1H4Fi9zqgFyfmbGhPgfZcHnDMPgP94NCnw4B+AUmT7j0AwzoWARB9RtYxZEpeyUrUvueHao qoGwAOm83JxH6twdfR7vlJNZD1gnxnzu04ZqdILlw16MRP9zl60vg9TAGBEmtJ0ghJzKVap/DUrQH AZaE1csoW2chN/Li7Pkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hbo-003IqI-4Z; Wed, 12 Jan 2022 17:40:29 +0000 Received: from mx0c-0054df01.pphosted.com ([67.231.159.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZi-003Hzb-Iw for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:20 +0000 Received: from pps.filterd (m0208999.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CE6nAw020453; Wed, 12 Jan 2022 12:38:04 -0500 Received: from can01-qb1-obe.outbound.protection.outlook.com (mail-qb1can01lp2051.outbound.protection.outlook.com [104.47.60.51]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj0fcg53p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4IZBq8jJQ0IWxB0LrO3ppilBCS51wt2fzT6WYh5+yV5cASd7O1fIC9V0RZ4f24dL0hWMJ/dOW0wO4RlLtYK8zIQAALAyeOZ91pptNmos6lGKCZ7NF5IZ0XsFnFmMq5106UB/gI920kEvS+1P5cSb7U9byh3T0G0RlIuIg1XoFpUciSR7mh7r9A989z2DrVUUNGpLpQ5c/SRhCnadZyst9UZ+wcAGtNzyJF7NW0Q0uxjIu4kwfVVm2TVldlXBnccIUW29AEzVzlaI/pCAh0A5oVwjb9LTPFAgRXvSdLDqbE/fRjImw6kxhbGGYdlygugmkBkOks1b4xtM8+mEQluPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3maKHlNnvSWV4s8RF71FZUrR7rUC6v0MJp7HOwqTX7U=; b=YxAHFXTKSfYNugrnOYdQeBMDGR1gscQvvv1E9zOvRnZs9e+N7b+i8/XP/fEtZKzX7yHFpel0QPMZatBPRyZL2kT9eOvTdpPyDlPLcDIQJWSTM0gbpWl2U3fa4fusT/mBj570vnxa8AGpToNEiCT4jRf9VAimpF7JBidYtGbLLTHdc12dLpDu0V3dYlbB0T2wD3NfenJmgjh1NRu1WeP3WkrjMKscijaHKNYPgy7LP5jSphaw2ZIs+FOE2KWpFXGTcVuMTjyphNEh9tw8weGvzs9+3D7DltIT/tkNkxkVRqprB/KM3XswMpi+EY3M9jjtY8tUmreRilnuUHufqUXtgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3maKHlNnvSWV4s8RF71FZUrR7rUC6v0MJp7HOwqTX7U=; b=VLhWmA9JbPy+B3OJnc4tkJFQ2DYWZnkb5VzMmxZHuNb2N+43zca3j+gq3OM35RDBJPzUukANurbQNe2XMvuNcC4O9w9hVEzhOjvY0Q7SiWGf3nxD86SwMSOwZA52B9R2yn4d+rejVhGPYsKxXEyfx8Bas4btH54lQd3KczdD8ak= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YTBPR01MB3424.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Wed, 12 Jan 2022 17:38:02 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:38:02 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 7/9] net: axienet: fix number of TX ring slots for available check Date: Wed, 12 Jan 2022 11:36:58 -0600 Message-Id: <20220112173700.873002-8-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc849574-ff67-4b35-6094-08d9d5f24885 X-MS-TrafficTypeDiagnostic: YTBPR01MB3424:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZtiSoB3YgPBzr8e6l5UmsP5dyRc69Fuetu3nib7YaWo5wQCoqCa1zflmmNysUvPapF6qmkkDCOtwDlMuoTIw7uDtBnv/xHpa5XDzxLv2K6b0UBo4dzDYwarksHt3OixM4XBDTULN3pQqLgeMftW4T7vFlogFBSWvRigg43iZ3yvtQOj8F+GbIRm9H4sehdN8aZnp89OoJs3s3N+Y56rplHxHvinb8312MQ4xz4INMBc7n7OGhi71MurXA4O3Aw/e4Ct2D4+GO2x1AoNQhBy1Aj45XKTXr1/nNhZucMGAvWwA92GUE8OLWY9ow7f0byJTzBx363Glc08NkA6cW9esnoi2fTqLHRvewxIMxPW4qATicb9PZ+a9zmksX1PsZehmDPKZzcErJRQD80CCzOAvGIcswNUso6fG7yJvZnw7S9i/ky2dUzWoO6EX/thA5seA3c1gk3LWjJ5e5FMRu7ZBQjHjjVZ8NNU1aQ5yIGZv6MEZovC8mo9Pb4q2+dmIffFzoYri2rHRz8InP+klC5qA7WLnF42mv/d6xikegWGeB8Y1ZvWc/peOgplHLU7BhAePdCi4P+UpMjitRTCe3dZST1MFM0QFfwyhFGFGeZ+Inyi/MHahSQ9G17LfIUPincXe/hWYSkf1lk+1v4DFtakDZb9u3OS79Z1I9yfMTXn3WUub9kvjLd+yj37wCRn4z7qsFTJqRZW/tbRxXMlbymA4TA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(6486002)(6666004)(107886003)(186003)(66476007)(44832011)(38100700002)(26005)(52116002)(6506007)(6916009)(8676002)(508600001)(66556008)(83380400001)(8936002)(6512007)(86362001)(38350700002)(2906002)(4326008)(1076003)(316002)(5660300002)(66946007)(2616005)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6TRcLu2fisTvPqeQWRpRbYkmuy6NJZ5ScUU5+6FQmKkSNfFb/zq1PK7z+87DOJzoHSY804LiZEG/6KPFww7rtsAPU2VX6BORyfLxwhFkl+B5MIoC2APXzTfMGPhuITuf1kVYW72ZbomGkhboSc/6I1HafUKPFxWkAKmrnqOU9HDL1L0VlYitAOnTS9qBBa8CJACUkK1oYrrNvH46M180rPXxwoApyQkk5MgjbAsD13C5JAQrDDYbtCB9kaXMkAfhE7wL1wzCm8wAmUoa+h4cNwxEHho9lviHTegSws/xSABaBjtf6L5BNffJKwrYX4RhU165kVXwGLEQmJDdlU2dIJCyvcrOwMOYAYCquMaHtv8S19wepyOYRiL5+QhJDOr/QIXSYfj3CtAuKT89Wdvd8AC2ziBE0iKzQFa1pOXPozQoZnw7wyW9iJMvaq3UxANasOCRvB4Fk1Mp/DRWjSIlwFGhfRNAZuJKkMpiE1mCP5K9YWMDl2lj1Cm9r1wCjqIKgQ2X5iKsOGfblPdFuj1HWBX/DZTaI0LuDWn0TPgEStm7vvtjMrXykrrYzxBHm4Ft/moww7va5f7m7BY0n5jSQVclWGy3Fs1jR53ILIEozCNKtvgM66eJ0wg7XNUTIHvV7POjevKSezXW2AXDal5iwBqTSqtOfVo0UVrNt3LBc92WsmMsJH/27/gdlbUU/0URwqynVIHeupulHRl/8Bfi+zAkqNmGaDKeHKchJhiAIn0JErYuEP4BlIW3mKXtS1HKiLMQ1fI04baEfqeCP0R6mjPsSSwRdZ7H5yNr2M2VIVn+0etOhm22NZMJPtq7GKG+t+fesv1AvaXshneVnI+qXBPfPwE9NWfVfbgvu8MjbPMoi4et27pryBU0OL3liv/W1DbXe1TdKSUIrba9OiyHTuJASj6UFY1HQ1ugjDhYn4WljT5TFIZsH0TYS917OM7QvgcwtrdatgQ5+xDwYmLNJpXikX5HPxoSOkRuUc4PqVsmBd5+wC3WiKyP/sHmmW6H1jJ+DK3IybMW3scYsgVXWaNoN1UDUHnpPDyROZwW2A93vnVo5YtMMS1JUek2s8fbX48BIRnbmObaC8tG+jTFFGonsbWDlFs9PiGvinvwAC04dVfazoPpwNJzTS0ubHP78xNHkrqd9y4KpOg+RIJnfcrU3CCb5IWr/GrrVfsDm9b/f+K+fB6T/oUwme9obCJC+eobd2Yf8fOEXhBH84kX3nHHBRlyZeHafD/ewBqehtQ7AamqCr9y4n+8K3eJxIprIMKfgSJOBG3HGPmzMVLvz6M8feSy6jGsubuUYqupSu2NK8X9H8HDHsnIavlhYvV3pGuoVO1JCsEFmumhmrnIM5r4Owu/qOl0PxYiB1inOKrK3nMF2i0und196lE79mGOWJ1kcBgDSBnAth4DeezuEMlQtvVtQs9H+jkNp51IYjz4rA0hYw0rri1k5/P860LFnHpGYyZ53hJHIchsu+cJoj4/z6nXt67X567fUMWnFS3N2j7izpdK2g5yndxNXTMRpqfIyqbnKmcYiQcBjq1RCHN0WScxs3TURrA65k9fLUJOEbcmsfyME3RsnS20KytbJi1kLFQmmvc5i7bqp1Gl871yGDFUzxJ4IWafhpprNcfPIuQH17MB2RvGpfu5EtVyIB9v51mCKVrt8NK2gEp3LkL0Da4WZAoXShbqfD6Ovzo= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc849574-ff67-4b35-6094-08d9d5f24885 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:38:02.6075 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6xxmd+Lt49NS6hBtAvjcglyX+SpS11pqdZricmKTEU29+WdbxEzMK6wCm1b4W0VZ8qvau95rr1Gep1d1iNpfo7SgtCVzU5EXBYS4hJgLI4E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTBPR01MB3424 X-Proofpoint-GUID: r_HUvlY7L_r2W2u3QmALDzzyrJW_TA-Q X-Proofpoint-ORIG-GUID: r_HUvlY7L_r2W2u3QmALDzzyrJW_TA-Q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=915 spamscore=0 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093818_828420_A60F5490 X-CRM114-Status: GOOD ( 13.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The check for the number of available TX ring slots was off by 1 since a slot is required for the skb header as well as each fragment. This could result in overwriting a TX ring slot that was still in use. Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index ee8d656200b8..c5d214abd4d5 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -747,7 +747,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) num_frag = skb_shinfo(skb)->nr_frags; cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; - if (axienet_check_tx_bd_space(lp, num_frag)) { + if (axienet_check_tx_bd_space(lp, num_frag + 1)) { if (netif_queue_stopped(ndev)) return NETDEV_TX_BUSY; @@ -757,7 +757,7 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) smp_mb(); /* Space might have just been freed - check again */ - if (axienet_check_tx_bd_space(lp, num_frag)) + if (axienet_check_tx_bd_space(lp, num_frag + 1)) return NETDEV_TX_BUSY; netif_wake_queue(ndev); From patchwork Wed Jan 12 17:36:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99949C433F5 for ; Wed, 12 Jan 2022 17:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=s16Qu2JycyxIorQUca72bm9iA/QV3wE1n1bdRaxnFoY=; b=Yk1GUedCyHaGg3 aK9OJi+4YVfDNLeKKEufDc71DlnIK5kRAfKA7vphdmrXexHnFA2dkckg9C2kMxfzJzwaM4vJm7HPe Kz72Q03AJTyTL4yCbj5F9Hj6ASQwAxrHIeK05oU2VMfHSENSSlbigd5rmQ8ZD56LbrstoN1Mootgn /KDkSKriS4KBZZW+XnTLFDwzEwgglCsA5sYzo+gFIjp2PbKscDqTlYusQnyDC8Gbbwl4DwvUtou7R rFR+fiYcAtLE/92zKvFf0dVTcA/SpGW0v1Obb8Y3ZLISLvfLIV6c6XG2EVvt2xb1LBFKqY6spmwYm qOo76SIky3UQWy3/bxsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hdF-003JOx-9D; Wed, 12 Jan 2022 17:41:58 +0000 Received: from mx0c-0054df01.pphosted.com ([67.231.159.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZj-003Hzr-8M for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:21 +0000 Received: from pps.filterd (m0208999.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CE6nAx020453; Wed, 12 Jan 2022 12:38:05 -0500 Received: from can01-qb1-obe.outbound.protection.outlook.com (mail-qb1can01lp2051.outbound.protection.outlook.com [104.47.60.51]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj0fcg53p-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:05 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EGxM14P0SI9Ck7iQYueMotkDvI2oivLtal/LOHmtfxQTeT+kUEe8SHybi61Jems/hnmasFs1iqCvk3IzTIqANGcTxkFGdwypQtpoDqwSxmNDT2PgpPNxBWGznel+xsgFtIFiC2/ucGV1aXeCAFFPZxns3XvUyD8nuIn5oMIRDv2HlproBoGN0/qu55jQdRXAe6KDX504kWZzLzCRjxa5CZYzvbmOGf4xHxpl+zL7I4JuVdeylwUC+rc0602glw71eWpXk5jvZ5yz4+dC0WdH6sLHu2p8c/yBQsdqZG+l7ewRzTq5oVNUDYpKwo/jXSuckBpwYovM/C1nrarJnua4Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=51+qJ3HUjZ4+DjkO06j8XK3STQZLOzifhN7quYniat4=; b=gDk7ohhaeFUS6Qgn7ytvdEDW/L/7aygPr7GaS2TZbjW7iChpZfYxfizU6RR0rYrDpRp0dyj2dJIx6ePzhp+TazwhMXj/4Z0Vp27aRZSltMarNYTvepLpMDaINmjH7TSF+XecRPomfl56f3UugTY35j0MNRMftBwOLfQW5f1Tq7SPG0L/GCfET21OkPrL+7dPuDHAeJgJf4lTF/EcswS/EC/z60BNaeGTuOpBn3LEZn3azvyxDhhqXfAFTpNG3hYEFKcMQJF1lusFJnIGKYicArFLsGXqUKVdtgIAYO0PTZD3VK5ZraPegbRpJbg1h3vAgLyc5W8yuun/0P4Ek5pPBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=51+qJ3HUjZ4+DjkO06j8XK3STQZLOzifhN7quYniat4=; b=IryDyLoDChT3TjDlXIvUCV89P2OSGlIKHa/RNCGSQ7AI38i/1vSXRUv8hsEMP2j6pPauXbDegjjZOPnnzLdINo4CNmIyedTEndfBP683YS/rFwpkC9I8dcXF4m9pmkSIpZLrA/4Qsk+Ois1PDFPz2r8nPBhuoEjWYlHJOSMUn1Q= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YTBPR01MB3424.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Wed, 12 Jan 2022 17:38:03 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:38:03 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 8/9] net: axienet: fix for TX busy handling Date: Wed, 12 Jan 2022 11:36:59 -0600 Message-Id: <20220112173700.873002-9-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b94b9e49-6bb6-48f1-0069-08d9d5f24943 X-MS-TrafficTypeDiagnostic: YTBPR01MB3424:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j9427KXUS0AFJxCAJ1wMWSjvy0DhA5AJ8XYgK2Jajd0Nz/65r42VgMeYWS9V7E63ngyUPiD7VJnUyf9nWXhRvf7TEiIHhq9YUEOdvAgzn+jlh1hpJLnvkMysgd+ecCnhfMle+hCX7gOn/w8mFxHCYTcTleaf2luqDLYFwhSz3WLJQpQoKwFa0QPC9HhCqrnw63fz4RuAX6wXQIicUJ+VryRWFq6RG+QapXT3KBqoGuqEBzh25n5BZ27vRmhusAiVjcD+j/Mc2RtqhBHZoTGUnqsDksvuePWfASQKqn+U0H3j8oit3oGmInf3JmQgn+5BEmHSiaqVZch1ZOW3DQ2BuamiQnEaEySSDds9wCSBdGQdrS8Neug3zJZXClL3+Oj0QfmOCz8lUWaBAkmzJ1vdlyparj8u/K6kyt2iaJMHS34PIN3TpZ76v8zTnSHPsHSEXv35d5F8aneRjvxaBz1xrOmTj4CoMwprjd1MhxcOLUErH4InTCF8nbB8FDPb/a4/8AdMEzkDJq0dK9z0SPzcTE9+51gOTpFOf4YFnkVl1yAqIhafvWens9SWY9tOXVjY6+YErwnWIDLa4BoS0AT0aen/4P6tzJBtZF4pE0kJc56xbMTk/eAUCza2pYZ2fWYRomAbEwYVtvlx62/mDB9MBWnlB69lD/FlsjaebL8qOqb8+snHqJK251h06yG/F3Zuar1P/61BTTrvtgtNW4lxDw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(6486002)(6666004)(107886003)(186003)(66476007)(44832011)(38100700002)(26005)(52116002)(6506007)(6916009)(8676002)(508600001)(66556008)(83380400001)(8936002)(6512007)(86362001)(38350700002)(2906002)(4326008)(1076003)(316002)(5660300002)(66946007)(2616005)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s3sat5LdVA5jPRYMm8UUknxBKakadpkWiahIz9SzoqLyjuB+roekH5xPzKvQPEiRHG04DsZwrlpZ2g5jcOhNlfOsJPzzDaZC6OmSWzLtMYxTXDlDtNcMqt3pUpVV8vRev1X4IYO1Pu9Ac4OoGYYNYz/zTLwx66xqOo4Xd1oQcuPwRRzvpsA86qOWvfXl0DoAL6fjDLG7nHBEH8CTNQgxuqrYy/DBHcIZ64X1wTa4na/Xjp7mTQ86K+IOmn4bNbe67JXRvDUvZIqdNZXvjPGI6Vf61ZXQEpV7/GE1ha1JayGD6JWR3JnNi603icrB+DtSVGvU6oafkb2wK2vGgt9e9r4l9IkLVIfLT1Z7koHJNrGUqmvCAlukzX07o9ah4l9ykdQny50q3WmIk8iFc5pCstHzw1KXYaULn1UBfRotFMJp+5gRN89oIDng6k0AXvqFKtVHrTNuLpq0UplfOBTwvIBd/fas8KkYWgPfTJE2x5oVahFl1IQrxpRlb0Zf3+hSHaOzkDSpfKy15LHb1QWih0bhStzzGXP7yuKB3qARka+N/I/rzQ8koxb2n8+8HcANq4HsLWfQ6Q8DuWxa7JFOsW1sZyUr4Hs0nDij+s6rA43wYhUCn3zvE0BNexsnUWJ40YqC/dY5gM/94wWgqYVlfqQs7CzLd8fNcoOgR8733e691EOnoYq7K1VganLWCF4o89eax4EbUYPjrNjpNdUADIc3YwYTz9B58fF4l4yB8X38rZZgkG/N6AGs8Tsf8CZtw0szdG1gSJ1XVP0ypKg+N1YtsVHJebCU9ID3yhi+RJiIMTV/gmE3aD1s+u33WzahvvS1pyR1CYMgzrwg7LH+ggeK0GaklU9/eSzKjVA+r649s3Oou2zEoWL4wOU9ZwIBvbeOMKymf2YNVsfDWgNGyIpwqXIWt8K4FViRWtWIkB3iPC4dMwtHgjTrp5FbblUDWoI2PyC4GmD3ZNhHKUMrVhZ/aTk5kDDVqgj852fefxFHLlz8zsrQ2n3rd9GJv3d0P++Cr70xycgeXqR9FYHIDjnFDtK6fyohLUWr1eizrcr7lA2dYAXC0uNYtGUoRoiQEV4VFWPkU/nYlx9n9pIVcA/SCssAlxot3pc5RuG1JxSCtTlyp1qlfaxEbnb7xaitojoPzlQhGpgNAT34RMFUXKo8RPkL7iCuSXkrt8WG0mzWE8HYZ5h82VS3g5UajYFGq314nlAuEmBbVgt1w/+fjO+a86w2jFDDpeRXs9xLmHxd+uTe3ylQ2XRtQxun0iq3A9bf7gIv9TroO0clFTQpVVH3lPcUIlm2gQ7oe91YK8vXISmKorAuE1DMdheyow6Xac9R7NQqYhl9UrfjT+i162ctWNkMx9Caj8qC7FA3Z2tIedVmxwgDByuxQ9/dla4VhUkq/8HBjhHAb3QF7kXPkqjQDiF/9lpWSwn6mm3hYqsHsJW5KsZMGhSFpXRTMwZUzFoSc0Kv88ErpHTBbJi/PxYvUe1V/qRtQD7soeGhybYZPkMNVnxmvSJtI9NCM453REZ0WPdquVUsbrIzGWdvC5APO2uhacLrjYD9016wfCl9oz7br8dpYL/C501eVqGmqD9oM8BoCPMdUZwIrcPvX2PkXQHxs98Zk0rBkbg2lpBPA+aHbRz4/7EYej05Zdx25KQzggAFvc5rRhi3NrKrJNgVCAFfk+a9gLTd2LWG2xg= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: b94b9e49-6bb6-48f1-0069-08d9d5f24943 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:38:03.8190 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Tqzg9ylnFQrqRA1yUIaMckJ0//7HbfqvlEy4invULf9QK8MkZOqz99U9tzNuTllin/w8i+zD6mOl+zdeR11vpmzIl9Ufwf83ty38qclAmH8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTBPR01MB3424 X-Proofpoint-GUID: nHzxSpE1v2tJ-FYMR-4p9_WYiomheZW0 X-Proofpoint-ORIG-GUID: nHzxSpE1v2tJ-FYMR-4p9_WYiomheZW0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=690 spamscore=0 mlxscore=0 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 priorityscore=1501 phishscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093819_545172_733F2AFC X-CRM114-Status: GOOD ( 24.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Network driver documentation indicates we should be avoiding returning NETDEV_TX_BUSY from ndo_start_xmit in normal cases, since it requires the packets to be requeued. Instead the queue should be stopped after a packet is added to the TX ring when there may not be enough room for an additional one. Also, when TX ring entries are completed, we should only wake the queue if we know there is room for another full maximally fragmented packet. Print a warning if there is insufficient space at the start of start_xmit, since this should no longer happen. Combined with increasing the default TX ring size (in a subsequent patch), this appears to recover the TX performance lost by previous changes to actually manage the TX ring state properly. Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock --- .../net/ethernet/xilinx/xilinx_axienet_main.c | 86 ++++++++++--------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index c5d214abd4d5..8ac277ef1f99 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -660,6 +660,32 @@ static int axienet_free_tx_chain(struct net_device *ndev, u32 first_bd, return i; } +/** + * axienet_check_tx_bd_space - Checks if a BD/group of BDs are currently busy + * @lp: Pointer to the axienet_local structure + * @num_frag: The number of BDs to check for + * + * Return: 0, on success + * NETDEV_TX_BUSY, if any of the descriptors are not free + * + * This function is invoked before BDs are allocated and transmission starts. + * This function returns 0 if a BD or group of BDs can be allocated for + * transmission. If the BD or any of the BDs are not free the function + * returns a busy status. This is invoked from axienet_start_xmit. + */ +static inline int axienet_check_tx_bd_space(struct axienet_local *lp, + int num_frag) +{ + struct axidma_bd *cur_p; + + /* Ensure we see all descriptor updates from device or TX IRQ path */ + rmb(); + cur_p = &lp->tx_bd_v[(lp->tx_bd_tail + num_frag) % lp->tx_bd_num]; + if (cur_p->cntrl) + return NETDEV_TX_BUSY; + return 0; +} + /** * axienet_start_xmit_done - Invoked once a transmit is completed by the * Axi DMA Tx channel. @@ -689,33 +715,8 @@ static void axienet_start_xmit_done(struct net_device *ndev) /* Matches barrier in axienet_start_xmit */ smp_mb(); - netif_wake_queue(ndev); -} - -/** - * axienet_check_tx_bd_space - Checks if a BD/group of BDs are currently busy - * @lp: Pointer to the axienet_local structure - * @num_frag: The number of BDs to check for - * - * Return: 0, on success - * NETDEV_TX_BUSY, if any of the descriptors are not free - * - * This function is invoked before BDs are allocated and transmission starts. - * This function returns 0 if a BD or group of BDs can be allocated for - * transmission. If the BD or any of the BDs are not free the function - * returns a busy status. This is invoked from axienet_start_xmit. - */ -static inline int axienet_check_tx_bd_space(struct axienet_local *lp, - int num_frag) -{ - struct axidma_bd *cur_p; - - /* Ensure we see all descriptor updates from device or TX IRQ path */ - rmb(); - cur_p = &lp->tx_bd_v[(lp->tx_bd_tail + num_frag) % lp->tx_bd_num]; - if (cur_p->cntrl) - return NETDEV_TX_BUSY; - return 0; + if (!axienet_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) + netif_wake_queue(ndev); } /** @@ -748,19 +749,14 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail]; if (axienet_check_tx_bd_space(lp, num_frag + 1)) { - if (netif_queue_stopped(ndev)) - return NETDEV_TX_BUSY; - + /* Should not happen as last start_xmit call should have + * checked for sufficient space and queue should only be + * woken when sufficient space is available. + */ netif_stop_queue(ndev); - - /* Matches barrier in axienet_start_xmit_done */ - smp_mb(); - - /* Space might have just been freed - check again */ - if (axienet_check_tx_bd_space(lp, num_frag + 1)) - return NETDEV_TX_BUSY; - - netif_wake_queue(ndev); + if (net_ratelimit()) + netdev_warn(ndev, "TX ring unexpectedly full\n"); + return NETDEV_TX_BUSY; } if (skb->ip_summed == CHECKSUM_PARTIAL) { @@ -821,6 +817,18 @@ axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) if (++lp->tx_bd_tail >= lp->tx_bd_num) lp->tx_bd_tail = 0; + /* Stop queue if next transmit may not have space */ + if (axienet_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) { + netif_stop_queue(ndev); + + /* Matches barrier in axienet_start_xmit_done */ + smp_mb(); + + /* Space might have just been freed - check again */ + if (!axienet_check_tx_bd_space(lp, MAX_SKB_FRAGS + 1)) + netif_wake_queue(ndev); + } + return NETDEV_TX_OK; } From patchwork Wed Jan 12 17:37:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 12711792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70A72C433F5 for ; Wed, 12 Jan 2022 17:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6f+GydDjIXbLYAtYJM4f8M0SAJsuHigg7gf/G7nVRUI=; b=E1IKXoojnyimsk HiygOZJCbrtvOGzUz1al+U6b08FXCu4PskDA1NJs4STakC0+/B/sfaY//QPkO2KasZZATXk7StS+Q WVulOJHulgsulCYhRsw5ljesEJLBspis1/Jc6Q9P9hQYnrRhiL+hxEcp7gZymJ/tYfOVcJurHRLcf 6JjRXyKX71/7rgFi/UWzw6dHW+/hFfm8IcWnzsuQkhjOd8YgdbHCQOghoAExgkRdwtzHx2zvGEBOi G4bmSQOvtUmPTXmMsUhQw3kuO4YEqDkRpJfc2pKU/refqaElejj1/0scMa0KPc6wZhp/NSs0KXP68 WeVV+o2+tC4B5qENDtrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hdu-003JaT-19; Wed, 12 Jan 2022 17:42:39 +0000 Received: from mx0d-0054df01.pphosted.com ([67.231.150.19]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7hZj-003I0c-LE for linux-arm-kernel@lists.infradead.org; Wed, 12 Jan 2022 17:38:22 +0000 Received: from pps.filterd (m0209000.ppops.net [127.0.0.1]) by mx0c-0054df01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CGT4uN010837; Wed, 12 Jan 2022 12:38:06 -0500 Received: from can01-to1-obe.outbound.protection.outlook.com (mail-to1can01lp2053.outbound.protection.outlook.com [104.47.61.53]) by mx0c-0054df01.pphosted.com (PPS) with ESMTPS id 3dj2j2g1b7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 12:38:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mLffMOYXSrSa95ZDUokz7q0eGoHBVhkmsXj1X78u3fiD2cL/9rrIigiKppnxO95KUX6o0cy+hLpoVgTvun7cAcpMipM++9x9mvM+58IMtCdcbqluyewZtZlYuvjIfrXgBGyrOPkTzdgUd02lt2bYK/pLKXwloZir3278ctXEnHIW2McZK2EZxw2O80DK4z5MrX+AwN4zmd7i0alRpXkXUP6i+dSigdO6Knzuudkfxp09KfcjGW6TZYhGUJRX3kz4MCJpOULNr1ykFFOw5tPExpP6P0xlmKD7HKOA8qCimsfoz2XSxoMuLJB/WB03qVyakvw2XiWBNaJu9moovNWvsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HgBfeBPBU0sHw7Q/3UtmHHhCi6TrDK/ghccggs1REW4=; b=CExq0eWqQOXwSemyzq+FQWg43R6PODl8pZJWVI72Yah9gWTfkwlZenq7xXl/BqKuUL7QB1zO5cbDC/H8V4G49pErbcwq5KtqPEGFkdaVOB33Nbg55dr5IxF+FATK0GfHGW/8KeUapdVbgMNNF8T3GV9Evc9k6dhj6lQkUf/Rf4tFPnzZlkPn61CT2xo2Mrk/gk1rBK3Z6cj4ab45ssAEJlwY3V0C7F50qpIaCOQJnUzJSAFXyIyzliyw604rYKpWgqvW0BShJYOikfKyV55+NqI0xyo7rBHUx1mnydmuLBbk3B4aYL22H5dhvnzdRZbPDnoTSzS6N00JuH2CTJrV1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=calian.com; dmarc=pass action=none header.from=calian.com; dkim=pass header.d=calian.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=calian.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HgBfeBPBU0sHw7Q/3UtmHHhCi6TrDK/ghccggs1REW4=; b=wfpK+7wQcBMQEo7o5nUTbzLnxGMuWtnNIFFYkyO1PIPCGi0csoAaXOt1DgKmMmPKxXb+bQxwhuhKZqv2KREeLkVSNvstVsvOy3ggh3WYNOLcLgWP5A3DrBW4h7mA9+lJVNU6WnWMOcszE5ys5FvxtYXIFJeFpET64x4Lfy+nn/w= Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) by YT3PR01MB5490.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:62::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Wed, 12 Jan 2022 17:38:05 +0000 Received: from YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8]) by YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM ([fe80::6929:c39f:d893:b6c8%2]) with mapi id 15.20.4888.010; Wed, 12 Jan 2022 17:38:05 +0000 From: Robert Hancock To: netdev@vger.kernel.org Cc: radhey.shyam.pandey@xilinx.com, davem@davemloft.net, kuba@kernel.org, linux-arm-kernel@lists.infradead.org, michal.simek@xilinx.com, ariane.keller@tik.ee.ethz.ch, daniel@iogearbox.net, Robert Hancock Subject: [PATCH net v2 9/9] net: axienet: increase default TX ring size to 128 Date: Wed, 12 Jan 2022 11:37:00 -0600 Message-Id: <20220112173700.873002-10-robert.hancock@calian.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112173700.873002-1-robert.hancock@calian.com> References: <20220112173700.873002-1-robert.hancock@calian.com> X-ClientProxiedBy: CO2PR05CA0061.namprd05.prod.outlook.com (2603:10b6:102:2::29) To YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:6a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3643171-af13-4ad3-2a85-08d9d5f249f8 X-MS-TrafficTypeDiagnostic: YT3PR01MB5490:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mk5ox980Ubn6hLgDCW8zLv2Ihd69FRyfJ9nK+d3W6VEWLGg99QArofjCmcCvQ7Ovy8dVVtX3CnSgwbEa/NYooqrQB+MZuICJQGl4d9ljMt1jQx6A7TGUM/KnZZPXwN0cL9WWe/dl5XxKL5x4NoVk6C5p7rtlwVMEw+J1xsunzosdPsJjSIhZsYM3aMxdSCz1MWWBa54VSAaCPQuQ/H8tdpCuvy8kNgRzWeag0yPnkFf9QkMAWtT2l0dLWxDv+HymJz/K9R27vdkaLBxMZcBYj+9RKF74lWLXQs3E710nKmz82N4thKDUKQJv1xZqnuAb7h5VwP7IFt2Hrx3TsTLaOeOHhS/7BeerT9sQ6apAB+oQdBIJhvqbO5RoGDdX/CypnMs/0yVaof/jkn3EUWKZC46BO4qfmJCU0VkbuFvn79zLCJxpt+VRkOV8rLkmyY3kRj1Pmww0rvtt7Rh986sm/vWI5igLiUEiDttFTyRrQZY3KfQAjQ6kcnY77vX9P0IPhuU8JwTKSWPk3Q20kUQEvU4OWzgJeCfQKWX/rC4jW3la1EauaP6Z/GckrvbUXbbZgKWDO2T63K73VcQlH2nZHwi/eyKIe0vie0GE/WZXlLAzx6BIKJshIyJbEOoE2dk9KuDE/iJ0l/2q+A6xaJu2a4qwZ5p4PrJDaRFn0CfGAWQHp0pGhFsro9uX5F8EizrEVX2Vs86/Gson1L9OFsp7rg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(66946007)(66556008)(38350700002)(2906002)(26005)(508600001)(6666004)(83380400001)(66476007)(38100700002)(52116002)(5660300002)(4326008)(86362001)(6512007)(8936002)(8676002)(44832011)(6486002)(36756003)(6916009)(6506007)(107886003)(2616005)(316002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uZ1DATRjSd15EQYzywt1IiWUogqzRGZhdrPHDl/Iv5SXKHMqMw+lJu4Ak8jvNpcsV6gBfBlygYoP5J13WjoZtMD27gGDoaX50fwFX9jMf6R+G4GGB9NFBjNv4aJJ8PMq0xe2fYLsizJD1K/iLrt5Hr8jCdqPCuAYalSD4mGt3epbyXHKY19o/xcjudCGSb0v04PFkKBnQGgQtaGogesMfNfAuEB/dvMAtHYg9gPc0sPuz+1jPefWshSgGi9JWRxDi7RpwFjfbrvSMk1Z/LuY3EAY1zjA4/VafU6XUOsCTXM3x6mlC9LSWSt9KmlIPNlG2GnGsRRLgD5buRR80bExPYq/yvgdM95h6xSBKq5204Fg3o24mI/jftbUYctdmkDj2NpKRhG20nEvXlkYlL7p/N1yJezwpww21dUvnKpclIu3Wl4jiiJnElH4G7gAlU1UG0A91SR034ZJv2iT4oUK20pI/kO9hEn/z07zKT3SkiTZiBnJ0icV5+Pl/iOcZf6iJFHitbXrf7rRrheL13iJlrx5EjMhm3QjqYl1vxvQtUbLA024yT4Fzc4A1Oh6UPukr+rkmW/beHFsODHfqxpEYJCrePuSWD9kt/JSMFejFTzeKNv9Jw9MnVM8KIPcwCeTOB4npYWthuueWQnuv943gMX9H05KoL+T9v8Q2624bZjg38TbcxBUDBgLoOEbaz4V1KjF6+wGXXZCB9JrNX/s3TiPD3xR44+X0s3ZH6y92pCfl4Lk5nc3+Da0om9Z4JgGwOb5YCsZleV4oybL/kuXv978BUwb8ceYZIPBPXoiDnx95W1NTgnMHG0JDu6MHMQNts98uhIvmMjnGnv5C7srXAolVU/IgCDrITLrkKgDa8AfCevR2YB12KcvejTfkCNqR9U23tO/vTuNS9Ev1Bd8EyD7KbZe4fTI4WA79FV7NTraP7zDktcUbPv+jDvWq2QfX5JZQODLROaYNVX2OJmqUe0a+lFe7dt8bjiWlxy3fmAh6pjYEAuWYKPzISDkfoQ0D6li45DM7z9hImSjS5byg4kxiM2AhedZYOoSsmp5ycObLXR9iVgLtRhCMSIqnfw+aygmfplqHtqNSAHXF0aiWCYrT5aLaHYsWczMjhHNnpSH/XACrxspn1uP3sO6vNa4rZ6ecqnJ5wSkuVIm9twCmaW7+ImZGQB2/J8NAbBJNSvNvKT7pW4y2iKxZXXn73Uiw3RZzSjPcMcuRqUbHa15Ui1U2GOt1agsL+QDgsn5ANDk9WOhMjYb5LErdYb/ptP5Z/V+4YdBE4vkRUMjSx7Ops4MAY1IbuMMCjP2IempWgGj+XQDEH6bF2TaPqlBiKccqMugDdStUDtLNE6N5eHU3C5+wHNvhl+IiB82iszgJcFKCsdI3fjxjEjMBDW1mc8zOZgWixrfwY5O55+6sgSADa2hVfGoEdpTJQL+tY1a2SrFDhSmte/3my42KNgM2boJ2xbhcaLsF5QC/E5/rtVzADrINYMjYIj1JYIgNOTaSFHIpZLMI8CeKSVFWp7UnkbCQWki34VIciMrUn0Y8SPeeeuXw3F3wYJKfRtmRER4MB7gWOqeIm+usB9TeQggfNA4Em1uWVhZmt3/mzKumFXqhbN+fbHDhNzsC8vECZyT0cl9MDIOcGTuyYXGbbYUJCZhGJJxvoPPNRRkGUT9zLCsOBiSE2pb5UP1FEyzbWj7S74= X-OriginatorOrg: calian.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3643171-af13-4ad3-2a85-08d9d5f249f8 X-MS-Exchange-CrossTenant-AuthSource: YT3PR01MB6274.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 17:38:05.1326 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3pmnsDCnWRzGCIWe+UbDfBlyKTlDykteHEl7To/mzMvv0FljBMy3WHZn1T/JWumiZG/QKpsUZUbY8yDp/B1kj3O1563SkIqv+Tf0UGZKuDs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB5490 X-Proofpoint-GUID: 5kjDNVzKQdKbWL-EZDX1MlTSRBgWpxfz X-Proofpoint-ORIG-GUID: 5kjDNVzKQdKbWL-EZDX1MlTSRBgWpxfz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-12_05,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxlogscore=687 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201120107 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220112_093819_942699_84A85B02 X-CRM114-Status: GOOD ( 13.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org With previous changes to make the driver handle the TX ring size more correctly, the default TX ring size of 64 appears to significantly bottleneck TX performance to around 600 Mbps on a 1 Gbps link on ZynqMP. Increasing this to 128 seems to bring performance up to near line rate and shouldn't cause excess bufferbloat (this driver doesn't yet support modern byte-based queue management). Fixes: 8a3b7a252dca9 ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver") Signed-off-by: Robert Hancock --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index 8ac277ef1f99..d5ea093fbd32 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -41,7 +41,7 @@ #include "xilinx_axienet.h" /* Descriptors defines for Tx and Rx DMA */ -#define TX_BD_NUM_DEFAULT 64 +#define TX_BD_NUM_DEFAULT 128 #define RX_BD_NUM_DEFAULT 1024 #define TX_BD_NUM_MIN (MAX_SKB_FRAGS + 1) #define TX_BD_NUM_MAX 4096