Re: [RFC 07/20] net: dsa: list ports in switch\\

From: Andrew Lunn
Date: Wed Apr 27 2016 - 19:15:43 EST


On Wed, Apr 27, 2016 at 06:30:04PM -0400, Vivien Didelot wrote:
> List DSA port structures in their switch structure, so that drivers can
> iterate on them to retrieve information such as their ports membership.

And this would be so much easier using a plan array.

Andrew

>
> Signed-off-by: Vivien Didelot <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
> ---
> include/net/dsa.h | 9 +++++++++
> net/dsa/dsa.c | 4 ++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/include/net/dsa.h b/include/net/dsa.h
> index 69e467c..5f2e7df 100644
> --- a/include/net/dsa.h
> +++ b/include/net/dsa.h
> @@ -32,6 +32,11 @@ enum dsa_tag_protocol {
> #define DSA_MAX_SWITCHES 4
> #define DSA_MAX_PORTS 12
>
> +#define dsa_switch_for_each_port(_ds, _dp, _num_ports) \
> + for (_dp = list_first_entry(&_ds->dp, typeof(*_dp), list); \
> + &_dp->list != (&_ds->dp) && _dp->port < _num_ports; \
> + _dp = list_next_entry(_dp, list))
> +
> struct dsa_chip_data {
> /*
> * How to access the switch configuration registers.
> @@ -123,6 +128,8 @@ struct dsa_switch_tree {
> };
>
> struct dsa_port {
> + struct list_head list;
> +
> struct dsa_switch *ds;
> int port;
>
> @@ -173,6 +180,8 @@ struct dsa_switch {
> u32 phys_mii_mask;
> struct mii_bus *slave_mii_bus;
> struct net_device *ports[DSA_MAX_PORTS];
> +
> + struct list_head dp;
> };
>
> static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
> diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
> index 222494c..3daffb6 100644
> --- a/net/dsa/dsa.c
> +++ b/net/dsa/dsa.c
> @@ -225,6 +225,8 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
> int index = ds->index;
> int i, ret;
>
> + INIT_LIST_HEAD(&ds->dp);
> +
> /*
> * Validate supplied switch configuration.
> */
> @@ -238,6 +240,8 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
> dp[i]->ds = ds;
> dp[i]->port = i;
>
> + list_add_tail(&dp[i]->list, &ds->dp);
> +
> name = pd->port_names[i];
> if (name == NULL)
> continue;
> --
> 2.8.0
>