Commit 9fc469b2 authored by Luiz Angelo Daros de Luca's avatar Luiz Angelo Daros de Luca Committed by David S. Miller
Browse files

net: dsa: realtek: embed dsa_switch into realtek_priv 



Embed dsa_switch within realtek_priv to eliminate the need for a second
memory allocation.

Suggested-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: default avatarLuiz Angelo Daros de Luca <luizluca@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bba140a5

drivers/net/dsa/realtek/realtek.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct realtek_priv { 
	const struct realtek_variant *variant;



	spinlock_t		lock; /* Locks around command writes */

	struct dsa_switch	*ds;

	struct dsa_switch	ds;

	struct irq_domain	*irqdomain;

	bool			leds_disabled;

drivers/net/dsa/realtek/rtl8365mb.c

+9 −6
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ static int rtl8365mb_ext_config_rgmii(struct realtek_priv *priv, int port, 
{

	const struct rtl8365mb_extint *extint =

		rtl8365mb_get_port_extint(priv, port);

	struct dsa_switch *ds = &priv->ds;

	struct device_node *dn;

	struct dsa_port *dp;

	int tx_delay = 0;
@@ -880,7 +881,7 @@ static int rtl8365mb_ext_config_rgmii(struct realtek_priv *priv, int port, 
	if (!extint)

		return -ENODEV;



	dp = dsa_to_port(priv->ds, port);

	dp = dsa_to_port(ds, port);

	dn = dp->dn;



	/* Set the RGMII TX/RX delay
@@ -1533,6 +1534,7 @@ static void rtl8365mb_get_stats64(struct dsa_switch *ds, int port, 
static void rtl8365mb_stats_setup(struct realtek_priv *priv)

{

	struct rtl8365mb *mb = priv->chip_data;

	struct dsa_switch *ds = &priv->ds;

	int i;



	/* Per-chip global mutex to protect MIB counter access, since doing
@@ -1543,7 +1545,7 @@ static void rtl8365mb_stats_setup(struct realtek_priv *priv) 
	for (i = 0; i < priv->num_ports; i++) {

		struct rtl8365mb_port *p = &mb->ports[i];



		if (dsa_is_unused_port(priv->ds, i))

		if (dsa_is_unused_port(ds, i))

			continue;



		/* Per-port spinlock to protect the stats64 data */
@@ -1559,12 +1561,13 @@ static void rtl8365mb_stats_setup(struct realtek_priv *priv) 
static void rtl8365mb_stats_teardown(struct realtek_priv *priv)

{

	struct rtl8365mb *mb = priv->chip_data;

	struct dsa_switch *ds = &priv->ds;

	int i;



	for (i = 0; i < priv->num_ports; i++) {

		struct rtl8365mb_port *p = &mb->ports[i];



		if (dsa_is_unused_port(priv->ds, i))

		if (dsa_is_unused_port(ds, i))

			continue;



		cancel_delayed_work_sync(&p->mib_work);
@@ -1963,7 +1966,7 @@ static int rtl8365mb_setup(struct dsa_switch *ds) 
		dev_info(priv->dev, "no interrupt support\n");



	/* Configure CPU tagging */

	dsa_switch_for_each_cpu_port(cpu_dp, priv->ds) {

	dsa_switch_for_each_cpu_port(cpu_dp, ds) {

		cpu->mask |= BIT(cpu_dp->index);



		if (cpu->trap_port == RTL8365MB_MAX_NUM_PORTS)
@@ -1978,7 +1981,7 @@ static int rtl8365mb_setup(struct dsa_switch *ds) 
	for (i = 0; i < priv->num_ports; i++) {

		struct rtl8365mb_port *p = &mb->ports[i];



		if (dsa_is_unused_port(priv->ds, i))

		if (dsa_is_unused_port(ds, i))

			continue;



		/* Forward only to the CPU */
@@ -1995,7 +1998,7 @@ static int rtl8365mb_setup(struct dsa_switch *ds) 
		 * ports will still forward frames to the CPU despite being

		 * administratively down by default.

		 */

		rtl8365mb_port_stp_state_set(priv->ds, i, BR_STATE_DISABLED);

		rtl8365mb_port_stp_state_set(ds, i, BR_STATE_DISABLED);



		/* Set up per-port private data */

		p->priv = priv;

drivers/net/dsa/realtek/rtl8366rb.c

+2 −1
Original line number Diff line number Diff line
@@ -1651,6 +1651,7 @@ static int rtl8366rb_get_mc_index(struct realtek_priv *priv, int port, int *val) 


static int rtl8366rb_set_mc_index(struct realtek_priv *priv, int port, int index)

{

	struct dsa_switch *ds = &priv->ds;

	struct rtl8366rb *rb;

	bool pvid_enabled;

	int ret;
@@ -1675,7 +1676,7 @@ static int rtl8366rb_set_mc_index(struct realtek_priv *priv, int port, int index 
	 * not drop any untagged or C-tagged frames. Make sure to update the

	 * filtering setting.

	 */

	if (dsa_port_is_vlan_filtering(dsa_to_port(priv->ds, port)))

	if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))

		ret = rtl8366rb_drop_untagged(priv, port, !pvid_enabled);



	return ret;

drivers/net/dsa/realtek/rtl83xx.c

+7 −8
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ EXPORT_SYMBOL_NS_GPL(rtl83xx_probe, REALTEK_DSA); 
 */

int rtl83xx_register_switch(struct realtek_priv *priv)

{

	struct dsa_switch *ds;

	struct dsa_switch *ds = &priv->ds;

	int ret;



	ret = priv->ops->detect(priv);
@@ -226,15 +226,10 @@ int rtl83xx_register_switch(struct realtek_priv *priv) 
		return ret;

	}



	ds = devm_kzalloc(priv->dev, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return -ENOMEM;



	ds->priv = priv;

	ds->dev = priv->dev;

	ds->ops = priv->variant->ds_ops;

	ds->num_ports = priv->num_ports;

	priv->ds = ds;



	ret = dsa_register_switch(ds);

	if (ret) {
@@ -257,7 +252,9 @@ EXPORT_SYMBOL_NS_GPL(rtl83xx_register_switch, REALTEK_DSA); 
 */

void rtl83xx_unregister_switch(struct realtek_priv *priv)

{

	dsa_unregister_switch(priv->ds);

	struct dsa_switch *ds = &priv->ds;



	dsa_unregister_switch(ds);

}

EXPORT_SYMBOL_NS_GPL(rtl83xx_unregister_switch, REALTEK_DSA);
@@ -274,7 +271,9 @@ EXPORT_SYMBOL_NS_GPL(rtl83xx_unregister_switch, REALTEK_DSA); 
 */

void rtl83xx_shutdown(struct realtek_priv *priv)

{

	dsa_switch_shutdown(priv->ds);

	struct dsa_switch *ds = &priv->ds;



	dsa_switch_shutdown(ds);



	dev_set_drvdata(priv->dev, NULL);

}