From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5DE4C433F5 for ; Mon, 10 Jan 2022 13:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rcG9X7dv+6zCF1WYP5QFtM6vNHp25dNczzL7LJ2HumU=; b=B6VvVDb/Jt8BDa O7NXHqc4PQ0KJGwbdrO8kwoCQXn5qq6Wi/M0Ta0PW6vS9Lrm3px6a8yyfHf0X4x95eNUmAiAsJ/d8 DBC3nx6156NqeyAqbY+gvER0+kpblxA4ylBcqQ6Ak8pOr/1K2/diM4JRUc8K9jkDsRVJrv3J8aD19 dnRT3Is9whORymNhL6ZZQsOCzRu6V105tYdPZaugqgAkqARmmYcTSrLo9JZ6/LlHKXatZESzecaRR yjNWsNPa69mhj5sU5to/LGyVLTuXbLZOTY8JdufrZGgDWTTDS24/V0/JYqjPEwjfcjgPFRP/0skmg ScDgQ5pyyuLhImwxWoVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6vBd-00BhGt-L2; Mon, 10 Jan 2022 13:58:14 +0000 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n6vA6-00BgHb-TR for linux-arm-kernel@lists.infradead.org; Mon, 10 Jan 2022 13:56:40 +0000 Received: by mail-wm1-x32b.google.com with SMTP id d18-20020a05600c251200b0034974323cfaso886635wma.4 for ; Mon, 10 Jan 2022 05:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=7heg+71uBrQhXC+hNkzRtnZ8MTgnA1dGRJdxtU7wamk=; b=cLA7bvd1r3QQA+lY1hK+z5ZcWGIqsbVCPhdDEwkd6xhtyzPEJbrqbiJ2PoGrnNdSkX GZeQbM09042bxJo33BjeYgMuNv3pxanHz3TgfjwDsmRO5GDUuqMHNJoKjp9S1F5OpPzC 0jYE0vIBscQqspAF2cNsl4+ceeFVdODFn60SFWLsZiwwExvXgRX34BXqSEiFoah45c35 psHiszvjHpqofJXek5TrUPea/5aagA8hdMTonj3SzQbknEzBdHnLou+2wvRoHsns0NTo Axr6IYJ+zN3p9Yzx9FZelr8XiNmH18xZdIpenV/wbbI5Uc48BiAMT3Me/gKgZmm2kGLh 4XFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=7heg+71uBrQhXC+hNkzRtnZ8MTgnA1dGRJdxtU7wamk=; b=Jua8CG3hG6UE3N/9jetUGiqZi9+H4uSHqhIeGEQKpnn+N+jQ839k8IpUg5RLGRc6+e imK1n7V+34M6FYCC6CMcj75lPAobVfagek/Ssvc9pzDvyuRwTSMfNg9VKyyfgl/TwTpq 86+crQ1Su08a8eFFDpZAjDJ6h9VIDsXt0YdQ2o1KXRXfSvc0pjljaVmW09x8uwpmr8s7 TuJBaPt43Jlxjd8wJMtN/F9Z0iML4e4Bk6QZZKzbviZ6Zg7dUIW8VG61woAw6BlJHeJO hCwwvN5EoRokEFEHXeKcnrAS0mEbssBIWoBIMq/YJVqr0SRfNss+UoUAvWyrKC/WB2oo LZ8A== X-Gm-Message-State: AOAM531h/aNIy1xwUhsJBHdlk1zCrmrMX+lcOFd5AfUGYXDzVwKvi0DG lv+jrNAZqcq87DI3UBT90eE4BK3IuQc= X-Google-Smtp-Source: ABdhPJxgi9RYk4+oynzM45mnhTF9RDnRgjCGG7Q2uv8G+2AfwE8arbzdsTLIcd1HvEieK4hhbZtRhQ== X-Received: by 2002:a7b:c921:: with SMTP id h1mr8294640wml.66.1641822997093; Mon, 10 Jan 2022 05:56:37 -0800 (PST) Received: from Red ([2a01:cb1d:3d5:a100:264b:feff:fe03:2806]) by smtp.googlemail.com with ESMTPSA id r206sm3145419wma.2.2022.01.10.05.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 05:56:36 -0800 (PST) Date: Mon, 10 Jan 2022 14:56:35 +0100 From: Corentin Labbe To: Conley Lee Cc: davem@davemloft.net, kuba@kernel.org, mripard@kernel.org, wens@csie.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] net: ethernet: sun4i-emac: replace magic number with macro Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220110_055639_028845_3468CDD9 X-CRM114-Status: GOOD ( 23.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Le Mon, Jan 10, 2022 at 07:35:49PM +0800, Conley Lee a =E9crit : > This patch remove magic numbers in sun4i-emac.c and replace with macros > defined in sun4i-emac.h > = > Change since v1 > --------------- > - reformat > - merge commits > - add commit message > = > Signed-off-by: Conley Lee > --- > drivers/net/ethernet/allwinner/sun4i-emac.c | 30 ++++++++++++--------- > drivers/net/ethernet/allwinner/sun4i-emac.h | 18 +++++++++++++ > 2 files changed, 35 insertions(+), 13 deletions(-) > = > diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/et= hernet/allwinner/sun4i-emac.c > index 849de4564709..98fd98feb439 100644 > --- a/drivers/net/ethernet/allwinner/sun4i-emac.c > +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c > @@ -106,9 +106,9 @@ static void emac_update_speed(struct net_device *dev) > = > /* set EMAC SPEED, depend on PHY */ > reg_val =3D readl(db->membase + EMAC_MAC_SUPP_REG); > - reg_val &=3D ~(0x1 << 8); > + reg_val &=3D ~EMAC_MAC_SUPP_100M; > if (db->speed =3D=3D SPEED_100) > - reg_val |=3D 1 << 8; > + reg_val |=3D EMAC_MAC_SUPP_100M; > writel(reg_val, db->membase + EMAC_MAC_SUPP_REG); > } > = > @@ -264,7 +264,7 @@ static void emac_dma_done_callback(void *arg) > = > /* re enable interrupt */ > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0x01 << 8); > + reg_val |=3D EMAC_INT_CTL_RX_EN; > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > = > db->emacrx_completed_flag =3D 1; > @@ -429,7 +429,7 @@ static unsigned int emac_powerup(struct net_device *n= dev) > /* initial EMAC */ > /* flush RX FIFO */ > reg_val =3D readl(db->membase + EMAC_RX_CTL_REG); > - reg_val |=3D 0x8; > + reg_val |=3D EMAC_RX_CTL_FLUSH_FIFO; > writel(reg_val, db->membase + EMAC_RX_CTL_REG); > udelay(1); > = > @@ -441,8 +441,8 @@ static unsigned int emac_powerup(struct net_device *n= dev) > = > /* set MII clock */ > reg_val =3D readl(db->membase + EMAC_MAC_MCFG_REG); > - reg_val &=3D (~(0xf << 2)); > - reg_val |=3D (0xD << 2); > + reg_val &=3D ~EMAC_MAC_MCFG_MII_CLKD_MASK; > + reg_val |=3D EMAC_MAC_MCFG_MII_CLKD_72; > writel(reg_val, db->membase + EMAC_MAC_MCFG_REG); > = > /* clear RX counter */ > @@ -506,7 +506,7 @@ static void emac_init_device(struct net_device *dev) > = > /* enable RX/TX0/RX Hlevel interrup */ > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0xf << 0) | (0x01 << 8); > + reg_val |=3D (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_C= TL_RX_EN); > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > = > spin_unlock_irqrestore(&db->lock, flags); > @@ -637,7 +637,9 @@ static void emac_rx(struct net_device *dev) > if (!rxcount) { > db->emacrx_completed_flag =3D 1; > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0xf << 0) | (0x01 << 8); > + reg_val |=3D > + (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | > + EMAC_INT_CTL_RX_EN); > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > = > /* had one stuck? */ > @@ -669,7 +671,9 @@ static void emac_rx(struct net_device *dev) > writel(reg_val | EMAC_CTL_RX_EN, > db->membase + EMAC_CTL_REG); > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0xf << 0) | (0x01 << 8); > + reg_val |=3D > + (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | > + EMAC_INT_CTL_RX_EN); > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > = > db->emacrx_completed_flag =3D 1; > @@ -783,20 +787,20 @@ static irqreturn_t emac_interrupt(int irq, void *de= v_id) > } > = > /* Transmit Interrupt check */ > - if (int_status & (0x01 | 0x02)) > + if (int_status & EMAC_INT_STA_TX_COMPLETE) > emac_tx_done(dev, db, int_status); > = > - if (int_status & (0x04 | 0x08)) > + if (int_status & EMAC_INT_STA_TX_ABRT) > netdev_info(dev, " ab : %x\n", int_status); > = > /* Re-enable interrupt mask */ > if (db->emacrx_completed_flag =3D=3D 1) { > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0xf << 0) | (0x01 << 8); > + reg_val |=3D (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_= CTL_RX_EN); > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > } else { > reg_val =3D readl(db->membase + EMAC_INT_CTL_REG); > - reg_val |=3D (0xf << 0); > + reg_val |=3D (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN); > writel(reg_val, db->membase + EMAC_INT_CTL_REG); > } > = > diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.h b/drivers/net/et= hernet/allwinner/sun4i-emac.h > index 38c72d9ec600..90bd9ad77607 100644 > --- a/drivers/net/ethernet/allwinner/sun4i-emac.h > +++ b/drivers/net/ethernet/allwinner/sun4i-emac.h > @@ -38,6 +38,7 @@ > #define EMAC_RX_CTL_REG (0x3c) > #define EMAC_RX_CTL_AUTO_DRQ_EN (1 << 1) > #define EMAC_RX_CTL_DMA_EN (1 << 2) > +#define EMAC_RX_CTL_FLUSH_FIFO (1 << 3) > #define EMAC_RX_CTL_PASS_ALL_EN (1 << 4) > #define EMAC_RX_CTL_PASS_CTL_EN (1 << 5) > #define EMAC_RX_CTL_PASS_CRC_ERR_EN (1 << 6) > @@ -61,7 +62,21 @@ > #define EMAC_RX_IO_DATA_STATUS_OK (1 << 7) > #define EMAC_RX_FBC_REG (0x50) > #define EMAC_INT_CTL_REG (0x54) > +#define EMAC_INT_CTL_RX_EN (1 << 8) > +#define EMAC_INT_CTL_TX0_EN (1) > +#define EMAC_INT_CTL_TX1_EN (1 << 1) > +#define EMAC_INT_CTL_TX_EN (EMAC_INT_CTL_TX0_EN | EMAC_INT_CTL_TX1_EN) > +#define EMAC_INT_CTL_TX0_ABRT_EN (0x1 << 2) > +#define EMAC_INT_CTL_TX1_ABRT_EN (0x1 << 3) > +#define EMAC_INT_CTL_TX_ABRT_EN (EMAC_INT_CTL_TX0_ABRT_EN | EMAC_INT_CTL= _TX1_ABRT_EN) > #define EMAC_INT_STA_REG (0x58) > +#define EMAC_INT_STA_TX0_COMPLETE (0x1) > +#define EMAC_INT_STA_TX1_COMPLETE (0x1 << 1) > +#define EMAC_INT_STA_TX_COMPLETE (EMAC_INT_STA_TX0_COMPLETE | EMAC_INT_S= TA_TX1_COMPLETE) > +#define EMAC_INT_STA_TX0_ABRT (0x1 << 2) > +#define EMAC_INT_STA_TX1_ABRT (0x1 << 3) > +#define EMAC_INT_STA_TX_ABRT (EMAC_INT_STA_TX0_ABRT | EMAC_INT_STA_TX1_A= BRT) > +#define EMAC_INT_STA_RX_COMPLETE (0x1 << 8) Hello As proposed by checkpatch, I thing there are several place (like all EMAC_I= NT_STA) where you could use BIT(x) instead of (0xX << x) Regards _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel