admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: stmmac: setup default RX channel map in stmmac_plat_dat_alloc()

Browse Source 
Setup the default 1:1 RX channel map in stmmac_plat_dat_alloc() and
remove 1:1 initialisations from platform glue drivers.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJvjQ-0000000EVk6-05z7@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle)
2025-11-14 15:29:00 +00:00
committed by Jakub Kicinski
parent d5e788e86f
commit b6d013b326
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
View File

@@ -618,7 +618,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
for (i = 0; i < plat->rx_queues_to_use; i++) {
plat->rx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;
plat->rx_queues_cfg[i].chan = i;
/* Disable Priority config by default */
plat->rx_queues_cfg[i].use_prio = false;

5
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@@ -7558,6 +7558,7 @@ static void stmmac_unregister_devlink(struct stmmac_priv *priv)
struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev)
{
struct plat_stmmacenet_data *plat_dat;
int i;
plat_dat = devm_kzalloc(dev, sizeof(*plat_dat), GFP_KERNEL);
if (!plat_dat)
@@ -7580,6 +7581,10 @@ struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev)
plat_dat->tx_queues_to_use = 1;
plat_dat->rx_queues_to_use = 1;
/* Setup the default RX queue channel map */
for (i = 0; i < ARRAY_SIZE(plat_dat->rx_queues_cfg); i++)
plat_dat->rx_queues_cfg[i].chan = i;
return plat_dat;
}
EXPORT_SYMBOL_GPL(stmmac_plat_dat_alloc);

1
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
View File

@@ -86,7 +86,6 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,
plat->rx_queues_cfg[i].use_prio = false;
plat->rx_queues_cfg[i].mode_to_use = MTL_QUEUE_DCB;
plat->rx_queues_cfg[i].pkt_route = 0x0;
plat->rx_queues_cfg[i].chan = i;
}
plat->bus_id = 1;

5
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@@ -177,9 +177,8 @@ static int stmmac_mtl_setup(struct platform_device *pdev,
else
plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
if (of_property_read_u32(q_node, "snps,map-to-dma-channel",
&plat->rx_queues_cfg[queue].chan))
plat->rx_queues_cfg[queue].chan = queue;
of_property_read_u32(q_node, "snps,map-to-dma-channel",
&plat->rx_queues_cfg[queue].chan);
/* TODO: Dynamic mapping to be included in the future */
if (of_property_read_u32(q_node, "snps,priority",