From: Andrew Lunn <andrew@lunn.ch>
To: Claudiu Manoil <claudiu.manoil@nxp.com>
Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org,
alexandru.marginean@nxp.com, linux-kernel@vger.kernel.org,
Li Yang <leoyang.li@nxp.com>, Rob Herring <robh+dt@kernel.org>,
"David S . Miller" <davem@davemloft.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH net-next v1 1/4] enetc: Clean up local mdio bus allocation
Date: Wed, 24 Jul 2019 17:18:03 +0200 [thread overview]
Message-ID: <20190724151803.GR25635@lunn.ch> (raw)
In-Reply-To: <1563979301-596-2-git-send-email-claudiu.manoil@nxp.com>
On Wed, Jul 24, 2019 at 05:41:38PM +0300, Claudiu Manoil wrote:
> Though it works, this is not how it should have been.
> What's needed is a pointer to the mdio registers.
> Store it properly inside bus->priv allocated space.
> Use devm_* variant to further clean up the init error /
> remove paths.
>
> Fixes following sparse warning:
> warning: incorrect type in assignment (different address spaces)
> expected void *priv
> got struct enetc_mdio_regs [noderef] <asn:2>*[assigned] regs
>
> Fixes: ebfcb23d62ab ("enetc: Add ENETC PF level external MDIO support")
>
> Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
> ---
> v1 - added this patch
>
> .../net/ethernet/freescale/enetc/enetc_mdio.c | 31 +++++++------------
> 1 file changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
> index 77b9cd10ba2b..1e3cd21c13ee 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c
> @@ -15,7 +15,8 @@ struct enetc_mdio_regs {
> u32 mdio_addr; /* MDIO address */
> };
>
> -#define bus_to_enetc_regs(bus) (struct enetc_mdio_regs __iomem *)((bus)->priv)
> +#define bus_to_enetc_regs(bus) (*(struct enetc_mdio_regs __iomem **) \
> + ((bus)->priv))
>
> #define ENETC_MDIO_REG_OFFSET 0x1c00
> #define ENETC_MDC_DIV 258
> @@ -146,12 +147,12 @@ static int enetc_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
> int enetc_mdio_probe(struct enetc_pf *pf)
> {
> struct device *dev = &pf->si->pdev->dev;
> - struct enetc_mdio_regs __iomem *regs;
> + struct enetc_mdio_regs __iomem **regsp;
> struct device_node *np;
> struct mii_bus *bus;
> - int ret;
> + int err;
>
> - bus = mdiobus_alloc_size(sizeof(regs));
> + bus = devm_mdiobus_alloc_size(dev, sizeof(*regsp));
> if (!bus)
> return -ENOMEM;
>
> @@ -159,41 +160,33 @@ int enetc_mdio_probe(struct enetc_pf *pf)
> bus->read = enetc_mdio_read;
> bus->write = enetc_mdio_write;
> bus->parent = dev;
> + regsp = bus->priv;
> snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev));
>
> /* store the enetc mdio base address for this bus */
> - regs = pf->si->hw.port + ENETC_MDIO_REG_OFFSET;
> - bus->priv = regs;
> + *regsp = pf->si->hw.port + ENETC_MDIO_REG_OFFSET;
This is all very odd and different to every other driver.
If i get the code write, there are 4 registers, each u32 in size,
starting at pf->si->hw.port + ENETC_MDIO_REG_OFFSET?
There are macros like enetc_port_wr() and enetc_global_wr(). It think
it would be much cleaner to add a macro enet_mdio_wr() which takes
hw, off, val.
#define enet_mdio_wr(hw, off, val) enet_port_wr(hw, off + ENETC_MDIO_REG_OFFSET, val)
struct enetc_mdio_priv {
struct enetc_hw *hw;
}
struct enetc_mdio_priv *mdio_priv;
bus = devm_mdiobus_alloc_size(dev, sizeof(*mdio_priv));
mdio_priv = bus->priv;
mdio_priv->hw = pf->si->hw;
static int enetc_mdio_write(struct mii_bus *bus, int phy_id, int regnum,
u16 value)
{
struct enetc_mdio_priv *mdio_priv = bus->priv;
...
enet_mdio_wr(priv->hw, ENETC_MDIO_CFG, mdio_cfg);
}
All the horrible casts go away, the driver is structured like every
other driver, sparse is probably happy, etc.
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-24 15:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 14:41 [PATCH net-next v1 0/4] enetc: Add mdio bus driver for the PCIe MDIO endpoint Claudiu Manoil
2019-07-24 14:41 ` [PATCH net-next v1 1/4] enetc: Clean up local mdio bus allocation Claudiu Manoil
2019-07-24 15:18 ` Andrew Lunn [this message]
2019-07-24 16:03 ` Claudiu Manoil
2019-07-24 16:39 ` Andrew Lunn
2019-07-24 14:41 ` [PATCH net-next v1 2/4] enetc: Add mdio bus driver for the PCIe MDIO endpoint Claudiu Manoil
2019-07-24 14:41 ` [PATCH net-next v1 3/4] dt-bindings: net: fsl: enetc: Add bindings for the central MDIO PCIe endpoint Claudiu Manoil
2019-07-24 14:41 ` [PATCH net-next v1 4/4] arm64: dts: fsl: ls1028a: Enable eth port1 on the ls1028a QDS board Claudiu Manoil
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=20190724151803.GR25635@lunn.ch \
--to=andrew@lunn.ch \
--cc=alexandru.marginean@nxp.com \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).