Commit cd5a2c82 authored Apr 17, 2016 by Vivien Didelot Committed by David S. Miller Apr 17, 2016

net: dsa: mv88e6xxx: add number of db to info



Add the number of databases to the info structure.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 009a2b98

drivers/net/dsa/mv88e6123.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,16 +22,19 @@ static const struct mv88e6xxx_info mv88e6123_table[] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6123,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6123",
		.num_databases = 4096,
		.num_ports = 3,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6161,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6161",
		.num_databases = 4096,
		.num_ports = 6,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6165,
		.family = MV88E6XXX_FAMILY_6165,
		.name = "Marvell 88E6165",
		.num_databases = 4096,
		.num_ports = 6,
		}
		};

drivers/net/dsa/mv88e6131.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,21 +22,25 @@ static const struct mv88e6xxx_info mv88e6131_table[] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6095,
		.family = MV88E6XXX_FAMILY_6095,
		.name = "Marvell 88E6095/88E6095F",
		.num_databases = 256,
		.num_ports = 11,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6085,
		.family = MV88E6XXX_FAMILY_6097,
		.name = "Marvell 88E6085",
		.num_databases = 4096,
		.num_ports = 10,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6131,
		.family = MV88E6XXX_FAMILY_6185,
		.name = "Marvell 88E6131",
		.num_databases = 256,
		.num_ports = 8,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6185,
		.family = MV88E6XXX_FAMILY_6185,
		.name = "Marvell 88E6185",
		.num_databases = 256,
		.num_ports = 10,
		}
		};

drivers/net/dsa/mv88e6171.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,21 +22,25 @@ static const struct mv88e6xxx_info mv88e6171_table[] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6171,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6171",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6175,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6175",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6350,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6350",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6351,
		.family = MV88E6XXX_FAMILY_6351,
		.name = "Marvell 88E6351",
		.num_databases = 4096,
		.num_ports = 7,
		}
		};

drivers/net/dsa/mv88e6352.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -27,31 +27,37 @@ static const struct mv88e6xxx_info mv88e6352_table[] = {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6320,
		.family = MV88E6XXX_FAMILY_6320,
		.name = "Marvell 88E6320",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6321,
		.family = MV88E6XXX_FAMILY_6320,
		.name = "Marvell 88E6321",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6172,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6172",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6176,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6176",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6240,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6240",
		.num_databases = 4096,
		.num_ports = 7,
		}, {
		.prod_num = PORT_SWITCH_ID_PROD_NUM_6352,
		.family = MV88E6XXX_FAMILY_6352,
		.name = "Marvell 88E6352",
		.num_databases = 4096,
		.num_ports = 7,
		}
		};

drivers/net/dsa/mv88e6xxx.c

+1 −18

Original line number	Diff line number	Diff line
		@@ -458,24 +458,7 @@ static unsigned int mv88e6xxx_num_databases(struct dsa_switch *ds)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		/* The following devices have 4-bit identifiers for 16 databases */
		if (ps->id == PORT_SWITCH_ID_6061)
		return 16;

		/* The following devices have 6-bit identifiers for 64 databases */
		if (ps->id == PORT_SWITCH_ID_6065)
		return 64;

		/* The following devices have 8-bit identifiers for 256 databases */
		if (mv88e6xxx_6095_family(ds) \|\| mv88e6xxx_6185_family(ds))
		return 256;

		/* The following devices have 12-bit identifiers for 4096 databases */
		if (mv88e6xxx_6097_family(ds) \|\| mv88e6xxx_6165_family(ds) \|\|
		mv88e6xxx_6351_family(ds) \|\| mv88e6xxx_6352_family(ds))
		return 4096;

		return 0;
		return ps->info->num_databases;
		}

		static bool mv88e6xxx_has_fid_reg(struct dsa_switch *ds)