openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

enetc: Use generic rule to map Tx rings to interrupt vectors 

Even if the current mapping is correct for the 1 CPU and 2 CPU cases
(currently enetc is included in SoCs with up to 2 CPUs only), better
use a generic rule for the mapping to cover all possible cases.
The number of CPUs is the same as the number of interrupt vectors:

Per device Tx rings -
device_tx_ring[idx], where idx = 0..n_rings_total-1

Per interrupt vector Tx rings -
int_vector[i].ring[j], where i = 0..n_int_vects-1
			     j = 0..n_rings_per_v-1

Mapping rule -
n_rings_per_v = n_rings_total / n_int_vects
for i = 0..n_int_vects - 1:
	for j = 0..n_rings_per_v - 1:
		idx = n_int_vects * j + i
		int_vector[i].ring[j] <- device_tx_ring[idx]

Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20210409071613.28912-1-claudiu.manoil@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Claudiu Manoil 2021-04-09 10:16:13 +03:00 committed by Jakub Kicinski
parent a93580a02d
commit 6c5e6b4ccc
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/freescale/enetc/enetc.c
View File

@ -2344,11 +2344,7 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv)
int idx; int idx;
/* default tx ring mapping policy */ /* default tx ring mapping policy */
if (priv->bdr_int_num == ENETC_MAX_BDR_INT) idx = priv->bdr_int_num * j + i;
idx = 2 * j + i; /* 2 CPUs */
else
idx = j + i * v_tx_rings; /* default */
__set_bit(idx, &v->tx_rings_map); __set_bit(idx, &v->tx_rings_map);
bdr = &v->tx_ring[j]; bdr = &v->tx_ring[j];
bdr->index = idx; bdr->index = idx;