| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aRtIVlVcv+8+LtHv@lizhi-Precision-Tower-5810>
Date: Mon, 17 Nov 2025 11:07:50 -0500
From: Frank Li <Frank.li@....com>
To: Wei Fang <wei.fang@....com>
Cc: shenwei.wang@....com, xiaoning.wang@....com, andrew+netdev@...n.ch,
davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org,
pabeni@...hat.com, eric@...int.com, imx@...ts.linux.dev,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 net-next 2/5] net: fec: simplify the conditional
preprocessor directives
On Mon, Nov 17, 2025 at 06:19:18PM +0800, Wei Fang wrote:
> From the Kconfig file, we can see CONFIG_FEC depends on the following
> platform-related options.
>
> ColdFire: M523x, M527x, M5272, M528x, M520x and M532x
> S32: ARCH_S32 (ARM64)
> i.MX: SOC_IMX28 and ARCH_MXC (ARM and ARM64)
>
> Based on the code of fec driver, only some macro definitions on the
> M5272 platform are different from those on other platforms. Therefore,
> we can simplify the following complex preprocessor directives to
> "if !defined(CONFIG_M5272)".
>
> "#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || \
> defined(CONFIG_M528x) || defined(CONFIG_M520x) || \
> defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
> defined(CONFIG_ARM64)"
>
> In addition, remove the "#ifdef" guard for fec_enet_register_offset_6ul,
> so that we can safely remove the preprocessor directive from
> fec_enet_get_regs().
>
> Signed-off-by: Wei Fang <wei.fang@....com>
> ---
Reviewed-by: Frank Li <Frank.Li@....com>
> drivers/net/ethernet/freescale/fec.h | 4 +-
> drivers/net/ethernet/freescale/fec_main.c | 57 +++++++++--------------
> 2 files changed, 23 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
> index 41e0d85d15da..8e438f6e7ec4 100644
> --- a/drivers/net/ethernet/freescale/fec.h
> +++ b/drivers/net/ethernet/freescale/fec.h
> @@ -24,9 +24,7 @@
> #include <linux/timecounter.h>
> #include <net/xdp.h>
>
> -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
> - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
> - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
> +#if !defined(CONFIG_M5272) || defined(CONFIG_COMPILE_TEST)
> /*
> * Just figures, Motorola would have to change the offsets for
> * registers in the same peripheral device on different models
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index e0e84f2979c8..9cf579a8ac0f 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -253,9 +253,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");
> * size bits. Other FEC hardware does not, so we need to take that into
> * account when setting it.
> */
> -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
> - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
> - defined(CONFIG_ARM64)
> +#ifndef CONFIG_M5272
> #define OPT_ARCH_HAS_MAX_FL 1
> #else
> #define OPT_ARCH_HAS_MAX_FL 0
> @@ -2704,9 +2702,7 @@ static int fec_enet_get_regs_len(struct net_device *ndev)
> }
>
> /* List of registers that can be safety be read to dump them with ethtool */
> -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
> - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
> - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
> +#if !defined(CONFIG_M5272) || defined(CONFIG_COMPILE_TEST)
> static __u32 fec_enet_register_version = 2;
> static u32 fec_enet_register_offset[] = {
> FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0,
> @@ -2737,6 +2733,21 @@ static u32 fec_enet_register_offset[] = {
> IEEE_R_DROP, IEEE_R_FRAME_OK, IEEE_R_CRC, IEEE_R_ALIGN, IEEE_R_MACERR,
> IEEE_R_FDXFC, IEEE_R_OCTETS_OK
> };
> +#else
> +static __u32 fec_enet_register_version = 1;
> +static u32 fec_enet_register_offset[] = {
> + FEC_ECNTRL, FEC_IEVENT, FEC_IMASK, FEC_IVEC, FEC_R_DES_ACTIVE_0,
> + FEC_R_DES_ACTIVE_1, FEC_R_DES_ACTIVE_2, FEC_X_DES_ACTIVE_0,
> + FEC_X_DES_ACTIVE_1, FEC_X_DES_ACTIVE_2, FEC_MII_DATA, FEC_MII_SPEED,
> + FEC_R_BOUND, FEC_R_FSTART, FEC_X_WMRK, FEC_X_FSTART, FEC_R_CNTRL,
> + FEC_MAX_FRM_LEN, FEC_X_CNTRL, FEC_ADDR_LOW, FEC_ADDR_HIGH,
> + FEC_GRP_HASH_TABLE_HIGH, FEC_GRP_HASH_TABLE_LOW, FEC_R_DES_START_0,
> + FEC_R_DES_START_1, FEC_R_DES_START_2, FEC_X_DES_START_0,
> + FEC_X_DES_START_1, FEC_X_DES_START_2, FEC_R_BUFF_SIZE_0,
> + FEC_R_BUFF_SIZE_1, FEC_R_BUFF_SIZE_2
> +};
> +#endif
> +
> /* for i.MX6ul */
> static u32 fec_enet_register_offset_6ul[] = {
> FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0,
> @@ -2762,48 +2773,24 @@ static u32 fec_enet_register_offset_6ul[] = {
> IEEE_R_DROP, IEEE_R_FRAME_OK, IEEE_R_CRC, IEEE_R_ALIGN, IEEE_R_MACERR,
> IEEE_R_FDXFC, IEEE_R_OCTETS_OK
> };
> -#else
> -static __u32 fec_enet_register_version = 1;
> -static u32 fec_enet_register_offset[] = {
> - FEC_ECNTRL, FEC_IEVENT, FEC_IMASK, FEC_IVEC, FEC_R_DES_ACTIVE_0,
> - FEC_R_DES_ACTIVE_1, FEC_R_DES_ACTIVE_2, FEC_X_DES_ACTIVE_0,
> - FEC_X_DES_ACTIVE_1, FEC_X_DES_ACTIVE_2, FEC_MII_DATA, FEC_MII_SPEED,
> - FEC_R_BOUND, FEC_R_FSTART, FEC_X_WMRK, FEC_X_FSTART, FEC_R_CNTRL,
> - FEC_MAX_FRM_LEN, FEC_X_CNTRL, FEC_ADDR_LOW, FEC_ADDR_HIGH,
> - FEC_GRP_HASH_TABLE_HIGH, FEC_GRP_HASH_TABLE_LOW, FEC_R_DES_START_0,
> - FEC_R_DES_START_1, FEC_R_DES_START_2, FEC_X_DES_START_0,
> - FEC_X_DES_START_1, FEC_X_DES_START_2, FEC_R_BUFF_SIZE_0,
> - FEC_R_BUFF_SIZE_1, FEC_R_BUFF_SIZE_2
> -};
> -#endif
>
> static void fec_enet_get_regs(struct net_device *ndev,
> struct ethtool_regs *regs, void *regbuf)
> {
> + u32 reg_cnt = ARRAY_SIZE(fec_enet_register_offset);
> struct fec_enet_private *fep = netdev_priv(ndev);
> u32 __iomem *theregs = (u32 __iomem *)fep->hwp;
> + u32 *reg_list = fec_enet_register_offset;
> struct device *dev = &fep->pdev->dev;
> u32 *buf = (u32 *)regbuf;
> u32 i, off;
> int ret;
> -#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
> - defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
> - defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
> - u32 *reg_list;
> - u32 reg_cnt;
> -
> - if (!of_machine_is_compatible("fsl,imx6ul")) {
> - reg_list = fec_enet_register_offset;
> - reg_cnt = ARRAY_SIZE(fec_enet_register_offset);
> - } else {
> +
> + if (of_machine_is_compatible("fsl,imx6ul")) {
> reg_list = fec_enet_register_offset_6ul;
> reg_cnt = ARRAY_SIZE(fec_enet_register_offset_6ul);
> }
> -#else
> - /* coldfire */
> - static u32 *reg_list = fec_enet_register_offset;
> - static const u32 reg_cnt = ARRAY_SIZE(fec_enet_register_offset);
> -#endif
> +
> ret = pm_runtime_resume_and_get(dev);
> if (ret < 0)
> return;
> --
> 2.34.1
>
Powered by blists - more mailing lists