From: Vivien Didelot <vivien.didelot@savoirfairelinux•com>
To: Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
narmstrong@baylibre•com
Cc: netdev <netdev@vger•kernel.org>, Andrew Lunn <andrew@lunn•ch>
Subject: Re: [PATCH RFC 08/28] net: dsa: Keep the mii bus and address in the private structure
Date: Thu, 21 Jan 2016 15:41:23 -0500 [thread overview]
Message-ID: <874me64qdo.fsf@ketchup.mtl.sfl> (raw)
In-Reply-To: <1450875402-20740-9-git-send-email-andrew@lunn.ch>
Hi Andrew,
Andrew Lunn <andrew@lunn•ch> writes:
> Rather than looking up the mii bus and address every time, do it once
> and setup, and keep it in the private structure.
>
> Signed-off-by: Andrew Lunn <andrew@lunn•ch>
> ---
> drivers/net/dsa/mv88e6060.c | 23 +++++++++++++----------
> drivers/net/dsa/mv88e6060.h | 11 +++++++++++
> drivers/net/dsa/mv88e6xxx.c | 16 ++++++----------
> drivers/net/dsa/mv88e6xxx.h | 6 ++++++
> 4 files changed, 36 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
> index 34bc374882c7..d48708dfd963 100644
> --- a/drivers/net/dsa/mv88e6060.c
> +++ b/drivers/net/dsa/mv88e6060.c
> @@ -19,12 +19,9 @@
>
> static int reg_read(struct dsa_switch *ds, int addr, int reg)
> {
> - struct mii_bus *bus = dsa_host_dev_to_mii_bus(ds->master_dev);
> + struct mv88e6060_priv *priv = ds_to_priv(ds);
>
> - if (bus == NULL)
> - return -EINVAL;
> -
> - return mdiobus_read_nested(bus, ds->pd->sw_addr + addr, reg);
> + return mdiobus_read_nested(priv->bus, priv->sw_addr + addr, reg);
> }
>
> #define REG_READ(addr, reg) \
> @@ -40,12 +37,9 @@ static int reg_read(struct dsa_switch *ds, int addr, int reg)
>
> static int reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)
> {
> - struct mii_bus *bus = dsa_host_dev_to_mii_bus(ds->master_dev);
> -
> - if (bus == NULL)
> - return -EINVAL;
> + struct mv88e6060_priv *priv = ds_to_priv(ds);
>
> - return mdiobus_write_nested(bus, ds->pd->sw_addr + addr, reg, val);
> + return mdiobus_write_nested(priv->bus, priv->sw_addr + addr, reg, val);
> }
>
> #define REG_WRITE(addr, reg, val) \
> @@ -176,6 +170,15 @@ static int mv88e6060_setup(struct dsa_switch *ds, struct device *dev)
> {
> int i;
> int ret;
> + struct mv88e6060_priv *priv;
> +
> + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + ds->priv = priv;
> + priv->bus = dsa_host_dev_to_mii_bus(ds->master_dev);
This patch drops the checks for !bus, and thus mdiobus_write_nested can
segfault later. Maybe restore the check here?
if (!priv->bus)
return -EINVAL;
> + priv->sw_addr = ds->pd->sw_addr;
>
> ret = mv88e6060_switch_reset(ds);
> if (ret < 0)
> diff --git a/drivers/net/dsa/mv88e6060.h b/drivers/net/dsa/mv88e6060.h
> index cc9b2ed4aff4..10249bd16292 100644
> --- a/drivers/net/dsa/mv88e6060.h
> +++ b/drivers/net/dsa/mv88e6060.h
> @@ -108,4 +108,15 @@
> #define GLOBAL_ATU_MAC_23 0x0e
> #define GLOBAL_ATU_MAC_45 0x0f
>
> +struct mv88e6060_priv {
> + /* MDIO bus and address on bus to use. When in single chip
> + * mode, address is 0, and the switch uses multiple addresses
> + * on the bus. When in multi-chip mode, the switch uses a
> + * single address which contains two registers used for
> + * indirect access to more registers.
> + */
> + struct mii_bus *bus;
> + int sw_addr;
> +};
> +
> #endif
> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
> index 772adc7f9397..170b98f3acbe 100644
> --- a/drivers/net/dsa/mv88e6xxx.c
> +++ b/drivers/net/dsa/mv88e6xxx.c
> @@ -94,15 +94,12 @@ static int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr,
>
> static int _mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg)
> {
> - struct mii_bus *bus = dsa_host_dev_to_mii_bus(ds->master_dev);
> + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
> int ret;
>
> assert_smi_lock(ds);
>
> - if (bus == NULL)
> - return -EINVAL;
> -
> - ret = __mv88e6xxx_reg_read(bus, ds->pd->sw_addr, addr, reg);
> + ret = __mv88e6xxx_reg_read(ps->bus, ps->sw_addr, addr, reg);
> if (ret < 0)
> return ret;
>
> @@ -159,17 +156,14 @@ static int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,
> static int _mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg,
> u16 val)
> {
> - struct mii_bus *bus = dsa_host_dev_to_mii_bus(ds->master_dev);
> + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
>
> assert_smi_lock(ds);
>
> - if (bus == NULL)
> - return -EINVAL;
> -
> dev_dbg(ds->master_dev, "-> addr: 0x%.2x reg: 0x%.2x val: 0x%.4x\n",
> addr, reg, val);
>
> - return __mv88e6xxx_reg_write(bus, ds->pd->sw_addr, addr, reg, val);
> + return __mv88e6xxx_reg_write(ps->bus, ps->sw_addr, addr, reg, val);
> }
>
> int mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)
> @@ -2197,6 +2191,8 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds, struct device *dev)
>
> ds->priv = ps;
> ps->ds = ds;
> + ps->bus = dsa_host_dev_to_mii_bus(ds->master_dev);
Same comment here.
> + ps->sw_addr = ds->pd->sw_addr;
>
> mutex_init(&ps->smi_mutex);
>
> diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
> index 72f7dbbce0e2..62069b30f6e5 100644
> --- a/drivers/net/dsa/mv88e6xxx.h
> +++ b/drivers/net/dsa/mv88e6xxx.h
> @@ -388,6 +388,12 @@ struct mv88e6xxx_priv_state {
> */
> struct mutex smi_mutex;
>
> + /* The MII bus and the address on the bus that is used to
> + * communication with the switch
> + */
> + struct mii_bus *bus;
> + int sw_addr;
> +
> #ifdef CONFIG_NET_DSA_MV88E6XXX_NEED_PPU
> /* Handles automatic disabling and re-enabling of the PHY
> * polling unit.
> --
> 2.6.3
Thanks,
-v
next prev parent reply other threads:[~2016-01-21 20:47 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 12:56 [PATCH RFC 00/28] DSA: Restructure probing Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 01/28] component: remove old add_components method Andrew Lunn
2015-12-23 13:21 ` Russell King - ARM Linux
2015-12-23 15:57 ` Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 02/28] ARM: VF610: Add Zodiac Inflight Innovations development boards Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 03/28] net: dsa: Move platform data allocation for OF Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 04/28] dsa: Rename mv88e6123_61_65 to mv88e6123 to be consistent Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 05/28] net: dsa: Pass the dsa device to the switch drivers Andrew Lunn
2015-12-23 20:36 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 06/28] net: dsa: Have the switch driver allocate there own private memory Andrew Lunn
2015-12-23 20:39 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 07/28] net: dsa: Remove allocation of driver " Andrew Lunn
2015-12-23 20:39 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 08/28] net: dsa: Keep the mii bus and address in the private structure Andrew Lunn
2015-12-23 20:40 ` Florian Fainelli
2016-01-21 20:41 ` Vivien Didelot [this message]
2016-01-21 20:50 ` Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 09/28] net: dsa: Add basic support for component master support Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 10/28] net: dsa: Keep a reference to the switch device for component matching Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 11/28] net: dsa: Add slave component matches based on a phandle to the slave Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 12/28] net: dsa: Make dsa,mii-bus optional Andrew Lunn
2015-12-23 20:42 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 13/28] net: dsa: Add register/unregister functions for switch drivers Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 14/28] net: dsa: Rename DSA probe function Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 15/28] of_mdio: Add "mii-bus" and address property parser Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 16/28] dsa: mv88e6xxx: Use bus in mv88e6xxx_lookup_name() Andrew Lunn
2016-01-21 20:54 ` Vivien Didelot
2015-12-23 12:56 ` [PATCH RFC 17/28] dsa: mv88e6xxx: Add shared code for binding/unbinding a switch driver Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 18/28] dsa: Add platform device support to Marvell switches Andrew Lunn
2016-01-21 21:05 ` Vivien Didelot
2015-12-23 12:56 ` [PATCH RFC 19/28] net: dsa: bcm_sf2: make it a real platform driver Andrew Lunn
2015-12-23 20:32 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 20/28] vf610: Zii: Convert rev b to switches as individual devices Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 21/28] net: dsa: Add some debug prints for error cases Andrew Lunn
2015-12-23 20:42 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 22/28] net: dsa: Setup the switches after all have been probed Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 23/28] net: dsa: Only setup platform switches, not device switches Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 24/28] net: dsa: If a switch fails to probe, defer probing Andrew Lunn
2015-12-23 20:46 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 25/28] Documentation: DSA: Describe how probe of DSA and switches work Andrew Lunn
2015-12-23 20:48 ` Florian Fainelli
2015-12-23 22:53 ` Andrew Lunn
2015-12-25 1:29 ` Florian Fainelli
2015-12-25 10:00 ` Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 26/28] dsa: Convert mv88e6xxx into a library allowing driver modules Andrew Lunn
2015-12-25 21:47 ` Florian Fainelli
2016-01-21 21:29 ` Vivien Didelot
2016-01-21 21:54 ` Andrew Lunn
2015-12-23 12:56 ` [PATCH RFC 27/28] dsa: slave: Don't reference NULL pointer during phy_disconnect Andrew Lunn
2015-12-23 20:45 ` Florian Fainelli
2015-12-23 12:56 ` [PATCH RFC 28/28] dsa: Destroy fixed link phys after the phy has been disconnected Andrew Lunn
2015-12-23 20:45 ` Florian Fainelli
2015-12-23 20:44 ` [PATCH RFC 00/28] DSA: Restructure probing Florian Fainelli
2015-12-23 22:33 ` Andrew Lunn
2015-12-23 23:13 ` Florian Fainelli
2015-12-24 12:58 ` Andrew Lunn
2015-12-25 1:47 ` Florian Fainelli
2015-12-25 11:31 ` Andrew Lunn
2015-12-25 22:00 ` Florian Fainelli
2015-12-25 23:41 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874me64qdo.fsf@ketchup.mtl.sfl \
--to=vivien.didelot@savoirfairelinux$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=f.fainelli@gmail$(echo .)com \
--cc=narmstrong@baylibre$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox