cassini: use request_firmware
Subsystems (2)
PATCH 6/21 cassini: use request_firmware
From: Jaswinder Singh <[email protected]>
Firmware blob looks like this...
__le16 load_address
unsigned char data[][[email protected]: include vmalloc.h]
Signed-off-by Jaswinder Singh <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/cassini.c | 54 + drivers/net/cassini.h | 1522 -------------------------------- firmware/Makefile | 1 firmware/WHENCE | 10 firmware/sun/cassini.bin.ihex | 143 +++ 5 files changed, 207 insertions(+), 1523 deletions(-)
drivers/net/cassini.c renamed from drivers/net/cassini.c~cassini-use-request_firmware +48 -6
@@ -74,6 +74,7 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> +#include <linux/vmalloc.h> #include <linux/ioport.h> #include <linux/pci.h> #include <linux/mm.h>
@@ -91,6 +92,7 @@#include <linux/ip.h> #include <linux/tcp.h> #include <linux/mutex.h> +#include <linux/firmware.h> #include <net/checksum.h>
@@ -197,6 +199,7 @@ static int link_mode;MODULE_AUTHOR ("Adrian Sun ([email protected])" );MODULE_DESCRIPTION ("Sun Cassini(+) ethernet driver" );MODULE_LICENSE ("GPL" ); +MODULE_FIRMWARE ("sun/cassini.bin" );module_param (cassini_debug, int,0 );MODULE_PARM_DESC (cassini_debug,"Cassini bitmapped debugging message enable value" );module_param (link_mode, int,0 );
@@ -812,9 +815,44 @@ static int cas_reset_mii_phy(struct casreturn (limit <=0 ); } +static int cas_saturn_firmware_init (struct cas *cp) +{ +const struct firmware *fw; +const char fw_name[] ="sun/cassini.bin" ; +int err; + +if (PHY_NS_DP83065 != cp->phy_id) +return 0 ; + + err =request_firmware (&fw, fw_name, &cp->pdev->dev); +if (err) { +printk (KERN_ERR "cassini: Failed to load firmware \"%s\"\n" , + fw_name); +return err; + } +if (fw->size <2 ) { +printk (KERN_ERR "cassini: bogus length %zu in \"%s\"\n" , + fw->size, fw_name); + err = -EINVAL ; + goto out; + } + cp->fw_load_addr= fw->data[1 ] <<8 | fw->data[0 ]; + cp->fw_size = fw->size -2 ; + cp->fw_data =vmalloc (cp->fw_size); +if (!cp->fw_data) { + err = -ENOMEM ; +printk (KERN_ERR "cassini: \"%s\" Failed %d\n" , fw_name, err); + goto out; + } +memcpy (cp->fw_data, &fw->data[2 ], cp->fw_size); +out: +release_firmware (fw); +return err; +} +static void cas_saturn_firmware_load (struct cas *cp) { -cas_saturn_patch_t *patch = cas_saturn_patch; +int i;cas_phy_powerdown (cp);
@@ -833,11 +871,9 @@ static void cas_saturn_firmware_load(str/* download new firmware */ cas_phy_write (cp,DP83065_MII_MEM ,0x1 ); -cas_phy_write (cp,DP83065_MII_REGE , patch->addr); -while (patch->addr) { -cas_phy_write (cp,DP83065_MII_REGD , patch->val); - patch++; - } +cas_phy_write (cp,DP83065_MII_REGE , cp->fw_load_addr); +for (i =0 ; i < cp->fw_size; i++) +cas_phy_write (cp,DP83065_MII_REGD , cp->fw_data[i]);/* enable firmware */ cas_phy_write (cp,DP83065_MII_REGE ,0x8ff8 );
@@ -5108,6 +5144,9 @@ static int __devinit cas_init_one(structcas_reset (cp,0 );if (cas_check_invariants (cp)) goto err_out_iounmap; +if (cp->cas_flags &CAS_FLAG_SATURN ) +if (cas_saturn_firmware_init (cp)) + goto err_out_iounmap; cp->init_block = (struct cas_init_block *) pci_alloc_consistent(pdev, sizeof(struct cas_init_block),
@@ -5217,6 +5256,9 @@ static void __devexit cas_remove_one(str cp =netdev_priv (dev);unregister_netdev (dev); +if (cp->fw_data) +vfree (cp->fw_data); +mutex_lock (&cp->pm_mutex);flush_scheduled_work ();if (cp->hw_running)
drivers/net/cassini.h renamed from drivers/net/cassini.h~cassini-use-request_firmware +5 -1517
1,534 lines not on this page · raw message
firmware/Makefile renamed from firmware/Makefile~cassini-use-request_firmware +1 -0
@@ -31,6 +31,7 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_tx.bin fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw +fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
firmware/WHENCE renamed from firmware/WHENCE~cassini-use-request_firmware +10 -0
@@ -460,3 +460,13 @@ Found in hex form in kernel source, with -------------------------------------------------------------------------- + +Driver: CASSINI - Sun Cassini + +File: sun/cassini.bin + +Licence: Unknown + +Found in hex form in kernel source. + +--------------------------------------------------------------------------
firmware/sun/cassini.bin.ihex new file +143 -0
143 lines not on this page · raw message
_
From: [email protected]
Date: Mon, 22 Sep 2008 14:52:13 -0700
Quoted 7 lines
Firmware blob looks like this...
__le16 load_address unsigned char data[][[email protected]: include vmalloc.h]Signed-off-by Jaswinder Singh <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Applied to net-next-2.6