netdev - SEEPROM test patch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090414172123.GA12319@xw6200.broadcom.net>
Date:	Tue, 14 Apr 2009 10:21:23 -0700
From:	"Matt Carlson" <mcarlson@...adcom.com>
To:	"Robin Holt" <holt@....com>,
	"James Bottomley" <James.Bottomley@...senPartnership.com>
cc:	"Michael Chan" <mchan@...adcom.com>, netdev@...r.kernel.org,
	"Parisc List" <linux-parisc@...r.kernel.org>
Subject: SEEPROM test patch

James, Robin.  I looked through the patches again and found that the
SEEPROM routines were not being adjusted correctly along with the flash
NVRAM access routines.  The patch below should shore up the difference.
The patch works on both BE and LE systems.

Can you apply the patch below and see if it fixes your problem?  (You
may have to back out David's changes for the mac addresses to be
restored, but 'eeprom -e' dumps should be fixed.)  If it does, I'll
post a replacement patch that documents why the code is doing what it's
doing.


diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6a736dd..3ef43c2 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -2190,7 +2190,10 @@ static int tg3_nvram_read_using_eeprom(struct tg3 *tp,
 	if (!(tmp & EEPROM_ADDR_COMPLETE))
 		return -EBUSY;
 
-	*val = tr32(GRC_EEPROM_DATA);
+	tmp = tr32(GRC_EEPROM_DATA);
+
+	*val = swab32(tmp);
+
 	return 0;
 }
 
@@ -10657,13 +10660,13 @@ static int tg3_nvram_write_block_using_eeprom(struct tg3 *tp,
 
 	for (i = 0; i < len; i += 4) {
 		u32 addr;
-		__be32 data;
+		__le32 data;
 
 		addr = offset + i;
 
 		memcpy(&data, buf + i, 4);
 
-		tw32(GRC_EEPROM_DATA, be32_to_cpu(data));
+		tw32(GRC_EEPROM_DATA, le32_to_cpu(data));
 
 		val = tr32(GRC_EEPROM_ADDR);
 		tw32(GRC_EEPROM_ADDR, val | EEPROM_ADDR_COMPLETE);

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html