leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: Introduce dsa_get_cpu_port()

Browse Source 
Introduce a helper function which will return a reference to the CPU
port used in a dsa_switch_tree. Right now this is a singleton, but this
will change once we introduce multi-CPU port support, so ease the
transition by converting the affected code paths.

Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-06-13 13:27:22 -07:00 committed by David S. Miller
parent a29342e739
commit 3cc9f2573c
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/dsa/dsa_priv.h
View File

@ -188,4 +188,9 @@ static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p)
return p->dp->cpu_dp->netdev; return p->dp->cpu_dp->netdev;
} }
static inline struct dsa_port *dsa_get_cpu_port(struct dsa_switch_tree *dst)
{
return dst->cpu_dp;
}
#endif #endif

31
net/dsa/slave.c
View File

@ -520,14 +520,14 @@ static void dsa_cpu_port_get_ethtool_stats(struct net_device *dev,
uint64_t *data) uint64_t *data)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds = dst->cpu_dp->ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
s8 cpu_port = dst->cpu_dp->index; struct dsa_switch *ds = cpu_dp->ds;
s8 cpu_port = cpu_dp->index;
int count = 0; int count = 0;
if (dst->cpu_dp->ethtool_ops.get_sset_count) { if (cpu_dp->ethtool_ops.get_sset_count) {
count = dst->cpu_dp->ethtool_ops.get_sset_count(dev, count = cpu_dp->ethtool_ops.get_sset_count(dev, ETH_SS_STATS);
ETH_SS_STATS); cpu_dp->ethtool_ops.get_ethtool_stats(dev, stats, data);
dst->cpu_dp->ethtool_ops.get_ethtool_stats(dev, stats, data);
} }
if (ds->ops->get_ethtool_stats) if (ds->ops->get_ethtool_stats)
@ -537,11 +537,12 @@ static void dsa_cpu_port_get_ethtool_stats(struct net_device *dev,
static int dsa_cpu_port_get_sset_count(struct net_device *dev, int sset) static int dsa_cpu_port_get_sset_count(struct net_device *dev, int sset)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds = dst->cpu_dp->ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
struct dsa_switch *ds = cpu_dp->ds;
int count = 0; int count = 0;
if (dst->cpu_dp->ethtool_ops.get_sset_count) if (cpu_dp->ethtool_ops.get_sset_count)
count += dst->cpu_dp->ethtool_ops.get_sset_count(dev, sset); count += cpu_dp->ethtool_ops.get_sset_count(dev, sset);
if (sset == ETH_SS_STATS && ds->ops->get_sset_count) if (sset == ETH_SS_STATS && ds->ops->get_sset_count)
count += ds->ops->get_sset_count(ds); count += ds->ops->get_sset_count(ds);
@ -553,8 +554,9 @@ static void dsa_cpu_port_get_strings(struct net_device *dev,
uint32_t stringset, uint8_t *data) uint32_t stringset, uint8_t *data)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds = dst->cpu_dp->ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
s8 cpu_port = dst->cpu_dp->index; struct dsa_switch *ds = cpu_dp->ds;
s8 cpu_port = cpu_dp->index;
int len = ETH_GSTRING_LEN; int len = ETH_GSTRING_LEN;
int mcount = 0, count; int mcount = 0, count;
unsigned int i; unsigned int i;
@ -565,10 +567,9 @@ static void dsa_cpu_port_get_strings(struct net_device *dev,
/* We do not want to be NULL-terminated, since this is a prefix */ /* We do not want to be NULL-terminated, since this is a prefix */
pfx[sizeof(pfx) - 1] = '_'; pfx[sizeof(pfx) - 1] = '_';
if (dst->cpu_dp->ethtool_ops.get_sset_count) { if (cpu_dp->ethtool_ops.get_sset_count) {
mcount = dst->cpu_dp->ethtool_ops.get_sset_count(dev, mcount = cpu_dp->ethtool_ops.get_sset_count(dev, ETH_SS_STATS);
ETH_SS_STATS); cpu_dp->ethtool_ops.get_strings(dev, stringset, data);
dst->cpu_dp->ethtool_ops.get_strings(dev, stringset, data);
} }
if (stringset == ETH_SS_STATS && ds->ops->get_strings) { if (stringset == ETH_SS_STATS && ds->ops->get_strings) {

5
net/dsa/tag_brcm.c
View File

@ -93,12 +93,11 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
struct net_device *orig_dev) struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
struct dsa_switch *ds = cpu_dp->ds;
int source_port; int source_port;
u8 *brcm_tag; u8 *brcm_tag;
ds = dst->cpu_dp->ds;
if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN))) if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN)))
return NULL; return NULL;

5
net/dsa/tag_ksz.c
View File

@ -75,12 +75,11 @@ static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,
struct net_device *orig_dev) struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
struct dsa_switch *ds = cpu_dp->ds;
u8 *tag; u8 *tag;
int source_port; int source_port;
ds = dst->cpu_dp->ds;
tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN; tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
source_port = tag[0] & 7; source_port = tag[0] & 7;

3
net/dsa/tag_qca.c
View File

@ -67,6 +67,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
struct net_device *orig_dev) struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
struct dsa_switch *ds; struct dsa_switch *ds;
u8 ver; u8 ver;
int port; int port;
@ -95,7 +96,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
/* This protocol doesn't support cascading multiple switches so it's /* This protocol doesn't support cascading multiple switches so it's
* safe to assume the switch is first in the tree * safe to assume the switch is first in the tree
*/ */
ds = dst->cpu_dp->ds; ds = cpu_dp->ds;
if (!ds) if (!ds)
return NULL; return NULL;

5
net/dsa/tag_trailer.c
View File

@ -61,12 +61,11 @@ static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
struct net_device *orig_dev) struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
struct dsa_switch *ds = cpu_dp->ds;
u8 *trailer; u8 *trailer;
int source_port; int source_port;
ds = dst->cpu_dp->ds;
if (skb_linearize(skb)) if (skb_linearize(skb))
return NULL; return NULL;