xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-11-26 19:29:04 +00:00
Code Issues Projects Releases Wiki Activity

[forcedeth] Add support for newer forcedeth NICs

Browse Source 
Also adds the MAC_ADDR_CORRECT flag, to indicate whether or not the
MAC address needs to be fixed up by the driver.

Signed-off-by: Michael Brown <mcb30@etherboot.org>
This commit is contained in:
Thomas Miletich 2009-03-26 10:26:55 +00:00 committed by Michael Brown
parent 3da6f1c7bd
commit 03ff8cd3e2
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/drivers/net/forcedeth.c
View File

@ -379,6 +379,9 @@ enum {
#define LPA_1000FULL 0x0800
#define LPA_1000HALF 0x0400
/* Bit to know if MAC addr is stored in correct order */
#define MAC_ADDR_CORRECT 0x01
/* Big endian: should work, but is untested */
struct ring_desc {
u32 PacketBuffer;
@ -1241,6 +1244,9 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) {
int sz;
u8 *base;
int i;
struct pci_device_id *ids = pci->driver->ids;
int id_count = pci->driver->id_count;
unsigned int flags = 0;
if (pci->ioaddr == 0)
return 0;
@ -1280,12 +1286,31 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) {
np->orig_mac[0] = readl(base + NvRegMacAddrA);
np->orig_mac[1] = readl(base + NvRegMacAddrB);
nic->node_addr[0] = (np->orig_mac[1] >> 8) & 0xff;
nic->node_addr[1] = (np->orig_mac[1] >> 0) & 0xff;
nic->node_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
nic->node_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
nic->node_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
nic->node_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
/* lookup the flags from pci_device_id */
for(i = 0; i < id_count; i++) {
if(pci->vendor == ids[i].vendor &&
pci->device == ids[i].device) {
flags = ids[i].driver_data;
break;
}
}
/* read MAC address */
if(flags & MAC_ADDR_CORRECT) {
nic->node_addr[0] = (np->orig_mac[0] >> 0) & 0xff;
nic->node_addr[1] = (np->orig_mac[0] >> 8) & 0xff;
nic->node_addr[2] = (np->orig_mac[0] >> 16) & 0xff;
nic->node_addr[3] = (np->orig_mac[0] >> 24) & 0xff;
nic->node_addr[4] = (np->orig_mac[1] >> 0) & 0xff;
nic->node_addr[5] = (np->orig_mac[1] >> 8) & 0xff;
} else {
nic->node_addr[0] = (np->orig_mac[1] >> 8) & 0xff;
nic->node_addr[1] = (np->orig_mac[1] >> 0) & 0xff;
nic->node_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
nic->node_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
nic->node_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
nic->node_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
}
#ifdef LINUX
if (!is_valid_ether_addr(dev->dev_addr)) {
/*
@ -1423,7 +1448,9 @@ PCI_ROM(0x10de, 0x0056, "nforce8", "nForce NVENET_8 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0057, "nforce9", "nForce NVENET_9 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0037, "nforce10", "nForce NVENET_10 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0038, "nforce11", "nForce NVENET_11 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller", 0)
PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0269, "nforce16", "nForce NVENET_16 Ethernet Controller", 0),
PCI_ROM(0x10de, 0x0760, "nforce17", "nForce NVENET_17 Ethernet Controller", MAC_ADDR_CORRECT),
};
PCI_DRIVER ( forcedeth_driver, forcedeth_nics, PCI_NO_CLASS );