Commit b5058d7a authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller

net: dsa: mv88e6xxx: add flags to info

Add a flags bitmap to the info structure in order to identify features
supported or not by the different switch models.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 908578e7
...@@ -24,18 +24,21 @@ static const struct mv88e6xxx_info mv88e6123_table[] = { ...@@ -24,18 +24,21 @@ static const struct mv88e6xxx_info mv88e6123_table[] = {
.name = "Marvell 88E6123", .name = "Marvell 88E6123",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 3, .num_ports = 3,
.flags = MV88E6XXX_FLAGS_FAMILY_6165,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6161, .prod_num = PORT_SWITCH_ID_PROD_NUM_6161,
.family = MV88E6XXX_FAMILY_6165, .family = MV88E6XXX_FAMILY_6165,
.name = "Marvell 88E6161", .name = "Marvell 88E6161",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 6, .num_ports = 6,
.flags = MV88E6XXX_FLAGS_FAMILY_6165,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6165, .prod_num = PORT_SWITCH_ID_PROD_NUM_6165,
.family = MV88E6XXX_FAMILY_6165, .family = MV88E6XXX_FAMILY_6165,
.name = "Marvell 88E6165", .name = "Marvell 88E6165",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 6, .num_ports = 6,
.flags = MV88E6XXX_FLAGS_FAMILY_6165,
} }
}; };
......
...@@ -24,24 +24,28 @@ static const struct mv88e6xxx_info mv88e6131_table[] = { ...@@ -24,24 +24,28 @@ static const struct mv88e6xxx_info mv88e6131_table[] = {
.name = "Marvell 88E6095/88E6095F", .name = "Marvell 88E6095/88E6095F",
.num_databases = 256, .num_databases = 256,
.num_ports = 11, .num_ports = 11,
.flags = MV88E6XXX_FLAGS_FAMILY_6095,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6085, .prod_num = PORT_SWITCH_ID_PROD_NUM_6085,
.family = MV88E6XXX_FAMILY_6097, .family = MV88E6XXX_FAMILY_6097,
.name = "Marvell 88E6085", .name = "Marvell 88E6085",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 10, .num_ports = 10,
.flags = MV88E6XXX_FLAGS_FAMILY_6097,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6131, .prod_num = PORT_SWITCH_ID_PROD_NUM_6131,
.family = MV88E6XXX_FAMILY_6185, .family = MV88E6XXX_FAMILY_6185,
.name = "Marvell 88E6131", .name = "Marvell 88E6131",
.num_databases = 256, .num_databases = 256,
.num_ports = 8, .num_ports = 8,
.flags = MV88E6XXX_FLAGS_FAMILY_6185,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6185, .prod_num = PORT_SWITCH_ID_PROD_NUM_6185,
.family = MV88E6XXX_FAMILY_6185, .family = MV88E6XXX_FAMILY_6185,
.name = "Marvell 88E6185", .name = "Marvell 88E6185",
.num_databases = 256, .num_databases = 256,
.num_ports = 10, .num_ports = 10,
.flags = MV88E6XXX_FLAGS_FAMILY_6185,
} }
}; };
......
...@@ -24,24 +24,28 @@ static const struct mv88e6xxx_info mv88e6171_table[] = { ...@@ -24,24 +24,28 @@ static const struct mv88e6xxx_info mv88e6171_table[] = {
.name = "Marvell 88E6171", .name = "Marvell 88E6171",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6351,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6175, .prod_num = PORT_SWITCH_ID_PROD_NUM_6175,
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6175", .name = "Marvell 88E6175",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6351,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6350, .prod_num = PORT_SWITCH_ID_PROD_NUM_6350,
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6350", .name = "Marvell 88E6350",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6351,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6351, .prod_num = PORT_SWITCH_ID_PROD_NUM_6351,
.family = MV88E6XXX_FAMILY_6351, .family = MV88E6XXX_FAMILY_6351,
.name = "Marvell 88E6351", .name = "Marvell 88E6351",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6351,
} }
}; };
......
...@@ -29,36 +29,42 @@ static const struct mv88e6xxx_info mv88e6352_table[] = { ...@@ -29,36 +29,42 @@ static const struct mv88e6xxx_info mv88e6352_table[] = {
.name = "Marvell 88E6320", .name = "Marvell 88E6320",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6320,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6321, .prod_num = PORT_SWITCH_ID_PROD_NUM_6321,
.family = MV88E6XXX_FAMILY_6320, .family = MV88E6XXX_FAMILY_6320,
.name = "Marvell 88E6321", .name = "Marvell 88E6321",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6320,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6172, .prod_num = PORT_SWITCH_ID_PROD_NUM_6172,
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6172", .name = "Marvell 88E6172",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6352,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6176, .prod_num = PORT_SWITCH_ID_PROD_NUM_6176,
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6176", .name = "Marvell 88E6176",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6352,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6240, .prod_num = PORT_SWITCH_ID_PROD_NUM_6240,
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6240", .name = "Marvell 88E6240",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6352,
}, { }, {
.prod_num = PORT_SWITCH_ID_PROD_NUM_6352, .prod_num = PORT_SWITCH_ID_PROD_NUM_6352,
.family = MV88E6XXX_FAMILY_6352, .family = MV88E6XXX_FAMILY_6352,
.name = "Marvell 88E6352", .name = "Marvell 88E6352",
.num_databases = 4096, .num_databases = 4096,
.num_ports = 7, .num_ports = 7,
.flags = MV88E6XXX_FLAGS_FAMILY_6352,
} }
}; };
......
...@@ -350,12 +350,27 @@ enum mv88e6xxx_family { ...@@ -350,12 +350,27 @@ enum mv88e6xxx_family {
MV88E6XXX_FAMILY_6352, /* 6172 6176 6240 6352 */ MV88E6XXX_FAMILY_6352, /* 6172 6176 6240 6352 */
}; };
#define MV88E6XXX_FLAGS_FAMILY_6095 0
#define MV88E6XXX_FLAGS_FAMILY_6097 0
#define MV88E6XXX_FLAGS_FAMILY_6165 0
#define MV88E6XXX_FLAGS_FAMILY_6185 0
#define MV88E6XXX_FLAGS_FAMILY_6320 0
#define MV88E6XXX_FLAGS_FAMILY_6351 0
#define MV88E6XXX_FLAGS_FAMILY_6352 0
struct mv88e6xxx_info { struct mv88e6xxx_info {
enum mv88e6xxx_family family; enum mv88e6xxx_family family;
u16 prod_num; u16 prod_num;
const char *name; const char *name;
unsigned int num_databases; unsigned int num_databases;
unsigned int num_ports; unsigned int num_ports;
unsigned long flags;
}; };
struct mv88e6xxx_atu_entry { struct mv88e6xxx_atu_entry {
...@@ -449,6 +464,12 @@ struct mv88e6xxx_hw_stat { ...@@ -449,6 +464,12 @@ struct mv88e6xxx_hw_stat {
enum stat_type type; enum stat_type type;
}; };
static inline bool mv88e6xxx_has(struct mv88e6xxx_priv_state *ps,
unsigned long flags)
{
return (ps->info->flags & flags) == flags;
}
int mv88e6xxx_switch_reset(struct mv88e6xxx_priv_state *ps, bool ppu_active); int mv88e6xxx_switch_reset(struct mv88e6xxx_priv_state *ps, bool ppu_active);
const char *mv88e6xxx_drv_probe(struct device *dsa_dev, struct device *host_dev, const char *mv88e6xxx_drv_probe(struct device *dsa_dev, struct device *host_dev,
int sw_addr, void **priv, int sw_addr, void **priv,
......
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