From: Sergei Shtylyov <sshtylyov@ru•mvista.com>
To: Chaithrika U S <chaithrika@ti•com>
Cc: netdev@vger•kernel.org,
davinci-linux-open-source@linux•davincidsp.com,
davem@davemloft•net
Subject: Re: [PATCH] TI DaVinci EMAC: Minor macro related updates
Date: Thu, 01 Oct 2009 16:11:13 +0400 [thread overview]
Message-ID: <4AC49C61.3060501@ru.mvista.com> (raw)
In-Reply-To: <1254428719-13960-1-git-send-email-chaithrika@ti.com>
Hello.
Chaithrika U S wrote:
> Use BIT for macro definitions wherever possible, remove
> unused and redundant macros.
>
> Signed-off-by: Chaithrika U S <chaithrika@ti•com>
[...]
> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
> index 65a2d0b..a421ec0 100644
> --- a/drivers/net/davinci_emac.c
> +++ b/drivers/net/davinci_emac.c
> @@ -164,16 +164,14 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
> # define EMAC_MBP_MCASTCHAN(ch) ((ch) & 0x7)
>
> /* EMAC mac_control register */
> -#define EMAC_MACCONTROL_TXPTYPE (0x200)
> -#define EMAC_MACCONTROL_TXPACEEN (0x40)
> -#define EMAC_MACCONTROL_MIIEN (0x20)
> -#define EMAC_MACCONTROL_GIGABITEN (0x80)
> -#define EMAC_MACCONTROL_GIGABITEN_SHIFT (7)
> -#define EMAC_MACCONTROL_FULLDUPLEXEN (0x1)
> +#define EMAC_MACCONTROL_TXPTYPE BIT(9)
> +#define EMAC_MACCONTROL_TXPACEEN BIT(6)
> +#define EMAC_MACCONTROL_GMIIEN BIT(5)
> +#define EMAC_MACCONTROL_GIGABITEN BIT(7)
> +#define EMAC_MACCONTROL_FULLDUPLEXEN BIT(0)
> #define EMAC_MACCONTROL_RMIISPEED_MASK BIT(15)
Can we have these properly sorted by value, while you're at it?
>
> /* GIGABIT MODE related bits */
> -#define EMAC_DM646X_MACCONTORL_GMIIEN BIT(5)
> #define EMAC_DM646X_MACCONTORL_GIG BIT(7)
> #define EMAC_DM646X_MACCONTORL_GIGFORCE BIT(17)
>
> @@ -192,10 +190,10 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
> #define EMAC_RX_BUFFER_OFFSET_MASK (0xFFFF)
>
> /* MAC_IN_VECTOR (0x180) register bit fields */
> -#define EMAC_DM644X_MAC_IN_VECTOR_HOST_INT (0x20000)
> -#define EMAC_DM644X_MAC_IN_VECTOR_STATPEND_INT (0x10000)
> -#define EMAC_DM644X_MAC_IN_VECTOR_RX_INT_VEC (0x0100)
> -#define EMAC_DM644X_MAC_IN_VECTOR_TX_INT_VEC (0x01)
> +#define EMAC_DM644X_MAC_IN_VECTOR_HOST_INT BIT(17)
> +#define EMAC_DM644X_MAC_IN_VECTOR_STATPEND_INT BIT(16)
> +#define EMAC_DM644X_MAC_IN_VECTOR_RX_INT_VEC BIT(8)
> +#define EMAC_DM644X_MAC_IN_VECTOR_TX_INT_VEC BIT(0)
>
> /** NOTE:: For DM646x the IN_VECTOR has changed */
> #define EMAC_DM646X_MAC_IN_VECTOR_RX_INT_VEC BIT(EMAC_DEF_RX_CH)
> @@ -203,7 +201,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
> #define EMAC_DM646X_MAC_IN_VECTOR_HOST_INT BIT(26)
> #define EMAC_DM646X_MAC_IN_VECTOR_STATPEND_INT BIT(27)
>
> -
> /* CPPI bit positions */
> #define EMAC_CPPI_SOP_BIT BIT(31)
> #define EMAC_CPPI_EOP_BIT BIT(30)
> @@ -747,8 +744,7 @@ static void emac_update_phystatus(struct emac_priv *priv)
>
> if (priv->speed == SPEED_1000 && (priv->version == EMAC_VERSION_2)) {
> mac_control = emac_read(EMAC_MACCONTROL);
> - mac_control |= (EMAC_DM646X_MACCONTORL_GMIIEN |
> - EMAC_DM646X_MACCONTORL_GIG |
> + mac_control |= (EMAC_DM646X_MACCONTORL_GIG |
> EMAC_DM646X_MACCONTORL_GIGFORCE);
> } else {
> /* Clear the GIG bit and GIGFORCE bit */
> @@ -2105,7 +2101,7 @@ static int emac_hw_enable(struct emac_priv *priv)
>
> /* Enable MII */
> val = emac_read(EMAC_MACCONTROL);
> - val |= (EMAC_MACCONTROL_MIIEN);
> + val |= (EMAC_MACCONTROL_GMIIEN);
Parens not needed.
> emac_write(EMAC_MACCONTROL, val);
>
> /* Enable NAPI and interrupts */
WBR, Sergei
next prev parent reply other threads:[~2009-10-01 12:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
2009-10-01 12:11 ` Sergei Shtylyov [this message]
2009-10-01 17:16 ` David Miller
2009-10-05 7:14 ` David Miller
2009-10-26 22:07 ` Jean-Christophe PLAGNIOL-VILLARD
2009-10-27 3:57 ` Chaithrika U S
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=4AC49C61.3060501@ru.mvista.com \
--to=sshtylyov@ru$(echo .)mvista.com \
--cc=chaithrika@ti$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=davinci-linux-open-source@linux$(echo .)davincidsp.com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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