From patchwork Fri Jul 9 19:08:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asmaa Mnebhi X-Patchwork-Id: 1503320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GM2kx3Mrbz9sRR; Sat, 10 Jul 2021 05:08:57 +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 1m1vrp-0003Am-Fc; Fri, 09 Jul 2021 19:08:53 +0000 Received: from mail-il-dmz.mellanox.com ([193.47.165.129] helo=mellanox.co.il) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m1vrm-00039M-W9 for kernel-team@lists.ubuntu.com; Fri, 09 Jul 2021 19:08:51 +0000 Received: from Internal Mail-Server by MTLPINE1 (envelope-from asmaa@mellanox.com) with SMTP; 9 Jul 2021 22:08:45 +0300 Received: from farm-0002.mtbu.labs.mlnx (farm-0002.mtbu.labs.mlnx [10.15.2.32]) by mtbu-labmailer.labs.mlnx (8.14.4/8.14.4) with ESMTP id 169J8iX1030188; Fri, 9 Jul 2021 15:08:44 -0400 Received: (from asmaa@localhost) by farm-0002.mtbu.labs.mlnx (8.14.7/8.13.8/Submit) id 169J8iH0005455; Fri, 9 Jul 2021 15:08:44 -0400 From: Asmaa Mnebhi To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PULL][PATCH v2 02/23] Revert "UBUNTU: SAUCE: mlxbf_gige: syncup with v1.21 content" Date: Fri, 9 Jul 2021 15:08:09 -0400 Message-Id: <20210709190830.5405-3-asmaa@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210709190830.5405-1-asmaa@nvidia.com> References: <20210709190830.5405-1-asmaa@nvidia.com> MIME-Version: 1.0 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@nvidia.com, davthompson@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1934923 This reverts commit b68212b84f8f9691152dad59d678c70aaf39c9a6. Signed-off-by: Asmaa Mnebhi --- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 6 +-- .../mellanox/mlxbf_gige/mlxbf_gige_intr.c | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 51 +++++++------------ .../mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_regs.h | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_rx.c | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_tx.c | 2 +- 8 files changed, 28 insertions(+), 41 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h index 1c59cad682c7..e8cf26f52851 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h @@ -4,7 +4,7 @@ * - this file contains software data structures and any chip-specific * data structures (e.g. TX WQE format) that are memory resident. * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #ifndef __MLXBF_GIGE_H__ diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c index 1d68b8ba9b02..55b5d67f25ca 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c @@ -2,7 +2,7 @@ /* Ethtool support for Mellanox Gigabit Ethernet driver * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include @@ -158,8 +158,8 @@ static void mlxbf_gige_get_pauseparam(struct net_device *netdev, struct mlxbf_gige *priv = netdev_priv(netdev); pause->autoneg = priv->aneg_pause; - pause->rx_pause = priv->rx_pause; - pause->tx_pause = priv->tx_pause; + pause->rx_pause = priv->tx_pause; + pause->tx_pause = priv->rx_pause; } const struct ethtool_ops mlxbf_gige_ethtool_ops = { diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c index c63a74d730f8..f67826a27203 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c @@ -2,7 +2,7 @@ /* Interrupt related logic for Mellanox Gigabit Ethernet driver * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include 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 2513c3547ea0..c5ffa6887357 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c @@ -2,7 +2,7 @@ /* Gigabit Ethernet driver for Mellanox BlueField SoC * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include @@ -21,12 +21,7 @@ #include "mlxbf_gige_regs.h" #define DRV_NAME "mlxbf_gige" -#define DRV_VERSION 1.21 - -/* This setting defines the version of the ACPI table - * content that is compatible with this driver version. - */ -#define MLXBF_GIGE_ACPI_TABLE_VERSION 1 +#define DRV_VERSION 1.19 /* Allocate SKB whose payload pointer aligns with the Bluefield * hardware DMA limitation, i.e. DMA operation can't cross @@ -76,7 +71,6 @@ static void mlxbf_gige_initial_mac(struct mlxbf_gige *priv) u8 mac[ETH_ALEN]; u64 local_mac; - memset(mac, 0, ETH_ALEN); mlxbf_gige_get_mac_rx_filter(priv, MLXBF_GIGE_LOCAL_MAC_FILTER_IDX, &local_mac); u64_to_ether_addr(local_mac, mac); @@ -218,8 +212,8 @@ static void mlxbf_gige_set_rx_mode(struct net_device *netdev) mlxbf_gige_enable_promisc(priv); else mlxbf_gige_disable_promisc(priv); - } - } + } +} static void mlxbf_gige_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats) @@ -253,15 +247,7 @@ static const struct net_device_ops mlxbf_gige_netdev_ops = { static void mlxbf_gige_adjust_link(struct net_device *netdev) { - struct mlxbf_gige *priv = netdev_priv(netdev); - struct phy_device *phydev = netdev->phydev; - - if (phydev->link) { - priv->rx_pause = phydev->pause; - priv->tx_pause = phydev->pause; - } - - phy_print_status(phydev); + /* Only one speed and one duplex supported, simply return */ } static int mlxbf_gige_probe(struct platform_device *pdev) @@ -276,21 +262,18 @@ static int mlxbf_gige_probe(struct platform_device *pdev) void __iomem *llu_base; void __iomem *plu_base; void __iomem *base; - u32 version; + int addr, version; u64 control; - int addr; - int err; + int err = 0; - version = 0; - err = device_property_read_u32(&pdev->dev, "version", &version); - if (err) { - dev_err(&pdev->dev, "ACPI table version not found\n"); + if (device_property_read_u32(&pdev->dev, "version", &version)) { + dev_err(&pdev->dev, "Version Info not found\n"); return -EINVAL; } - if (version != MLXBF_GIGE_ACPI_TABLE_VERSION) { - dev_err(&pdev->dev, "ACPI table version mismatch: expected %d found %d\n", - MLXBF_GIGE_ACPI_TABLE_VERSION, version); + if (version != (int)DRV_VERSION) { + dev_err(&pdev->dev, "Version Mismatch. Expected %d Returned %d\n", + (int)DRV_VERSION, version); return -EINVAL; } @@ -384,6 +367,10 @@ static int mlxbf_gige_probe(struct platform_device *pdev) addr = phydev->mdio.addr; phydev->irq = priv->mdiobus->irq[addr] = priv->phy_irq; + /* Sets netdev->phydev to phydev; which will eventually + * be used in ioctl calls. + * Cannot pass NULL handler. + */ err = phy_connect_direct(netdev, phydev, mlxbf_gige_adjust_link, PHY_INTERFACE_MODE_GMII); @@ -403,9 +390,9 @@ static int mlxbf_gige_probe(struct platform_device *pdev) /* MAC supports symmetric flow control */ phy_support_sym_pause(phydev); - /* Initialise pause frame settings */ - priv->rx_pause = 0; - priv->tx_pause = 0; + /* Enable pause */ + priv->rx_pause = phydev->pause; + priv->tx_pause = phydev->pause; priv->aneg_pause = AUTONEG_ENABLE; /* Display information about attached PHY device */ diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c index d1643177ad8a..af4a754d7c25 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c @@ -2,7 +2,7 @@ /* MDIO support for Mellanox Gigabit Ethernet driver * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h index d4652f9ce225..30ad896f6252 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h @@ -2,7 +2,7 @@ /* Header file for Mellanox BlueField GigE register defines * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #ifndef __MLXBF_GIGE_REGS_H__ 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 9e4c507497a1..1cf8be27ef2a 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c @@ -2,7 +2,7 @@ /* Packet receive logic for Mellanox Gigabit Ethernet driver * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c index 0c35b2f2dfcd..257dd0238129 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c @@ -2,7 +2,7 @@ /* Packet transmit logic for Mellanox Gigabit Ethernet driver * - * Copyright (C) 2020-2021 Mellanox Technologies, Ltd. ALL RIGHTS RESERVED. + * Copyright (c) 2020-2021 NVIDIA Corporation. */ #include