#define RTL8366RB_VLAN_MEMBER_MASK 0xff
#define RTL8366RB_VLAN_FID_MASK 0x7
-struct rtl8366rb {
- struct device *parent;
- struct rtl8366_smi smi;
-};
-
static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
{ 0, 0, 4, "IfInOctets" },
{ 0, 4, 4, "EtherStatsOctets" },
return err; \
} while (0)
-static inline struct rtl8366rb *smi_to_rtl8366rb(struct rtl8366_smi *smi)
-{
- return container_of(smi, struct rtl8366rb, smi);
-}
-
-static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw)
-{
- struct rtl8366_smi *smi = sw_to_rtl8366_smi(sw);
- return smi_to_rtl8366rb(smi);
-}
-
static int rtl8366rb_reset_chip(struct rtl8366_smi *smi)
{
int timeout = 10;
RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));
}
+static int rtl8366rb_is_vlan_valid(struct rtl8366_smi *smi, unsigned vlan)
+{
+ if (vlan == 0 || vlan >= RTL8366RB_NUM_VLANS)
+ return 0;
+
+ return 1;
+}
+
static int rtl8366rb_vlan_set_vlan(struct rtl8366_smi *smi, int enable)
{
return rtl8366_smi_rmwr(smi, RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,
char *buf = smi->buf;
int err;
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+ if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
return -EINVAL;
memset(buf, '\0', sizeof(smi->buf));
- err = rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ err = smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
if (err)
return err;
len += snprintf(buf + len, sizeof(smi->buf) - len,
"VLAN %d: Ports: '", vlan4k.vid);
- for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & (1 << i)))
continue;
RTL8366RB_MIB_CTRL_PORT_RESET(val->port_vlan));
}
-static int rtl8366rb_sw_get_port_mib(struct switch_dev *dev,
- const struct switch_attr *attr,
- struct switch_val *val)
-{
- struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
- int i, len = 0;
- unsigned long long counter = 0;
- char *buf = smi->buf;
-
- if (val->port_vlan >= RTL8366RB_NUM_PORTS)
- return -EINVAL;
-
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "Port %d MIB counters\n",
- val->port_vlan);
-
- for (i = 0; i < ARRAY_SIZE(rtl8366rb_mib_counters); ++i) {
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%-36s: ", rtl8366rb_mib_counters[i].name);
- if (!rtl8366rb_get_mib_counter(smi, i, val->port_vlan, &counter))
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%llu\n", counter);
- else
- len += snprintf(buf + len, sizeof(smi->buf) - len,
- "%s\n", "error");
- }
-
- val->value.s = buf;
- val->len = len;
- return 0;
-}
-
static int rtl8366rb_sw_get_vlan_ports(struct switch_dev *dev,
struct switch_val *val)
{
struct rtl8366_vlan_4k vlan4k;
int i;
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+ if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
return -EINVAL;
- rtl8366rb_get_vlan_4k(smi, val->port_vlan, &vlan4k);
+ smi->ops->get_vlan_4k(smi, val->port_vlan, &vlan4k);
port = &val->value.ports[0];
val->len = 0;
- for (i = 0; i < RTL8366RB_NUM_PORTS; i++) {
+ for (i = 0; i < smi->num_ports; i++) {
if (!(vlan4k.member & BIT(i)))
continue;
u32 untag = 0;
int i;
- if (val->port_vlan == 0 || val->port_vlan >= RTL8366RB_NUM_VLANS)
+ if (!smi->ops->is_vlan_valid(smi, val->port_vlan))
return -EINVAL;
port = &val->value.ports[0];
return rtl8366_set_vlan(smi, val->port_vlan, member, untag, 0);
}
-static int rtl8366rb_sw_get_port_pvid(struct switch_dev *dev, int port, int *val)
-{
- struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
- return rtl8366_get_pvid(smi, port, val);
-}
-
-static int rtl8366rb_sw_set_port_pvid(struct switch_dev *dev, int port, int val)
-{
- struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
- return rtl8366_set_pvid(smi, port, val);
-}
-
static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
{
struct rtl8366_smi *smi = sw_to_rtl8366_smi(dev);
.description = "Get MIB counters for port",
.max = 33,
.set = NULL,
- .get = rtl8366rb_sw_get_port_mib,
+ .get = rtl8366_sw_get_port_mib,
}, {
.type = SWITCH_TYPE_INT,
.name = "led",
.get_vlan_ports = rtl8366rb_sw_get_vlan_ports,
.set_vlan_ports = rtl8366rb_sw_set_vlan_ports,
- .get_port_pvid = rtl8366rb_sw_get_port_pvid,
- .set_port_pvid = rtl8366rb_sw_set_port_pvid,
+ .get_port_pvid = rtl8366_sw_get_port_pvid,
+ .set_port_pvid = rtl8366_sw_set_port_pvid,
.reset_switch = rtl8366rb_sw_reset_switch,
};
-static int rtl8366rb_switch_init(struct rtl8366rb *rtl)
+static int rtl8366rb_switch_init(struct rtl8366_smi *smi)
{
- struct switch_dev *dev = &rtl->smi.sw_dev;
+ struct switch_dev *dev = &smi->sw_dev;
int err;
memcpy(dev, &rtl8366_switch_dev, sizeof(struct switch_dev));
- dev->priv = rtl;
- dev->devname = dev_name(rtl->parent);
+ dev->priv = smi;
+ dev->devname = dev_name(smi->parent);
err = register_switch(dev, NULL);
if (err)
- dev_err(rtl->parent, "switch registration failed\n");
+ dev_err(smi->parent, "switch registration failed\n");
return err;
}
-static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
+static void rtl8366rb_switch_cleanup(struct rtl8366_smi *smi)
{
- unregister_switch(&rtl->smi.sw_dev);
+ unregister_switch(&smi->sw_dev);
}
static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
bus->write == rtl8366rb_mii_write);
}
-static int rtl8366rb_setup(struct rtl8366rb *rtl)
+static int rtl8366rb_setup(struct rtl8366_smi *smi)
{
- struct rtl8366_smi *smi = &rtl->smi;
int ret;
ret = rtl8366rb_reset_chip(smi);
static struct rtl8366_smi_ops rtl8366rb_smi_ops = {
.detect = rtl8366rb_detect,
+ .setup = rtl8366rb_setup,
+
.mii_read = rtl8366rb_mii_read,
.mii_write = rtl8366rb_mii_write,
.get_mc_index = rtl8366rb_get_mc_index,
.set_mc_index = rtl8366rb_set_mc_index,
.get_mib_counter = rtl8366rb_get_mib_counter,
+ .is_vlan_valid = rtl8366rb_is_vlan_valid,
};
static int __init rtl8366rb_probe(struct platform_device *pdev)
{
static int rtl8366_smi_version_printed;
struct rtl8366rb_platform_data *pdata;
- struct rtl8366rb *rtl;
struct rtl8366_smi *smi;
int err;
goto err_out;
}
- rtl = kzalloc(sizeof(*rtl), GFP_KERNEL);
- if (!rtl) {
- dev_err(&pdev->dev, "no memory for private data\n");
+ smi = rtl8366_smi_alloc(&pdev->dev);
+ if (!smi) {
err = -ENOMEM;
goto err_out;
}
- rtl->parent = &pdev->dev;
-
- smi = &rtl->smi;
- smi->parent = &pdev->dev;
smi->gpio_sda = pdata->gpio_sda;
smi->gpio_sck = pdata->gpio_sck;
smi->ops = &rtl8366rb_smi_ops;
err = rtl8366_smi_init(smi);
if (err)
- goto err_free_rtl;
-
- platform_set_drvdata(pdev, rtl);
+ goto err_free_smi;
- err = rtl8366rb_setup(rtl);
- if (err)
- goto err_clear_drvdata;
+ platform_set_drvdata(pdev, smi);
- err = rtl8366rb_switch_init(rtl);
+ err = rtl8366rb_switch_init(smi);
if (err)
goto err_clear_drvdata;
err_clear_drvdata:
platform_set_drvdata(pdev, NULL);
rtl8366_smi_cleanup(smi);
- err_free_rtl:
- kfree(rtl);
+ err_free_smi:
+ kfree(smi);
err_out:
return err;
}
static int __devexit rtl8366rb_remove(struct platform_device *pdev)
{
- struct rtl8366rb *rtl = platform_get_drvdata(pdev);
+ struct rtl8366_smi *smi = platform_get_drvdata(pdev);
- if (rtl) {
- rtl8366rb_switch_cleanup(rtl);
+ if (smi) {
+ rtl8366rb_switch_cleanup(smi);
platform_set_drvdata(pdev, NULL);
- rtl8366_smi_cleanup(&rtl->smi);
- kfree(rtl);
+ rtl8366_smi_cleanup(smi);
+ kfree(smi);
}
return 0;
projects / openwrt.git / blobdiff