Re: dl2k stopped working on 2.6.24

[Al Viro <viro@ZenIV.linux.org.uk>]

On Fri, Feb 01, 2008 at 01:04:42AM +0100, Santiago Garcia Mantinan wrote:
> > I have today compiled dl2k from git, the version with the 2007-12-23 patches
> > from Al Viro: dl2k endianness fixes (.24 fodder?) Right before the Al Viro
> > patches. This seems to be working perfectly on my system.
> 
> Ok, I've been applying Al's patches one by one, everything went fine till I
> applied the "dl2k: MSCR, MSSR, ESR, PHY_SCR fixes" patch. With this patch I
> experimented the behaviour I commented on my first message.
> 
> I don't know what else to try now, any ideas?
> 
> Regards...

Very interesting.  Relevant part seems to be
-               mscr.image = mii_read (dev, phy_addr, MII_MSCR);
-               mssr.image = mii_read (dev, phy_addr, MII_MSSR);
-               if (mscr.bits.media_1000BT_FD & mssr.bits.lp_1000BT_FD) {
+               mscr = mii_read (dev, phy_addr, MII_MSCR);
+               mssr = mii_read (dev, phy_addr, MII_MSSR);
+               if (mscr & MII_MSCR_1000BT_FD && mssr & MII_MSSR_LP_1000BT_FD) {
                        np->speed = 1000;
                        np->full_duplex = 1;
                        printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
-               } else if (mscr.bits.media_1000BT_HD & mssr.bits.lp_1000BT_HD) {
+               } else if (mscr & MII_MSCR_1000BT_HD && mssr & MII_MSSR_LP_1000BT_HD) {
                        np->speed = 1000;
                        np->full_duplex = 0;
                        printk (KERN_INFO "Auto 1000 Mbps, Half duplex\n");

More specifically, this:
-               if (mscr.bits.media_1000BT_FD & mssr.bits.lp_1000BT_FD) {
+               if (mscr & MII_MSCR_1000BT_FD && mssr & MII_MSSR_LP_1000BT_FD) {

We used to have mscr declared as
typedef union t_MII_MSCR {
       u16 image;
       struct {
               u16 _bit_7_0:8; // bit 7:0
               u16 media_1000BT_HD:1;  // bit 8
               u16 media_1000BT_FD:1;  // bit 9
               u16 port_type:1;        // bit 10
               u16 cfg_value:1;        // bit 11
               u16 cfg_enable:1;       // bit 12
               u16 test_mode:3;        // bit 15:13
       } bits;
} MSCR_t, *PMSCR_t;

and mssr as
typedef union t_MII_MSSR {
       u16 image;
       struct {
               u16 idle_err_count:8;   // bit 7:0
               u16 _bit_9_8:2; // bit 9:8
               u16 lp_1000BT_HD:1;     // bit 10
               u16 lp_1000BT_FD:1;     // bit 11
               u16 remote_rcv_status:1;        // bit 12
               u16 local_rcv_status:1; // bit 13
               u16 cfg_resolution:1;   // bit 14
               u16 cfg_fault:1;        // bit 15
       } bits;
} MSSR_t, *PMSSR_t;

so it looks like these constants had not been right...  Damn right, they
had not - 
        MII_MSSR_LP_1000BT_HD = 0x0800,
        MII_MSSR_LP_1000BT_FD = 0x0400,
and that has HD at bit 11 and FD at bit 10 - swapped, IOW.  Driver had them
defined wrong all along, but they were not used until now, so bug had not been
noticed.

See if the patch below takes care of all of that:

diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index d66c605..266ec87 100644
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -388,8 +388,8 @@ enum _mii_mssr {
 	MII_MSSR_CFG_RES = 0x4000,
 	MII_MSSR_LOCAL_RCV_STATUS = 0x2000,
 	MII_MSSR_REMOTE_RCVR = 0x1000,
-	MII_MSSR_LP_1000BT_HD = 0x0800,
-	MII_MSSR_LP_1000BT_FD = 0x0400,
+	MII_MSSR_LP_1000BT_FD = 0x0800,
+	MII_MSSR_LP_1000BT_HD = 0x0400,
 	MII_MSSR_IDLE_ERR_COUNT = 0x00ff,
 };