From patchwork Tue Aug 28 23:07:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 963167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 420PYS6q1Fz9s1x; Wed, 29 Aug 2018 09:07:56 +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 1fun5R-0007qG-PB; Tue, 28 Aug 2018 23:07:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fun5Q-0007pF-Mk for kernel-team@lists.ubuntu.com; Tue, 28 Aug 2018 23:07:48 +0000 Received: from mail-oi0-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fun5Q-0000gq-8m for kernel-team@lists.ubuntu.com; Tue, 28 Aug 2018 23:07:48 +0000 Received: by mail-oi0-f71.google.com with SMTP id b8-v6so2608816oib.4 for ; Tue, 28 Aug 2018 16:07:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=oEZOM2syQ1E5RwfY3SNByM5gC7bxsEPees81q0+gCPQ=; b=QVx8G+rVWS3eJi2+7I3ZfJLD+LzN8oTJNJURHOQD0acaUCEF4S48Fr9vzMQ4QBP+GD mGW9h3lPYXXhWX38INbADo9dEtiHdgfsyRGXDU9shCsSe86huAGev79A8FlbZuUQpYf6 8rF+HEJEUDG+JkCqrJ6Jspvy1W5Dig9oShpTYtwPuMxiylH3dQjwK6twRHBhIOTZm51B G1Var74vLnBQMfG/0x5K+bdimkHAy6dAd+mjefVWXcFn1ZLmK57x7vhXxUFxJ7TnOu3y xhHwXB+mpT4zXuATEQWsxkN4k35kOR5QNc/3uHPyRjH+PMSEfF58u96SW+iuMxeFsX17 F8Rg== X-Gm-Message-State: APzg51AN3U/yBYS0iSaWLBaPfmYSTV8gH4nSV9vMztl92Bkb7bmqR6ai endMMjjoUl3uX4QiDXP2PU+MQpWSbBBNZcb+wTviwYFA/LtpId/GhlBmZERCuFpwLHlxwS/IifM RKGiWbEQn99ep6vzn7HYTnwhx8QsiR1dTxS28lNda0p67LPXZEW1lprpW5A== X-Received: by 2002:aca:3003:: with SMTP id w3-v6mr203358oiw.231.1535497666895; Tue, 28 Aug 2018 16:07:46 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ9A0Z4XwMvpE16bZa47ERKC8I17MNM6qwReCf6sH9+Z/vA9FS7Xvphc8u3ssYfTpohxT6jmFfb1mIXMNb1+Hs= X-Received: by 2002:aca:3003:: with SMTP id w3-v6mr203335oiw.231.1535497666509; Tue, 28 Aug 2018 16:07:46 -0700 (PDT) MIME-Version: 1.0 From: dann frazier Date: Tue, 28 Aug 2018 17:07:35 -0600 Message-ID: Subject: [PULL][Unstable] Reconcile hns3 SAUCE patches with upstream To: Ubuntu Kernel Team 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1787477 Similar to the Cosmic/Bionic versions, replaces our SAUCE patches with upstream cherry-picks. Unlike Cosmic/Bionic, I've also reverted the handful of SAUCE patches that have not made it upstream yet (mostly RoCE-related). I'll propose them again once upstream equivalents have landed. The following changes since commit 1f8da55b1b7b30ce3966f547c0cd83f357bca954: UBUNTU: SAUCE: Revert "vti6: fix PMTU caching and reporting on xmit" (2018-08-28 10:57:44 -0500) are available in the Git repository at: git://git.launchpad.net/~dannf/ubuntu/+source/linux/+git/linux hns3-upstream-unstable for you to fetch changes up to d599d399cad7e9279170c1dd8a8aa1fe2870e391: net: hns3: Fix for phy link issue when using marvell phy driver (2018-08-28 16:02:36 -0600) ---------------------------------------------------------------- Fuyun Liang (3): net: hns3: Fix for mailbox message truncated problem net: hns3: Fix for using wrong mask and shift in hclge_get_ring_chain_from_mbx net: hns3: Fix comments for hclge_get_ring_chain_from_mbx Huazhong Tan (17): net: hns3: remove back in struct hclge_hw net: hns3: use lower_32_bits and upper_32_bits net: hns3: remove unused hclge_ring_to_dma_dir net: hns3: remove useless code in hclge_cmd_send net: hns3: remove some redundant assignments net: hns3: simplify hclge_cmd_csq_clean net: hns3: remove a redundant hclge_cmd_csq_done net: hns3: remove some unused members of some structures net: hns3: give default option while dependency HNS3 set net: hns3: use dma_zalloc_coherent instead of kzalloc/dma_map_single net: hns3: Prevent sending command during global or core reset net: hns3: Modify the order of initializing command queue register net: hns3: Reset net device with rtnl_lock net: hns3: Prevent to request reset frequently net: hns3: Correct reset event status register net: hns3: Fix return value error in hns3_reset_notify_down_enet net: hns3: remove unnecessary ring configuration operation while resetting Jian Shen (11): net: hns3: Add configure for mac minimal frame size net: hns3: Remove some redundant assignments net: hns3: Standardize the handle of return value net: hns3: Remove extra space and brackets net: hns3: Correct unreasonable code comments net: hns3: Use decimal for bit offset macros net: hns3: Modify inconsistent bit mask macros net: hns3: Fix misleading parameter name net: hns3: Remove unused struct member and definition net: hns3: Add SPDX tags to HNS3 PF driver net: hns3: Fix for phy link issue when using marvell phy driver Peng Li (13): net: hns3: Updates RX packet info fetch in case of multi BD net: hns3: remove hclge_get_vector_index from hclge_bind_ring_with_vector net: hns3: rename the interface for init_client_instance and uninit_client_instance net: hns3: add vector status check before free vector net: hns3: add l4_type check for both ipv4 and ipv6 net: hns3: add unlikely for error check net: hns3: remove unused head file in hnae3.c net: hns3: extraction an interface for state init|uninit net: hns3: print the ret value in error information net: hns3: remove the Redundant put_vector in hns3_client_uninit net: hns3: modify hnae_ to hnae3_ net: hns3: Remove the warning when clear reset cause net: hns3: Add support for serdes loopback selftest Yunsheng Lin (7): net: hns3: Fix tc setup when netdev is first up net: hns3: Fix for mac pause not disable in pfc mode net: hns3: Fix for waterline not setting correctly net: hns3: Fix for l4 checksum offload bug net: hns3: Fix warning bug when doing lp selftest net: hns3: Fix get_vector ops in hclgevf_main module net: hns3: Fix for reset_level default assignment probelm dann frazier (57): Revert "UBUNTU: SAUCE: {topost} net: hns3: fix comments for hclge_get_ring_chain_from_mbx" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for using wrong mask and shift in hclge_get_ring_chain_from_mbx" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for reset_level default assignment probelm" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove unnecessary ring configuration operation while resetting" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix return value error in hns3_reset_notify_down_enet" Revert "UBUNTU: SAUCE: net: hns3: Fix for phy link issue when using marvell phy driver" Revert "UBUNTU: SAUCE: {topost} net: hns3: separate roce from nic when resetting" Revert "UBUNTU: SAUCE: {topost} net: hns3: correct reset event status register" Revert "UBUNTU: SAUCE: {topost} net: hns3: prevent to request reset frequently" Revert "UBUNTU: SAUCE: {topost} net: hns3: reset net device with rtnl_lock" Revert "UBUNTU: SAUCE: {topost} net: hns3: modify the order of initializeing command queue register" Revert "UBUNTU: SAUCE: {topost} net: hns3: prevent sending command during global or core reset" Revert "UBUNTU: SAUCE: {topost} net: hns3: Use roce handle when calling roce callback function" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove the warning when clear reset cause" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix get_vector ops in hclgevf_main module" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix warning bug when doing lp selftest" Revert "UBUNTU: SAUCE: {topost} net: hns3: Add configure for mac minimal frame size" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for mailbox message truncated problem" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for l4 checksum offload bug" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for waterline not setting correctly" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix for mac pause not disable in pfc mode" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix tc setup when netdev is first up" Revert "UBUNTU: SAUCE: {topost} net: hns3: Add calling roce callback function when link status change" Revert "UBUNTU: SAUCE: {topost} net: hns3: optimize the process of notifying roce client" Revert "UBUNTU: SAUCE: {topost} net: hns3: Add pf reset for hip08 RoCE" Revert "UBUNTU: SAUCE: {topost} net: hns3: Add SPDX tags to hns3 driver" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove unused struct member and definition" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix mislead parameter name" Revert "UBUNTU: SAUCE: {topost} net: hns3: modify inconsistent bit mask macros" Revert "UBUNTU: SAUCE: {topost} net: hns3: use decimal for bit offset macros" Revert "UBUNTU: SAUCE: {topost} net: hns3: fix unreasonable code comments" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove extra space and brackets" Revert "UBUNTU: SAUCE: {topost} net: hns3: standardize the handle of return value" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove some redundant assignments" Revert "UBUNTU: SAUCE: {topost} net: hns3: modify hnae_ to hnae3_" Revert "UBUNTU: SAUCE: {topost} net: hns3: use dma_zalloc_coherent instead of kzalloc/dma_map_single" Revert "UBUNTU: SAUCE: {topost} net: hns3: give default option while dependency HNS3 set" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove some unused members of some structures" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove a redundant hclge_cmd_csq_done" Revert "UBUNTU: SAUCE: {topost} net: hns3: using modulo for cyclic counters in hclge_cmd_send" Revert "UBUNTU: SAUCE: {topost} net: hns3: simplify hclge_cmd_csq_clean" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove some redundant assignments" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove useless code in hclge_cmd_send" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove unused hclge_ring_to_dma_dir" Revert "UBUNTU: SAUCE: {topost} net: hns3: use lower_32_bits and upper_32_bits" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove back in struct hclge_hw" Revert "UBUNTU: SAUCE: {topost} net: hns3: add unlikely for error check" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove the Redundant put_vector in hns3_client_uninit" Revert "UBUNTU: SAUCE: {topost} net: hns3: print the ret value in error information" Revert "UBUNTU: SAUCE: {topost} net: hns3: extraction an interface for state state init|uninit" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove unused head file in hnae3.c" Revert "UBUNTU: SAUCE: {topost} net: hns3: add l4_type check for both ipv4 and ipv6" Revert "UBUNTU: SAUCE: {topost} net: hns3: add vector status check before free vector" Revert "UBUNTU: SAUCE: {topost} net: hns3: rename the interface for init_client_instance and uninit_client_instance" Revert "UBUNTU: SAUCE: {topost} net: hns3: remove hclge_get_vector_index from hclge_bind_ring_with_vector" Revert "UBUNTU: SAUCE: {topost} net: hns3: RX BD information valid only in last BD except VLD bit and buffer size" Revert "UBUNTU: SAUCE: {topost} net: hns3: add support for serdes loopback selftest" drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 7 ++- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 6 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 73 +++++----------------- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 -- 7 files changed, 29 insertions(+), 74 deletions(-)