Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d13a06e authored May 09, 2016 by Vivien Didelot Committed by David S. Miller May 09, 2016

net: dsa: mv88e6xxx: factorize MAC address setting

Some switch models have a dedicated register for Switch MAC/WoF/WoL.
This register, when present, is used to indirectly set the switch MAC
address, instead of a direct write to 3 global registers.

Identify this feature and share a common mv88e6xxx_set_addr function.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6594f615

drivers/net/dsa/mv88e6123.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ struct dsa_switch_driver mv88e6123_switch_driver = {
		.tag_protocol = DSA_TAG_PROTO_EDSA,
		.probe = mv88e6123_drv_probe,
		.setup = mv88e6123_setup,
		.set_addr = mv88e6xxx_set_addr_indirect,
		.set_addr = mv88e6xxx_set_addr,
		.phy_read = mv88e6xxx_phy_read,
		.phy_write = mv88e6xxx_phy_write,
		.get_strings = mv88e6xxx_get_strings,

drivers/net/dsa/mv88e6131.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ struct dsa_switch_driver mv88e6131_switch_driver = {
		.tag_protocol = DSA_TAG_PROTO_DSA,
		.probe = mv88e6131_drv_probe,
		.setup = mv88e6131_setup,
		.set_addr = mv88e6xxx_set_addr_direct,
		.set_addr = mv88e6xxx_set_addr,
		.phy_read = mv88e6xxx_phy_read,
		.phy_write = mv88e6xxx_phy_write,
		.get_strings = mv88e6xxx_get_strings,

drivers/net/dsa/mv88e6171.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ struct dsa_switch_driver mv88e6171_switch_driver = {
		.tag_protocol = DSA_TAG_PROTO_EDSA,
		.probe = mv88e6171_drv_probe,
		.setup = mv88e6171_setup,
		.set_addr = mv88e6xxx_set_addr_indirect,
		.set_addr = mv88e6xxx_set_addr,
		.phy_read = mv88e6xxx_phy_read,
		.phy_write = mv88e6xxx_phy_write,
		.get_strings = mv88e6xxx_get_strings,

drivers/net/dsa/mv88e6352.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
		.tag_protocol = DSA_TAG_PROTO_EDSA,
		.probe = mv88e6352_drv_probe,
		.setup = mv88e6352_setup,
		.set_addr = mv88e6xxx_set_addr_indirect,
		.set_addr = mv88e6xxx_set_addr,
		.phy_read = mv88e6xxx_phy_read,
		.phy_write = mv88e6xxx_phy_write,
		.get_strings = mv88e6xxx_get_strings,

drivers/net/dsa/mv88e6xxx.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ int mv88e6xxx_reg_write(struct mv88e6xxx_priv_state *ps, int addr,
		return ret;
		}

		int mv88e6xxx_set_addr_direct(struct dsa_switch ds, u8 addr)
		static int mv88e6xxx_set_addr_direct(struct dsa_switch ds, u8 addr)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
		int err;
		@@ -192,7 +192,7 @@ int mv88e6xxx_set_addr_direct(struct dsa_switch ds, u8 addr)
		(addr[4] << 8) \| addr[5]);
		}

		int mv88e6xxx_set_addr_indirect(struct dsa_switch ds, u8 addr)
		static int mv88e6xxx_set_addr_indirect(struct dsa_switch ds, u8 addr)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
		int ret;
		@@ -225,6 +225,16 @@ int mv88e6xxx_set_addr_indirect(struct dsa_switch ds, u8 addr)
		return 0;
		}

		int mv88e6xxx_set_addr(struct dsa_switch ds, u8 addr)
		{
		struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

		if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_SWITCH_MAC))
		return mv88e6xxx_set_addr_indirect(ds, addr);
		else
		return mv88e6xxx_set_addr_direct(ds, addr);
		}

		static int _mv88e6xxx_phy_read(struct mv88e6xxx_priv_state *ps, int addr,
		int regnum)
		{