src - FreeBSD source tree

diff options


context:
space:
mode:

author	Kip Macy <kmacy@FreeBSD.org>	2008-02-26 03:02:20 +0000
committer	Kip Macy <kmacy@FreeBSD.org>	2008-02-26 03:02:20 +0000
commit	404825a72b6fdaada592ae93c5e39f0536a96d5a (patch)
tree	e4dabfbcd90a45ff6c8ded3887a3e5cd387cf560
parent	23e30a506bf2eae66c5478ca0a9a7b01e5c3f448 (diff)
download	src-404825a72b6fdaada592ae93c5e39f0536a96d5a.tar.gz src-404825a72b6fdaada592ae93c5e39f0536a96d5a.zip

Move firmware in to separate module that can be compiled statically in to the kernel

Add utility for converting future firmware revs to a C header file

Notes

Notes: svn path=/head/; revision=176572

Diffstat

-rw-r--r--

sys/conf/NOTES

-rw-r--r--

sys/conf/files

-rw-r--r--

sys/dev/cxgb/bin2h.pl

-rw-r--r--

sys/dev/cxgb/cxgb_main.c

-rw-r--r--

sys/dev/cxgb/cxgb_t3fw.c

-rw-r--r--

sys/dev/cxgb/cxgb_t3fw.h

6621

-rw-r--r--

sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu

496

-rw-r--r--

sys/modules/cxgb/Makefile

-rw-r--r--

sys/modules/cxgb/cxgb/Makefile

-rw-r--r--

sys/modules/cxgb/cxgb_t3fw/Makefile

10 files changed, 6775 insertions, 517 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9abaa2f90e96..4548876f3f14 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES

@@ -1883,6 +1883,7 @@ device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet

device bfe # Broadcom BCM440x 10/100 Ethernet

device bge # Broadcom BCM570xx Gigabit Ethernet

device cxgb # Chelsio T3 10 Gigabit Ethernet

+device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware

device dc # DEC/Intel 21143 and various workalikes

device fxp # Intel EtherExpress PRO/100B (82557, 82558)

hint.fxp.0.prefer_iomap="0"

diff --git a/sys/conf/files b/sys/conf/files
index 3dec2fb5e14d..5e225bfa5a29 100644
--- a/sys/conf/files
+++ b/sys/conf/files

@@ -528,6 +528,7 @@ dev/cxgb/common/cxgb_xgmac.c optional cxgb pci

dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci

dev/cxgb/sys/uipc_mvec.c optional cxgb pci

dev/cxgb/sys/cxgb_support.c optional cxgb pci

+dev/cxgb/cxgb_t3fw.c optional cxgb cxgb_t3fw

dev/cy/cy.c optional cy

dev/cy/cy_isa.c optional cy isa

dev/cy/cy_pci.c optional cy pci

diff --git a/sys/dev/cxgb/bin2h.pl b/sys/dev/cxgb/bin2h.pl
new file mode 100644
index 000000000000..01a97a3eb852
--- /dev/null
+++ b/sys/dev/cxgb/bin2h.pl

@@ -0,0 +1,79 @@

+#!/usr/bin/perl -w

+#$FreeBSD$

+if ($#ARGV != 1) {

+ print "bin2h.pl <firmware> <headername>\n";

+ exit 1;

+my $success = open INPUT, "$ARGV[0]";

+unless ($success) {

+ print "failed to open input\n";

+ exit 1;

+$success = open OUTPUT, ">$ARGV[1]";

+unless ($success) {

+ print "failed to open output\n";

+ exit 1;

+my $license = <<END;

+/**************************************************************************

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are met:

+ 1. Redistributions of source code must retain the above copyright notice,

+ this list of conditions and the following disclaimer.

+ 2. Neither the name of the Chelsio Corporation nor the names of its

+ contributors may be used to endorse or promote products derived from

+ this software without specific prior written permission.

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN22

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGE.

+\$FreeBSD\$

+***************************************************************************/

+END

+print OUTPUT "$license\n";

+my $binary;

+my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,

+ $atime,$mtime,$ctime,$blksize,$blocks)

+ = stat($ARGV[0]);

+print OUTPUT "#define U (unsigned char)\n\n";

+print OUTPUT "static unsigned int t3fw_length = $size;\n";

+print OUTPUT "static unsigned char t3fw[$size] = {\n";

+for (my $i = 0; $i < $size; $i += 4) {

+ my $number_read = read(INPUT, $binary, 4);

+ my ($a, $b, $c, $d) = unpack("C C C C", $binary);

+ $buf = sprintf("U 0x%02X, U 0x%02X, U 0x%02X, U 0x%02X, \n", $a, $b, $c, $d);

+ print OUTPUT $buf;

+print OUTPUT "};\n";

diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 9db52566f92a..b42c32b33e30 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c

@@ -217,6 +217,14 @@ SYSCTL_UINT(_hw_cxgb, OID_AUTO, singleq, CTLFLAG_RDTUN, &singleq, 0,

"use a single queue-set per port");

+/*

+ * The driver uses an auto-queue algorithm by default.

+ * To disable it and force a single queue-set per port, use singleq = 1.

+ */

+static int force_fw_update = 0;

+TUNABLE_INT("hw.cxgb.force_fw_update", &force_fw_update);

+SYSCTL_UINT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0,

+ "update firmware even if up to date");

int cxgb_use_16k_clusters = 0;

TUNABLE_INT("hw.cxgb.use_16k_clusters", &cxgb_use_16k_clusters);

@@ -380,14 +388,13 @@ cxgb_controller_probe(device_t dev)

return (BUS_PROBE_DEFAULT);

}

-#define FW_FNAME "t3fw%d%d%d"

+#define FW_FNAME "cxgb_t3fw"

#define TPEEPROM_NAME "t3%ctpe%d%d%d"

#define TPSRAM_NAME "t3%cps%d%d%d"

static int

upgrade_fw(adapter_t *sc)

{

- char buf[32];

#ifdef FIRMWARE_LATEST

const struct firmware *fw;

#else

@@ -395,16 +402,11 @@ upgrade_fw(adapter_t *sc)

#endif

int status;

- snprintf(&buf[0], sizeof(buf), FW_FNAME, FW_VERSION_MAJOR,

- FW_VERSION_MINOR, FW_VERSION_MICRO);

- fw = firmware_get(buf);

- if (fw == NULL) {

- device_printf(sc->dev, "Could not find firmware image %s\n", buf);

+ if ((fw = firmware_get(FW_FNAME)) == NULL) {

+ device_printf(sc->dev, "Could not find firmware image %s\n", FW_FNAME);

return (ENOENT);

} else

- device_printf(sc->dev, "updating firmware on card with %s\n", buf);

+ device_printf(sc->dev, "updating firmware on card\n");

status = t3_load_fw(sc, (const uint8_t *)fw->data, fw->datasize);

device_printf(sc->dev, "firmware update returned %s %d\n", (status == 0) ? "success" : "fail", status);

@@ -570,7 +572,7 @@ cxgb_controller_attach(device_t dev)

/* Create a periodic callout for checking adapter status */

callout_init(&sc->cxgb_tick_ch, TRUE);

- if (t3_check_fw_version(sc, &must_load) != 0 && must_load) {

+ if ((t3_check_fw_version(sc, &must_load) != 0 && must_load) || force_fw_update) {

* Warn user that a firmware update will be attempted in init.

@@ -2680,3 +2682,6 @@ cxgb_get_regs(adapter_t *sc, struct ifconf_regs *regs, uint8_t *buf)

reg_block_dump(sc, buf, XGM_REG(A_XGM_SERDES_STATUS0, 1),

XGM_REG(A_XGM_RX_SPI4_SOP_EOP_CNT, 1));

}

+MODULE_DEPEND(if_cxgb, cxgb_t3fw, 1, 1, 1);

diff --git a/sys/dev/cxgb/cxgb_t3fw.c b/sys/dev/cxgb/cxgb_t3fw.c
new file mode 100644
index 000000000000..af1d34515fa1
--- /dev/null
+++ b/sys/dev/cxgb/cxgb_t3fw.c

@@ -0,0 +1,47 @@

+/*

+ * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz

+ */

+#include <sys/cdefs.h>

+__FBSDID("$FreeBSD$");

+#include <sys/param.h>

+#include <sys/errno.h>

+#include <sys/kernel.h>

+#include <sys/module.h>

+#include <sys/linker.h>

+#include <sys/firmware.h>

+#include <sys/systm.h>

+#include <dev/cxgb/cxgb_t3fw.h>

+static int

+cxgb_t3fw_modevent(module_t mod, int type, void *unused)

+ const struct firmware *fp, *parent;

+ int error;

+ switch (type) {

+ case MOD_LOAD:

+ fp = firmware_register("cxgb_t3fw", t3fw,

+ (size_t)t3fw_length,

+ 0, NULL);

+ if (fp == NULL)

+ goto fail_0;

+ parent = fp;

+ return (0);

+ fail_0:

+ return (ENXIO);

+ case MOD_UNLOAD:

+ error = firmware_unregister("cxgb_t3fw");

+ return (error);

+ }

+ return (EINVAL);

+static moduledata_t cxgb_t3fw_mod = {

+ "cxgb_t3fw",

+ cxgb_t3fw_modevent,

+ 0

+};

+DECLARE_MODULE(cxgb_t3fw, cxgb_t3fw_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);

+MODULE_VERSION(cxgb_t3fw, 1);

+MODULE_DEPEND(cxgb_t3fw, firmware, 1, 1, 1);

diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h
new file mode 100644
index 000000000000..cdec47918846
--- /dev/null
+++ b/sys/dev/cxgb/cxgb_t3fw.h

@@ -0,0 +1,6621 @@