Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 66639
b: refs/heads/master
c: 2fd3768
h: refs/heads/master
i:
  66637: 58cdac8
  66635: c0626b1
  66631: 8868c5b
  66623: 267c727
v: v3
  • Loading branch information
Sivakumar Subramani authored and David S. Miller committed Oct 10, 2007
1 parent c5a8dce commit 76dcd8a
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a4bdbaa93c2df4cfac2174ba536cd586014787d
refs/heads/master: 2fd37688455857b7b92bc2b1379a4c48aa9af147
107 changes: 67 additions & 40 deletions trunk/drivers/net/s2io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,16 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
timer.data = (unsigned long) arg; \
mod_timer(&timer, (jiffies + exp)) \

/* copy mac addr to def_mac_addr array */
static void do_s2io_copy_mac_addr(struct s2io_nic *sp, int offset, u64 mac_addr)
{
sp->def_mac_addr[offset].mac_addr[5] = (u8) (mac_addr);
sp->def_mac_addr[offset].mac_addr[4] = (u8) (mac_addr >> 8);
sp->def_mac_addr[offset].mac_addr[3] = (u8) (mac_addr >> 16);
sp->def_mac_addr[offset].mac_addr[2] = (u8) (mac_addr >> 24);
sp->def_mac_addr[offset].mac_addr[1] = (u8) (mac_addr >> 32);
sp->def_mac_addr[offset].mac_addr[0] = (u8) (mac_addr >> 40);
}
/* Add the vlan */
static void s2io_vlan_rx_register(struct net_device *dev,
struct vlan_group *grp)
Expand Down Expand Up @@ -3412,7 +3422,7 @@ static void s2io_reset(struct s2io_nic * sp)
}

/* restore the previously assigned mac address */
s2io_set_mac_addr(sp->dev, (u8 *)&sp->def_mac_addr[0].mac_addr);
do_s2io_prog_unicast(sp->dev, (u8 *)&sp->def_mac_addr[0].mac_addr);

sp->device_enabled_once = FALSE;
}
Expand Down Expand Up @@ -3843,7 +3853,7 @@ static int s2io_open(struct net_device *dev)
goto hw_init_failed;
}

if (s2io_set_mac_addr(dev, dev->dev_addr) == FAILURE) {
if (do_s2io_prog_unicast(dev, dev->dev_addr) == FAILURE) {
DBG_PRINT(ERR_DBG, "Set Mac Address Failed\n");
s2io_card_down(sp);
err = -ENODEV;
Expand Down Expand Up @@ -4845,65 +4855,80 @@ static void s2io_set_multicast(struct net_device *dev)
}
}

/* add unicast MAC address to CAM */
static int do_s2io_add_unicast(struct s2io_nic *sp, u64 addr, int off)
{
u64 val64;
struct XENA_dev_config __iomem *bar0 = sp->bar0;

writeq(RMAC_ADDR_DATA0_MEM_ADDR(addr),
&bar0->rmac_addr_data0_mem);

val64 =
RMAC_ADDR_CMD_MEM_WE | RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
RMAC_ADDR_CMD_MEM_OFFSET(off);
writeq(val64, &bar0->rmac_addr_cmd_mem);

/* Wait till command completes */
if (wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
S2IO_BIT_RESET)) {
DBG_PRINT(INFO_DBG, "add_mac_addr failed\n");
return FAILURE;
}
return SUCCESS;
}

/**
* s2io_set_mac_addr driver entry point
*/
static int s2io_set_mac_addr(struct net_device *dev, void *p)
{
struct sockaddr *addr = p;

if (!is_valid_ether_addr(addr->sa_data))
return -EINVAL;

memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);

/* store the MAC address in CAM */
return (do_s2io_prog_unicast(dev, dev->dev_addr));
}

/**
* s2io_set_mac_addr - Programs the Xframe mac address
* do_s2io_prog_unicast - Programs the Xframe mac address
* @dev : pointer to the device structure.
* @addr: a uchar pointer to the new mac address which is to be set.
* Description : This procedure will program the Xframe to receive
* frames with new Mac Address
* Return value: SUCCESS on success and an appropriate (-)ve integer
* as defined in errno.h file on failure.
*/

static int s2io_set_mac_addr(struct net_device *dev, u8 * addr)
static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr)
{
struct s2io_nic *sp = dev->priv;
struct XENA_dev_config __iomem *bar0 = sp->bar0;
register u64 val64, mac_addr = 0;
register u64 mac_addr = 0, perm_addr = 0;
int i;
u64 old_mac_addr = 0;

/*
* Set the new MAC address as the new unicast filter and reflect this
* change on the device address registered with the OS. It will be
* at offset 0.
*/
* Set the new MAC address as the new unicast filter and reflect this
* change on the device address registered with the OS. It will be
* at offset 0.
*/
for (i = 0; i < ETH_ALEN; i++) {
mac_addr <<= 8;
mac_addr |= addr[i];
old_mac_addr <<= 8;
old_mac_addr |= sp->def_mac_addr[0].mac_addr[i];
perm_addr <<= 8;
perm_addr |= sp->def_mac_addr[0].mac_addr[i];
}

if(0 == mac_addr)
/* check if the dev_addr is different than perm_addr */
if (mac_addr == perm_addr)
return SUCCESS;

/* Update the internal structure with this new mac address */
if(mac_addr != old_mac_addr) {
memset(sp->def_mac_addr[0].mac_addr, 0, sizeof(ETH_ALEN));
sp->def_mac_addr[0].mac_addr[5] = (u8) (mac_addr);
sp->def_mac_addr[0].mac_addr[4] = (u8) (mac_addr >> 8);
sp->def_mac_addr[0].mac_addr[3] = (u8) (mac_addr >> 16);
sp->def_mac_addr[0].mac_addr[2] = (u8) (mac_addr >> 24);
sp->def_mac_addr[0].mac_addr[1] = (u8) (mac_addr >> 32);
sp->def_mac_addr[0].mac_addr[0] = (u8) (mac_addr >> 40);
}

writeq(RMAC_ADDR_DATA0_MEM_ADDR(mac_addr),
&bar0->rmac_addr_data0_mem);

val64 =
RMAC_ADDR_CMD_MEM_WE | RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
RMAC_ADDR_CMD_MEM_OFFSET(0);
writeq(val64, &bar0->rmac_addr_cmd_mem);
/* Wait till command completes */
if (wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING, S2IO_BIT_RESET)) {
DBG_PRINT(ERR_DBG, "%s: set_mac_addr failed\n", dev->name);
return FAILURE;
}

return SUCCESS;
do_s2io_copy_mac_addr(sp, 0, mac_addr);
return (do_s2io_add_unicast(sp, mac_addr, 0));
}

/**
Expand Down Expand Up @@ -7530,6 +7555,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
dev->get_stats = &s2io_get_stats;
dev->set_multicast_list = &s2io_set_multicast;
dev->do_ioctl = &s2io_ioctl;
dev->set_mac_address = &s2io_set_mac_addr;
dev->change_mtu = &s2io_change_mtu;
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
Expand Down Expand Up @@ -7615,6 +7641,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
/* Set the factory defined MAC address initially */
dev->addr_len = ETH_ALEN;
memcpy(dev->dev_addr, sp->def_mac_addr, ETH_ALEN);
memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);

/* Store the values of the MSIX table in the s2io_nic structure */
store_xmsi_data(sp);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/s2io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ static void s2io_link(struct s2io_nic * sp, int link);
static void s2io_reset(struct s2io_nic * sp);
static int s2io_poll(struct napi_struct *napi, int budget);
static void s2io_init_pci(struct s2io_nic * sp);
static int s2io_set_mac_addr(struct net_device *dev, u8 * addr);
static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr);
static void s2io_alarm_handle(unsigned long data);
static irqreturn_t
s2io_msix_ring_handle(int irq, void *dev_id);
Expand Down

0 comments on commit 76dcd8a

Please sign in to comment.