github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-10 17:11:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: sparx5: Move TAS link speed configuration to sparx5_tas.c

Browse Source 
Move sparx5_tas_speed() and its link speed enum from sparx5_qos.c to a
new sparx5_tas.c, which the following TAS offload patch builds on.

No functional change.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Link: https://patch.msgid.link/20261006-sparx5-tas-v1-2-5eef1126dfd5@microchip.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Daniel Machon 2026-10-06 15:51:07 +02:00 committed by Paolo Abeni
parent 48b7611964
commit 9662850854
5 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/microchip/sparx5/Makefile
View File

@ -11,7 +11,7 @@ sparx5-switch-y := sparx5_main.o sparx5_packet.o \
sparx5_ptp.o sparx5_pgid.o sparx5_tc.o sparx5_qos.o \
sparx5_vcap_impl.o sparx5_vcap_ag_api.o sparx5_tc_flower.o \
sparx5_tc_matchall.o sparx5_pool.o sparx5_sdlb.o sparx5_police.o \
sparx5_psfp.o sparx5_mirror.o sparx5_regs.o
sparx5_psfp.o sparx5_mirror.o sparx5_regs.o sparx5_tas.o
sparx5-switch-$(CONFIG_SPARX5_DCB) += sparx5_dcb.o
sparx5-switch-$(CONFIG_DEBUG_FS) += sparx5_vcap_debugfs.o

3
drivers/net/ethernet/microchip/sparx5/sparx5_main.h
View File

@ -707,6 +707,9 @@ void sparx5_psfp_init(struct sparx5 *sparx5);
void sparx5_new_base_time(struct sparx5 *sparx5, const u32 cycle_time,
const ktime_t org_base_time, ktime_t *new_base_time);
/* sparx5_tas.c */
void sparx5_tas_speed(struct sparx5_port *port, int speed);
/* sparx5_mirror.c */
int sparx5_mirror_add(struct sparx5_mall_entry *entry);
void sparx5_mirror_del(struct sparx5_mall_entry *entry);

49
drivers/net/ethernet/microchip/sparx5/sparx5_qos.c
View File

@ -9,17 +9,6 @@
#include "sparx5_main.h"
#include "sparx5_qos.h"
enum sparx5_tas_link_speed {
TAS_SPEED_NO_GB,
TAS_SPEED_10,
TAS_SPEED_100,
TAS_SPEED_1000,
TAS_SPEED_2500,
TAS_SPEED_5000,
TAS_SPEED_10000,
TAS_SPEED_25000,
};
/* Calculate new base_time based on cycle_time.
*
* The hardware requires a base_time that is always in the future.
@ -592,41 +581,3 @@ int sparx5_tc_ets_del(struct sparx5_port *port)
return sparx5_dwrr_conf_set(port, &dwrr);
}
void sparx5_tas_speed(struct sparx5_port *port, int speed)
{
struct sparx5 *sparx5 = port->sparx5;
u8 spd;
switch (speed) {
case SPEED_10:
spd = TAS_SPEED_10;
break;
case SPEED_100:
spd = TAS_SPEED_100;
break;
case SPEED_1000:
spd = TAS_SPEED_1000;
break;
case SPEED_2500:
spd = TAS_SPEED_2500;
break;
case SPEED_5000:
spd = TAS_SPEED_5000;
break;
case SPEED_10000:
spd = TAS_SPEED_10000;
break;
case SPEED_25000:
spd = TAS_SPEED_25000;
break;
default:
netdev_err(port->ndev, "TAS: Unsupported speed: %d\n", speed);
return;
}
spx5_rmw(HSCH_TAS_PROFILE_CONFIG_LINK_SPEED_SET(spd),
HSCH_TAS_PROFILE_CONFIG_LINK_SPEED,
sparx5,
HSCH_TAS_PROFILE_CONFIG(port->portno));
}

1
drivers/net/ethernet/microchip/sparx5/sparx5_qos.h
View File

@ -60,7 +60,6 @@ struct sparx5_dwrr {
};
int sparx5_qos_init(struct sparx5 *sparx5);
void sparx5_tas_speed(struct sparx5_port *port, int speed);
/* Multi-Queue Priority */
int sparx5_tc_mqprio_add(struct net_device *ndev, u8 num_tc);

56
drivers/net/ethernet/microchip/sparx5/sparx5_tas.c Normal file
View File

@ -0,0 +1,56 @@
// SPDX-License-Identifier: GPL-2.0+
/* Microchip Sparx5 Switch driver
*
* Copyright (c) 2026 Microchip Technology Inc. and its subsidiaries.
*/
#include "sparx5_main.h"
enum sparx5_tas_link_speed {
TAS_SPEED_NO_GB,
TAS_SPEED_10,
TAS_SPEED_100,
TAS_SPEED_1000,
TAS_SPEED_2500,
TAS_SPEED_5000,
TAS_SPEED_10000,
TAS_SPEED_25000,
};
void sparx5_tas_speed(struct sparx5_port *port, int speed)
{
struct sparx5 *sparx5 = port->sparx5;
u8 spd;
switch (speed) {
case SPEED_10:
spd = TAS_SPEED_10;
break;
case SPEED_100:
spd = TAS_SPEED_100;
break;
case SPEED_1000:
spd = TAS_SPEED_1000;
break;
case SPEED_2500:
spd = TAS_SPEED_2500;
break;
case SPEED_5000:
spd = TAS_SPEED_5000;
break;
case SPEED_10000:
spd = TAS_SPEED_10000;
break;
case SPEED_25000:
spd = TAS_SPEED_25000;
break;
default:
netdev_err(port->ndev, "TAS: Unsupported speed: %d\n", speed);
return;
}
spx5_rmw(HSCH_TAS_PROFILE_CONFIG_LINK_SPEED_SET(spd),
HSCH_TAS_PROFILE_CONFIG_LINK_SPEED,
sparx5,
HSCH_TAS_PROFILE_CONFIG(port->portno));
}