* Re: [PATCH] TI DaVinci EMAC: Minor macro related updates
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
@ 2009-10-01 12:11 ` Sergei Shtylyov
2009-10-01 17:16 ` David Miller
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Sergei Shtylyov @ 2009-10-01 12:11 UTC (permalink / raw)
To: Chaithrika U S; +Cc: netdev, davinci-linux-open-source, davem
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] TI DaVinci EMAC: Minor macro related updates
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
2009-10-01 12:11 ` Sergei Shtylyov
@ 2009-10-01 17:16 ` David Miller
2009-10-05 7:14 ` David Miller
2009-10-26 22:07 ` Jean-Christophe PLAGNIOL-VILLARD
3 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2009-10-01 17:16 UTC (permalink / raw)
To: chaithrika; +Cc: netdev, davinci-linux-open-source
Date: Thu, 1 Oct 2009 16:25:19 -0400
Please fix the time on your computer.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] TI DaVinci EMAC: Minor macro related updates
@ 2009-10-01 20:25 Chaithrika U S
2009-10-01 12:11 ` Sergei Shtylyov
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Chaithrika U S @ 2009-10-01 20:25 UTC (permalink / raw)
To: netdev; +Cc: davem, davinci-linux-open-source, Chaithrika U S
Use BIT for macro definitions wherever possible, remove
unused and redundant macros.
Signed-off-by: Chaithrika U S <chaithrika@ti.com>
---
Applies to Linus' kernel tree
drivers/net/davinci_emac.c | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
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)
/* 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);
emac_write(EMAC_MACCONTROL, val);
/* Enable NAPI and interrupts */
--
1.5.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] TI DaVinci EMAC: Minor macro related updates
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
2009-10-01 12:11 ` Sergei Shtylyov
2009-10-01 17:16 ` David Miller
@ 2009-10-05 7:14 ` David Miller
2009-10-26 22:07 ` Jean-Christophe PLAGNIOL-VILLARD
3 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2009-10-05 7:14 UTC (permalink / raw)
To: chaithrika; +Cc: netdev, davinci-linux-open-source
From: Chaithrika U S <chaithrika@ti.com>
Date: Thu, 1 Oct 2009 16:25:19 -0400
> Use BIT for macro definitions wherever possible, remove
> unused and redundant macros.
>
> Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] TI DaVinci EMAC: Minor macro related updates
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
` (2 preceding siblings ...)
2009-10-05 7:14 ` David Miller
@ 2009-10-26 22:07 ` Jean-Christophe PLAGNIOL-VILLARD
2009-10-27 3:57 ` Chaithrika U S
3 siblings, 1 reply; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2009-10-26 22:07 UTC (permalink / raw)
To: Chaithrika U S; +Cc: netdev, davem, davinci-linux-open-source
On 16:25 Thu 01 Oct , 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>
> ---
> Applies to Linus' kernel tree
do you plan to send a new version soon?
as the current DaVinci EMAC does not build on the v2.6.32-rc5
Best Regards,
J.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] TI DaVinci EMAC: Minor macro related updates
2009-10-26 22:07 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2009-10-27 3:57 ` Chaithrika U S
0 siblings, 0 replies; 6+ messages in thread
From: Chaithrika U S @ 2009-10-27 3:57 UTC (permalink / raw)
To: 'Jean-Christophe PLAGNIOL-VILLARD'
Cc: netdev, davem, davinci-linux-open-source
On Tue, Oct 27, 2009 at 03:37:22, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 16:25 Thu 01 Oct , 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>
> > ---
> > Applies to Linus' kernel tree
> do you plan to send a new version soon?
>
> as the current DaVinci EMAC does not build on the v2.6.32-rc5
>
> Best Regards,
> J.
>
DaVinci EMAC builds and work fine on Linus' tree and DaVinci GIT tree.
Can you please provide more info regarding the errors you are seeing?
Regards,
Chaithrika
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-27 4:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-01 20:25 [PATCH] TI DaVinci EMAC: Minor macro related updates Chaithrika U S
2009-10-01 12:11 ` Sergei Shtylyov
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
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).