summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitDavid Woodhouse2008-07-15181-50283/+29649
|\ | | | | | | | | | | Conflicts: sound/pci/Kconfig
| * firmware: convert sb16_csp driver to use firmware loader exclusivelyJaswinder Singh2008-07-1410-980/+506
| | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * dsp56k: use request_firmwareJaswinder Singh2008-07-145-51/+170
| | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * edgeport-ti: use request_firmware()Jaswinder Singh2008-07-145-873/+879
| | | | | | | | | | | | | | | | | | | | | | Firmware blob looks like this... uint8_t MajorVersion uint8_t MinorVersion __le16 BuildNumber uint8_t data[] Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * edgeport: use request_firmware()Jaswinder Singh2008-07-1411-3557/+225
| | | | | | | | | | | | | | Version number provided in first HEX record. Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * vicam: use request_firmware()Jaswinder Singh2008-07-144-296/+39
| | | | | | | | | | | | | | | | | | | | Although it wasn't actually using ihex records before, we use the Intel HEX record format for this firmware -- because that gives us a simple way to split it into separate chunks internally as we need, without loading each part as a separate file. Signed-off-by: Jaswinder Singh <jaswinder@infradead.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * dabusb: use request_firmware()David Woodhouse2008-07-146-1427/+1461
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * cpia2: use request_firmware()David Woodhouse2008-07-145-242/+124
| | | | | | | | | | | | Thanks for Jaswinder Singh for converting the firmware blob itself to ihex. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * ip2: use request_firmware()David Woodhouse2008-07-106-2163/+2196
| | | | | | | | | | | | | | Converted with help from Jaswinder Singh Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Alan Cox <alan@redhat.com>
| * firmware: convert Ambassador ATM driver to request_firmware()David Woodhouse2008-07-108-2170/+265
| | | | | | | | | | | | | | | | | | Since it had various regions to be loaded to separate addresses, and it wanted to do them in fairly small chunks anyway, switch it to use the new ihex code. Encode the start address in the first record. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Chas Williams <chas@cmf.nrl.navy.mil>
| * whiteheat: use request_firmware()David Woodhouse2008-07-107-1696/+1887
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ti_usb_3410_5052: use request_firmware()David Woodhouse2008-07-107-1783/+1767
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * emi62: use request_firmware()David Woodhouse2008-07-109-17747/+7100
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * emi26: use request_firmware()David Woodhouse2008-07-107-5809/+5870
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * keyspan_pda: use request_firmware()David Woodhouse2008-07-109-229/+210
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * keyspan: use request_firmware()David Woodhouse2008-07-1029-5078/+1712
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ttusb-budget: use request_firmware()David Woodhouse2008-07-105-1648/+843
| | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * kaweth: use request_firmware()David Woodhouse2008-07-108-574/+304
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * smctr: use request_firmware()David Woodhouse2008-07-106-1001/+526
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: convert ymfpci driver to use firmware loader exclusivelyDavid Woodhouse2008-07-108-1638/+1562
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: convert maestro3 driver to use firmware loader exclusivelyDavid Woodhouse2008-07-106-181/+187
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: convert korg1212 driver to use firmware loader exclusivelyDavid Woodhouse2008-07-106-1015/+1007
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ihex: Add support for long records to ihex2fw.cDavid Woodhouse2008-07-102-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers could do with using records like Intel HEX, but with each record being larger than 256 bytes. This has been possible in the binary representation (struct ihex_binrec) in the kernel since the beginning -- at least of the the current version of history. But we haven't been able to represent that in the .HEX files which get converted to .fw files. This adds a '-w' option to ihex2fw to make it interpret the first _two_ bytes of each line as the record length, instead of only one byte. And adds makefile rules for %.H16->%.fw which use that. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ihex: add ihex2fw tool for converting HEX files into firmware imagesDavid Woodhouse2008-07-103-1/+262
| | | | | | | | | | | | | | | | | | | | Not the straight conversion to binary which objcopy can do for us, but actually representing each record with its original {addr, length}, because some drivers need that information preserved. Fix up 'firmware_install' to be able to build $(hostprogs-y) too. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ihex: request_ihex_firmware() function to load and validate firmwareDavid Woodhouse2008-07-101-0/+24
| | | | | | | | | | | | | | Provide a helper to load the file and validate it in one call, to simplify error handling in the drivers which are going to use it. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ihex.h: binary representation of ihex recordsDavid Woodhouse2008-07-101-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices need their firmware as a set of {address, len, data...} records in some specific order rather than a simple blob. The normal way of doing this kind of thing is 'ihex', which is a text format and not entirely suitable for use in the kernel. This provides a binary representation which is very similar, but much more compact -- and a helper routine to skip to the next record, because the alignment constraints mean that everybody will screw it up for themselves otherwise. Also a helper function which can verify that a 'struct firmware' contains a valid set of ihex records, and that following them won't run off the end of the loaded data. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: Add firmware installation to modules_install, add firmware_installDavid Woodhouse2008-07-103-7/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | For 'make modules_install', install any firmware required by the modules which are being installed. Also add a 'make firmware_install' target which doesn't depend on the configuration, but installs _all_ available in-kernel-tree firmware into $(INSTALL_FW_PATH), which defaults to /lib/firmware. This is intended for distributors to make arch-independent (and config-independent) packages containing firmware. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * firmware: Add CONFIG_FIRMWARE_IN_KERNEL option.David Woodhouse2008-07-102-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | This will control whether we build firmware into the kernel image for _every_ driver which we convert to request_firmware(), to avoid a proliferation of 'CONFIG_XXX_FIRMWARE' options for each one. Default to 'y' for now, which is the wrong thing to do but people seem to be insisting on it and refusing to even review patches until it's done. And it does preserve the existing behaviour for built-in drivers. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: Add CONFIG_EXTRA_FIRMWARE optionDavid Woodhouse2008-07-103-1/+128
| | | | | | | | | | | | | | | | | | | | | | | | This allows arbitrary firmware files to be included in the static kernel where the firmware loader can find them without requiring userspace to be alive. (Updated and CONFIG_EXTRA_FIRMWARE_DIR added with lots of help from Johannes Berg). Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
| * firmware: allow firmware files to be built into kernel imageDavid Woodhouse2008-07-103-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers have their own hacks to bypass the kernel's firmware loader and build their firmware into the kernel; this renders those unnecessary. Other drivers don't use the firmware loader at all, because they always want the firmware to be available. This allows them to start using the firmware loader. A third set of drivers already use the firmware loader, but can't be used without help from userspace, which sometimes requires an initrd. This allows them to work in a static kernel. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * firmware: make fw->data constDavid Woodhouse2008-07-102-2/+2
| | | | | | | | | | | | | | | | | | In preparation for supporting firmware files linked into the static kernel, make fw->data const to ensure that users aren't modifying it (so that we can pass a pointer to the original in-kernel copy, rather than having to copy it). Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * Fix a const pointer usage warning in the Digigram miXart soundcard driverDavid Howells2008-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix a const pointer usage warning in the Digigram miXart soundcard driver. A const pointer is being passed to copy_from_user() to load the firmware into. This is okay in this case because the function has allocated the firmware struct itself, but the const qualifier is part of the firmware struct - so the patch casts the const away. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * Fix a const pointer usage warning in the Digigram pcxhr soundcard driverDavid Howells2008-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix a const pointer usage warning in the Digigram pcxhr compatible soundcard driver. A const pointer is being passed to copy_from_user() to load the firmware into. This is okay in this case because the function has allocated the firmware struct itself, but the const qualifier is part of the firmware struct - so the patch casts the const away. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * Fix a const pointer error in the Conexant cx23418 MPEG encoder driverDavid Howells2008-07-101-1/+1
| | | | | | | | | | | | | | | | Fix a const pointer to non-const pointer assignment error in the Conexant cx23418 MPEG encoder driver. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * Fix a const assignment in moxa_load_fw()David Howells2008-07-101-2/+2
| | | | | | | | | | | | | | Fix an assignment of a const pointer to a non-const pointer in moxa_load_fw(). Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * Fix a const pointer usage warning in the Digigram VX soundcard driverDavid Howells2008-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fix a const pointer usage warning in the Digigram VX soundcard driver. A const pointer is being passed to copy_from_user() to load the firmware into. This is okay in this case because the function has allocated the firmware struct itself, but the const qualifier will be part of the firmware struct - so the patch casts the const away. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * isight: treat firmware data as constgregkh@suse.de2008-07-101-1/+1
| | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * x86 microcode: firmware data is constGreg Kroah-Hartman2008-07-101-2/+2
| | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * dell_rbu: firmware data is constGreg Kroah-Hartman2008-07-101-1/+1
| | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ymfpci: treat firmware data as constDavid Woodhouse2008-07-101-25/+34
| | | | | | | | | | | | | | Standardise both in-kernel and loaded firmware to be stored as little-endian instead of host-endian. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * maestro3: treat firmware data as constDavid Woodhouse2008-07-101-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maestro3 driver is byte-swapping its firmware to be host-endian in advance, when it doesn't seem to be necessary -- we could just use le16_to_cpu() as we load it. Doing that means that we need to switch the in-tree firmware to be little-endian too. Take the least intrusive way of doing this, which is to switch the existing snd_m3_convert_from_le() function to convert _to_ little-endian instead, and use it on the in-tree firmware instead of the loaded firmware. It's a bit suboptimal but doesn't matter much right now because we're about to remove the special cases for the in-tree version anyway. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * tuners: treat firmware data as constDavid Woodhouse2008-07-102-2/+2
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * gp8psk: treat firmware data as constDavid Woodhouse2008-07-101-1/+2
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * cxusb: treat firmware data as constDavid Woodhouse2008-07-101-3/+18
| | | | | | | | | | | | | | | | | | ...which means allocating our own copy when we want to modify it. (stupid thinko fixed by mkrufky) Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| * dvb frontends: treat firmware data as constDavid Woodhouse2008-07-107-9/+11
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * ttusb-dec: treat firmware data as constDavid Woodhouse2008-07-101-1/+1
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * bt8xx: treat firmware data as constDavid Woodhouse2008-07-101-1/+2
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * cxgb3: treat firmware data as constDavid Woodhouse2008-07-102-5/+7
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * irda-usb: treat firmware data as constDavid Woodhouse2008-07-101-6/+6
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * atmel: treat firmware data as constDavid Woodhouse2008-07-101-3/+3
| | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org>