Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 1 Apr 2023 16:58:59 +0200
From:   Simon Horman <simon.horman@corigine.com>
To:     Andrew Halaney <ahalaney@redhat.com>
Cc:     linux-kernel@vger.kernel.org, agross@kernel.org,
        andersson@kernel.org, konrad.dybcio@linaro.org,
        davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, robh+dt@kernel.org,
        krzysztof.kozlowski+dt@linaro.org, vkoul@kernel.org,
        bhupesh.sharma@linaro.org, wens@csie.org, jernej.skrabec@gmail.com,
        samuel@sholland.org, mturquette@baylibre.com,
        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-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 v3 09/12] net: stmmac: dwmac4: Allow platforms
 to specify some DMA/MTL offsets
Message-ID: <ZChGswjgAOkT0jvY@corigine.com>
References: <20230331214549.756660-1-ahalaney@redhat.com>
 <20230331214549.756660-10-ahalaney@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230331214549.756660-10-ahalaney@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1u4fHk4HtSM7kgAuB4AqCJDficjPcJAxed8iHrbnxL7Tg8TTFQ9mieoX8Gd/?=
 =?us-ascii?Q?9WyAMbF5Z1rLFn4LJEz0jUVO/6rtsyCyAc/+16R4gKGdNS6HbHB944f+EECg?=
 =?us-ascii?Q?XC0zsaPwGwJZb0/odY3LZvfnlV51tgvTrLfdq/L+AuZbUKfsQNgeac6PJ3TP?=
 =?us-ascii?Q?Z9YIWmaUvCBnTET+yTp16aZA7ihhlleebX2dbBRXGqNs8V9sbvSP5Z/bULjL?=
 =?us-ascii?Q?Ib4rS04iR80Pdcf0fKwPQSOa0T+Ryjtg6RzJYcAlyZu4cpcsrB9IJPrUnIKB?=
 =?us-ascii?Q?W7rISLa7tqMtohNkf+RKqMXS6+8HUhiXY9yOWZFg3Eun2Jz3Sqm7ioNYhuxQ?=
 =?us-ascii?Q?2vNZPjeWQLfaH5RXCrzq7UpKdnDzdjYR4VnoYwAYYpF5Ll9mU7OGydCnIxIX?=
 =?us-ascii?Q?PoYutYaP7RBeCNiReBpJKn/f2sNccJugU+aaYjXbUFt80tSBD3GH/PcqhaTr?=
 =?us-ascii?Q?eXlfMye6N0wHnleCnITAN4QsGgXdWp+x4S2UNZl2NzVxAZL1uHP06UOetE7/?=
 =?us-ascii?Q?BYOq+9/oezvqVtVhjMmKqio2nwn++5UBDIOfTzwbP6lf3nCW35oICMbH/Lur?=
 =?us-ascii?Q?MkpnEnVh4qlmmnzwZ/0kUo+JswuwlHfsOF4A4ffk8gCyRQTPy1/TbBppAj5C?=
 =?us-ascii?Q?Wyf/wYMUhU0x6MTRGTZOoOZ6kjArGB94NYsviPMjmEqo0bA6HZG16icshVA2?=
 =?us-ascii?Q?kMRbZhqZRIaSL46y1RYYUEjJ0M6mGkUR1e3F3dMtSTTAUM4hNJDF/IOYyqNh?=
 =?us-ascii?Q?/ukhA6irBlJi02asJdalIy6HC8OjZ0au2+1jBuCfuAAtjs9XGXmFn2UBvzxR?=
 =?us-ascii?Q?y5UadCimjcrqw/1929XurUYhRZ6kfHgdcaSJ1NSpGMOK7FcuHDrHuCOzqACd?=
 =?us-ascii?Q?NXgx8UOvnTel4WkPNPF/1g0uMGLBcz1mQR4xT4YzJ59lOk7vhe9e0+9Q/cjh?=
 =?us-ascii?Q?PjZyKesKsDp3zwIilY+IzsRE7VW6C/sdX6epUCryVB93AOeVzL0/Vriak207?=
 =?us-ascii?Q?9t5Rjr7eiPFnOO11fBGcKj4ORbzgLnOoEERVWvoCh9Glc2G85eYGAbBai66L?=
 =?us-ascii?Q?xwEuKeTsTXamTv4ST/3qqgjtaduTjFb6TaeBxO1KLsYt8Dh23dRgoe5OFPYs?=
 =?us-ascii?Q?qr9P8Sg1cSLnsSvN+KMbCNkjBaB40keWfkzK/XTCULAd5ClS9IuA7xsRXN0I?=
 =?us-ascii?Q?D+vjmaibAH3rPOrmFgXEvDDod+t4bKo/Y19a5W8AzOzBiMj+YxFnvsY+VPUZ?=
 =?us-ascii?Q?INJA2Ei9x5GKTUPLXr9G5XQgDG1/u4im29k1SncFatn6UF7DSKE8Z+WxSFWj?=
 =?us-ascii?Q?Lsm/7I0P8G6nL2MvqNUR2rkwUPYmyAXfIlSrdTOVZmh5XWAiA1MH/DsIHlpj?=
 =?us-ascii?Q?eKockzr5L1ZUpV3tUyABn44e9h2+4c36wwPJMngK6nlZsl6KUnv7SQGtXI2z?=
 =?us-ascii?Q?iecf0ctBT/spw0mKlkLFp8aJtJozfLIWbHVyagB0vwS4wbpMn2ETzr8vEV2u?=
 =?us-ascii?Q?fL7VVyxRV1MFHdJJ5PnfaBCgG2Ds96mA5OFhPozfk2gEP/I/hPJmv2sC1eGA?=
 =?us-ascii?Q?66thbD+gVQWlqEdIBMtLi4PWOCh066S/dOhWjSLcbvm4ysmg/wc/1GnKHkYt?=
 =?us-ascii?Q?ehLLmZy6yJrbs8AiayHBfTgYHEpB1Fo4KzAU/QPYTTe78SGzg9BWIATpSyNs?=
 =?us-ascii?Q?y/Mtjg=3D=3D?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d64d151-1bcb-41e7-1aed-08db32c1a684
X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2023 14:59:11.1074
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kvdBOGxMlg6hN0mn9B1R9F3uOqlyre+jxJ05/ufRxzBwRMS7Lhj0iqiqdNfiaN/UX8u/NBU8cZ/bc0fBvBLQ7N/D+fK3GgPM6fmZ8YW82as=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5294
X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Mar 31, 2023 at 04:45:46PM -0500, Andrew Halaney wrote:
> Some platforms have dwmac4 implementations that have a different
> address space layout than the default, resulting in the need to define
> their own DMA/MTL offsets.
> 
> Extend the functions to allow a platform driver to indicate what its
> addresses are, overriding the defaults.
> 
> Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
> ---
> 
> This patch (and the prior patch) are replacements for
> https://lore.kernel.org/netdev/20230320204153.21736840@kernel.org/
> as was requested. Hopefully I was understanding the intent correctly :)
> 
> I'm pretty sure further refinement will be requested for this one, but
> it is the best I could come up with myself! Specifically some of the
> naming, dealing with spacing in some older spots of dwmac4,
> where the addresses should live in the structure hierarchy, etc are
> things I would not be surprised to have to rework if this is still
> preferred over the wrapper approach.
> 
> Changes since v2:
>     * New, replacing old wrapper approach
> 
>  drivers/net/ethernet/stmicro/stmmac/dwmac4.h  |  91 ++++++++--
>  .../net/ethernet/stmicro/stmmac/dwmac4_core.c |  36 ++--
>  .../net/ethernet/stmicro/stmmac/dwmac4_dma.c  | 157 ++++++++++--------
>  .../net/ethernet/stmicro/stmmac/dwmac4_dma.h  |  51 +++---
>  .../net/ethernet/stmicro/stmmac/dwmac4_lib.c  |  67 +++++---
>  include/linux/stmmac.h                        |  19 +++
>  6 files changed, 279 insertions(+), 142 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
> index ccd49346d3b3..a0c0ee1dc13f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
> @@ -336,14 +336,23 @@ enum power_event {
>  
>  #define MTL_CHAN_BASE_ADDR		0x00000d00
>  #define MTL_CHAN_BASE_OFFSET		0x40
> -#define MTL_CHANX_BASE_ADDR(x)		(MTL_CHAN_BASE_ADDR + \
> -					(x * MTL_CHAN_BASE_OFFSET))
> -
> -#define MTL_CHAN_TX_OP_MODE(x)		MTL_CHANX_BASE_ADDR(x)
> -#define MTL_CHAN_TX_DEBUG(x)		(MTL_CHANX_BASE_ADDR(x) + 0x8)
> -#define MTL_CHAN_INT_CTRL(x)		(MTL_CHANX_BASE_ADDR(x) + 0x2c)
> -#define MTL_CHAN_RX_OP_MODE(x)		(MTL_CHANX_BASE_ADDR(x) + 0x30)
> -#define MTL_CHAN_RX_DEBUG(x)		(MTL_CHANX_BASE_ADDR(x) + 0x38)
> +#define MTL_CHANX_BASE_ADDR(addrs, x)  \
> +({ \
> +	const struct dwmac4_addrs *__addrs = addrs; \
> +	const u32 __x = x; \
> +	u32 __addr; \
> +	if (__addrs) \
> +		__addr = __addrs->mtl_chan + (__x * __addrs->mtl_chan_offset); \
> +	else \
> +		__addr = MTL_CHAN_BASE_ADDR + (__x * MTL_CHAN_BASE_OFFSET); \
> +	__addr; \
> +})

Could this and similar macros added by this patch be functions?
From my pov a benefit would be slightly more type safety.
And as a bonus there wouldn't be any need to handle aliasing of input.