From patchwork Fri Jun 2 19:47:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asmaa Mnebhi X-Patchwork-Id: 1789825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=bF5lSoNh; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXtnr2616z20WV for ; Sat, 3 Jun 2023 05:47:43 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1q5AkJ-0005A1-AA; Fri, 02 Jun 2023 19:47:35 +0000 Received: from mail-dm6nam12on2088.outbound.protection.outlook.com ([40.107.243.88] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1q5AkH-00059Z-1F for kernel-team@lists.ubuntu.com; Fri, 02 Jun 2023 19:47:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ceSLZkcsWryOj+ToLInLzjJC+5JmJlkcy63Oj2EKkgMZP8EH442OzGWiQsew4g2uG2APSIlnKccYo60eoeltlaWvGMsXLs0yDNu88eIGBm3HiyuX807M/oMIWOe4d9EKVc57pEATt3in2cNgO9yl58NVxBlHgZjdbvb8W5Erk3YHOW+BhyaQTlE/D+/tSqooAfj5UjR2QIQrrGvBW93IMqleDy6QH2t2NcRBzCGvJoq8x1BkeZnnNonCxs0+/70mUYAi7XZ9JBEFwGoBcA38Y+RV6rZ+e6Q4oFKWDHJyOpwhsrkV4GGFAtPFbElAuLo1L1pYuDi6PMDK3xRhSeX4Kg== 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=a1pDUKL2X7QTb7y84twdiNuweyj0/bIsZNudOq0Ucas=; b=evwuMt1tlry6MFKKILEeXqKKF9Iwq5PLxLztjh4+2MNVSLLuTcW9Ko00Rdg5+BKnlMc7DOy+IRWJ5haOjtPtfFLekIPw0iAl96DOThs0sqnjmjDKiDo5R89Mp0Qxy+vneW140pKFsVFY6Ed7fbqI1tidDpS64rdX4H2PTLFiGyzTJMlwjWos+LPTuMo2LIB0E26uqt9eKlP26ENvw7kh7IDaXSRdekwaVilEtV4UpSRblQ6CBitIBa2hpV5j6SClp1oZhCs2fossdG/g8Fzjop0G/vKjSPivzCStZ9RDacDceeiW8WmW5B26msJw/Z2kWvax5wtPrfN6pFxcdnRzLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a1pDUKL2X7QTb7y84twdiNuweyj0/bIsZNudOq0Ucas=; b=bF5lSoNheFQPp4xzOVbGL17AqkFD8JRX753k7q4rmmrZQFWmeQBZnc/6gcCOhLXG1T/pKqoZccb620H44GVP5ECq7eZVx+aIKEuv19SbsKDAmXhesEnEff2oIrga2euWNl2HjSV6D7tSwxaxUF1qcDI0IhGpoKmv3QSHUb5thBm5a/0pWswUf1TVAeO9NHCReyX+1WHJKc4Owc4wEmx/tgvt3GmcORHf98IxdwaUDHxy9FSuZR5MlxdfEZ4SNomY9QPrUdZEgM5uvr3yDd30dhnnTZi7YfIsMstYUEckxdaSqxS4/TSeNNnCeQo9tJxdUQM0u5V6jI41TAQnzTmmdw== Received: from BLAPR03CA0047.namprd03.prod.outlook.com (2603:10b6:208:32d::22) by PH8PR12MB6844.namprd12.prod.outlook.com (2603:10b6:510:1cb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.27; Fri, 2 Jun 2023 19:47:30 +0000 Received: from BL02EPF000145BB.namprd05.prod.outlook.com (2603:10b6:208:32d:cafe::84) by BLAPR03CA0047.outlook.office365.com (2603:10b6:208:32d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.26 via Frontend Transport; Fri, 2 Jun 2023 19:47:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BL02EPF000145BB.mail.protection.outlook.com (10.167.241.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.13 via Frontend Transport; Fri, 2 Jun 2023 19:47:29 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Fri, 2 Jun 2023 12:47:17 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Fri, 2 Jun 2023 12:47:17 -0700 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Fri, 2 Jun 2023 12:47:17 -0700 From: Asmaa Mnebhi To: Subject: [SRU][F:linux-bluefield][PATCH v1 1/1] mlxbf-gige: Fix intermittent no ip issue Date: Fri, 2 Jun 2023 15:47:11 -0400 Message-ID: <20230602194711.28685-2-asmaa@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230602194711.28685-1-asmaa@nvidia.com> References: <20230602194711.28685-1-asmaa@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF000145BB:EE_|PH8PR12MB6844:EE_ X-MS-Office365-Filtering-Correlation-Id: 97bf6ab5-ac80-4301-dcf3-08db63a23335 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UH2nmo9d8MMdr1J8OpMg2pZhT0OrfHlsaZvTgXcSf3RPtstLfs2lZ6rTS/gyHSUeFRag4YXQUqdnezsx9JbiJyRopV8JLUyVfFnyQj2t2pz/a8IeT8vt6lirL/lm2PTYBXUedr1/JeA47rfFLFTDpAs71lmiHPJMSQL9lTkI8AdktEZ4SZ9Gb6ItMPfp6jJcE2T0IWJj/l3YdgLynaXOYDy+I3gyfgQ9GvXZXgegbxnLknhSDr2T4aS4EsJIuwcew7+Ga8w2+NQhxKfqQQeo0GYJ6/BBbruKyya0w2UaxOd+xOHuEzDoi+ibquBOY1rcX1mx0z3S7ykgBlg94HR/IXYsLNApuSayAkccg6+GZfvc7028C8NoCIAeJJPqYwKN9qNNZIVJnRxGCbL98U6du48wJjSA7nRSMiL6xBhUhwzM6rIhBtDoLiqILcsYeCLYR9MIdzhADzjS7CrmrLVREyuhQCr6eRJ1UIOCXMyeypoito+6ngEuc7WTpmgXNWUfWui05KrAq5PwD9shaACbag7duZoyM9PEF7KnMFC+nylQpFR2dhRD2Cg5QtKvlBMwmxKZGLGw8ySOzNc7LO0MvD7TGbcEf3u9G1qwmyW473RraWywgdGC+bChhDfrK6POo+XbaAL+DoWeZgv5y4uPcffSDlLgayd0e4nIlKrA6wFquHx6MdF86gAY31gDuRw+J9hFMcByuqbAr+bW8ELcMJBJW5wGYJDUG6KrkzTFaM5v/stubR25EBZnjMwDxpdyF1WY2fR9VEm0H4HEIgCnCA== X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199021)(46966006)(36840700001)(40470700004)(6916009)(4326008)(70206006)(316002)(70586007)(186003)(2906002)(83380400001)(8936002)(8676002)(426003)(336012)(36860700001)(41300700001)(47076005)(5660300002)(2616005)(7636003)(356005)(40460700003)(82740400003)(40480700001)(966005)(6666004)(478600001)(82310400005)(1076003)(36756003)(26005)(7696005)(86362001)(107886003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 19:47:29.6201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97bf6ab5-ac80-4301-dcf3-08db63a23335 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF000145BB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6844 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Asmaa Mnebhi Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2022387 During the reboot test, the OOB might not get an ip assigned. This is due to a race condition between phy_startcall and the RX DMA being enabled and depends on the amount of background traffic received by the OOB. Enable the RX DMA after teh phy is started. Signed-off-by: Asmaa Mnebhi --- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 14 +++++++------- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c index 8161f703b18b..3dd60989512f 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c @@ -155,14 +155,14 @@ static int mlxbf_gige_open(struct net_device *netdev) */ priv->valid_polarity = 0; - err = mlxbf_gige_rx_init(priv); + phy_start(phydev); + + err = mlxbf_gige_tx_init(priv); if (err) goto free_irqs; - err = mlxbf_gige_tx_init(priv); + err = mlxbf_gige_rx_init(priv); if (err) - goto rx_deinit; - - phy_start(phydev); + goto tx_deinit; netif_napi_add(netdev, &priv->napi, mlxbf_gige_poll, NAPI_POLL_WEIGHT); napi_enable(&priv->napi); @@ -184,8 +184,8 @@ static int mlxbf_gige_open(struct net_device *netdev) return 0; -rx_deinit: - mlxbf_gige_rx_deinit(priv); +tx_deinit: + mlxbf_gige_tx_deinit(priv); free_irqs: mlxbf_gige_free_irqs(priv); diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c index 96230763cf6c..f21dafde490b 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c @@ -142,6 +142,9 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv) writeq(MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS_EN, priv->base + MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS); + writeq(ilog2(priv->rx_q_entries), + priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2); + /* Clear MLXBF_GIGE_INT_MASK 'receive pkt' bit to * indicate readiness to receive interrupts */ @@ -154,9 +157,6 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv) data |= MLXBF_GIGE_RX_DMA_EN; writeq(data, priv->base + MLXBF_GIGE_RX_DMA); - writeq(ilog2(priv->rx_q_entries), - priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2); - return 0; free_wqe_and_skb: