From: Igor Russkikh <irusskikh@marvell.com>
To: <netdev@vger.kernel.org>
Cc: "David S . Miller" <davem@davemloft.net>,
Mark Starovoytov <mstarovoitov@marvell.com>,
Igor Russkikh <irusskikh@marvell.com>
Subject: [PATCH net-next 06/12] net: atlantic: make TCVEC2RING accept nic_cfg
Date: Wed, 20 May 2020 16:47:28 +0300 [thread overview]
Message-ID: <20200520134734.2014-7-irusskikh@marvell.com> (raw)
In-Reply-To: <20200520134734.2014-1-irusskikh@marvell.com>
From: Mark Starovoytov <mstarovoitov@marvell.com>
This patch updates TCVEC2RING to accept nic_cfg, which is needed to be able
to use it from hw_atl.
The name is updated to reflect the changes.
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 9 +++++----
drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 13 +++++++------
drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 ++-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index 440a7d129848..90a52a4b2d48 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -254,7 +254,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
snprintf(p, ETH_GSTRING_LEN,
aq_ethtool_queue_stat_names[si],
tc_string,
- AQ_NIC_TCVEC2RING(nic, tc, i));
+ AQ_NIC_CFG_TCVEC2RING(cfg, tc, i));
p += ETH_GSTRING_LEN;
}
}
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 88021baf65fb..1346197c0b01 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -705,15 +705,16 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)
{
- unsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs;
- unsigned int tc = skb->queue_mapping / self->aq_nic_cfg.vecs;
+ struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);
+ unsigned int vec = skb->queue_mapping % cfg->vecs;
+ unsigned int tc = skb->queue_mapping / cfg->vecs;
struct aq_ring_s *ring = NULL;
unsigned int frags = 0U;
int err = NETDEV_TX_OK;
frags = skb_shinfo(skb)->nr_frags + 1;
- ring = self->aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)];
+ ring = self->aq_ring_tx[AQ_NIC_CFG_TCVEC2RING(cfg, tc, vec)];
if (frags > AQ_CFG_SKB_FRAGS_MAX) {
dev_kfree_skb_any(skb);
@@ -722,7 +723,7 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)
aq_ring_update_queue_state(ring);
- if (self->aq_nic_cfg.priv_flags & BIT(AQ_HW_LOOPBACK_DMA_NET)) {
+ if (cfg->priv_flags & BIT(AQ_HW_LOOPBACK_DMA_NET)) {
err = NETDEV_TX_BUSY;
goto err_exit;
}
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index 29e129411945..6cc2ebfe6a44 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -81,15 +81,16 @@ struct aq_nic_cfg_s {
#define AQ_NIC_WOL_MODES (WAKE_MAGIC |\
WAKE_PHY)
-#define AQ_NIC_RING_PER_TC(_NIC_) \
- (((_NIC_)->aq_nic_cfg.tc_mode == AQ_TC_MODE_4TCS) ? 8 : 4)
+#define AQ_NIC_CFG_RING_PER_TC(_NIC_CFG_) \
+ (((_NIC_CFG_)->tc_mode == AQ_TC_MODE_4TCS) ? 8 : 4)
-#define AQ_NIC_TCVEC2RING(_NIC_, _TC_, _VEC_) \
- ((_TC_) * AQ_NIC_RING_PER_TC(_NIC_) + (_VEC_))
+#define AQ_NIC_CFG_TCVEC2RING(_NIC_CFG_, _TC_, _VEC_) \
+ ((_TC_) * AQ_NIC_CFG_RING_PER_TC(_NIC_CFG_) + (_VEC_))
#define AQ_NIC_RING2QMAP(_NIC_, _ID_) \
- ((_ID_) / AQ_NIC_RING_PER_TC(_NIC_) * (_NIC_)->aq_vecs + \
- ((_ID_) % AQ_NIC_RING_PER_TC(_NIC_)))
+ ((_ID_) / AQ_NIC_CFG_RING_PER_TC(&(_NIC_)->aq_nic_cfg) * \
+ (_NIC_)->aq_vecs + \
+ ((_ID_) % AQ_NIC_CFG_RING_PER_TC(&(_NIC_)->aq_nic_cfg)))
struct aq_hw_rx_fl2 {
struct aq_rx_filter_vlan aq_vlans[AQ_VLAN_MAX_FILTERS];
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
index 41826c10700f..d1d43c8ce400 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c
@@ -135,7 +135,8 @@ int aq_vec_ring_alloc(struct aq_vec_s *self, struct aq_nic_s *aq_nic,
int err = 0;
for (i = 0; i < aq_nic_cfg->tcs; ++i) {
- unsigned int idx_ring = AQ_NIC_TCVEC2RING(aq_nic, i, idx);
+ const unsigned int idx_ring = AQ_NIC_CFG_TCVEC2RING(aq_nic_cfg,
+ i, idx);
ring = aq_ring_tx_alloc(&self->ring[i][AQ_VEC_TX_ID], aq_nic,
idx_ring, aq_nic_cfg);
--
2.25.1
next prev parent reply other threads:[~2020-05-20 13:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:47 [PATCH net-next 00/12] net: atlantic: QoS implementation Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 01/12] net: atlantic: changes for multi-TC support Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 02/12] net: atlantic: move PTP TC initialization to a separate function Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 03/12] net: atlantic: changes for multi-TC support Igor Russkikh
2020-05-20 17:08 ` Jakub Kicinski
2020-05-20 21:01 ` Jakub Kicinski
2020-05-21 9:18 ` [EXT] " Mark Starovoytov
2020-05-21 19:11 ` Jakub Kicinski
2020-05-21 20:38 ` Igor Russkikh
2020-05-21 21:36 ` David Miller
2020-05-20 23:18 ` kbuild test robot
2020-05-21 2:15 ` kbuild test robot
2020-05-21 2:15 ` [RFC PATCH] net: atlantic: ptp_ring_idx() can be static kbuild test robot
2020-05-20 13:47 ` [PATCH net-next 04/12] net: atlantic: QoS implementation: multi-TC support Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 05/12] net: atlantic: per-TC queue statistics Igor Russkikh
2020-05-20 13:47 ` Igor Russkikh [this message]
2020-05-20 13:47 ` [PATCH net-next 07/12] net: atlantic: QoS implementation: max_rate Igor Russkikh
2020-05-20 17:11 ` Jakub Kicinski
2020-05-20 18:05 ` [EXT] " Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 08/12] net: atlantic: automatically downgrade the number of queues if necessary Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 09/12] net: atlantic: always use random TC-queue mapping for TX on A2 Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 10/12] net: atlantic: change the order of arguments for TC weight/credit setters Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 11/12] net: atlantic: QoS implementation: min_rate Igor Russkikh
2020-05-20 13:47 ` [PATCH net-next 12/12] net: atlantic: proper rss_ctrl1 (54c0) initialization Igor Russkikh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520134734.2014-7-irusskikh@marvell.com \
--to=irusskikh@marvell.com \
--cc=davem@davemloft.net \
--cc=mstarovoitov@marvell.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).