From: Andrew Halaney <ahalaney@redhat.com>
To: Jakub Kicinski <kuba@kernel.org>
Cc: linux-kernel@vger.kernel.org, agross@kernel.org,
andersson@kernel.org, konrad.dybcio@linaro.org,
davem@davemloft.net, edumazet@google.com, pabeni@redhat.com,
robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org,
vkoul@kernel.org, bhupesh.sharma@linaro.org,
mturquette@baylibre.com, sboyd@kernel.org,
peppe.cavallaro@st.com, alexandre.torgue@foss.st.com,
joabreu@synopsys.com, mcoquelin.stm32@gmail.com,
richardcochran@gmail.com, linux@armlinux.org.uk,
veekhee@apple.com, tee.min.tan@linux.intel.com,
mohammad.athari.ismail@intel.com, jonathanh@nvidia.com,
ruppala@nvidia.com, bmasney@redhat.com,
andrey.konovalov@linaro.org, linux-arm-msm@vger.kernel.org,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org, ncai@quicinc.com,
jsuraj@qti.qualcomm.com, hisunil@quicinc.com,
echanude@redhat.com
Subject: Re: [PATCH net-next v2 09/12] net: stmmac: Add EMAC3 variant of dwmac4
Date: Tue, 21 Mar 2023 17:19:58 -0500 [thread overview]
Message-ID: <20230321221958.e3s7mbpxp5hpm7su@halaney-x13s> (raw)
In-Reply-To: <20230320204153.21736840@kernel.org>
On Mon, Mar 20, 2023 at 08:41:53PM -0700, Jakub Kicinski wrote:
> On Mon, 20 Mar 2023 17:16:14 -0500 Andrew Halaney wrote:
> > The next approach that was checked was to have a function pointer
> > embedded inside a structure that does the appropriate conversion based
> > on the variant that's in use. However, some of the function definitions
> > are like the following:
> >
> > void emac3_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan)
>
> I checked a couple of callbacks and they seem to all be called with
> priv->iomem as an arg, so there is no strong reason to pass iomem
> instead of priv / hw. Or at least not to pass both..
>
> I think that's a better approach than adding the wrappers :(
>
> Are you familiar with coccinelle / spatch? It's often better than
> just regexps for refactoring, maybe it can help?
>
No worries, I'll try and refactor as you mentioned. Looking at it some
this afternoon makes me think I'll try something like this:
diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 16a7421715cb..75c55f696c7a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -12,7 +12,7 @@
({ \
int __result = -EINVAL; \
if ((__priv)->hw->__module && (__priv)->hw->__module->__cname) { \
- (__priv)->hw->__module->__cname((__arg0), ##__args); \
+ (__priv)->hw->__module->__cname((__priv), (__arg0), ##__args); \
__result = 0; \
} \
__result; \
@@ -21,7 +21,7 @@
({ \
int __result = -EINVAL; \
if ((__priv)->hw->__module && (__priv)->hw->__module->__cname) \
- __result = (__priv)->hw->__module->__cname((__arg0), ##__args); \
+ __result = (__priv)->hw->__module->__cname((__priv), (__arg0), ##__args); \
__result; \
})
@@ -34,68 +34,68 @@ struct dma_edesc;
/* Descriptors helpers */
struct stmmac_desc_ops {
/* DMA RX descriptor ring initialization */
- void (*init_rx_desc)(struct dma_desc *p, int disable_rx_ic, int mode,
- int end, int bfsize);
+ void (*init_rx_desc)(struct stmmac_priv *priv, struct dma_desc *p,
+ int disable_rx_ic, int mode, int end, int bfsize);
/* DMA TX descriptor ring initialization */
(...)
and then, I'll add something like:
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index a152678b82b7..f5f406a09ae3 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -273,5 +273,7 @@ struct plat_stmmacenet_data {
bool use_phy_wol;
bool sph_disable;
bool serdes_up_after_phy_linkup;
+ u32 mtl_base;
+ u32 mtl_offset;
};
#endif
and rewrite:
#define MTL_CHANX_BASE_ADDR(x) (MTL_CHAN_BASE_ADDR + \
(x * MTL_CHAN_BASE_OFFSET))
to use mtl_base/offset if they exist, and so on for the DMA versions,
etc...
I'm sure I'll probably run into some issue and change course slightly,
but thought I'd post a hint of the path to make sure I'm not way off the
mark.
Thanks for your feedback,
Andrew
next prev parent reply other threads:[~2023-03-21 22:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 22:16 [PATCH net-next v2 00/12] Add EMAC3 support for sa8540p-ride Andrew Halaney
2023-03-20 22:16 ` [PATCH net-next v2 01/12] dt-bindings: net: snps,dwmac: Update interrupt-names Andrew Halaney
2023-03-21 6:46 ` Krzysztof Kozlowski
2023-03-20 22:16 ` [PATCH net-next v2 02/12] dt-bindings: net: snps,dwmac: Add Qualcomm Ethernet ETHQOS compatibles Andrew Halaney
2023-03-20 22:16 ` [PATCH net-next v2 03/12] dt-bindings: net: qcom,ethqos: Convert bindings to yaml Andrew Halaney
2023-03-21 6:47 ` Krzysztof Kozlowski
2023-03-20 22:16 ` [PATCH net-next v2 04/12] dt-bindings: net: qcom,ethqos: Add Qualcomm sc8280xp compatibles Andrew Halaney
2023-03-21 6:47 ` Krzysztof Kozlowski
2023-03-20 22:16 ` [PATCH net-next v2 05/12] clk: qcom: gcc-sc8280xp: Add EMAC GDSCs Andrew Halaney
2023-03-21 19:33 ` Konrad Dybcio
2023-03-20 22:16 ` [PATCH net-next v2 06/12] arm64: dts: qcom: sc8280xp: Add ethernet nodes Andrew Halaney
2023-03-21 19:33 ` Konrad Dybcio
2023-03-20 22:16 ` [PATCH net-next v2 07/12] arm64: dts: qcom: sa8540p-ride: " Andrew Halaney
2023-03-20 22:16 ` [PATCH net-next v2 08/12] net: stmmac: Remove unnecessary if statement brackets Andrew Halaney
2023-03-20 22:16 ` [PATCH net-next v2 09/12] net: stmmac: Add EMAC3 variant of dwmac4 Andrew Halaney
2023-03-21 3:41 ` Jakub Kicinski
2023-03-21 22:19 ` Andrew Halaney [this message]
2023-03-20 22:16 ` [PATCH net-next v2 10/12] net: stmmac: dwmac-qcom-ethqos: Respect phy-mode and TX delay Andrew Halaney
2023-03-21 3:29 ` Jakub Kicinski
2023-03-20 22:16 ` [PATCH net-next v2 11/12] net: stmmac: dwmac-qcom-ethqos: Use loopback_en for all speeds Andrew Halaney
2023-03-20 22:16 ` [PATCH net-next v2 12/12] net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support Andrew Halaney
2023-03-21 3:28 ` [PATCH net-next v2 00/12] Add EMAC3 support for sa8540p-ride Jakub Kicinski
2023-03-21 18:44 ` Andrew Halaney
2023-03-22 2:44 ` Bjorn Andersson
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=20230321221958.e3s7mbpxp5hpm7su@halaney-x13s \
--to=ahalaney@redhat.com \
--cc=agross@kernel.org \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=bhupesh.sharma@linaro.org \
--cc=bmasney@redhat.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=echanude@redhat.com \
--cc=edumazet@google.com \
--cc=hisunil@quicinc.com \
--cc=joabreu@synopsys.com \
--cc=jonathanh@nvidia.com \
--cc=jsuraj@qti.qualcomm.com \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=mcoquelin.stm32@gmail.com \
--cc=mohammad.athari.ismail@intel.com \
--cc=mturquette@baylibre.com \
--cc=ncai@quicinc.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=peppe.cavallaro@st.com \
--cc=richardcochran@gmail.com \
--cc=robh+dt@kernel.org \
--cc=ruppala@nvidia.com \
--cc=sboyd@kernel.org \
--cc=tee.min.tan@linux.intel.com \
--cc=veekhee@apple.com \
--cc=vkoul@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).