Skip to contentSkip to conversation

cxgb3: Update FW to 7.4.0

PATCH Applied Divy Le Ray 2 participants 5 messages Jun 3, 2009 – Jun 4, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cxgb3: Update FW to 7.4.0

From: Divy Le Ray <[email protected]>

Update FW to 7.4.
Bump up driver revision.

---

 drivers/net/cxgb3/version.h        |    4 
 firmware/Makefile                  |    2 
 firmware/WHENCE                    |    2 
 firmware/cxgb3/t3fw-7.1.0.bin.ihex | 1885 --------------------------
 firmware/cxgb3/t3fw-7.4.0.bin.ihex | 2561 ++++++++++++++++++++++++++++++++++++
 5 files changed, 2565 insertions(+), 1889 deletions(-)
 delete mode 100644 firmware/cxgb3/t3fw-7.1.0.bin.ihex
 create mode 100644 firmware/cxgb3/t3fw-7.4.0.bin.ihex
drivers/net/cxgb3/version.h +2 -2
index 7bf963e..9d0bd9d 100644
@@ -35,10 +35,10 @@
 #define DRV_DESC "Chelsio T3 Network Driver"
 #define DRV_NAME "cxgb3"
 /* Driver version */
-#define DRV_VERSION "1.1.2-ko"
+#define DRV_VERSION "1.1.3-ko"
 
 /* Firmware version */
 #define FW_VERSION_MAJOR 7
-#define FW_VERSION_MINOR 1
+#define FW_VERSION_MINOR 4
 #define FW_VERSION_MICRO 0
 #endif				/* __CHELSIO_VERSION_H */
firmware/Makefile +1 -1
index 96c3dd8..621de8e 100644
@@ -41,7 +41,7 @@ fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
 				   cxgb3/t3c_psram-1.1.0.bin \
-				   cxgb3/t3fw-7.1.0.bin
+				   cxgb3/t3fw-7.4.0.bin
 fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
 fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
 fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
firmware/WHENCE +1 -1
index bb8fda8..0f5649a 100644
@@ -412,7 +412,7 @@ Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
 
 File: cxgb3/t3b_psram-1.1.0.bin.ihex
 File: cxgb3/t3c_psram-1.1.0.bin.ihex
-file: cxgb3/t3fw-7.1.0.bin.ihex
+file: cxgb3/t3fw-7.4.0.bin.ihex
 
 License: GPLv2 or OpenIB.org BSD license, no source visible
 
firmware/cxgb3/t3fw-7.1.0.bin.ihex deleted +0 -1885

1,885 lines not on this page · raw message

firmware/cxgb3/t3fw-7.4.0.bin.ihex new file +2561 -0

1,087 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 2/2 cxgb3: minor aq100x phy fixes

From: Divy Le Ray <[email protected]>

Use generic MDIO generic values.
Based on Ben Hutchings'review comments.

---

 drivers/net/cxgb3/aq100x.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
drivers/net/cxgb3/aq100x.c +12 -12
index c51e50d..b1fd5bf 100644
@@ -43,8 +43,6 @@ enum {
 	AQ_XAUI_TX_CFG	= 0xe400,
 
 	/* MDIO_DEV_ANEG registers */
-	AQ_100M_CTRL	= 0x0010,
-	AQ_10G_CTRL	= 0x0020,
 	AQ_1G_CTRL	= 0xc400,
 	AQ_ANEG_STAT	= 0xc800,
 
@@ -54,14 +52,15 @@ enum {
 	AQ_IMASK_GLOBAL	= 0xff00,
 };
 
-#define AQBIT(x)	(1 << (x))
-#define IMASK_PMA	AQBIT(0x2)
-#define IMASK_GLOBAL	AQBIT(0xf)
-#define ADV_1G_FULL	AQBIT(0xf)
-#define ADV_1G_HALF	AQBIT(0xe)
-#define ADV_10G_FULL	AQBIT(0xc)
-#define AQ_RESET	(AQBIT(0xe) | AQBIT(0xf))
-#define AQ_LOWPOWER	AQBIT(0xb)
+enum {
+	IMASK_PMA	= 1 << 2,
+	IMASK_GLOBAL	= 1 << 15,
+	ADV_1G_FULL	= 1 << 15,
+	ADV_1G_HALF	= 1 << 14,
+	ADV_10G_FULL	= 1 << 12,
+	AQ_RESET	= (1 << 14) | (1 << 15),
+	AQ_LOWPOWER	= 1 << 12,
+};
 
 static int aq100x_reset(struct cphy *phy, int wait)
 {
@@ -160,7 +159,7 @@ static int aq100x_advertise(struct cphy *phy, unsigned int advertise_map)
 	adv = 0;
 	if (advertise_map & ADVERTISED_10000baseT_Full)
 		adv |= ADV_10G_FULL;
-	err = t3_mdio_change_bits(phy, MDIO_MMD_AN, AQ_10G_CTRL,
+	err = t3_mdio_change_bits(phy, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
 				  ADV_10G_FULL, adv);
 	if (err)
 		return err;
@@ -186,7 +185,8 @@ static int aq100x_advertise(struct cphy *phy, unsigned int advertise_map)
 		adv |= ADVERTISE_PAUSE_CAP;
 	if (advertise_map & ADVERTISED_Asym_Pause)
 		adv |= ADVERTISE_PAUSE_ASYM;
-	err = t3_mdio_change_bits(phy, MDIO_MMD_AN, AQ_100M_CTRL, 0xfe0, adv);
+	err = t3_mdio_change_bits(phy, MDIO_MMD_AN, MDIO_AN_ADVERTISE,
+				  0xfe0, adv);
 
 	return err;
 }
maintainer
#4 lore raw

From: Divy Le Ray <[email protected]>
Date: Wed, 03 Jun 2009 16:39:10 -0700

Quoted 2 lines

Please drop this patch. The FW image is corrupted. I reposted the patch with the correct image.

Will do.

Could you please address Ben's request that you use request_firmware() for that in-source firmware blob you added for new PHY support recently? I never saw you even reply to his posting stating how you intend to deal with that problem, and that's not acceptable. :-)