Skip to content

Commit 3def80e

Browse files
wkzdavem330
wkz
authored and
davem330
committed
net: dsa: mv88e6xxx: Create API to read a single stat counter
This change contains no functional change. We simply push the hardware specific stats logic to a function reading a single counter, rather than the whole set. This is a preparatory change for the upcoming standard ethtool statistics support (i.e. "eth-mac", "eth-ctrl" etc.). Reviewed-by: Vladimir Oltean <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Signed-off-by: Tobias Waldekranz <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d624afa commit 3def80e

File tree

2 files changed

+106
-83
lines changed

2 files changed

+106
-83
lines changed

‎drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 92 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ static struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {
10181018
};
10191019

10201020
static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
1021-
struct mv88e6xxx_hw_stat *s,
1021+
const struct mv88e6xxx_hw_stat *s,
10221022
int port, u16 bank1_select,
10231023
u16 histogram)
10241024
{
@@ -1201,59 +1201,82 @@ static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port, int sset)
12011201
return count;
12021202
}
12031203

1204-
static int mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1205-
uint64_t *data, int types,
1206-
u16 bank1_select, u16 histogram)
1204+
static size_t mv88e6095_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
1205+
const struct mv88e6xxx_hw_stat *stat,
1206+
uint64_t *data)
12071207
{
1208-
struct mv88e6xxx_hw_stat *stat;
1209-
int i, j;
1208+
if (!(stat->type & (STATS_TYPE_BANK0 | STATS_TYPE_PORT)))
1209+
return 0;
12101210

1211-
for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
1212-
stat = &mv88e6xxx_hw_stats[i];
1213-
if (stat->type & types) {
1214-
mv88e6xxx_reg_lock(chip);
1215-
data[j] = _mv88e6xxx_get_ethtool_stat(chip, stat, port,
1216-
bank1_select,
1217-
histogram);
1218-
mv88e6xxx_reg_unlock(chip);
1211+
*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,
1212+
MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1213+
return 1;
1214+
}
12191215

1220-
j++;
1221-
}
1222-
}
1223-
return j;
1216+
static size_t mv88e6250_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
1217+
const struct mv88e6xxx_hw_stat *stat,
1218+
uint64_t *data)
1219+
{
1220+
if (!(stat->type & STATS_TYPE_BANK0))
1221+
return 0;
1222+
1223+
*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,
1224+
MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1225+
return 1;
12241226
}
12251227

1226-
static int mv88e6095_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1227-
uint64_t *data)
1228+
static size_t mv88e6320_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
1229+
const struct mv88e6xxx_hw_stat *stat,
1230+
uint64_t *data)
12281231
{
1229-
return mv88e6xxx_stats_get_stats(chip, port, data,
1230-
STATS_TYPE_BANK0 | STATS_TYPE_PORT,
1231-
0, MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1232+
if (!(stat->type & (STATS_TYPE_BANK0 | STATS_TYPE_BANK1)))
1233+
return 0;
1234+
1235+
*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port,
1236+
MV88E6XXX_G1_STATS_OP_BANK_1_BIT_9,
1237+
MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1238+
return 1;
12321239
}
12331240

1234-
static int mv88e6250_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1235-
uint64_t *data)
1241+
static size_t mv88e6390_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
1242+
const struct mv88e6xxx_hw_stat *stat,
1243+
uint64_t *data)
12361244
{
1237-
return mv88e6xxx_stats_get_stats(chip, port, data, STATS_TYPE_BANK0,
1238-
0, MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1245+
if (!(stat->type & (STATS_TYPE_BANK0 | STATS_TYPE_BANK1)))
1246+
return 0;
1247+
1248+
*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port,
1249+
MV88E6XXX_G1_STATS_OP_BANK_1_BIT_10,
1250+
0);
1251+
return 1;
12391252
}
12401253

1241-
static int mv88e6320_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1242-
uint64_t *data)
1254+
static size_t mv88e6xxx_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
1255+
const struct mv88e6xxx_hw_stat *stat,
1256+
uint64_t *data)
12431257
{
1244-
return mv88e6xxx_stats_get_stats(chip, port, data,
1245-
STATS_TYPE_BANK0 | STATS_TYPE_BANK1,
1246-
MV88E6XXX_G1_STATS_OP_BANK_1_BIT_9,
1247-
MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
1258+
int ret = 0;
1259+
1260+
if (chip->info->ops->stats_get_stat) {
1261+
mv88e6xxx_reg_lock(chip);
1262+
ret = chip->info->ops->stats_get_stat(chip, port, stat, data);
1263+
mv88e6xxx_reg_unlock(chip);
1264+
}
1265+
1266+
return ret;
12481267
}
12491268

1250-
static int mv88e6390_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1251-
uint64_t *data)
1269+
static size_t mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port,
1270+
uint64_t *data)
12521271
{
1253-
return mv88e6xxx_stats_get_stats(chip, port, data,
1254-
STATS_TYPE_BANK0 | STATS_TYPE_BANK1,
1255-
MV88E6XXX_G1_STATS_OP_BANK_1_BIT_10,
1256-
0);
1272+
struct mv88e6xxx_hw_stat *stat;
1273+
size_t i, j;
1274+
1275+
for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
1276+
stat = &mv88e6xxx_hw_stats[i];
1277+
j += mv88e6xxx_stats_get_stat(chip, port, stat, &data[j]);
1278+
}
1279+
return j;
12571280
}
12581281

12591282
static void mv88e6xxx_atu_vtu_get_stats(struct mv88e6xxx_chip *chip, int port,
@@ -1269,10 +1292,9 @@ static void mv88e6xxx_atu_vtu_get_stats(struct mv88e6xxx_chip *chip, int port,
12691292
static void mv88e6xxx_get_stats(struct mv88e6xxx_chip *chip, int port,
12701293
uint64_t *data)
12711294
{
1272-
int count = 0;
1295+
size_t count;
12731296

1274-
if (chip->info->ops->stats_get_stats)
1275-
count = chip->info->ops->stats_get_stats(chip, port, data);
1297+
count = mv88e6xxx_stats_get_stats(chip, port, data);
12761298

12771299
mv88e6xxx_reg_lock(chip);
12781300
if (chip->info->ops->serdes_get_stats) {
@@ -3988,7 +4010,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
39884010
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
39894011
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
39904012
.stats_get_strings = mv88e6095_stats_get_strings,
3991-
.stats_get_stats = mv88e6095_stats_get_stats,
4013+
.stats_get_stat = mv88e6095_stats_get_stat,
39924014
.set_cpu_port = mv88e6095_g1_set_cpu_port,
39934015
.set_egress_port = mv88e6095_g1_set_egress_port,
39944016
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4026,7 +4048,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {
40264048
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
40274049
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
40284050
.stats_get_strings = mv88e6095_stats_get_strings,
4029-
.stats_get_stats = mv88e6095_stats_get_stats,
4051+
.stats_get_stat = mv88e6095_stats_get_stat,
40304052
.mgmt_rsvd2cpu = mv88e6185_g2_mgmt_rsvd2cpu,
40314053
.ppu_enable = mv88e6185_g1_ppu_enable,
40324054
.ppu_disable = mv88e6185_g1_ppu_disable,
@@ -4067,7 +4089,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
40674089
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
40684090
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
40694091
.stats_get_strings = mv88e6095_stats_get_strings,
4070-
.stats_get_stats = mv88e6095_stats_get_stats,
4092+
.stats_get_stat = mv88e6095_stats_get_stat,
40714093
.set_cpu_port = mv88e6095_g1_set_cpu_port,
40724094
.set_egress_port = mv88e6095_g1_set_egress_port,
40734095
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4109,7 +4131,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
41094131
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
41104132
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
41114133
.stats_get_strings = mv88e6095_stats_get_strings,
4112-
.stats_get_stats = mv88e6095_stats_get_stats,
4134+
.stats_get_stat = mv88e6095_stats_get_stat,
41134135
.set_cpu_port = mv88e6095_g1_set_cpu_port,
41144136
.set_egress_port = mv88e6095_g1_set_egress_port,
41154137
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4152,7 +4174,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {
41524174
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
41534175
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
41544176
.stats_get_strings = mv88e6095_stats_get_strings,
4155-
.stats_get_stats = mv88e6095_stats_get_stats,
4177+
.stats_get_stat = mv88e6095_stats_get_stat,
41564178
.set_cpu_port = mv88e6095_g1_set_cpu_port,
41574179
.set_egress_port = mv88e6095_g1_set_egress_port,
41584180
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4201,7 +4223,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
42014223
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
42024224
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
42034225
.stats_get_strings = mv88e6320_stats_get_strings,
4204-
.stats_get_stats = mv88e6390_stats_get_stats,
4226+
.stats_get_stat = mv88e6390_stats_get_stat,
42054227
.set_cpu_port = mv88e6390_g1_set_cpu_port,
42064228
.set_egress_port = mv88e6390_g1_set_egress_port,
42074229
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4256,7 +4278,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
42564278
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
42574279
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
42584280
.stats_get_strings = mv88e6095_stats_get_strings,
4259-
.stats_get_stats = mv88e6095_stats_get_stats,
4281+
.stats_get_stat = mv88e6095_stats_get_stat,
42604282
.set_cpu_port = mv88e6095_g1_set_cpu_port,
42614283
.set_egress_port = mv88e6095_g1_set_egress_port,
42624284
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4294,7 +4316,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {
42944316
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
42954317
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
42964318
.stats_get_strings = mv88e6095_stats_get_strings,
4297-
.stats_get_stats = mv88e6095_stats_get_stats,
4319+
.stats_get_stat = mv88e6095_stats_get_stat,
42984320
.set_cpu_port = mv88e6095_g1_set_cpu_port,
42994321
.set_egress_port = mv88e6095_g1_set_egress_port,
43004322
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4342,7 +4364,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {
43424364
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
43434365
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
43444366
.stats_get_strings = mv88e6095_stats_get_strings,
4345-
.stats_get_stats = mv88e6095_stats_get_stats,
4367+
.stats_get_stat = mv88e6095_stats_get_stat,
43464368
.set_cpu_port = mv88e6095_g1_set_cpu_port,
43474369
.set_egress_port = mv88e6095_g1_set_egress_port,
43484370
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4391,7 +4413,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {
43914413
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
43924414
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
43934415
.stats_get_strings = mv88e6095_stats_get_strings,
4394-
.stats_get_stats = mv88e6095_stats_get_stats,
4416+
.stats_get_stat = mv88e6095_stats_get_stat,
43954417
.set_cpu_port = mv88e6095_g1_set_cpu_port,
43964418
.set_egress_port = mv88e6095_g1_set_egress_port,
43974419
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4442,7 +4464,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {
44424464
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
44434465
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
44444466
.stats_get_strings = mv88e6095_stats_get_strings,
4445-
.stats_get_stats = mv88e6095_stats_get_stats,
4467+
.stats_get_stat = mv88e6095_stats_get_stat,
44464468
.set_cpu_port = mv88e6095_g1_set_cpu_port,
44474469
.set_egress_port = mv88e6095_g1_set_egress_port,
44484470
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4491,7 +4513,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
44914513
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
44924514
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
44934515
.stats_get_strings = mv88e6095_stats_get_strings,
4494-
.stats_get_stats = mv88e6095_stats_get_stats,
4516+
.stats_get_stat = mv88e6095_stats_get_stat,
44954517
.set_cpu_port = mv88e6095_g1_set_cpu_port,
44964518
.set_egress_port = mv88e6095_g1_set_egress_port,
44974519
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4536,7 +4558,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {
45364558
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
45374559
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
45384560
.stats_get_strings = mv88e6095_stats_get_strings,
4539-
.stats_get_stats = mv88e6095_stats_get_stats,
4561+
.stats_get_stat = mv88e6095_stats_get_stat,
45404562
.set_cpu_port = mv88e6095_g1_set_cpu_port,
45414563
.set_egress_port = mv88e6095_g1_set_egress_port,
45424564
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4585,7 +4607,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
45854607
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
45864608
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
45874609
.stats_get_strings = mv88e6320_stats_get_strings,
4588-
.stats_get_stats = mv88e6390_stats_get_stats,
4610+
.stats_get_stat = mv88e6390_stats_get_stat,
45894611
.set_cpu_port = mv88e6390_g1_set_cpu_port,
45904612
.set_egress_port = mv88e6390_g1_set_egress_port,
45914613
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4643,7 +4665,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
46434665
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
46444666
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
46454667
.stats_get_strings = mv88e6320_stats_get_strings,
4646-
.stats_get_stats = mv88e6390_stats_get_stats,
4668+
.stats_get_stat = mv88e6390_stats_get_stat,
46474669
.set_cpu_port = mv88e6390_g1_set_cpu_port,
46484670
.set_egress_port = mv88e6390_g1_set_egress_port,
46494671
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4699,7 +4721,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
46994721
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
47004722
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
47014723
.stats_get_strings = mv88e6320_stats_get_strings,
4702-
.stats_get_stats = mv88e6390_stats_get_stats,
4724+
.stats_get_stat = mv88e6390_stats_get_stat,
47034725
.set_cpu_port = mv88e6390_g1_set_cpu_port,
47044726
.set_egress_port = mv88e6390_g1_set_egress_port,
47054727
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4758,7 +4780,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
47584780
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
47594781
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
47604782
.stats_get_strings = mv88e6095_stats_get_strings,
4761-
.stats_get_stats = mv88e6095_stats_get_stats,
4783+
.stats_get_stat = mv88e6095_stats_get_stat,
47624784
.set_cpu_port = mv88e6095_g1_set_cpu_port,
47634785
.set_egress_port = mv88e6095_g1_set_egress_port,
47644786
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -4811,7 +4833,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = {
48114833
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
48124834
.stats_get_sset_count = mv88e6250_stats_get_sset_count,
48134835
.stats_get_strings = mv88e6250_stats_get_strings,
4814-
.stats_get_stats = mv88e6250_stats_get_stats,
4836+
.stats_get_stat = mv88e6250_stats_get_stat,
48154837
.set_cpu_port = mv88e6095_g1_set_cpu_port,
48164838
.set_egress_port = mv88e6095_g1_set_egress_port,
48174839
.watchdog_ops = &mv88e6250_watchdog_ops,
@@ -4858,7 +4880,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
48584880
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
48594881
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
48604882
.stats_get_strings = mv88e6320_stats_get_strings,
4861-
.stats_get_stats = mv88e6390_stats_get_stats,
4883+
.stats_get_stat = mv88e6390_stats_get_stat,
48624884
.set_cpu_port = mv88e6390_g1_set_cpu_port,
48634885
.set_egress_port = mv88e6390_g1_set_egress_port,
48644886
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4917,7 +4939,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
49174939
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
49184940
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
49194941
.stats_get_strings = mv88e6320_stats_get_strings,
4920-
.stats_get_stats = mv88e6320_stats_get_stats,
4942+
.stats_get_stat = mv88e6320_stats_get_stat,
49214943
.set_cpu_port = mv88e6095_g1_set_cpu_port,
49224944
.set_egress_port = mv88e6095_g1_set_egress_port,
49234945
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -4964,7 +4986,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
49644986
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
49654987
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
49664988
.stats_get_strings = mv88e6320_stats_get_strings,
4967-
.stats_get_stats = mv88e6320_stats_get_stats,
4989+
.stats_get_stat = mv88e6320_stats_get_stat,
49684990
.set_cpu_port = mv88e6095_g1_set_cpu_port,
49694991
.set_egress_port = mv88e6095_g1_set_egress_port,
49704992
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -5013,7 +5035,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
50135035
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
50145036
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
50155037
.stats_get_strings = mv88e6320_stats_get_strings,
5016-
.stats_get_stats = mv88e6390_stats_get_stats,
5038+
.stats_get_stat = mv88e6390_stats_get_stat,
50175039
.set_cpu_port = mv88e6390_g1_set_cpu_port,
50185040
.set_egress_port = mv88e6390_g1_set_egress_port,
50195041
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -5071,7 +5093,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {
50715093
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
50725094
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
50735095
.stats_get_strings = mv88e6095_stats_get_strings,
5074-
.stats_get_stats = mv88e6095_stats_get_stats,
5096+
.stats_get_stat = mv88e6095_stats_get_stat,
50755097
.set_cpu_port = mv88e6095_g1_set_cpu_port,
50765098
.set_egress_port = mv88e6095_g1_set_egress_port,
50775099
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -5117,7 +5139,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {
51175139
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
51185140
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
51195141
.stats_get_strings = mv88e6095_stats_get_strings,
5120-
.stats_get_stats = mv88e6095_stats_get_stats,
5142+
.stats_get_stat = mv88e6095_stats_get_stat,
51215143
.set_cpu_port = mv88e6095_g1_set_cpu_port,
51225144
.set_egress_port = mv88e6095_g1_set_egress_port,
51235145
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -5168,7 +5190,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
51685190
.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
51695191
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
51705192
.stats_get_strings = mv88e6095_stats_get_strings,
5171-
.stats_get_stats = mv88e6095_stats_get_stats,
5193+
.stats_get_stat = mv88e6095_stats_get_stat,
51725194
.set_cpu_port = mv88e6095_g1_set_cpu_port,
51735195
.set_egress_port = mv88e6095_g1_set_egress_port,
51745196
.watchdog_ops = &mv88e6097_watchdog_ops,
@@ -5230,7 +5252,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
52305252
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
52315253
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
52325254
.stats_get_strings = mv88e6320_stats_get_strings,
5233-
.stats_get_stats = mv88e6390_stats_get_stats,
5255+
.stats_get_stat = mv88e6390_stats_get_stat,
52345256
.set_cpu_port = mv88e6390_g1_set_cpu_port,
52355257
.set_egress_port = mv88e6390_g1_set_egress_port,
52365258
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -5292,7 +5314,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
52925314
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
52935315
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
52945316
.stats_get_strings = mv88e6320_stats_get_strings,
5295-
.stats_get_stats = mv88e6390_stats_get_stats,
5317+
.stats_get_stat = mv88e6390_stats_get_stat,
52965318
.set_cpu_port = mv88e6390_g1_set_cpu_port,
52975319
.set_egress_port = mv88e6390_g1_set_egress_port,
52985320
.watchdog_ops = &mv88e6390_watchdog_ops,
@@ -5354,7 +5376,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = {
53545376
.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
53555377
.stats_get_sset_count = mv88e6320_stats_get_sset_count,
53565378
.stats_get_strings = mv88e6320_stats_get_strings,
5357-
.stats_get_stats = mv88e6390_stats_get_stats,
5379+
.stats_get_stat = mv88e6390_stats_get_stat,
53585380
/* .set_cpu_port is missing because this family does not support a global
53595381
* CPU port, only per port CPU port which is set via
53605382
* .port_set_upstream_port method.

0 commit comments

Comments
 (0)