Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfc3a44c authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by David S. Miller
Browse files

starfire: use request_firmware() 



Firmware blob is big endian

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 077f849d

drivers/net/starfire.c

+48 −6
Original line number Diff line number Diff line
@@ -42,11 +42,11 @@ 
#include <linux/mii.h>

#include <linux/if_vlan.h>

#include <linux/mm.h>

#include <linux/firmware.h>

#include <asm/processor.h>		/* Processor type for cache alignment. */

#include <asm/uaccess.h>

#include <asm/io.h>



#include "starfire_firmware.h"

/*

 * The current frame processor firmware fails to checksum a fragment

 * of length 1. If and when this is fixed, the #define below can be removed.
@@ -173,6 +173,10 @@ static int full_duplex[MAX_UNITS] = {0, }; 
#define skb_first_frag_len(skb)	skb_headlen(skb)

#define skb_num_frags(skb) (skb_shinfo(skb)->nr_frags + 1)



/* Firmware names */

#define FIRMWARE_RX	"adaptec/starfire_rx.bin"

#define FIRMWARE_TX	"adaptec/starfire_tx.bin"



/* These identify the driver base version and may not be removed. */

static char version[] =

KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker <becker@scyld.com>\n"
@@ -182,6 +186,8 @@ MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); 
MODULE_DESCRIPTION("Adaptec Starfire Ethernet driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_FIRMWARE(FIRMWARE_RX);

MODULE_FIRMWARE(FIRMWARE_TX);



module_param(max_interrupt_work, int, 0);

module_param(mtu, int, 0);
@@ -902,9 +908,12 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val 


static int netdev_open(struct net_device *dev)

{

	const struct firmware *fw_rx, *fw_tx;

	const __be32 *fw_rx_data, *fw_tx_data;

	struct netdev_private *np = netdev_priv(dev);

	void __iomem *ioaddr = np->base;

	int i, retval;

	size_t tx_size, rx_size;

	size_t tx_done_q_size, rx_done_q_size, tx_ring_size, rx_ring_size;



	/* Do we ever need to reset the chip??? */
@@ -1040,11 +1049,40 @@ static int netdev_open(struct net_device *dev) 
	writel(ETH_P_8021Q, ioaddr + VlanType);

#endif /* VLAN_SUPPORT */



	retval = request_firmware(&fw_rx, FIRMWARE_RX, &np->pci_dev->dev);

	if (retval) {

		printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n",

		       FIRMWARE_RX);

		return retval;

	}

	if (fw_rx->size % 4) {

		printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n",

		       fw_rx->size, FIRMWARE_RX);

		retval = -EINVAL;

		goto out_rx;

	}

	retval = request_firmware(&fw_tx, FIRMWARE_TX, &np->pci_dev->dev);

	if (retval) {

		printk(KERN_ERR "starfire: Failed to load firmware \"%s\"\n",

		       FIRMWARE_TX);

		goto out_rx;

	}

	if (fw_tx->size % 4) {

		printk(KERN_ERR "starfire: bogus length %zu in \"%s\"\n",

		       fw_tx->size, FIRMWARE_TX);

		retval = -EINVAL;

		goto out_tx;

	}

	fw_rx_data = (const __be32 *)&fw_rx->data[0];

	fw_tx_data = (const __be32 *)&fw_tx->data[0];

	rx_size = fw_rx->size / 4;

	tx_size = fw_tx->size / 4;



	/* Load Rx/Tx firmware into the frame processors */

	for (i = 0; i < FIRMWARE_RX_SIZE * 2; i++)

		writel(firmware_rx[i], ioaddr + RxGfpMem + i * 4);

	for (i = 0; i < FIRMWARE_TX_SIZE * 2; i++)

		writel(firmware_tx[i], ioaddr + TxGfpMem + i * 4);

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

		writel(be32_to_cpup(&fw_rx_data[i]), ioaddr + RxGfpMem + i * 4);

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

		writel(be32_to_cpup(&fw_tx_data[i]), ioaddr + TxGfpMem + i * 4);

	if (enable_hw_cksum)

		/* Enable the Rx and Tx units, and the Rx/Tx frame processors. */

		writel(TxEnable|TxGFPEnable|RxEnable|RxGFPEnable, ioaddr + GenCtrl);
@@ -1056,7 +1094,11 @@ static int netdev_open(struct net_device *dev) 
		printk(KERN_DEBUG "%s: Done netdev_open().\n",

		       dev->name);



	return 0;

out_tx:

	release_firmware(fw_tx);

out_rx:

	release_firmware(fw_rx);

	return retval;

}

drivers/net/starfire_firmware.h

deleted100644 → 0
+0 −346
Original line number Diff line number Diff line 
/*

 * Copyright 2003 Adaptec, Inc.

 *

 * Please read the following license before using the Adaptec Software

 * ("Program"). If you do not agree to the license terms, do not use the

 * Program:

 *

 * You agree to be bound by version 2 of the General Public License ("GPL")

 * dated June 1991, which can be found at http://www.fsf.org/licenses/gpl.html.

 * If the link is broken, write to Free Software Foundation, 59 Temple Place,

 * Boston, Massachusetts 02111-1307.

 *

 * BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND

 * THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE

 * IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE

 * (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR

 * OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR

 * DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES

 * ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.

 *

 */



static const u32 firmware_rx[] = {

  0x010003dc, 0x00000000,

  0x04000421, 0x00000086,

  0x80000015, 0x0000180e,

  0x81000015, 0x00006664,

  0x1a0040ab, 0x00000b06,

  0x14200011, 0x00000000,

  0x14204022, 0x0000aaaa,

  0x14204022, 0x00000300,

  0x14204022, 0x00000000,

  0x1a0040ab, 0x00000b14,

  0x14200011, 0x00000000,

  0x83000015, 0x00000002,

  0x04000021, 0x00000000,

  0x00000010, 0x00000000,

  0x04000421, 0x00000087,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00008015, 0x00000000,

  0x0000003e, 0x00000000,

  0x00000010, 0x00000000,

  0x82000015, 0x00004000,

  0x009e8050, 0x00000000,

  0x03008015, 0x00000000,

  0x86008015, 0x00000000,

  0x82000015, 0x00008000,

  0x0100001c, 0x00000000,

  0x000050a0, 0x0000010c,

  0x4e20d011, 0x00006008,

  0x1420d012, 0x00004008,

  0x0000f090, 0x00007000,

  0x0000c8b0, 0x00003000,

  0x00004040, 0x00000000,

  0x00108015, 0x00000000,

  0x00a2c150, 0x00004000,

  0x00a400b0, 0x00000014,

  0x00000020, 0x00000000,

  0x2500400d, 0x00002525,

  0x00047220, 0x00003100,

  0x00934070, 0x00000000,

  0x00000020, 0x00000000,

  0x00924460, 0x00000184,

  0x2b20c011, 0x00000000,

  0x0000c420, 0x00000540,

  0x36014018, 0x0000422d,

  0x14200011, 0x00000000,

  0x00924460, 0x00000183,

  0x3200001f, 0x00000034,

  0x02ac0015, 0x00000002,

  0x00a60110, 0x00000008,

  0x42200011, 0x00000000,

  0x00924060, 0x00000103,

  0x0000001e, 0x00000000,

  0x00000020, 0x00000100,

  0x0000001e, 0x00000000,

  0x00924460, 0x00000086,

  0x00004080, 0x00000000,

  0x0092c070, 0x00000000,

  0x00924060, 0x00000100,

  0x0000c890, 0x00005000,

  0x00a6c110, 0x00000000,

  0x00b0c090, 0x00000012,

  0x021c0015, 0x00000000,

  0x3200001f, 0x00000034,

  0x00924460, 0x00000510,

  0x44210011, 0x00000000,

  0x42000011, 0x00000000,

  0x83000015, 0x00000040,

  0x00924460, 0x00000508,

  0x45014018, 0x00004545,

  0x00808050, 0x00000000,

  0x62208012, 0x00000000,

  0x82000015, 0x00000800,

  0x15200011, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x80000015, 0x0000eea4,

  0x81000015, 0x0000005f,

  0x00000060, 0x00000000,

  0x00004120, 0x00000000,

  0x00004a00, 0x00004000,

  0x00924460, 0x00000190,

  0x5601401a, 0x00005956,

  0x14000011, 0x00000000,

  0x00934050, 0x00000018,

  0x00930050, 0x00000018,

  0x3601403a, 0x0000002d,

  0x000643a9, 0x00000000,

  0x0000c420, 0x00000140,

  0x5601401a, 0x00005956,

  0x14000011, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x000642a9, 0x00000000,

  0x00024420, 0x00000183,

  0x5601401a, 0x00005956,

  0x82000015, 0x00002000,

  0x15200011, 0x00000000,

  0x82000015, 0x00000010,

  0x15200011, 0x00000000,

  0x82000015, 0x00000010,

  0x15200011, 0x00000000,

};	/* 104 Rx instructions */

#define FIRMWARE_RX_SIZE 104



static const u32 firmware_tx[] = {

  0x010003dc, 0x00000000,

  0x04000421, 0x00000086,

  0x80000015, 0x0000180e,

  0x81000015, 0x00006664,

  0x1a0040ab, 0x00000b06,

  0x14200011, 0x00000000,

  0x14204022, 0x0000aaaa,

  0x14204022, 0x00000300,

  0x14204022, 0x00000000,

  0x1a0040ab, 0x00000b14,

  0x14200011, 0x00000000,

  0x83000015, 0x00000002,

  0x04000021, 0x00000000,

  0x00000010, 0x00000000,

  0x04000421, 0x00000087,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00008015, 0x00000000,

  0x0000003e, 0x00000000,

  0x00000010, 0x00000000,

  0x82000015, 0x00004000,

  0x009e8050, 0x00000000,

  0x03008015, 0x00000000,

  0x86008015, 0x00000000,

  0x82000015, 0x00008000,

  0x0100001c, 0x00000000,

  0x000050a0, 0x0000010c,

  0x4e20d011, 0x00006008,

  0x1420d012, 0x00004008,

  0x0000f090, 0x00007000,

  0x0000c8b0, 0x00003000,

  0x00004040, 0x00000000,

  0x00108015, 0x00000000,

  0x00a2c150, 0x00004000,

  0x00a400b0, 0x00000014,

  0x00000020, 0x00000000,

  0x2500400d, 0x00002525,

  0x00047220, 0x00003100,

  0x00934070, 0x00000000,

  0x00000020, 0x00000000,

  0x00924460, 0x00000184,

  0x2b20c011, 0x00000000,

  0x0000c420, 0x00000540,

  0x36014018, 0x0000422d,

  0x14200011, 0x00000000,

  0x00924460, 0x00000183,

  0x3200001f, 0x00000034,

  0x02ac0015, 0x00000002,

  0x00a60110, 0x00000008,

  0x42200011, 0x00000000,

  0x00924060, 0x00000103,

  0x0000001e, 0x00000000,

  0x00000020, 0x00000100,

  0x0000001e, 0x00000000,

  0x00924460, 0x00000086,

  0x00004080, 0x00000000,

  0x0092c070, 0x00000000,

  0x00924060, 0x00000100,

  0x0000c890, 0x00005000,

  0x00a6c110, 0x00000000,

  0x00b0c090, 0x00000012,

  0x021c0015, 0x00000000,

  0x3200001f, 0x00000034,

  0x00924460, 0x00000510,

  0x44210011, 0x00000000,

  0x42000011, 0x00000000,

  0x83000015, 0x00000040,

  0x00924460, 0x00000508,

  0x45014018, 0x00004545,

  0x00808050, 0x00000000,

  0x62208012, 0x00000000,

  0x82000015, 0x00000800,

  0x15200011, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x80000015, 0x0000eea4,

  0x81000015, 0x0000005f,

  0x00000060, 0x00000000,

  0x00004120, 0x00000000,

  0x00004a00, 0x00004000,

  0x00924460, 0x00000190,

  0x5601401a, 0x00005956,

  0x14000011, 0x00000000,

  0x00934050, 0x00000018,

  0x00930050, 0x00000018,

  0x3601403a, 0x0000002d,

  0x000643a9, 0x00000000,

  0x0000c420, 0x00000140,

  0x5601401a, 0x00005956,

  0x14000011, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x000642a9, 0x00000000,

  0x00024420, 0x00000183,

  0x5601401a, 0x00005956,

  0x82000015, 0x00002000,

  0x15200011, 0x00000000,

  0x82000015, 0x00000010,

  0x15200011, 0x00000000,

  0x82000015, 0x00000010,

  0x15200011, 0x00000000,

};	/* 104 Tx instructions */

#define FIRMWARE_TX_SIZE 104

#if 0

static const u32 firmware_wol[] = {

  0x010003dc, 0x00000000,

  0x19000421, 0x00000087,

  0x80000015, 0x00001a1a,

  0x81000015, 0x00001a1a,

  0x1a0040ab, 0x00000b06,

  0x15200011, 0x00000000,

  0x15204022, 0x0000aaaa,

  0x15204022, 0x00000300,

  0x15204022, 0x00000000,

  0x1a0040ab, 0x00000b15,

  0x15200011, 0x00000000,

  0x83000015, 0x00000002,

  0x04000021, 0x00000000,

  0x00000010, 0x00000000,

  0x04000421, 0x00000087,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00008015, 0x00000000,

  0x0000003e, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x82000015, 0x00004000,

  0x82000015, 0x00008000,

  0x0000000c, 0x00000000,

  0x00000010, 0x00000000,

  0x00004080, 0x00000100,

  0x1f20c011, 0x00001122,

  0x2720f011, 0x00003011,

  0x19200071, 0x00000000,

  0x1a200051, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x1d2040a4, 0x00003344,

  0x1d2040a2, 0x00005566,

  0x000040a0, 0x00000100,

  0x00108050, 0x00000001,

  0x1a208012, 0x00000006,

  0x82000015, 0x00008080,

  0x010003dc, 0x00000000,

  0x1d2040a4, 0x00002233,

  0x1d2040a4, 0x00004455,

  0x2d208011, 0x00000005,

  0x1d2040a4, 0x00006611,

  0x00108050, 0x00000001,

  0x27200011, 0x00000000,

  0x1d2050a4, 0x00006600,

  0x82000015, 0x00008080,

  0x010003dc, 0x00000000,

  0x00000050, 0x00000000,

  0x1b200031, 0x00000000,

  0x0000001e, 0x00000000,

  0x0000001e, 0x00000000,

  0x0000001e, 0x00000000,

  0x0000001e, 0x00000000,

  0x00924460, 0x00000086,

  0x00004080, 0x00000000,

  0x0092c070, 0x00000000,

  0x00924060, 0x00000100,

  0x0000c890, 0x00005000,

  0x00a6c110, 0x00000000,

  0x00b0c090, 0x00000012,

  0x021c0015, 0x00000000,

  0x3200001f, 0x00000034,

  0x00924460, 0x00000510,

  0x44210011, 0x00000000,

  0x42000011, 0x00000000,

  0x83000015, 0x00000040,

  0x00924460, 0x00000508,

  0x476a0012, 0x00000100,

  0x83000015, 0x00000008,

  0x16200011, 0x00000000,

  0x001e8050, 0x00000000,

  0x001e8050, 0x00000000,

  0x00808050, 0x00000000,

  0x03008015, 0x00000000,

  0x62208012, 0x00000000,

  0x82000015, 0x00000800,

  0x16200011, 0x00000000,

  0x80000015, 0x0000eea4,

  0x81000015, 0x0000005f,

  0x00000020, 0x00000000,

  0x00004120, 0x00000000,

  0x00004a00, 0x00004000,

  0x00924460, 0x00000190,

  0x5c01401a, 0x0000595c,

  0x15000011, 0x00000000,

  0x00934050, 0x00000018,

  0x00930050, 0x00000018,

  0x3601403a, 0x0000002d,

  0x00064029, 0x00000000,

  0x0000c420, 0x00000140,

  0x5c01401a, 0x0000595c,

  0x15000011, 0x00000000,

  0x00000010, 0x00000000,

  0x00000010, 0x00000000,

  0x00064029, 0x00000000,

  0x00024420, 0x00000183,

  0x5c01401a, 0x0000595c,

  0x82000015, 0x00002000,

  0x16200011, 0x00000000,

  0x82000015, 0x00000010,

  0x16200011, 0x00000000,

  0x82000015, 0x00000010,

  0x16200011, 0x00000000,

};	/* 104 WoL instructions */

#define FIRMWARE_WOL_SIZE 104

#endif

drivers/net/starfire_firmware.pl

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#!/usr/bin/perl



# This script can be used to generate a new starfire_firmware.h

# from GFP_RX.DAT and GFP_TX.DAT, files included with the DDK

# and also with the Novell drivers.



open FW, "GFP_RX.DAT" || die;

open FWH, ">starfire_firmware.h" || die;



printf(FWH "static u32 firmware_rx[] = {\n");

$counter = 0;

while ($foo = <FW>) {

  chomp;

  printf(FWH "  0x%s, 0x0000%s,\n", substr($foo, 4, 8), substr($foo, 0, 4));

  $counter++;

}



close FW;

open FW, "GFP_TX.DAT" || die;



printf(FWH "};\t/* %d Rx instructions */\n#define FIRMWARE_RX_SIZE %d\n\nstatic u32 firmware_tx[] = {\n", $counter, $counter);

$counter = 0;

while ($foo = <FW>) {

  chomp;

  printf(FWH "  0x%s, 0x0000%s,\n", substr($foo, 4, 8), substr($foo, 0, 4));

  $counter++;

}



close FW;

printf(FWH "};\t/* %d Tx instructions */\n#define FIRMWARE_TX_SIZE %d\n", $counter, $counter);

close(FWH);

firmware/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ else 
acenic-objs := acenic/tg1.bin acenic/tg2.bin

endif

fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)

fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \

					 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

firmware/WHENCE

+19 −0
Original line number Diff line number Diff line
@@ -390,3 +390,22 @@ Licence: 
Found in hex form in kernel source.



--------------------------------------------------------------------------



Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support



File: adaptec/starfire_rx.bin

File: adaptec/starfire_tx.bin



Licence: Allegedly GPLv2, but no source visible.



Found in hex form in kernel source, with the following notice:



 BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND

 THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE

 IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE

 (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR

 OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR

 DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES

 ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.



--------------------------------------------------------------------------