Date: Sun, 9 Jul 2006 17:50:20 +0000 (UTC) From: Matt Jacob <mjacob@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/dev/isp isp_freebsd.c isp_freebsd.h isp_pci.c isp_sbus.c src/sys/dev/ispfw asm_1040.h asm_1080.h asm_12160.h ispfw.c src/sys/modules/ispfw Makefile src/sys/modules/ispfw/isp_1000 Makefile src/sys/modules/ispfw/isp_1040 ... Message-ID: <200607091750.k69HoKSP039680@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
mjacob 2006-07-09 17:50:20 UTC
FreeBSD src repository
Modified files:
sys/dev/isp isp_freebsd.c isp_freebsd.h isp_pci.c
isp_sbus.c
sys/dev/ispfw asm_1040.h asm_1080.h asm_12160.h ispfw.c
sys/modules/ispfw Makefile
Added files:
sys/modules/ispfw/isp_1000 Makefile
sys/modules/ispfw/isp_1040 Makefile
sys/modules/ispfw/isp_1040_it Makefile
sys/modules/ispfw/isp_1080 Makefile
sys/modules/ispfw/isp_1080_it Makefile
sys/modules/ispfw/isp_12160 Makefile
sys/modules/ispfw/isp_12160_it Makefile
sys/modules/ispfw/isp_2100 Makefile
sys/modules/ispfw/isp_2200 Makefile
sys/modules/ispfw/isp_2300 Makefile
sys/modules/ispfw/isp_2322 Makefile
sys/modules/ispfw/ispfw Makefile
Log:
Convert isp(4) and ispfw(4) to use firmware(9) to manage firmware
loading for the QLogic cards.
Because isp(4) exists before the root is mounted, it's not really
possible for us to use the kernel's linker to load modules directly
from disk- that's really too bad.
However, the this is still a net win in in that the firmware has
been split up on a per chip (and in some cases, functionality)
basis, so the amount of stuff loaded *can* be substantially less
than the 1.5MB of firmware images that ispfw now manages. That is,
each specific f/w set is now also built as a module. For example,
QLogic 2322 f/w is built as isp_2322.ko and Initiator/Target 1080
firmware is built as isp_1080_it.ko.
For compatibility purposes (i.e., to perturb folks the least), we
also still build all of the firmware as one ispfw.ko module.
This allows us to let 'ispfw_LOAD' keep on working in existing
loader.conf files. If you now want to strip this down to just
the firmware for your h/w, you can then change loader.conf to
load the f/w you specifically want.
We also still allow for ispfw to be statically built (e.g., for
PAE and sparc64).
Future changes will look at f/w unloading and also role switching
that then uses the kernel linker to load different ips f/w sets.
MFC after: 2 months
Revision Changes Path
1.118 +0 -1 src/sys/dev/isp/isp_freebsd.c
1.91 +1 -2 src/sys/dev/isp/isp_freebsd.h
1.116 +76 -3 src/sys/dev/isp/isp_pci.c
1.20 +22 -2 src/sys/dev/isp/isp_sbus.c
1.5 +5 -1 src/sys/dev/ispfw/asm_1040.h
1.4 +5 -2 src/sys/dev/ispfw/asm_1080.h
1.7 +5 -1 src/sys/dev/ispfw/asm_12160.h
1.17 +144 -119 src/sys/dev/ispfw/ispfw.c
1.3 +42 -5 src/sys/modules/ispfw/Makefile
1.1 +36 -0 src/sys/modules/ispfw/isp_1000/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_1040/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_1040_it/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_1080/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_1080_it/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_12160/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_12160_it/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_2100/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_2200/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_2300/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/isp_2322/Makefile (new)
1.1 +36 -0 src/sys/modules/ispfw/ispfw/Makefile (new)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607091750.k69HoKSP039680>