[PATCH] fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

[PATCH] fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

[Greg Ungerer]

fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

The ColdFire 5272 FEC driver has a different register address map
than other users of the FEC driver. And its definition of the
FEC_X_DES_ACTIVE register is incorrect, it should be 0x14.
The fec interface cannot transmit data with the old value.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
----

diff --git a/drivers/net/fec.h b/drivers/net/fec.h
index 6958d85..cc47f3f 100644
--- a/drivers/net/fec.h
+++ b/drivers/net/fec.h
@@ -51,7 +51,7 @@
 #define FEC_IMASK		0x008 /* Interrupt mask reg */
 #define FEC_IVEC		0x00c /* Interrupt vec status reg */
 #define FEC_R_DES_ACTIVE	0x010 /* Receive descriptor reg */
-#define FEC_X_DES_ACTIVE	0x01c /* Transmit descriptor reg */
+#define FEC_X_DES_ACTIVE	0x014 /* Transmit descriptor reg */
 #define FEC_MII_DATA		0x040 /* MII manage frame reg */
 #define FEC_MII_SPEED		0x044 /* MII speed control reg */
 #define FEC_R_BOUND		0x08c /* FIFO receive bound reg */

Re: [PATCH] fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

[David Miller]

From: Greg Ungerer <gerg@snapgear.com>
Date: Tue, 7 Jul 2009 11:23:34 +1000

> fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register
> 
> The ColdFire 5272 FEC driver has a different register address map
> than other users of the FEC driver. And its definition of the
> FEC_X_DES_ACTIVE register is incorrect, it should be 0x14.
> The fec interface cannot transmit data with the old value.
> 
> Signed-off-by: Greg Ungerer <gerg@uclinux.org>

This wasn't handled well at all.

You sent me what amounted to a cleanup patch to remove the
trailing ";" in these definitions first.  I can only put
that into net-next-2.6

Now you send me a real bug fix for one of these macro
values and it only applies on top of that ";" removal
patch.

That completely sucks.  Now I can't just apply this to
net-2.6 to get the bug fixed.

You should have sent just the bug fix, then waited a week
or so for the net-2.6 tree to get merged into the net-next-2.6
tree and then you could send the ";" cleanup cleanly on top
of that.

I can't apply this so I'm rejecting it in patchwork.

Re: [PATCH] fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

[Greg Ungerer]

Hi David,

David Miller wrote:
> From: Greg Ungerer <gerg@snapgear.com>
> Date: Tue, 7 Jul 2009 11:23:34 +1000
> 
>> fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register
>>
>> The ColdFire 5272 FEC driver has a different register address map
>> than other users of the FEC driver. And its definition of the
>> FEC_X_DES_ACTIVE register is incorrect, it should be 0x14.
>> The fec interface cannot transmit data with the old value.
>>
>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
> 
> This wasn't handled well at all.
> 
> You sent me what amounted to a cleanup patch to remove the
> trailing ";" in these definitions first.  I can only put
> that into net-next-2.6

That is not a cleanup patch. It is a bug fix. You cannot build
with those ";" in there:

   CC      drivers/net/fec.o
In file included from drivers/net/fec.c:51:
drivers/net/fec.h:49:19: warning: missing whitespace after the macro name
drivers/net/fec.h:50:19: warning: missing whitespace after the macro name
drivers/net/fec.h:51:18: warning: missing whitespace after the macro name
drivers/net/fec.h:52:17: warning: missing whitespace after the macro name
drivers/net/fec.h:53:25: warning: missing whitespace after the macro name
drivers/net/fec.h:54:25: warning: missing whitespace after the macro name
drivers/net/fec.c: In function ‘fec_enet_start_xmit’:
drivers/net/fec.c:352: error: expected expression before ‘;’ token
drivers/net/fec.c: In function ‘fec_enet_interrupt’:


> Now you send me a real bug fix for one of these macro
> values and it only applies on top of that ";" removal
> patch.
 >
> That completely sucks.  Now I can't just apply this to
> net-2.6 to get the bug fixed.
> 
> You should have sent just the bug fix, then waited a week
> or so for the net-2.6 tree to get merged into the net-next-2.6
> tree and then you could send the ";" cleanup cleanly on top
> of that.
> 
> I can't apply this so I'm rejecting it in patchwork.

Care to reconsider?

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com

Re: [PATCH] fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register

[David Miller]

From: Greg Ungerer <gerg@snapgear.com>
Date: Tue, 07 Jul 2009 11:37:18 +1000

> That is not a cleanup patch. It is a bug fix. You cannot build
> with those ";" in there:

Your commit message could have been more explicit about this.
In fact, your commit message was empty. :-/

I'll move that change over to net-2.6 and apply the bug fix for that
one value as well, but you can avoid these kinds of charades in the
future by writing proper, verbose, commit messages.