Commit 5a861022 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6 

* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
  firmware: convert sb16_csp driver to use firmware loader exclusively
  dsp56k: use request_firmware
  edgeport-ti: use request_firmware()
  edgeport: use request_firmware()
  vicam: use request_firmware()
  dabusb: use request_firmware()
  cpia2: use request_firmware()
  ip2: use request_firmware()
  firmware: convert Ambassador ATM driver to request_firmware()
  whiteheat: use request_firmware()
  ti_usb_3410_5052: use request_firmware()
  emi62: use request_firmware()
  emi26: use request_firmware()
  keyspan_pda: use request_firmware()
  keyspan: use request_firmware()
  ttusb-budget: use request_firmware()
  kaweth: use request_firmware()
  smctr: use request_firmware()
  firmware: convert ymfpci driver to use firmware loader exclusively
  firmware: convert maestro3 driver to use firmware loader exclusively
  ...

Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.
parents 85082fd7 751851af

Makefile

+14 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ scripts: scripts_basic include/config/auto.conf 


# Objects we will link into vmlinux / subdirs we need to visit

init-y		:= init/

drivers-y	:= drivers/ sound/

drivers-y	:= drivers/ sound/ firmware/

net-y		:= net/

libs-y		:= lib/

core-y		:= usr/
@@ -998,6 +998,16 @@ PHONY += depend dep 
depend dep:

	@echo '*** Warning: make $@ is unnecessary now.'



# ---------------------------------------------------------------------------

# Firmware install

INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware

export INSTALL_FW_PATH



PHONY += firmware_install

firmware_install: FORCE

	@mkdir -p $(objtree)/firmware

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_install



# ---------------------------------------------------------------------------

# Kernel headers

INSTALL_HDR_PATH=$(objtree)/usr
@@ -1084,6 +1094,7 @@ _modinst_: 
# boot script depmod is the master version.

PHONY += _modinst_post

_modinst_post: _modinst_

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst

	$(call cmd,depmod)



else # CONFIG_MODULES
@@ -1201,6 +1212,8 @@ help: 
	@echo  '* vmlinux	  - Build the bare kernel'

	@echo  '* modules	  - Build all modules'

	@echo  '  modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'

	@echo  '  firmware_install- Install all firmware to INSTALL_FW_PATH'

	@echo  '                    (default: $$(INSTALL_MOD_PATH)/lib/firmware)'

	@echo  '  dir/            - Build all files in dir and below'

	@echo  '  dir/file.[ois]  - Build specified target only'

	@echo  '  dir/file.ko     - Build module including final link'

arch/x86/kernel/microcode.c

+2 −2
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); 
#define microcode_dev_exit() do { } while(0)

#endif



static long get_next_ucode_from_buffer(void **mc, void *buf,

static long get_next_ucode_from_buffer(void **mc, const u8 *buf,

	unsigned long size, long offset)

{

	microcode_header_t *mc_header;
@@ -525,7 +525,7 @@ static int cpu_request_microcode(int cpu) 
	char name[30];

	struct cpuinfo_x86 *c = &cpu_data(cpu);

	const struct firmware *firmware;

	void *buf;

	const u8 *buf;

	unsigned long size;

	long offset = 0;

	int error;

drivers/atm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ fore_200e-objs := fore200e.o 
hostprogs-y	:= fore200e_mkfirm



# Files generated that shall be removed upon make clean

clean-files := atmsar11.bin atmsar11.bin1 atmsar11.bin2 pca200e.bin \

	pca200e.bin1 pca200e.bin2 pca200e_ecd.bin pca200e_ecd.bin1 \

	pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 sba200e_ecd.bin2

clean-files := pca200e.bin pca200e.bin1 pca200e.bin2 pca200e_ecd.bin \

	pca200e_ecd.bin1 pca200e_ecd.bin2 sba200e_ecd.bin sba200e_ecd.bin1 \

	sba200e_ecd.bin2

# Firmware generated that shall be removed upon make clean

clean-files += fore200e_pca_fw.c fore200e_sba_fw.c

drivers/atm/ambassador.c

+57 −83
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <linux/poison.h>

#include <linux/bitrev.h>

#include <linux/mutex.h>

#include <linux/firmware.h>

#include <linux/ihex.h>



#include <asm/atomic.h>

#include <asm/io.h>
@@ -290,29 +292,6 @@ static inline void __init show_version (void) { 
  

*/



/********** microcode **********/



#ifdef AMB_NEW_MICROCODE

#define UCODE(x) UCODE2(atmsar12.x)

#else

#define UCODE(x) UCODE2(atmsar11.x)

#endif

#define UCODE2(x) #x



static u32 __devinitdata ucode_start =

#include UCODE(start)

;



static region __devinitdata ucode_regions[] = {

#include UCODE(regions)

  { 0, 0 }

};



static u32 __devinitdata ucode_data[] = {

#include UCODE(data)

  0xdeadbeef

};



static void do_housekeeping (unsigned long arg);

/********** globals **********/
@@ -1842,44 +1821,33 @@ static int __devinit get_loader_version (loader_block * lb, 
/* loader: write memory data blocks */



static int __devinit loader_write (loader_block* lb,

				const amb_dev * dev, const u32 * data,

				u32 address, unsigned int count) {

  unsigned int i;

				   const amb_dev *dev,

				   const struct ihex_binrec *rec) {

  transfer_block * tb = &lb->payload.transfer;

  

  PRINTD (DBG_FLOW|DBG_LOAD, "loader_write");



  if (count > MAX_TRANSFER_DATA)

    return -EINVAL;

  tb->address = cpu_to_be32 (address);

  tb->count = cpu_to_be32 (count);

  for (i = 0; i < count; ++i)

    tb->data[i] = cpu_to_be32 (data[i]);

  tb->address = rec->addr;

  tb->count = cpu_to_be32(be16_to_cpu(rec->len) / 4);

  memcpy(tb->data, rec->data, be16_to_cpu(rec->len));

  return do_loader_command (lb, dev, write_adapter_memory);

}



/* loader: verify memory data blocks */



static int __devinit loader_verify (loader_block * lb,

				 const amb_dev * dev, const u32 * data,

				 u32 address, unsigned int count) {

  unsigned int i;

				    const amb_dev *dev,

				    const struct ihex_binrec *rec) {

  transfer_block * tb = &lb->payload.transfer;

  int res;

  

  PRINTD (DBG_FLOW|DBG_LOAD, "loader_verify");

  

  if (count > MAX_TRANSFER_DATA)

    return -EINVAL;

  tb->address = cpu_to_be32 (address);

  tb->count = cpu_to_be32 (count);

  tb->address = rec->addr;

  tb->count = cpu_to_be32(be16_to_cpu(rec->len) / 4);

  res = do_loader_command (lb, dev, read_adapter_memory);

  if (!res)

    for (i = 0; i < count; ++i)

      if (tb->data[i] != cpu_to_be32 (data[i])) {

  if (!res && memcmp(tb->data, rec->data, be16_to_cpu(rec->len)))

    res = -EINVAL;

	break;

      }

  return res;

}
@@ -1962,47 +1930,53 @@ static int amb_reset (amb_dev * dev, int diags) { 
/********** transfer and start the microcode **********/



static int __devinit ucode_init (loader_block * lb, amb_dev * dev) {

  unsigned int i = 0;

  unsigned int total = 0;

  const u32 * pointer = ucode_data;

  u32 address;

  unsigned int count;

  const struct firmware *fw;

  unsigned long start_address;

  const struct ihex_binrec *rec;

  int res;

  

  res = request_ihex_firmware(&fw, "atmsar11.fw", &dev->pci_dev->dev);

  if (res) {

    PRINTK (KERN_ERR, "Cannot load microcode data");

    return res;

  }



  /* First record contains just the start address */

  rec = (const struct ihex_binrec *)fw->data;

  if (be16_to_cpu(rec->len) != sizeof(__be32) || be32_to_cpu(rec->addr)) {

    PRINTK (KERN_ERR, "Bad microcode data (no start record)");

    return -EINVAL;

  }

  start_address = be32_to_cpup((__be32 *)rec->data);



  rec = ihex_next_binrec(rec);



  PRINTD (DBG_FLOW|DBG_LOAD, "ucode_init");



  while (address = ucode_regions[i].start,

	 count = ucode_regions[i].count) {

    PRINTD (DBG_LOAD, "starting region (%x, %u)", address, count);

    while (count) {

      unsigned int words;

      if (count <= MAX_TRANSFER_DATA)

	words = count;

      else

	words = MAX_TRANSFER_DATA;

      total += words;

      res = loader_write (lb, dev, pointer, address, words);

      if (res)

	return res;

      res = loader_verify (lb, dev, pointer, address, words);

      if (res)

	return res;

      count -= words;

      address += sizeof(u32) * words;

      pointer += words;

  while (rec) {

    PRINTD (DBG_LOAD, "starting region (%x, %u)", be32_to_cpu(rec->addr),

	    be16_to_cpu(rec->len));

    if (be16_to_cpu(rec->len) > 4 * MAX_TRANSFER_DATA) {

	    PRINTK (KERN_ERR, "Bad microcode data (record too long)");

	    return -EINVAL;

    }

    i += 1;

    if (be16_to_cpu(rec->len) & 3) {

	    PRINTK (KERN_ERR, "Bad microcode data (odd number of bytes)");

	    return -EINVAL;

    }

  if (*pointer == ATM_POISON) {

    return loader_start (lb, dev, ucode_start);

  } else {

    // cast needed as there is no %? for pointer differnces

    PRINTD (DBG_LOAD|DBG_ERR,

	    "offset=%li, *pointer=%x, address=%x, total=%u",

	    (long) (pointer - ucode_data), *pointer, address, total);

    PRINTK (KERN_ERR, "incorrect microcode data");

    return -ENOMEM;

    res = loader_write(lb, dev, rec);

    if (res)

      break;



    res = loader_verify(lb, dev, rec);

    if (res)

      break;

  }

  release_firmware(fw);

  if (!res)

    res = loader_start(lb, dev, start_address);



  return res;

}



/********** give adapter parameters **********/

drivers/atm/ambassador.h

+0 −11
Original line number Diff line number Diff line
@@ -656,17 +656,6 @@ typedef struct amb_dev amb_dev; 
#define AMB_DEV(atm_dev) ((amb_dev *) (atm_dev)->dev_data)

#define AMB_VCC(atm_vcc) ((amb_vcc *) (atm_vcc)->dev_data)



/* the microcode */



typedef struct {

  u32 start;

  unsigned int count;

} region;



static region ucode_regions[];

static u32 ucode_data[];

static u32 ucode_start;



/* rate rounding */



typedef enum {

CRA Git | Maintained and supported by SUSTech CRA and CCSE