korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-01 19:34:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: dsa: realtek: rename realtek_smi to realtek_priv

Browse Source 
In preparation to adding other interfaces, the private data structure
was renamed to priv. Also, realtek_smi_variant and realtek_smi_ops
were renamed to realtek_variant and realtek_ops as those structs are
not SMI specific.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Luiz Angelo Daros de Luca 2022-01-28 03:04:59 -03:00 committed by David S. Miller
parent 319a70a5fe
commit f5f119077b
5 changed files with 671 additions and 671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
drivers/net/dsa/realtek/realtek-smi-core.c
View File

@ -40,105 +40,105 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include "realtek-smi-core.h" #include "realtek.h"
#define REALTEK_SMI_ACK_RETRY_COUNT 5 #define REALTEK_SMI_ACK_RETRY_COUNT 5
#define REALTEK_SMI_HW_STOP_DELAY 25 /* msecs */ #define REALTEK_SMI_HW_STOP_DELAY 25 /* msecs */
#define REALTEK_SMI_HW_START_DELAY 100 /* msecs */ #define REALTEK_SMI_HW_START_DELAY 100 /* msecs */
static inline void realtek_smi_clk_delay(struct realtek_smi *smi) static inline void realtek_smi_clk_delay(struct realtek_priv *priv)
{ {
ndelay(smi->clk_delay); ndelay(priv->clk_delay);
} }
static void realtek_smi_start(struct realtek_smi *smi) static void realtek_smi_start(struct realtek_priv *priv)
{ {
/* Set GPIO pins to output mode, with initial state: /* Set GPIO pins to output mode, with initial state:
* SCK = 0, SDA = 1 * SCK = 0, SDA = 1
*/ */
gpiod_direction_output(smi->mdc, 0); gpiod_direction_output(priv->mdc, 0);
gpiod_direction_output(smi->mdio, 1); gpiod_direction_output(priv->mdio, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
/* CLK 1: 0 -> 1, 1 -> 0 */ /* CLK 1: 0 -> 1, 1 -> 0 */
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
/* CLK 2: */ /* CLK 2: */
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdio, 0); gpiod_set_value(priv->mdio, 0);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdio, 1); gpiod_set_value(priv->mdio, 1);
} }
static void realtek_smi_stop(struct realtek_smi *smi) static void realtek_smi_stop(struct realtek_priv *priv)
{ {
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdio, 0); gpiod_set_value(priv->mdio, 0);
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdio, 1); gpiod_set_value(priv->mdio, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
/* Add a click */ /* Add a click */
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
/* Set GPIO pins to input mode */ /* Set GPIO pins to input mode */
gpiod_direction_input(smi->mdio); gpiod_direction_input(priv->mdio);
gpiod_direction_input(smi->mdc); gpiod_direction_input(priv->mdc);
} }
static void realtek_smi_write_bits(struct realtek_smi *smi, u32 data, u32 len) static void realtek_smi_write_bits(struct realtek_priv *priv, u32 data, u32 len)
{ {
for (; len > 0; len--) { for (; len > 0; len--) {
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
/* Prepare data */ /* Prepare data */
gpiod_set_value(smi->mdio, !!(data & (1 << (len - 1)))); gpiod_set_value(priv->mdio, !!(data & (1 << (len - 1))));
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
/* Clocking */ /* Clocking */
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
} }
} }
static void realtek_smi_read_bits(struct realtek_smi *smi, u32 len, u32 *data) static void realtek_smi_read_bits(struct realtek_priv *priv, u32 len, u32 *data)
{ {
gpiod_direction_input(smi->mdio); gpiod_direction_input(priv->mdio);
for (*data = 0; len > 0; len--) { for (*data = 0; len > 0; len--) {
u32 u; u32 u;
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
/* Clocking */ /* Clocking */
gpiod_set_value(smi->mdc, 1); gpiod_set_value(priv->mdc, 1);
realtek_smi_clk_delay(smi); realtek_smi_clk_delay(priv);
u = !!gpiod_get_value(smi->mdio); u = !!gpiod_get_value(priv->mdio);
gpiod_set_value(smi->mdc, 0); gpiod_set_value(priv->mdc, 0);
*data |= (u << (len - 1)); *data |= (u << (len - 1));
} }
gpiod_direction_output(smi->mdio, 0); gpiod_direction_output(priv->mdio, 0);
} }
static int realtek_smi_wait_for_ack(struct realtek_smi *smi) static int realtek_smi_wait_for_ack(struct realtek_priv *priv)
{ {
int retry_cnt; int retry_cnt;
@ -146,12 +146,12 @@ static int realtek_smi_wait_for_ack(struct realtek_smi *smi)
do { do {
u32 ack; u32 ack;
realtek_smi_read_bits(smi, 1, &ack); realtek_smi_read_bits(priv, 1, &ack);
if (ack == 0) if (ack == 0)
break; break;
if (++retry_cnt > REALTEK_SMI_ACK_RETRY_COUNT) { if (++retry_cnt > REALTEK_SMI_ACK_RETRY_COUNT) {
dev_err(smi->dev, "ACK timeout\n"); dev_err(priv->dev, "ACK timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
} while (1); } while (1);
@ -159,131 +159,131 @@ static int realtek_smi_wait_for_ack(struct realtek_smi *smi)
return 0; return 0;
} }
static int realtek_smi_write_byte(struct realtek_smi *smi, u8 data) static int realtek_smi_write_byte(struct realtek_priv *priv, u8 data)
{ {
realtek_smi_write_bits(smi, data, 8); realtek_smi_write_bits(priv, data, 8);
return realtek_smi_wait_for_ack(smi); return realtek_smi_wait_for_ack(priv);
} }
static int realtek_smi_write_byte_noack(struct realtek_smi *smi, u8 data) static int realtek_smi_write_byte_noack(struct realtek_priv *priv, u8 data)
{ {
realtek_smi_write_bits(smi, data, 8); realtek_smi_write_bits(priv, data, 8);
return 0; return 0;
} }
static int realtek_smi_read_byte0(struct realtek_smi *smi, u8 *data) static int realtek_smi_read_byte0(struct realtek_priv *priv, u8 *data)
{ {
u32 t; u32 t;
/* Read data */ /* Read data */
realtek_smi_read_bits(smi, 8, &t); realtek_smi_read_bits(priv, 8, &t);
*data = (t & 0xff); *data = (t & 0xff);
/* Send an ACK */ /* Send an ACK */
realtek_smi_write_bits(smi, 0x00, 1); realtek_smi_write_bits(priv, 0x00, 1);
return 0; return 0;
} }
static int realtek_smi_read_byte1(struct realtek_smi *smi, u8 *data) static int realtek_smi_read_byte1(struct realtek_priv *priv, u8 *data)
{ {
u32 t; u32 t;
/* Read data */ /* Read data */
realtek_smi_read_bits(smi, 8, &t); realtek_smi_read_bits(priv, 8, &t);
*data = (t & 0xff); *data = (t & 0xff);
/* Send an ACK */ /* Send an ACK */
realtek_smi_write_bits(smi, 0x01, 1); realtek_smi_write_bits(priv, 0x01, 1);
return 0; return 0;
} }
static int realtek_smi_read_reg(struct realtek_smi *smi, u32 addr, u32 *data) static int realtek_smi_read_reg(struct realtek_priv *priv, u32 addr, u32 *data)
{ {
unsigned long flags; unsigned long flags;
u8 lo = 0; u8 lo = 0;
u8 hi = 0; u8 hi = 0;
int ret; int ret;
spin_lock_irqsave(&smi->lock, flags); spin_lock_irqsave(&priv->lock, flags);
realtek_smi_start(smi); realtek_smi_start(priv);
/* Send READ command */ /* Send READ command */
ret = realtek_smi_write_byte(smi, smi->cmd_read); ret = realtek_smi_write_byte(priv, priv->cmd_read);
if (ret) if (ret)
goto out; goto out;
/* Set ADDR[7:0] */ /* Set ADDR[7:0] */
ret = realtek_smi_write_byte(smi, addr & 0xff); ret = realtek_smi_write_byte(priv, addr & 0xff);
if (ret) if (ret)
goto out; goto out;
/* Set ADDR[15:8] */ /* Set ADDR[15:8] */
ret = realtek_smi_write_byte(smi, addr >> 8); ret = realtek_smi_write_byte(priv, addr >> 8);
if (ret) if (ret)
goto out; goto out;
/* Read DATA[7:0] */ /* Read DATA[7:0] */
realtek_smi_read_byte0(smi, &lo); realtek_smi_read_byte0(priv, &lo);
/* Read DATA[15:8] */ /* Read DATA[15:8] */
realtek_smi_read_byte1(smi, &hi); realtek_smi_read_byte1(priv, &hi);
*data = ((u32)lo) | (((u32)hi) << 8); *data = ((u32)lo) | (((u32)hi) << 8);
ret = 0; ret = 0;
out: out:
realtek_smi_stop(smi); realtek_smi_stop(priv);
spin_unlock_irqrestore(&smi->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return ret; return ret;
} }
static int realtek_smi_write_reg(struct realtek_smi *smi, static int realtek_smi_write_reg(struct realtek_priv *priv,
u32 addr, u32 data, bool ack) u32 addr, u32 data, bool ack)
{ {
unsigned long flags; unsigned long flags;
int ret; int ret;
spin_lock_irqsave(&smi->lock, flags); spin_lock_irqsave(&priv->lock, flags);
realtek_smi_start(smi); realtek_smi_start(priv);
/* Send WRITE command */ /* Send WRITE command */
ret = realtek_smi_write_byte(smi, smi->cmd_write); ret = realtek_smi_write_byte(priv, priv->cmd_write);
if (ret) if (ret)
goto out; goto out;
/* Set ADDR[7:0] */ /* Set ADDR[7:0] */
ret = realtek_smi_write_byte(smi, addr & 0xff); ret = realtek_smi_write_byte(priv, addr & 0xff);
if (ret) if (ret)
goto out; goto out;
/* Set ADDR[15:8] */ /* Set ADDR[15:8] */
ret = realtek_smi_write_byte(smi, addr >> 8); ret = realtek_smi_write_byte(priv, addr >> 8);
if (ret) if (ret)
goto out; goto out;
/* Write DATA[7:0] */ /* Write DATA[7:0] */
ret = realtek_smi_write_byte(smi, data & 0xff); ret = realtek_smi_write_byte(priv, data & 0xff);
if (ret) if (ret)
goto out; goto out;
/* Write DATA[15:8] */ /* Write DATA[15:8] */
if (ack) if (ack)
ret = realtek_smi_write_byte(smi, data >> 8); ret = realtek_smi_write_byte(priv, data >> 8);
else else
ret = realtek_smi_write_byte_noack(smi, data >> 8); ret = realtek_smi_write_byte_noack(priv, data >> 8);
if (ret) if (ret)
goto out; goto out;
ret = 0; ret = 0;
out: out:
realtek_smi_stop(smi); realtek_smi_stop(priv);
spin_unlock_irqrestore(&smi->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return ret; return ret;
} }
@ -292,10 +292,10 @@ static int realtek_smi_write_reg(struct realtek_smi *smi,
* is when issueing soft reset. Since the device reset as soon as we write * is when issueing soft reset. Since the device reset as soon as we write
* that bit, no ACK will come back for natural reasons. * that bit, no ACK will come back for natural reasons.
*/ */
int realtek_smi_write_reg_noack(struct realtek_smi *smi, u32 addr, int realtek_smi_write_reg_noack(struct realtek_priv *priv, u32 addr,
u32 data) u32 data)
{ {
return realtek_smi_write_reg(smi, addr, data, false); return realtek_smi_write_reg(priv, addr, data, false);
} }
EXPORT_SYMBOL_GPL(realtek_smi_write_reg_noack); EXPORT_SYMBOL_GPL(realtek_smi_write_reg_noack);
@ -303,16 +303,16 @@ EXPORT_SYMBOL_GPL(realtek_smi_write_reg_noack);
static int realtek_smi_write(void *ctx, u32 reg, u32 val) static int realtek_smi_write(void *ctx, u32 reg, u32 val)
{ {
struct realtek_smi *smi = ctx; struct realtek_priv *priv = ctx;
return realtek_smi_write_reg(smi, reg, val, true); return realtek_smi_write_reg(priv, reg, val, true);
} }
static int realtek_smi_read(void *ctx, u32 reg, u32 *val) static int realtek_smi_read(void *ctx, u32 reg, u32 *val)
{ {
struct realtek_smi *smi = ctx; struct realtek_priv *priv = ctx;
return realtek_smi_read_reg(smi, reg, val); return realtek_smi_read_reg(priv, reg, val);
} }
static const struct regmap_config realtek_smi_mdio_regmap_config = { static const struct regmap_config realtek_smi_mdio_regmap_config = {
@ -329,49 +329,49 @@ static const struct regmap_config realtek_smi_mdio_regmap_config = {
static int realtek_smi_mdio_read(struct mii_bus *bus, int addr, int regnum) static int realtek_smi_mdio_read(struct mii_bus *bus, int addr, int regnum)
{ {
struct realtek_smi *smi = bus->priv; struct realtek_priv *priv = bus->priv;
return smi->ops->phy_read(smi, addr, regnum); return priv->ops->phy_read(priv, addr, regnum);
} }
static int realtek_smi_mdio_write(struct mii_bus *bus, int addr, int regnum, static int realtek_smi_mdio_write(struct mii_bus *bus, int addr, int regnum,
u16 val) u16 val)
{ {
struct realtek_smi *smi = bus->priv; struct realtek_priv *priv = bus->priv;
return smi->ops->phy_write(smi, addr, regnum, val); return priv->ops->phy_write(priv, addr, regnum, val);
} }
int realtek_smi_setup_mdio(struct realtek_smi *smi) int realtek_smi_setup_mdio(struct realtek_priv *priv)
{ {
struct device_node *mdio_np; struct device_node *mdio_np;
int ret; int ret;
mdio_np = of_get_compatible_child(smi->dev->of_node, "realtek,smi-mdio"); mdio_np = of_get_compatible_child(priv->dev->of_node, "realtek,smi-mdio");
if (!mdio_np) { if (!mdio_np) {
dev_err(smi->dev, "no MDIO bus node\n"); dev_err(priv->dev, "no MDIO bus node\n");
return -ENODEV; return -ENODEV;
} }
smi->slave_mii_bus = devm_mdiobus_alloc(smi->dev); priv->slave_mii_bus = devm_mdiobus_alloc(priv->dev);
if (!smi->slave_mii_bus) { if (!priv->slave_mii_bus) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_put_node; goto err_put_node;
} }
smi->slave_mii_bus->priv = smi; priv->slave_mii_bus->priv = priv;
smi->slave_mii_bus->name = "SMI slave MII"; priv->slave_mii_bus->name = "SMI slave MII";
smi->slave_mii_bus->read = realtek_smi_mdio_read; priv->slave_mii_bus->read = realtek_smi_mdio_read;
smi->slave_mii_bus->write = realtek_smi_mdio_write; priv->slave_mii_bus->write = realtek_smi_mdio_write;
snprintf(smi->slave_mii_bus->id, MII_BUS_ID_SIZE, "SMI-%d", snprintf(priv->slave_mii_bus->id, MII_BUS_ID_SIZE, "SMI-%d",
smi->ds->index); priv->ds->index);
smi->slave_mii_bus->dev.of_node = mdio_np; priv->slave_mii_bus->dev.of_node = mdio_np;
smi->slave_mii_bus->parent = smi->dev; priv->slave_mii_bus->parent = priv->dev;
smi->ds->slave_mii_bus = smi->slave_mii_bus; priv->ds->slave_mii_bus = priv->slave_mii_bus;
ret = devm_of_mdiobus_register(smi->dev, smi->slave_mii_bus, mdio_np); ret = devm_of_mdiobus_register(priv->dev, priv->slave_mii_bus, mdio_np);
if (ret) { if (ret) {
dev_err(smi->dev, "unable to register MDIO bus %s\n", dev_err(priv->dev, "unable to register MDIO bus %s\n",
smi->slave_mii_bus->id); priv->slave_mii_bus->id);
goto err_put_node; goto err_put_node;
} }
@ -385,76 +385,76 @@ err_put_node:
static int realtek_smi_probe(struct platform_device *pdev) static int realtek_smi_probe(struct platform_device *pdev)
{ {
const struct realtek_smi_variant *var; const struct realtek_variant *var;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct realtek_smi *smi; struct realtek_priv *priv;
struct device_node *np; struct device_node *np;
int ret; int ret;
var = of_device_get_match_data(dev); var = of_device_get_match_data(dev);
np = dev->of_node; np = dev->of_node;
smi = devm_kzalloc(dev, sizeof(*smi) + var->chip_data_sz, GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv) + var->chip_data_sz, GFP_KERNEL);
if (!smi) if (!priv)
return -ENOMEM; return -ENOMEM;
smi->chip_data = (void *)smi + sizeof(*smi); priv->chip_data = (void *)priv + sizeof(*priv);
smi->map = devm_regmap_init(dev, NULL, smi, priv->map = devm_regmap_init(dev, NULL, priv,
&realtek_smi_mdio_regmap_config); &realtek_smi_mdio_regmap_config);
if (IS_ERR(smi->map)) { if (IS_ERR(priv->map)) {
ret = PTR_ERR(smi->map); ret = PTR_ERR(priv->map);
dev_err(dev, "regmap init failed: %d\n", ret); dev_err(dev, "regmap init failed: %d\n", ret);
return ret; return ret;
} }
/* Link forward and backward */ /* Link forward and backward */
smi->dev = dev; priv->dev = dev;
smi->clk_delay = var->clk_delay; priv->clk_delay = var->clk_delay;
smi->cmd_read = var->cmd_read; priv->cmd_read = var->cmd_read;
smi->cmd_write = var->cmd_write; priv->cmd_write = var->cmd_write;
smi->ops = var->ops; priv->ops = var->ops;
dev_set_drvdata(dev, smi); dev_set_drvdata(dev, priv);
spin_lock_init(&smi->lock); spin_lock_init(&priv->lock);
/* TODO: if power is software controlled, set up any regulators here */ /* TODO: if power is software controlled, set up any regulators here */
/* Assert then deassert RESET */ /* Assert then deassert RESET */
smi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); priv->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
if (IS_ERR(smi->reset)) { if (IS_ERR(priv->reset)) {
dev_err(dev, "failed to get RESET GPIO\n"); dev_err(dev, "failed to get RESET GPIO\n");
return PTR_ERR(smi->reset); return PTR_ERR(priv->reset);
} }
msleep(REALTEK_SMI_HW_STOP_DELAY); msleep(REALTEK_SMI_HW_STOP_DELAY);
gpiod_set_value(smi->reset, 0); gpiod_set_value(priv->reset, 0);
msleep(REALTEK_SMI_HW_START_DELAY); msleep(REALTEK_SMI_HW_START_DELAY);
dev_info(dev, "deasserted RESET\n"); dev_info(dev, "deasserted RESET\n");
/* Fetch MDIO pins */ /* Fetch MDIO pins */
smi->mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW); priv->mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW);
if (IS_ERR(smi->mdc)) if (IS_ERR(priv->mdc))
return PTR_ERR(smi->mdc); return PTR_ERR(priv->mdc);
smi->mdio = devm_gpiod_get_optional(dev, "mdio", GPIOD_OUT_LOW); priv->mdio = devm_gpiod_get_optional(dev, "mdio", GPIOD_OUT_LOW);
if (IS_ERR(smi->mdio)) if (IS_ERR(priv->mdio))
return PTR_ERR(smi->mdio); return PTR_ERR(priv->mdio);
smi->leds_disabled = of_property_read_bool(np, "realtek,disable-leds"); priv->leds_disabled = of_property_read_bool(np, "realtek,disable-leds");
ret = smi->ops->detect(smi); ret = priv->ops->detect(priv);
if (ret) { if (ret) {
dev_err(dev, "unable to detect switch\n"); dev_err(dev, "unable to detect switch\n");
return ret; return ret;
} }
smi->ds = devm_kzalloc(dev, sizeof(*smi->ds), GFP_KERNEL); priv->ds = devm_kzalloc(dev, sizeof(*priv->ds), GFP_KERNEL);
if (!smi->ds) if (!priv->ds)
return -ENOMEM; return -ENOMEM;
smi->ds->dev = dev; priv->ds->dev = dev;
smi->ds->num_ports = smi->num_ports; priv->ds->num_ports = priv->num_ports;
smi->ds->priv = smi; priv->ds->priv = priv;
smi->ds->ops = var->ds_ops; priv->ds->ops = var->ds_ops;
ret = dsa_register_switch(smi->ds); ret = dsa_register_switch(priv->ds);
if (ret) { if (ret) {
dev_err_probe(dev, ret, "unable to register switch\n"); dev_err_probe(dev, ret, "unable to register switch\n");
return ret; return ret;
@ -464,15 +464,15 @@ static int realtek_smi_probe(struct platform_device *pdev)
static int realtek_smi_remove(struct platform_device *pdev) static int realtek_smi_remove(struct platform_device *pdev)
{ {
struct realtek_smi *smi = platform_get_drvdata(pdev); struct realtek_priv *priv = platform_get_drvdata(pdev);
if (!smi) if (!priv)
return 0; return 0;
dsa_unregister_switch(smi->ds); dsa_unregister_switch(priv->ds);
if (smi->slave_mii_bus) if (priv->slave_mii_bus)
of_node_put(smi->slave_mii_bus->dev.of_node); of_node_put(priv->slave_mii_bus->dev.of_node);
gpiod_set_value(smi->reset, 1); gpiod_set_value(priv->reset, 1);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
@ -481,12 +481,12 @@ static int realtek_smi_remove(struct platform_device *pdev)
static void realtek_smi_shutdown(struct platform_device *pdev) static void realtek_smi_shutdown(struct platform_device *pdev)
{ {
struct realtek_smi *smi = platform_get_drvdata(pdev); struct realtek_priv *priv = platform_get_drvdata(pdev);
if (!smi) if (!priv)
return; return;
dsa_switch_shutdown(smi->ds); dsa_switch_shutdown(priv->ds);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
} }

68
drivers/net/dsa/realtek/realtek-smi-core.h → drivers/net/dsa/realtek/realtek.h
View File

@ -13,7 +13,7 @@
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <net/dsa.h> #include <net/dsa.h>
struct realtek_smi_ops; struct realtek_ops;
struct dentry; struct dentry;
struct inode; struct inode;
struct file; struct file;
@ -43,7 +43,7 @@ struct rtl8366_vlan_4k {
u8 fid; u8 fid;
}; };
struct realtek_smi { struct realtek_priv {
struct device *dev; struct device *dev;
struct gpio_desc *reset; struct gpio_desc *reset;
struct gpio_desc *mdc; struct gpio_desc *mdc;
@ -65,7 +65,7 @@ struct realtek_smi {
unsigned int num_mib_counters; unsigned int num_mib_counters;
struct rtl8366_mib_counter *mib_counters; struct rtl8366_mib_counter *mib_counters;
const struct realtek_smi_ops *ops; const struct realtek_ops *ops;
int vlan_enabled; int vlan_enabled;
int vlan4k_enabled; int vlan4k_enabled;
@ -75,40 +75,40 @@ struct realtek_smi {
}; };
/* /*
* struct realtek_smi_ops - vtable for the per-SMI-chiptype operations * struct realtek_ops - vtable for the per-SMI-chiptype operations
* @detect: detects the chiptype * @detect: detects the chiptype
*/ */
struct realtek_smi_ops { struct realtek_ops {
int (*detect)(struct realtek_smi *smi); int (*detect)(struct realtek_priv *priv);
int (*reset_chip)(struct realtek_smi *smi); int (*reset_chip)(struct realtek_priv *priv);
int (*setup)(struct realtek_smi *smi); int (*setup)(struct realtek_priv *priv);
void (*cleanup)(struct realtek_smi *smi); void (*cleanup)(struct realtek_priv *priv);
int (*get_mib_counter)(struct realtek_smi *smi, int (*get_mib_counter)(struct realtek_priv *priv,
int port, int port,
struct rtl8366_mib_counter *mib, struct rtl8366_mib_counter *mib,
u64 *mibvalue); u64 *mibvalue);
int (*get_vlan_mc)(struct realtek_smi *smi, u32 index, int (*get_vlan_mc)(struct realtek_priv *priv, u32 index,
struct rtl8366_vlan_mc *vlanmc); struct rtl8366_vlan_mc *vlanmc);
int (*set_vlan_mc)(struct realtek_smi *smi, u32 index, int (*set_vlan_mc)(struct realtek_priv *priv, u32 index,
const struct rtl8366_vlan_mc *vlanmc); const struct rtl8366_vlan_mc *vlanmc);
int (*get_vlan_4k)(struct realtek_smi *smi, u32 vid, int (*get_vlan_4k)(struct realtek_priv *priv, u32 vid,
struct rtl8366_vlan_4k *vlan4k); struct rtl8366_vlan_4k *vlan4k);
int (*set_vlan_4k)(struct realtek_smi *smi, int (*set_vlan_4k)(struct realtek_priv *priv,
const struct rtl8366_vlan_4k *vlan4k); const struct rtl8366_vlan_4k *vlan4k);
int (*get_mc_index)(struct realtek_smi *smi, int port, int *val); int (*get_mc_index)(struct realtek_priv *priv, int port, int *val);
int (*set_mc_index)(struct realtek_smi *smi, int port, int index); int (*set_mc_index)(struct realtek_priv *priv, int port, int index);
bool (*is_vlan_valid)(struct realtek_smi *smi, unsigned int vlan); bool (*is_vlan_valid)(struct realtek_priv *priv, unsigned int vlan);
int (*enable_vlan)(struct realtek_smi *smi, bool enable); int (*enable_vlan)(struct realtek_priv *priv, bool enable);
int (*enable_vlan4k)(struct realtek_smi *smi, bool enable); int (*enable_vlan4k)(struct realtek_priv *priv, bool enable);
int (*enable_port)(struct realtek_smi *smi, int port, bool enable); int (*enable_port)(struct realtek_priv *priv, int port, bool enable);
int (*phy_read)(struct realtek_smi *smi, int phy, int regnum); int (*phy_read)(struct realtek_priv *priv, int phy, int regnum);
int (*phy_write)(struct realtek_smi *smi, int phy, int regnum, int (*phy_write)(struct realtek_priv *priv, int phy, int regnum,
u16 val); u16 val);
}; };
struct realtek_smi_variant { struct realtek_variant {
const struct dsa_switch_ops *ds_ops; const struct dsa_switch_ops *ds_ops;
const struct realtek_smi_ops *ops; const struct realtek_ops *ops;
unsigned int clk_delay; unsigned int clk_delay;
u8 cmd_read; u8 cmd_read;
u8 cmd_write; u8 cmd_write;
@ -116,19 +116,19 @@ struct realtek_smi_variant {
}; };
/* SMI core calls */ /* SMI core calls */
int realtek_smi_write_reg_noack(struct realtek_smi *smi, u32 addr, int realtek_smi_write_reg_noack(struct realtek_priv *priv, u32 addr,
u32 data); u32 data);
int realtek_smi_setup_mdio(struct realtek_smi *smi); int realtek_smi_setup_mdio(struct realtek_priv *priv);
/* RTL8366 library helpers */ /* RTL8366 library helpers */
int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used); int rtl8366_mc_is_used(struct realtek_priv *priv, int mc_index, int *used);
int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, int rtl8366_set_vlan(struct realtek_priv *priv, int vid, u32 member,
u32 untag, u32 fid); u32 untag, u32 fid);
int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, int rtl8366_set_pvid(struct realtek_priv *priv, unsigned int port,
unsigned int vid); unsigned int vid);
int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable); int rtl8366_enable_vlan4k(struct realtek_priv *priv, bool enable);
int rtl8366_enable_vlan(struct realtek_smi *smi, bool enable); int rtl8366_enable_vlan(struct realtek_priv *priv, bool enable);
int rtl8366_reset_vlan(struct realtek_smi *smi); int rtl8366_reset_vlan(struct realtek_priv *priv);
int rtl8366_vlan_add(struct dsa_switch *ds, int port, int rtl8366_vlan_add(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan, const struct switchdev_obj_port_vlan *vlan,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
@ -139,7 +139,7 @@ void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,
int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset); int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset);
void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data); void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);
extern const struct realtek_smi_variant rtl8366rb_variant; extern const struct realtek_variant rtl8366rb_variant;
extern const struct realtek_smi_variant rtl8365mb_variant; extern const struct realtek_variant rtl8365mb_variant;
#endif /* _REALTEK_SMI_H */ #endif /* _REALTEK_SMI_H */

394
drivers/net/dsa/realtek/rtl8365mb.c
View File

File diff suppressed because it is too large Load Diff

164
drivers/net/dsa/realtek/rtl8366.c
View File

@ -11,18 +11,18 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include <net/dsa.h> #include <net/dsa.h>
#include "realtek-smi-core.h" #include "realtek.h"
int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used) int rtl8366_mc_is_used(struct realtek_priv *priv, int mc_index, int *used)
{ {
int ret; int ret;
int i; int i;
*used = 0; *used = 0;
for (i = 0; i < smi->num_ports; i++) { for (i = 0; i < priv->num_ports; i++) {
int index = 0; int index = 0;
ret = smi->ops->get_mc_index(smi, i, &index); ret = priv->ops->get_mc_index(priv, i, &index);
if (ret) if (ret)
return ret; return ret;
@ -38,13 +38,13 @@ EXPORT_SYMBOL_GPL(rtl8366_mc_is_used);
/** /**
* rtl8366_obtain_mc() - retrieve or allocate a VLAN member configuration * rtl8366_obtain_mc() - retrieve or allocate a VLAN member configuration
* @smi: the Realtek SMI device instance * @priv: the Realtek SMI device instance
* @vid: the VLAN ID to look up or allocate * @vid: the VLAN ID to look up or allocate
* @vlanmc: the pointer will be assigned to a pointer to a valid member config * @vlanmc: the pointer will be assigned to a pointer to a valid member config
* if successful * if successful
* @return: index of a new member config or negative error number * @return: index of a new member config or negative error number
*/ */
static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid, static int rtl8366_obtain_mc(struct realtek_priv *priv, int vid,
struct rtl8366_vlan_mc *vlanmc) struct rtl8366_vlan_mc *vlanmc)
{ {
struct rtl8366_vlan_4k vlan4k; struct rtl8366_vlan_4k vlan4k;
@ -52,10 +52,10 @@ static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid,
int i; int i;
/* Try to find an existing member config entry for this VID */ /* Try to find an existing member config entry for this VID */
for (i = 0; i < smi->num_vlan_mc; i++) { for (i = 0; i < priv->num_vlan_mc; i++) {
ret = smi->ops->get_vlan_mc(smi, i, vlanmc); ret = priv->ops->get_vlan_mc(priv, i, vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n", dev_err(priv->dev, "error searching for VLAN MC %d for VID %d\n",
i, vid); i, vid);
return ret; return ret;
} }
@ -65,19 +65,19 @@ static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid,
} }
/* We have no MC entry for this VID, try to find an empty one */ /* We have no MC entry for this VID, try to find an empty one */
for (i = 0; i < smi->num_vlan_mc; i++) { for (i = 0; i < priv->num_vlan_mc; i++) {
ret = smi->ops->get_vlan_mc(smi, i, vlanmc); ret = priv->ops->get_vlan_mc(priv, i, vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n", dev_err(priv->dev, "error searching for VLAN MC %d for VID %d\n",
i, vid); i, vid);
return ret; return ret;
} }
if (vlanmc->vid == 0 && vlanmc->member == 0) { if (vlanmc->vid == 0 && vlanmc->member == 0) {
/* Update the entry from the 4K table */ /* Update the entry from the 4K table */
ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); ret = priv->ops->get_vlan_4k(priv, vid, &vlan4k);
if (ret) { if (ret) {
dev_err(smi->dev, "error looking for 4K VLAN MC %d for VID %d\n", dev_err(priv->dev, "error looking for 4K VLAN MC %d for VID %d\n",
i, vid); i, vid);
return ret; return ret;
} }
@ -86,30 +86,30 @@ static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid,
vlanmc->member = vlan4k.member; vlanmc->member = vlan4k.member;
vlanmc->untag = vlan4k.untag; vlanmc->untag = vlan4k.untag;
vlanmc->fid = vlan4k.fid; vlanmc->fid = vlan4k.fid;
ret = smi->ops->set_vlan_mc(smi, i, vlanmc); ret = priv->ops->set_vlan_mc(priv, i, vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n", dev_err(priv->dev, "unable to set/update VLAN MC %d for VID %d\n",
i, vid); i, vid);
return ret; return ret;
} }
dev_dbg(smi->dev, "created new MC at index %d for VID %d\n", dev_dbg(priv->dev, "created new MC at index %d for VID %d\n",
i, vid); i, vid);
return i; return i;
} }
} }
/* MC table is full, try to find an unused entry and replace it */ /* MC table is full, try to find an unused entry and replace it */
for (i = 0; i < smi->num_vlan_mc; i++) { for (i = 0; i < priv->num_vlan_mc; i++) {
int used; int used;
ret = rtl8366_mc_is_used(smi, i, &used); ret = rtl8366_mc_is_used(priv, i, &used);
if (ret) if (ret)
return ret; return ret;
if (!used) { if (!used) {
/* Update the entry from the 4K table */ /* Update the entry from the 4K table */
ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); ret = priv->ops->get_vlan_4k(priv, vid, &vlan4k);
if (ret) if (ret)
return ret; return ret;
@ -117,23 +117,23 @@ static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid,
vlanmc->member = vlan4k.member; vlanmc->member = vlan4k.member;
vlanmc->untag = vlan4k.untag; vlanmc->untag = vlan4k.untag;
vlanmc->fid = vlan4k.fid; vlanmc->fid = vlan4k.fid;
ret = smi->ops->set_vlan_mc(smi, i, vlanmc); ret = priv->ops->set_vlan_mc(priv, i, vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n", dev_err(priv->dev, "unable to set/update VLAN MC %d for VID %d\n",
i, vid); i, vid);
return ret; return ret;
} }
dev_dbg(smi->dev, "recycled MC at index %i for VID %d\n", dev_dbg(priv->dev, "recycled MC at index %i for VID %d\n",
i, vid); i, vid);
return i; return i;
} }
} }
dev_err(smi->dev, "all VLAN member configurations are in use\n"); dev_err(priv->dev, "all VLAN member configurations are in use\n");
return -ENOSPC; return -ENOSPC;
} }
int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, int rtl8366_set_vlan(struct realtek_priv *priv, int vid, u32 member,
u32 untag, u32 fid) u32 untag, u32 fid)
{ {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
@ -141,31 +141,31 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,
int mc; int mc;
int ret; int ret;
if (!smi->ops->is_vlan_valid(smi, vid)) if (!priv->ops->is_vlan_valid(priv, vid))
return -EINVAL; return -EINVAL;
dev_dbg(smi->dev, dev_dbg(priv->dev,
"setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", "setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",
vid, member, untag); vid, member, untag);
/* Update the 4K table */ /* Update the 4K table */
ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); ret = priv->ops->get_vlan_4k(priv, vid, &vlan4k);
if (ret) if (ret)
return ret; return ret;
vlan4k.member |= member; vlan4k.member |= member;
vlan4k.untag |= untag; vlan4k.untag |= untag;
vlan4k.fid = fid; vlan4k.fid = fid;
ret = smi->ops->set_vlan_4k(smi, &vlan4k); ret = priv->ops->set_vlan_4k(priv, &vlan4k);
if (ret) if (ret)
return ret; return ret;
dev_dbg(smi->dev, dev_dbg(priv->dev,
"resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", "resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",
vid, vlan4k.member, vlan4k.untag); vid, vlan4k.member, vlan4k.untag);
/* Find or allocate a member config for this VID */ /* Find or allocate a member config for this VID */
ret = rtl8366_obtain_mc(smi, vid, &vlanmc); ret = rtl8366_obtain_mc(priv, vid, &vlanmc);
if (ret < 0) if (ret < 0)
return ret; return ret;
mc = ret; mc = ret;
@ -176,12 +176,12 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,
vlanmc.fid = fid; vlanmc.fid = fid;
/* Commit updates to the MC entry */ /* Commit updates to the MC entry */
ret = smi->ops->set_vlan_mc(smi, mc, &vlanmc); ret = priv->ops->set_vlan_mc(priv, mc, &vlanmc);
if (ret) if (ret)
dev_err(smi->dev, "failed to commit changes to VLAN MC index %d for VID %d\n", dev_err(priv->dev, "failed to commit changes to VLAN MC index %d for VID %d\n",
mc, vid); mc, vid);
else else
dev_dbg(smi->dev, dev_dbg(priv->dev,
"resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n", "resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n",
vid, vlanmc.member, vlanmc.untag); vid, vlanmc.member, vlanmc.untag);
@ -189,37 +189,37 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,
} }
EXPORT_SYMBOL_GPL(rtl8366_set_vlan); EXPORT_SYMBOL_GPL(rtl8366_set_vlan);
int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, int rtl8366_set_pvid(struct realtek_priv *priv, unsigned int port,
unsigned int vid) unsigned int vid)
{ {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
int mc; int mc;
int ret; int ret;
if (!smi->ops->is_vlan_valid(smi, vid)) if (!priv->ops->is_vlan_valid(priv, vid))
return -EINVAL; return -EINVAL;
/* Find or allocate a member config for this VID */ /* Find or allocate a member config for this VID */
ret = rtl8366_obtain_mc(smi, vid, &vlanmc); ret = rtl8366_obtain_mc(priv, vid, &vlanmc);
if (ret < 0) if (ret < 0)
return ret; return ret;
mc = ret; mc = ret;
ret = smi->ops->set_mc_index(smi, port, mc); ret = priv->ops->set_mc_index(priv, port, mc);
if (ret) { if (ret) {
dev_err(smi->dev, "set PVID: failed to set MC index %d for port %d\n", dev_err(priv->dev, "set PVID: failed to set MC index %d for port %d\n",
mc, port); mc, port);
return ret; return ret;
} }
dev_dbg(smi->dev, "set PVID: the PVID for port %d set to %d using existing MC index %d\n", dev_dbg(priv->dev, "set PVID: the PVID for port %d set to %d using existing MC index %d\n",
port, vid, mc); port, vid, mc);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(rtl8366_set_pvid); EXPORT_SYMBOL_GPL(rtl8366_set_pvid);
int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable) int rtl8366_enable_vlan4k(struct realtek_priv *priv, bool enable)
{ {
int ret; int ret;
@ -229,52 +229,52 @@ int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable)
*/ */
if (enable) { if (enable) {
/* Make sure VLAN is ON */ /* Make sure VLAN is ON */
ret = smi->ops->enable_vlan(smi, true); ret = priv->ops->enable_vlan(priv, true);
if (ret) if (ret)
return ret; return ret;
smi->vlan_enabled = true; priv->vlan_enabled = true;
} }
ret = smi->ops->enable_vlan4k(smi, enable); ret = priv->ops->enable_vlan4k(priv, enable);
if (ret) if (ret)
return ret; return ret;
smi->vlan4k_enabled = enable; priv->vlan4k_enabled = enable;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(rtl8366_enable_vlan4k); EXPORT_SYMBOL_GPL(rtl8366_enable_vlan4k);
int rtl8366_enable_vlan(struct realtek_smi *smi, bool enable) int rtl8366_enable_vlan(struct realtek_priv *priv, bool enable)
{ {
int ret; int ret;
ret = smi->ops->enable_vlan(smi, enable); ret = priv->ops->enable_vlan(priv, enable);
if (ret) if (ret)
return ret; return ret;
smi->vlan_enabled = enable; priv->vlan_enabled = enable;
/* If we turn VLAN off, make sure that we turn off /* If we turn VLAN off, make sure that we turn off
* 4k VLAN as well, if that happened to be on. * 4k VLAN as well, if that happened to be on.
*/ */
if (!enable) { if (!enable) {
smi->vlan4k_enabled = false; priv->vlan4k_enabled = false;
ret = smi->ops->enable_vlan4k(smi, false); ret = priv->ops->enable_vlan4k(priv, false);
} }
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(rtl8366_enable_vlan); EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
int rtl8366_reset_vlan(struct realtek_smi *smi) int rtl8366_reset_vlan(struct realtek_priv *priv)
{ {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
int ret; int ret;
int i; int i;
rtl8366_enable_vlan(smi, false); rtl8366_enable_vlan(priv, false);
rtl8366_enable_vlan4k(smi, false); rtl8366_enable_vlan4k(priv, false);
/* Clear the 16 VLAN member configurations */ /* Clear the 16 VLAN member configurations */
vlanmc.vid = 0; vlanmc.vid = 0;
@ -282,8 +282,8 @@ int rtl8366_reset_vlan(struct realtek_smi *smi)
vlanmc.member = 0; vlanmc.member = 0;
vlanmc.untag = 0; vlanmc.untag = 0;
vlanmc.fid = 0; vlanmc.fid = 0;
for (i = 0; i < smi->num_vlan_mc; i++) { for (i = 0; i < priv->num_vlan_mc; i++) {
ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); ret = priv->ops->set_vlan_mc(priv, i, &vlanmc);
if (ret) if (ret)
return ret; return ret;
} }
@ -298,12 +298,12 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port,
{ {
bool untagged = !!(vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED); bool untagged = !!(vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED);
bool pvid = !!(vlan->flags & BRIDGE_VLAN_INFO_PVID); bool pvid = !!(vlan->flags & BRIDGE_VLAN_INFO_PVID);
struct realtek_smi *smi = ds->priv; struct realtek_priv *priv = ds->priv;
u32 member = 0; u32 member = 0;
u32 untag = 0; u32 untag = 0;
int ret; int ret;
if (!smi->ops->is_vlan_valid(smi, vlan->vid)) { if (!priv->ops->is_vlan_valid(priv, vlan->vid)) {
NL_SET_ERR_MSG_MOD(extack, "VLAN ID not valid"); NL_SET_ERR_MSG_MOD(extack, "VLAN ID not valid");
return -EINVAL; return -EINVAL;
} }
@ -312,13 +312,13 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port,
* FIXME: what's with this 4k business? * FIXME: what's with this 4k business?
* Just rtl8366_enable_vlan() seems inconclusive. * Just rtl8366_enable_vlan() seems inconclusive.
*/ */
ret = rtl8366_enable_vlan4k(smi, true); ret = rtl8366_enable_vlan4k(priv, true);
if (ret) { if (ret) {
NL_SET_ERR_MSG_MOD(extack, "Failed to enable VLAN 4K"); NL_SET_ERR_MSG_MOD(extack, "Failed to enable VLAN 4K");
return ret; return ret;
} }
dev_dbg(smi->dev, "add VLAN %d on port %d, %s, %s\n", dev_dbg(priv->dev, "add VLAN %d on port %d, %s, %s\n",
vlan->vid, port, untagged ? "untagged" : "tagged", vlan->vid, port, untagged ? "untagged" : "tagged",
pvid ? "PVID" : "no PVID"); pvid ? "PVID" : "no PVID");
@ -327,18 +327,18 @@ int rtl8366_vlan_add(struct dsa_switch *ds, int port,
if (untagged) if (untagged)
untag |= BIT(port); untag |= BIT(port);
ret = rtl8366_set_vlan(smi, vlan->vid, member, untag, 0); ret = rtl8366_set_vlan(priv, vlan->vid, member, untag, 0);
if (ret) { if (ret) {
dev_err(smi->dev, "failed to set up VLAN %04x", vlan->vid); dev_err(priv->dev, "failed to set up VLAN %04x", vlan->vid);
return ret; return ret;
} }
if (!pvid) if (!pvid)
return 0; return 0;
ret = rtl8366_set_pvid(smi, port, vlan->vid); ret = rtl8366_set_pvid(priv, port, vlan->vid);
if (ret) { if (ret) {
dev_err(smi->dev, "failed to set PVID on port %d to VLAN %04x", dev_err(priv->dev, "failed to set PVID on port %d to VLAN %04x",
port, vlan->vid); port, vlan->vid);
return ret; return ret;
} }
@ -350,15 +350,15 @@ EXPORT_SYMBOL_GPL(rtl8366_vlan_add);
int rtl8366_vlan_del(struct dsa_switch *ds, int port, int rtl8366_vlan_del(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan) const struct switchdev_obj_port_vlan *vlan)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_priv *priv = ds->priv;
int ret, i; int ret, i;
dev_dbg(smi->dev, "del VLAN %d on port %d\n", vlan->vid, port); dev_dbg(priv->dev, "del VLAN %d on port %d\n", vlan->vid, port);
for (i = 0; i < smi->num_vlan_mc; i++) { for (i = 0; i < priv->num_vlan_mc; i++) {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
ret = smi->ops->get_vlan_mc(smi, i, &vlanmc); ret = priv->ops->get_vlan_mc(priv, i, &vlanmc);
if (ret) if (ret)
return ret; return ret;
@ -376,9 +376,9 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port,
vlanmc.priority = 0; vlanmc.priority = 0;
vlanmc.fid = 0; vlanmc.fid = 0;
} }
ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); ret = priv->ops->set_vlan_mc(priv, i, &vlanmc);
if (ret) { if (ret) {
dev_err(smi->dev, dev_err(priv->dev,
"failed to remove VLAN %04x\n", "failed to remove VLAN %04x\n",
vlan->vid); vlan->vid);
return ret; return ret;
@ -394,15 +394,15 @@ EXPORT_SYMBOL_GPL(rtl8366_vlan_del);
void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset, void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,
uint8_t *data) uint8_t *data)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_priv *priv = ds->priv;
struct rtl8366_mib_counter *mib; struct rtl8366_mib_counter *mib;
int i; int i;
if (port >= smi->num_ports) if (port >= priv->num_ports)
return; return;
for (i = 0; i < smi->num_mib_counters; i++) { for (i = 0; i < priv->num_mib_counters; i++) {
mib = &smi->mib_counters[i]; mib = &priv->mib_counters[i];
strncpy(data + i * ETH_GSTRING_LEN, strncpy(data + i * ETH_GSTRING_LEN,
mib->name, ETH_GSTRING_LEN); mib->name, ETH_GSTRING_LEN);
} }
@ -411,35 +411,35 @@ EXPORT_SYMBOL_GPL(rtl8366_get_strings);
int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset) int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_priv *priv = ds->priv;
/* We only support SS_STATS */ /* We only support SS_STATS */
if (sset != ETH_SS_STATS) if (sset != ETH_SS_STATS)
return 0; return 0;
if (port >= smi->num_ports) if (port >= priv->num_ports)
return -EINVAL; return -EINVAL;
return smi->num_mib_counters; return priv->num_mib_counters;
} }
EXPORT_SYMBOL_GPL(rtl8366_get_sset_count); EXPORT_SYMBOL_GPL(rtl8366_get_sset_count);
void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_priv *priv = ds->priv;
int i; int i;
int ret; int ret;
if (port >= smi->num_ports) if (port >= priv->num_ports)
return; return;
for (i = 0; i < smi->num_mib_counters; i++) { for (i = 0; i < priv->num_mib_counters; i++) {
struct rtl8366_mib_counter *mib; struct rtl8366_mib_counter *mib;
u64 mibvalue = 0; u64 mibvalue = 0;
mib = &smi->mib_counters[i]; mib = &priv->mib_counters[i];
ret = smi->ops->get_mib_counter(smi, port, mib, &mibvalue); ret = priv->ops->get_mib_counter(priv, port, mib, &mibvalue);
if (ret) { if (ret) {
dev_err(smi->dev, "error reading MIB counter %s\n", dev_err(priv->dev, "error reading MIB counter %s\n",
mib->name); mib->name);
} }
data[i] = mibvalue; data[i] = mibvalue;

402
drivers/net/dsa/realtek/rtl8366rb.c
View File

File diff suppressed because it is too large Load Diff