Commit 5656ac55 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller

net: stmmac: xgmac: Implement set_mtl_tx_queue_weight()

Implement the TX Queue Weight callback. In order for this to be active
we also need to set ETS algorithm when configuring Queue.
Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6cdf09f
...@@ -144,7 +144,9 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_device_info *hw, ...@@ -144,7 +144,9 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_device_info *hw,
u32 tx_alg) u32 tx_alg)
{ {
void __iomem *ioaddr = hw->pcsr; void __iomem *ioaddr = hw->pcsr;
bool ets = true;
u32 value; u32 value;
int i;
value = readl(ioaddr + XGMAC_MTL_OPMODE); value = readl(ioaddr + XGMAC_MTL_OPMODE);
value &= ~XGMAC_ETSALG; value &= ~XGMAC_ETSALG;
...@@ -160,10 +162,28 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_device_info *hw, ...@@ -160,10 +162,28 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_device_info *hw,
value |= XGMAC_DWRR; value |= XGMAC_DWRR;
break; break;
default: default:
ets = false;
break; break;
} }
writel(value, ioaddr + XGMAC_MTL_OPMODE); writel(value, ioaddr + XGMAC_MTL_OPMODE);
/* Set ETS if desired */
for (i = 0; i < MTL_MAX_TX_QUEUES; i++) {
value = readl(ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(i));
value &= ~XGMAC_TSA;
if (ets)
value |= XGMAC_ETS;
writel(value, ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(i));
}
}
static void dwxgmac2_set_mtl_tx_queue_weight(struct mac_device_info *hw,
u32 weight, u32 queue)
{
void __iomem *ioaddr = hw->pcsr;
writel(weight, ioaddr + XGMAC_MTL_TCx_QUANTUM_WEIGHT(queue));
} }
static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue, static void dwxgmac2_map_mtl_to_dma(struct mac_device_info *hw, u32 queue,
...@@ -412,7 +432,7 @@ const struct stmmac_ops dwxgmac210_ops = { ...@@ -412,7 +432,7 @@ const struct stmmac_ops dwxgmac210_ops = {
.rx_queue_routing = NULL, .rx_queue_routing = NULL,
.prog_mtl_rx_algorithms = dwxgmac2_prog_mtl_rx_algorithms, .prog_mtl_rx_algorithms = dwxgmac2_prog_mtl_rx_algorithms,
.prog_mtl_tx_algorithms = dwxgmac2_prog_mtl_tx_algorithms, .prog_mtl_tx_algorithms = dwxgmac2_prog_mtl_tx_algorithms,
.set_mtl_tx_queue_weight = NULL, .set_mtl_tx_queue_weight = dwxgmac2_set_mtl_tx_queue_weight,
.map_mtl_to_dma = dwxgmac2_map_mtl_to_dma, .map_mtl_to_dma = dwxgmac2_map_mtl_to_dma,
.config_cbs = dwxgmac2_config_cbs, .config_cbs = dwxgmac2_config_cbs,
.dump_regs = NULL, .dump_regs = NULL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment