You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
97 lines
3.9 KiB
97 lines
3.9 KiB
From c95311eccb9cb3c5fe7c9b29bb040d9a6d641c50 Mon Sep 17 00:00:00 2001
|
|
From: Igor Russkikh <irusskik@redhat.com>
|
|
Date: Fri, 6 Nov 2020 18:37:47 -0500
|
|
Subject: [PATCH 090/139] [netdrv] net: atlantic: remove hw_atl_b0_hw_rss_set
|
|
call from A2 code
|
|
|
|
Message-id: <1604687916-15087-91-git-send-email-irusskik@redhat.com>
|
|
Patchwork-id: 338507
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.4 BZ 1857861 090/139] net: atlantic: remove hw_atl_b0_hw_rss_set call from A2 code
|
|
Bugzilla: 1857861
|
|
RH-Acked-by: David Arcari <darcari@redhat.com>
|
|
RH-Acked-by: John Linville <linville@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1857861
|
|
|
|
commit ad46bd5ec357ebb18c42398d8760bad4d611b53e
|
|
Author: Mark Starovoytov <mstarovoitov@marvell.com>
|
|
Date: Sat May 9 09:46:58 2020 +0300
|
|
|
|
net: atlantic: remove hw_atl_b0_hw_rss_set call from A2 code
|
|
|
|
No need to call hw_atl_b0_hw_rss_set from hw_atl2_hw_rss_set
|
|
|
|
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
|
|
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
Signed-off-by: Igor Russkikh <irusskik@redhat.com>
|
|
|
|
Cc: David Arcari <darcari@redhat.com>
|
|
Cc: Igor Russkikh <irusskik@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
---
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 ++--
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h | 9 ++++-----
|
|
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +-
|
|
3 files changed, 7 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
index 1d872547a87c..fa3cd7e9954b 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
|
|
@@ -216,8 +216,8 @@ int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,
|
|
return err;
|
|
}
|
|
|
|
-int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,
|
|
- struct aq_rss_parameters *rss_params)
|
|
+static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,
|
|
+ struct aq_rss_parameters *rss_params)
|
|
{
|
|
u32 num_rss_queues = max(1U, self->aq_nic_cfg->num_rss_queues);
|
|
u8 *indirection_table = rss_params->indirection_table;
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
|
|
index f5091d79ab43..b855459272ca 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
|
|
@@ -1,7 +1,8 @@
|
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
-/*
|
|
- * aQuantia Corporation Network Driver
|
|
- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved
|
|
+/* Atlantic Network Driver
|
|
+ *
|
|
+ * Copyright (C) 2014-2019 aQuantia Corporation
|
|
+ * Copyright (C) 2019-2020 Marvell International Ltd.
|
|
*/
|
|
|
|
/* File hw_atl_b0.h: Declaration of abstract interface for Atlantic hardware
|
|
@@ -35,8 +36,6 @@ extern const struct aq_hw_ops hw_atl_ops_b0;
|
|
|
|
int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,
|
|
struct aq_rss_parameters *rss_params);
|
|
-int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,
|
|
- struct aq_rss_parameters *rss_params);
|
|
int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,
|
|
struct aq_nic_cfg_s *aq_nic_cfg);
|
|
|
|
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
|
|
index 84d9b828dc4e..6f2b33ae3d06 100644
|
|
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
|
|
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
|
|
@@ -172,7 +172,7 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self,
|
|
for (i = HW_ATL2_RSS_REDIRECTION_MAX; i--;)
|
|
hw_atl2_new_rpf_rss_redir_set(self, 0, i, indirection_table[i]);
|
|
|
|
- return hw_atl_b0_hw_rss_set(self, rss_params);
|
|
+ return aq_hw_err_from_flags(self);
|
|
}
|
|
|
|
static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self)
|
|
--
|
|
2.13.6
|
|
|