mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
net: mvneta: fix txq_map in case of txq_number==1
[ Upstream commit21327f81db
] If we boot with mvneta.txq_number=1, the txq_map is set incorrectly: MVNETA_CPU_TXQ_ACCESS(1) refers to TX queue 1, but only TX queue 0 is initialized. Fix this. Fixes:50bf8cb6fc
("net: mvneta: Configure XPS support") Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> Link: https://lore.kernel.org/r/20230705053712.3914-1-klaus.kudielka@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7fa7ac28bd
commit
fa27885c48
1 changed files with 2 additions and 2 deletions
|
@ -1505,7 +1505,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp)
|
|||
*/
|
||||
if (txq_number == 1)
|
||||
txq_map = (cpu == pp->rxq_def) ?
|
||||
MVNETA_CPU_TXQ_ACCESS(1) : 0;
|
||||
MVNETA_CPU_TXQ_ACCESS(0) : 0;
|
||||
|
||||
} else {
|
||||
txq_map = MVNETA_CPU_TXQ_ACCESS_ALL_MASK;
|
||||
|
@ -4295,7 +4295,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp)
|
|||
*/
|
||||
if (txq_number == 1)
|
||||
txq_map = (cpu == elected_cpu) ?
|
||||
MVNETA_CPU_TXQ_ACCESS(1) : 0;
|
||||
MVNETA_CPU_TXQ_ACCESS(0) : 0;
|
||||
else
|
||||
txq_map = mvreg_read(pp, MVNETA_CPU_MAP(cpu)) &
|
||||
MVNETA_CPU_TXQ_ACCESS_ALL_MASK;
|
||||
|
|
Loading…
Reference in a new issue