APPLIED[Bionic]: [PULL][Cosmic][SRU Bionic] Reconcile hns3 SAUCE patches with upstream
Kleber Souza
kleber.souza at canonical.com
Wed Sep 5 12:21:05 UTC 2018
On 08/17/18 20:24, dann frazier wrote:
> https://bugs.launchpad.net/bugs/1787477
>
> As promised[1], I've been tracking the upstream status of the various
> hns3 SAUCE patches we are carrying. This PR reverts most of the SAUCE
> patches and replaces them with clean upstream cherry-picks. This
> reduces our SAUCE from 61 patches to 5 - see the bug for details.
> Note: One of the residual SAUCE patches is reverted and reapplied at
> the end to avoid conflicts.
>
> [1] https://lists.ubuntu.com/archives/kernel-team/2018-June/093066.html
>
> The following changes since commit a80aa0aa24ffffc77ac230329b4eb1bd653368aa:
>
> UBUNTU: [Packaging] retpoline -- fix temporary filenaming
> (2018-08-16 16:27:39 +0100)
>
> are available in the Git repository at:
>
> git://git.launchpad.net/~dannf/ubuntu/+source/linux/+git/linux
> hns3-upstream-cosmic
>
> for you to fetch changes up to e93e34a5a51b9bf112b99eb5796a64d8ec5c6786:
>
> UBUNTU: SAUCE: {topost} net: hns3: separate roce from nic when
> resetting (2018-08-17 11:14:00 -0600)
>
> ----------------------------------------------------------------
> Arnd Bergmann (1):
> net: hns3: remove unused hclgevf_cfg_func_mta_filter
>
> 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 (18):
> 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
> UBUNTU: SAUCE: {topost} net: hns3: separate roce from nic when 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
>
> Xi Wang (3):
> net: hns3: Fix for VF mailbox cannot receiving PF response
> net: hns3: Fix for VF mailbox receiving unknown message
> net: hns3: Optimize PF CMDQ interrupt switching process
>
> 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: net: hns3: Optimize PF CMDQ interrupt
> switching process"
> Revert "UBUNTU: SAUCE: net: hns3: Fix for VF mailbox receiving
> unknown message"
> Revert "UBUNTU: SAUCE: net: hns3: Fix for VF mailbox cannot
> receiving PF response"
> 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: 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 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: fix unused function
> warning in VF driver"
> 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 | 22 +++++++++++-----------
> 6 files changed, 25 insertions(+), 22 deletions(-)
>
Applied to bionic/master-next branch.
Thanks,
Kleber
More information about the kernel-team
mailing list