Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-dsa-mv88e6xxx-remove-some-6250-specific-methods'
Rasmus Villemoes says:
====================
net: dsa: mv88e6xxx: remove some 6250-specific methods
v2:
- resend now that the bug-fix patch (87fe04367d84, "net: dsa:
mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext") is in
net and also merged to net-next.
- include various tags in patch 1.
- add second similar patch for loadpurge.
====================
Link: https://lore.kernel.org/r/20210125150449.115032-1-rasmus.villemoes@prevas.dk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+8
-69
+2
-2
drivers/net/dsa/mv88e6xxx/chip.c
+2
-2
drivers/net/dsa/mv88e6xxx/chip.c
···
4049
4049
.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,
4050
4050
.pot_clear = mv88e6xxx_g2_pot_clear,
4051
4051
.reset = mv88e6250_g1_reset,
4052
-
.vtu_getnext = mv88e6250_g1_vtu_getnext,
4053
-
.vtu_loadpurge = mv88e6250_g1_vtu_loadpurge,
4052
+
.vtu_getnext = mv88e6185_g1_vtu_getnext,
4053
+
.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
4054
4054
.avb_ops = &mv88e6352_avb_ops,
4055
4055
.ptp_ops = &mv88e6250_ptp_ops,
4056
4056
.phylink_validate = mv88e6065_phylink_validate,
-4
drivers/net/dsa/mv88e6xxx/global1.h
-4
drivers/net/dsa/mv88e6xxx/global1.h
···
336
336
struct mv88e6xxx_vtu_entry *entry);
337
337
int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
338
338
struct mv88e6xxx_vtu_entry *entry);
339
-
int mv88e6250_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
340
-
struct mv88e6xxx_vtu_entry *entry);
341
-
int mv88e6250_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
342
-
struct mv88e6xxx_vtu_entry *entry);
343
339
int mv88e6352_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
344
340
struct mv88e6xxx_vtu_entry *entry);
345
341
int mv88e6352_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
+6
-63
drivers/net/dsa/mv88e6xxx/global1_vtu.c
+6
-63
drivers/net/dsa/mv88e6xxx/global1_vtu.c
···
336
336
return mv88e6xxx_g1_vtu_vid_read(chip, entry);
337
337
}
338
338
339
-
int mv88e6250_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
340
-
struct mv88e6xxx_vtu_entry *entry)
341
-
{
342
-
u16 val;
343
-
int err;
344
-
345
-
err = mv88e6xxx_g1_vtu_getnext(chip, entry);
346
-
if (err)
347
-
return err;
348
-
349
-
if (entry->valid) {
350
-
err = mv88e6185_g1_vtu_data_read(chip, entry);
351
-
if (err)
352
-
return err;
353
-
354
-
err = mv88e6185_g1_stu_data_read(chip, entry);
355
-
if (err)
356
-
return err;
357
-
358
-
/* VTU DBNum[3:0] are located in VTU Operation 3:0
359
-
* VTU DBNum[5:4] are located in VTU Operation 9:8
360
-
*/
361
-
err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &val);
362
-
if (err)
363
-
return err;
364
-
365
-
entry->fid = val & 0x000f;
366
-
entry->fid |= (val & 0x0300) >> 4;
367
-
}
368
-
369
-
return 0;
370
-
}
371
-
372
339
int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
373
340
struct mv88e6xxx_vtu_entry *entry)
374
341
{
···
356
389
return err;
357
390
358
391
/* VTU DBNum[3:0] are located in VTU Operation 3:0
359
-
* VTU DBNum[7:4] are located in VTU Operation 11:8
392
+
* VTU DBNum[7:4] ([5:4] for 6250) are located in VTU Operation 11:8 (9:8)
360
393
*/
361
394
err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &val);
362
395
if (err)
···
364
397
365
398
entry->fid = val & 0x000f;
366
399
entry->fid |= (val & 0x0f00) >> 4;
400
+
entry->fid &= mv88e6xxx_num_databases(chip) - 1;
367
401
}
368
402
369
403
return 0;
···
434
466
return 0;
435
467
}
436
468
437
-
int mv88e6250_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
438
-
struct mv88e6xxx_vtu_entry *entry)
439
-
{
440
-
u16 op = MV88E6XXX_G1_VTU_OP_VTU_LOAD_PURGE;
441
-
int err;
442
-
443
-
err = mv88e6xxx_g1_vtu_op_wait(chip);
444
-
if (err)
445
-
return err;
446
-
447
-
err = mv88e6xxx_g1_vtu_vid_write(chip, entry);
448
-
if (err)
449
-
return err;
450
-
451
-
if (entry->valid) {
452
-
err = mv88e6185_g1_vtu_data_write(chip, entry);
453
-
if (err)
454
-
return err;
455
-
456
-
/* VTU DBNum[3:0] are located in VTU Operation 3:0
457
-
* VTU DBNum[5:4] are located in VTU Operation 9:8
458
-
*/
459
-
op |= entry->fid & 0x000f;
460
-
op |= (entry->fid & 0x0030) << 4;
461
-
}
462
-
463
-
return mv88e6xxx_g1_vtu_op(chip, op);
464
-
}
465
-
466
469
int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
467
470
struct mv88e6xxx_vtu_entry *entry)
468
471
{
···
455
516
456
517
/* VTU DBNum[3:0] are located in VTU Operation 3:0
457
518
* VTU DBNum[7:4] are located in VTU Operation 11:8
519
+
*
520
+
* For the 6250/6220, the latter are really [5:4] and
521
+
* 9:8, but in those cases bits 7:6 of entry->fid are
522
+
* 0 since they have num_databases = 64.
458
523
*/
459
524
op |= entry->fid & 0x000f;
460
525
op |= (entry->fid & 0x00f0) << 4;