diff options
| author | Paolo Bonzini <[email protected]> | 2024-07-12 11:24:12 -0400 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2024-07-12 11:24:12 -0400 |
| commit | c8b8b8190a80b591aa73c27c70a668799f8db547 (patch) | |
| tree | 9d948c9aac89678abe64ac81f6c43348bf4b2091 /drivers/net/ethernet/marvell/octeontx2/nic/qos.c | |
| parent | f0a23883fad4ec8a63faddb9639a92be2e007624 (diff) | |
| parent | 492ac37fa38faf520b5beae44c930063265ee183 (diff) | |
Merge tag 'loongarch-kvm-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD
LoongArch KVM changes for v6.11
1. Add ParaVirt steal time support.
2. Add some VM migration enhancement.
3. Add perf kvm-stat support for loongarch.
Diffstat (limited to 'drivers/net/ethernet/marvell/octeontx2/nic/qos.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c index edac008099c0..0f844c14485a 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/qos.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/qos.c @@ -153,7 +153,6 @@ static void __otx2_qos_txschq_cfg(struct otx2_nic *pfvf, num_regs++; otx2_config_sched_shaping(pfvf, node, cfg, &num_regs); - } else if (level == NIX_TXSCH_LVL_TL4) { otx2_config_sched_shaping(pfvf, node, cfg, &num_regs); } else if (level == NIX_TXSCH_LVL_TL3) { @@ -176,7 +175,7 @@ static void __otx2_qos_txschq_cfg(struct otx2_nic *pfvf, /* check if node is root */ if (node->qid == OTX2_QOS_QID_INNER && !node->parent) { cfg->reg[num_regs] = NIX_AF_TL2X_SCHEDULE(node->schq); - cfg->regval[num_regs] = TXSCH_TL1_DFLT_RR_PRIO << 24 | + cfg->regval[num_regs] = (u64)hw->txschq_aggr_lvl_rr_prio << 24 | mtu_to_dwrr_weight(pfvf, pfvf->tx_max_pktlen); num_regs++; |