Skip to content

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

net: dsa: mv88e6xxx: Add number of internal PHYs 

Add to the info structure the number of internal PHYs, if they generate
interrupts. Some of the older generations of switches have internal
PHYs, but no interrupt registers. In this case, set the count to zero.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adfccf11
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 0 deletions
drivers/net/dsa/mv88e6xxx/chip.c
View file @ bc393155
...@@ -3319,6 +3319,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3319,6 +3319,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6085", .name = "Marvell 88E6085",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 10, .num_ports = 10,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3339,6 +3340,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3339,6 +3340,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6095/88E6095F", .name = "Marvell 88E6095/88E6095F",
.num_databases = 256, .num_databases = 256,
.num_ports = 11, .num_ports = 11,
.num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3357,6 +3359,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3357,6 +3359,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6097/88E6097F", .name = "Marvell 88E6097/88E6097F",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, .num_ports = 11,
.num_internal_phys = 8,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3377,6 +3380,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3377,6 +3380,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6123", .name = "Marvell 88E6123",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 3, .num_ports = 3,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3397,6 +3401,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3397,6 +3401,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6131", .name = "Marvell 88E6131",
.num_databases = 256, .num_databases = 256,
.num_ports = 8, .num_ports = 8,
.num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3415,6 +3420,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3415,6 +3420,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6341", .name = "Marvell 88E6341",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 5,
.num_gpio = 11, .num_gpio = 11,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3436,6 +3442,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3436,6 +3442,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6161", .name = "Marvell 88E6161",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3456,6 +3463,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3456,6 +3463,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6165", .name = "Marvell 88E6165",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 6, .num_ports = 6,
.num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3476,6 +3484,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3476,6 +3484,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6171", .name = "Marvell 88E6171",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3496,6 +3505,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3496,6 +3505,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6172", .name = "Marvell 88E6172",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3517,6 +3527,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3517,6 +3527,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6175", .name = "Marvell 88E6175",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3537,6 +3548,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3537,6 +3548,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6176", .name = "Marvell 88E6176",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3558,6 +3570,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3558,6 +3570,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6185", .name = "Marvell 88E6185",
.num_databases = 256, .num_databases = 256,
.num_ports = 10, .num_ports = 10,
.num_internal_phys = 0,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3576,6 +3589,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3576,6 +3589,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6190", .name = "Marvell 88E6190",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.num_gpio = 16, .num_gpio = 16,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
...@@ -3597,6 +3611,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3597,6 +3611,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6190X", .name = "Marvell 88E6190X",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.num_gpio = 16, .num_gpio = 16,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
...@@ -3618,6 +3633,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3618,6 +3633,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6191", .name = "Marvell 88E6191",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3639,6 +3655,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3639,6 +3655,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6240", .name = "Marvell 88E6240",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3661,6 +3678,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3661,6 +3678,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6290", .name = "Marvell 88E6290",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.num_gpio = 16, .num_gpio = 16,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
...@@ -3683,6 +3701,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3683,6 +3701,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6320", .name = "Marvell 88E6320",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3690,6 +3709,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3690,6 +3709,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.global2_addr = 0x1c, .global2_addr = 0x1c,
.age_time_coeff = 15000, .age_time_coeff = 15000,
.g1_irqs = 8, .g1_irqs = 8,
.g2_irqs = 10,
.atu_move_port_mask = 0xf, .atu_move_port_mask = 0xf,
.pvt = true, .pvt = true,
.multi_chip = true, .multi_chip = true,
...@@ -3704,6 +3724,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3704,6 +3724,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6321", .name = "Marvell 88E6321",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3711,6 +3732,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3711,6 +3732,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.global2_addr = 0x1c, .global2_addr = 0x1c,
.age_time_coeff = 15000, .age_time_coeff = 15000,
.g1_irqs = 8, .g1_irqs = 8,
.g2_irqs = 10,
.atu_move_port_mask = 0xf, .atu_move_port_mask = 0xf,
.multi_chip = true, .multi_chip = true,
.tag_protocol = DSA_TAG_PROTO_EDSA, .tag_protocol = DSA_TAG_PROTO_EDSA,
...@@ -3723,6 +3745,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3723,6 +3745,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_internal_phys = 5,
.num_ports = 6, .num_ports = 6,
.num_gpio = 11, .num_gpio = 11,
.max_vid = 4095, .max_vid = 4095,
...@@ -3746,6 +3769,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3746,6 +3769,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6350", .name = "Marvell 88E6350",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3766,6 +3790,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3766,6 +3790,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6351", .name = "Marvell 88E6351",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
.global1_addr = 0x1b, .global1_addr = 0x1b,
...@@ -3786,6 +3811,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3786,6 +3811,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6352", .name = "Marvell 88E6352",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.num_internal_phys = 5,
.num_gpio = 15, .num_gpio = 15,
.max_vid = 4095, .max_vid = 4095,
.port_base_addr = 0x10, .port_base_addr = 0x10,
...@@ -3807,6 +3833,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3807,6 +3833,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6390", .name = "Marvell 88E6390",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.num_gpio = 16, .num_gpio = 16,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
...@@ -3828,6 +3855,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { ...@@ -3828,6 +3855,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.name = "Marvell 88E6390X", .name = "Marvell 88E6390X",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */ .num_ports = 11, /* 10 + Z80 */
.num_internal_phys = 11,
.num_gpio = 16, .num_gpio = 16,
.max_vid = 8191, .max_vid = 8191,
.port_base_addr = 0x0, .port_base_addr = 0x0,
......
drivers/net/dsa/mv88e6xxx/chip.h
View file @ bc393155
...@@ -110,6 +110,7 @@ struct mv88e6xxx_info { ...@@ -110,6 +110,7 @@ struct mv88e6xxx_info {
const char *name; const char *name;
unsigned int num_databases; unsigned int num_databases;
unsigned int num_ports; unsigned int num_ports;
unsigned int num_internal_phys;
unsigned int num_gpio; unsigned int num_gpio;
unsigned int max_vid; unsigned int max_vid;
unsigned int port_base_addr; unsigned int port_base_addr;
......
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