Skip to content

L
linux
Commit d9ea5620 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files
Options

net: dsa: mv88e6xxx: Add number of MACs in the ATU 

For each supported switch, add an entry to the info structure for the
number of MACs which can be stored in the ATU. This will later be used
to export the ATU as a devlink resource, and indicate its occupancy,
how full the ATU is.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5cd73fbd
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 0 deletions
drivers/net/dsa/mv88e6xxx/chip.c
View file @ d9ea5620
...@@ -4299,6 +4299,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4299,6 +4299,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6097, .family = MV88E6XXX_FAMILY_6097,
.name = "Marvell 88E6085", .name = "Marvell 88E6085",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 10, .num_ports = 10,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4321,6 +4322,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4321,6 +4322,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6095, .family = MV88E6XXX_FAMILY_6095,
.name = "Marvell 88E6095/88E6095F", .name = "Marvell 88E6095/88E6095F",
.num_databases = 256, .num_databases = 256,
.num_macs = 8192,
.num_ports = 11, .num_ports = 11,
.num_internal_phys = 0, .num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
...@@ -4341,6 +4343,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4341,6 +4343,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6097, .family = MV88E6XXX_FAMILY_6097,
.name = "Marvell 88E6097/88E6097F", .name = "Marvell 88E6097/88E6097F",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 11, .num_ports = 11,
.num_internal_phys = 8, .num_internal_phys = 8,
.max_vid = 4095, .max_vid = 4095,
...@@ -4363,6 +4366,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4363,6 +4366,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6165, .family = MV88E6XXX_FAMILY_6165,
.name = "Marvell 88E6123", .name = "Marvell 88E6123",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 1024,
.num_ports = 3, .num_ports = 3,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4385,6 +4389,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4385,6 +4389,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6185, .family = MV88E6XXX_FAMILY_6185,
.name = "Marvell 88E6131", .name = "Marvell 88E6131",
.num_databases = 256, .num_databases = 256,
.num_macs = 8192,
.num_ports = 8, .num_ports = 8,
.num_internal_phys = 0, .num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
...@@ -4405,6 +4410,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4405,6 +4410,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6341, .family = MV88E6XXX_FAMILY_6341,
.name = "Marvell 88E6141", .name = "Marvell 88E6141",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 2048,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 11, .num_gpio = 11,
...@@ -4428,6 +4434,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4428,6 +4434,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6165, .family = MV88E6XXX_FAMILY_6165,
.name = "Marvell 88E6161", .name = "Marvell 88E6161",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 1024,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4451,6 +4458,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4451,6 +4458,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6165, .family = MV88E6XXX_FAMILY_6165,
.name = "Marvell 88E6165", .name = "Marvell 88E6165",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 0, .num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
...@@ -4474,6 +4482,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4474,6 +4482,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6171", .name = "Marvell 88E6171",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4496,6 +4505,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4496,6 +4505,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6172", .name = "Marvell 88E6172",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4519,6 +4529,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4519,6 +4529,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6175", .name = "Marvell 88E6175",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4541,6 +4552,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4541,6 +4552,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6176", .name = "Marvell 88E6176",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4564,6 +4576,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4564,6 +4576,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6185, .family = MV88E6XXX_FAMILY_6185,
.name = "Marvell 88E6185", .name = "Marvell 88E6185",
.num_databases = 256, .num_databases = 256,
.num_macs = 8192,
.num_ports = 10, .num_ports = 10,
.num_internal_phys = 0, .num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
...@@ -4584,6 +4597,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4584,6 +4597,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6390, .family = MV88E6XXX_FAMILY_6390,
.name = "Marvell 88E6190", .name = "Marvell 88E6190",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 16384,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 9, .num_internal_phys = 9,
.num_gpio = 16, .num_gpio = 16,
...@@ -4607,6 +4621,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4607,6 +4621,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6390, .family = MV88E6XXX_FAMILY_6390,
.name = "Marvell 88E6190X", .name = "Marvell 88E6190X",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 16384,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 9, .num_internal_phys = 9,
.num_gpio = 16, .num_gpio = 16,
...@@ -4630,6 +4645,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4630,6 +4645,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6390, .family = MV88E6XXX_FAMILY_6390,
.name = "Marvell 88E6191", .name = "Marvell 88E6191",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 16384,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 9, .num_internal_phys = 9,
.max_vid = 8191, .max_vid = 8191,
...@@ -4680,6 +4696,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4680,6 +4696,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6240", .name = "Marvell 88E6240",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4750,6 +4767,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4750,6 +4767,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6320, .family = MV88E6XXX_FAMILY_6320,
.name = "Marvell 88E6320", .name = "Marvell 88E6320",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4774,6 +4792,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4774,6 +4792,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6320, .family = MV88E6XXX_FAMILY_6320,
.name = "Marvell 88E6321", .name = "Marvell 88E6321",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4797,6 +4816,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4797,6 +4816,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6341, .family = MV88E6XXX_FAMILY_6341,
.name = "Marvell 88E6341", .name = "Marvell 88E6341",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 2048,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_ports = 6, .num_ports = 6,
.num_gpio = 11, .num_gpio = 11,
...@@ -4821,6 +4841,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4821,6 +4841,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6350", .name = "Marvell 88E6350",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4843,6 +4864,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4843,6 +4864,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6351", .name = "Marvell 88E6351",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
...@@ -4865,6 +4887,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4865,6 +4887,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6352", .name = "Marvell 88E6352",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 8192,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5, .num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
...@@ -4888,6 +4911,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4888,6 +4911,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6390, .family = MV88E6XXX_FAMILY_6390,
.name = "Marvell 88E6390", .name = "Marvell 88E6390",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 16384,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 9, .num_internal_phys = 9,
.num_gpio = 16, .num_gpio = 16,
...@@ -4911,6 +4935,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -4911,6 +4935,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.family = MV88E6XXX_FAMILY_6390, .family = MV88E6XXX_FAMILY_6390,
.name = "Marvell 88E6390X", .name = "Marvell 88E6390X",
.num_databases = 4096, .num_databases = 4096,
.num_macs = 16384,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 9, .num_internal_phys = 9,
.num_gpio = 16, .num_gpio = 16,
......
drivers/net/dsa/mv88e6xxx/chip.h
View file @ d9ea5620
...@@ -94,6 +94,7 @@ struct mv88e6xxx_info { ...@@ -94,6 +94,7 @@ struct mv88e6xxx_info {
u16 prod_num; u16 prod_num;
const char *name; const char *name;
unsigned int num_databases; unsigned int num_databases;
unsigned int num_macs;
unsigned int num_ports; unsigned int num_ports;
unsigned int num_internal_phys; unsigned int num_internal_phys;
unsigned int num_gpio; unsigned int num_gpio;
...@@ -613,6 +614,11 @@ static inline unsigned int mv88e6xxx_num_databases(struct mv88e6xxx_chip *chip) ...@@ -613,6 +614,11 @@ static inline unsigned int mv88e6xxx_num_databases(struct mv88e6xxx_chip *chip)
return chip->info->num_databases; return chip->info->num_databases;
} }
static inline unsigned int mv88e6xxx_num_macs(struct mv88e6xxx_chip *chip)
{
return chip->info->num_macs;
}
static inline unsigned int mv88e6xxx_num_ports(struct mv88e6xxx_chip *chip) static inline unsigned int mv88e6xxx_num_ports(struct mv88e6xxx_chip *chip)
{ {
return chip->info->num_ports; return chip->info->num_ports;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7