Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D606C3DA4B for ; Fri, 12 Jul 2024 13:16:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BDEB881BA; Fri, 12 Jul 2024 15:16:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1720790169; bh=CMZaJgbdcl3BXLlwuIv8IyvKNv9NdLrFthldG32fp2M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qNpuJmeumMEKvPfwZ0lNP0jlI6ynUzl/J45Mv/WVL1tBkoqbrGx2HtS15waEK7n7j 291WMDjfvl2tLbrvK3rTjzFhy0+JmG49NUDE9Y86ESbpamQWh9szwQS5EoOGH5zNiG 7Si5Noqtmfm3z3IvpemFkLX0qx7f4DmEEZ9cS9em7a7uYf6N2DsN6ymxSOwY/CPXvd lyMFuv5lBxBxT9+kL0INE1GAdB5m25KzqyMhGdIbBdmimPo+FWro/Vt2rp2du67vG1 foWLyBtS1RVkb4ij++PTTUlHAsCEZxEHaGFZWEzYVluFF82WECIxvMc5WVfyrmmDRq hduabZWnF8CuA== Received: from eryximachos (lmontsouris-657-1-115-25.w82-127.abo.wanadoo.fr [82.127.153.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: pro@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id E270187B8D; Fri, 12 Jul 2024 15:16:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1720790168; bh=CMZaJgbdcl3BXLlwuIv8IyvKNv9NdLrFthldG32fp2M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=RmC2Aj6moQoDSysyfFH2y9IDV4QwDeLMoAwBjwx7XEpkmk2ury1wAL2lm6Zq74Nkh yWZw51rr4jLvDIrAeYngmrFOpCU3tU5iDomvDn5eElStSTIzGh7+Ta12mfI8eZLVwQ dgntl6xa6Uq+0qa7Uu1XZwEI1QLOBOT1eO8mPS7K/rqkY91R0rcPCpZhkpC5Jj90qV r0VmyFIhSAc9x5AQ+xUKRtV3FiEsETS0QYvr1kqb7OcgiarMyvMSY+L2ZFwycNltk5 9KuULhuu7kFkZe+bXkaVMqW9rX5OU+Y259i0t9R9h0UswjxAzqyVrCzQwWgnrcJYKV +IVJPeIgnWjUA== Date: Fri, 12 Jul 2024 15:16:03 +0200 From: Philip Oberfichtner To: Marek Vasut Cc: u-boot@lists.denx.de, bmeng.cn@gmail.com, caleb.connolly@linaro.org, christophe.roullier@foss.st.com, epsi@gmx.de, eugen.hristev@collabora.com, festevam@gmail.com, forbidden405@outlook.com, ivprusov@salutedevices.com, joe.hershberger@ni.com, jonas@kwiboo.se, kever.yang@rock-chips.com, leyfoon.tan@starfivetech.com, marek.vasut+renesas@mailbox.org, marjolaine.amate@odyssee-systemes.fr, neil.armstrong@linaro.org, n-francis@ti.com, patrice.chotard@foss.st.com, patrick.delaunay@foss.st.com, philipp.tomsich@vrull.eu, rfried.dev@gmail.com, seanga2@gmail.com, sebastian.reichel@collabora.com, sebastien.szymanski@armadeus.com, sjg@chromium.org, sumit.garg@linaro.org, trini@konsulko.com, xypron.glpk@gmx.de Subject: Re: [RESEND PATCH v2 3/5] net: dwc_eth_qos: Adapt probe() for PCI devices Message-ID: References: <20240624083450.90297-1-pro@denx.de> <20240624083450.90297-4-pro@denx.de> <94f5509d-2a99-49cb-96b4-f405a6143ee7@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <94f5509d-2a99-49cb-96b4-f405a6143ee7@denx.de> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Hi Marek, Thank you for the review! On Sun, Jun 30, 2024 at 07:33:33AM +0200, Marek Vasut wrote: > On 6/24/24 10:34 AM, Philip Oberfichtner wrote: > > PCI devices do not necessarily use a device tree. In that case, the > > driver currently fails to find eqos->config and eqos->regs. > > > > This commit factors out the respective functionality. Device tree usage > > remains default, but board specific implementations will be possible as > > well. > > > > Signed-off-by: Philip Oberfichtner > > --- > > drivers/net/dwc_eth_qos.c | 28 +++++++++++++++++++++++++--- > > drivers/net/dwc_eth_qos.h | 3 +++ > > drivers/net/dwc_eth_qos_imx.c | 1 + > > drivers/net/dwc_eth_qos_qcom.c | 1 + > > drivers/net/dwc_eth_qos_rockchip.c | 1 + > > drivers/net/dwc_eth_qos_starfive.c | 1 + > > drivers/net/dwc_eth_qos_stm32.c | 1 + > > 7 files changed, 33 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c > > index b87634f1f5..34e29301cc 100644 > > --- a/drivers/net/dwc_eth_qos.c > > +++ b/drivers/net/dwc_eth_qos.c > > @@ -1376,6 +1376,21 @@ static int eqos_remove_resources_tegra186(struct udevice *dev) > > return 0; > > } > > +/* > > + * Get driver data based on the device tree. Boards not using a device tree can > > + * overwrite this function. > > + */ > > +__weak void *eqos_get_driver_data(struct udevice *dev) > > +{ > > + return (void *)dev_get_driver_data(dev); > > +} > > + > > +/* Function to get base address, useable for all boards having a device tree. */ > > +fdt_addr_t eqos_get_base_addr_dt(struct udevice *dev) > > +{ > > + return dev_read_addr(dev); > > +} > > + > > static int eqos_probe(struct udevice *dev) > > { > > struct eqos_priv *eqos = dev_get_priv(dev); > > @@ -1384,13 +1399,19 @@ static int eqos_probe(struct udevice *dev) > > debug("%s(dev=%p):\n", __func__, dev); > > eqos->dev = dev; > > - eqos->config = (void *)dev_get_driver_data(dev); > > - eqos->regs = dev_read_addr(dev); > > + eqos->config = eqos_get_driver_data(dev); > > + if (!eqos->config) { > > + pr_err("Failed to get driver data.\n"); > > + return -ENODEV; > > + } > > + > > + eqos->regs = eqos->config->ops->eqos_get_base_addr(dev); > > if (eqos->regs == FDT_ADDR_T_NONE) { > > - pr_err("dev_read_addr() failed\n"); > > + pr_err("Failed to get device address.\n"); > > return -ENODEV; > > } > > + > > eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE); > > eqos->mtl_regs = (void *)(eqos->regs + EQOS_MTL_REGS_BASE); > > eqos->dma_regs = (void *)(eqos->regs + EQOS_DMA_REGS_BASE); > > Could you factor out the entirety of: > > eqos->regs = dev_read_addr(dev); > if (eqos->regs == FDT_ADDR_T_NONE) { > pr_err("dev_read_addr() failed\n"); > return -ENODEV; > } > eqos->mac_regs = (void *)(eqos->regs + EQOS_MAC_REGS_BASE); > eqos->mtl_regs = (void *)(eqos->regs + EQOS_MTL_REGS_BASE); > eqos->dma_regs = (void *)(eqos->regs + EQOS_DMA_REGS_BASE); > eqos->tegra186_regs = (void *)(eqos->regs + > EQOS_TEGRA186_REGS_BASE); > > into some common function, like eqos_get_base_addr_dt() , and call it from > .eqos_probe_resources callback instead ? That way you wouldn't have to add > new callback specifically for register address. Good point. I'll include it in V3. Best regards, Philip -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-22 Fax: +49-8142-66989-80 Email: pro@denx.de =====================================================================