aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c16
-rw-r--r--include/linux/stmmac.h8
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 6383695004a5..195eb7e71473 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -168,8 +168,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
168 } 168 }
169 169
170 /* Processing RX queues common config */ 170 /* Processing RX queues common config */
171 if (of_property_read_u8(rx_node, "snps,rx-queues-to-use", 171 if (of_property_read_u32(rx_node, "snps,rx-queues-to-use",
172 &plat->rx_queues_to_use)) 172 &plat->rx_queues_to_use))
173 plat->rx_queues_to_use = 1; 173 plat->rx_queues_to_use = 1;
174 174
175 if (of_property_read_bool(rx_node, "snps,rx-sched-sp")) 175 if (of_property_read_bool(rx_node, "snps,rx-sched-sp"))
@@ -191,8 +191,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
191 else 191 else
192 plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB; 192 plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
193 193
194 if (of_property_read_u8(q_node, "snps,map-to-dma-channel", 194 if (of_property_read_u32(q_node, "snps,map-to-dma-channel",
195 &plat->rx_queues_cfg[queue].chan)) 195 &plat->rx_queues_cfg[queue].chan))
196 plat->rx_queues_cfg[queue].chan = queue; 196 plat->rx_queues_cfg[queue].chan = queue;
197 /* TODO: Dynamic mapping to be included in the future */ 197 /* TODO: Dynamic mapping to be included in the future */
198 198
@@ -222,8 +222,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
222 } 222 }
223 223
224 /* Processing TX queues common config */ 224 /* Processing TX queues common config */
225 if (of_property_read_u8(tx_node, "snps,tx-queues-to-use", 225 if (of_property_read_u32(tx_node, "snps,tx-queues-to-use",
226 &plat->tx_queues_to_use)) 226 &plat->tx_queues_to_use))
227 plat->tx_queues_to_use = 1; 227 plat->tx_queues_to_use = 1;
228 228
229 if (of_property_read_bool(tx_node, "snps,tx-sched-wrr")) 229 if (of_property_read_bool(tx_node, "snps,tx-sched-wrr"))
@@ -244,8 +244,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
244 if (queue >= plat->tx_queues_to_use) 244 if (queue >= plat->tx_queues_to_use)
245 break; 245 break;
246 246
247 if (of_property_read_u8(q_node, "snps,weight", 247 if (of_property_read_u32(q_node, "snps,weight",
248 &plat->tx_queues_cfg[queue].weight)) 248 &plat->tx_queues_cfg[queue].weight))
249 plat->tx_queues_cfg[queue].weight = 0x10 + queue; 249 plat->tx_queues_cfg[queue].weight = 0x10 + queue;
250 250
251 if (of_property_read_bool(q_node, "snps,dcb-algorithm")) { 251 if (of_property_read_bool(q_node, "snps,dcb-algorithm")) {
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 108739ff9223..32feac5bbd75 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -126,14 +126,14 @@ struct stmmac_axi {
126 126
127struct stmmac_rxq_cfg { 127struct stmmac_rxq_cfg {
128 u8 mode_to_use; 128 u8 mode_to_use;
129 u8 chan; 129 u32 chan;
130 u8 pkt_route; 130 u8 pkt_route;
131 bool use_prio; 131 bool use_prio;
132 u32 prio; 132 u32 prio;
133}; 133};
134 134
135struct stmmac_txq_cfg { 135struct stmmac_txq_cfg {
136 u8 weight; 136 u32 weight;
137 u8 mode_to_use; 137 u8 mode_to_use;
138 /* Credit Base Shaper parameters */ 138 /* Credit Base Shaper parameters */
139 u32 send_slope; 139 u32 send_slope;
@@ -168,8 +168,8 @@ struct plat_stmmacenet_data {
168 int unicast_filter_entries; 168 int unicast_filter_entries;
169 int tx_fifo_size; 169 int tx_fifo_size;
170 int rx_fifo_size; 170 int rx_fifo_size;
171 u8 rx_queues_to_use; 171 u32 rx_queues_to_use;
172 u8 tx_queues_to_use; 172 u32 tx_queues_to_use;
173 u8 rx_sched_algorithm; 173 u8 rx_sched_algorithm;
174 u8 tx_sched_algorithm; 174 u8 tx_sched_algorithm;
175 struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES]; 175 struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];