hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

annotate netxen 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro 2007-12-22 19:44:00 +00:00 committed by David S. Miller
parent 66341fffd4
commit f305f789bb
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/netxen/netxen_nic.h
View File

@ -898,7 +898,7 @@ struct netxen_adapter {
u32 curr_window; u32 curr_window;
u32 cmd_producer; u32 cmd_producer;
u32 *cmd_consumer; __le32 *cmd_consumer;
u32 last_cmd_consumer; u32 last_cmd_consumer;
u32 max_tx_desc_count; u32 max_tx_desc_count;
@ -1195,7 +1195,7 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter)
int netxen_is_flash_supported(struct netxen_adapter *adapter); int netxen_is_flash_supported(struct netxen_adapter *adapter);
int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]); int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[]);
extern void netxen_change_ringparam(struct netxen_adapter *adapter); extern void netxen_change_ringparam(struct netxen_adapter *adapter);
extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
int *valp); int *valp);

26
drivers/net/netxen/netxen_nic_hw.c
View File

@ -419,7 +419,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
adapter->ctx_desc->cmd_consumer_offset = adapter->ctx_desc->cmd_consumer_offset =
cpu_to_le64(adapter->ctx_desc_phys_addr + cpu_to_le64(adapter->ctx_desc_phys_addr +
sizeof(struct netxen_ring_ctx)); sizeof(struct netxen_ring_ctx));
adapter->cmd_consumer = (uint32_t *) (((char *)addr) + adapter->cmd_consumer = (__le32 *) (((char *)addr) +
sizeof(struct netxen_ring_ctx)); sizeof(struct netxen_ring_ctx));
addr = netxen_alloc(adapter->ahw.pdev, addr = netxen_alloc(adapter->ahw.pdev,
@ -586,35 +586,35 @@ int netxen_is_flash_supported(struct netxen_adapter *adapter)
} }
static int netxen_get_flash_block(struct netxen_adapter *adapter, int base, static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
int size, u32 * buf) int size, __le32 * buf)
{ {
int i, addr; int i, addr;
u32 *ptr32; __le32 *ptr32;
u32 v;
addr = base; addr = base;
ptr32 = buf; ptr32 = buf;
for (i = 0; i < size / sizeof(u32); i++) { for (i = 0; i < size / sizeof(u32); i++) {
if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) if (netxen_rom_fast_read(adapter, addr, &v) == -1)
return -1; return -1;
*ptr32 = cpu_to_le32(*ptr32); *ptr32 = cpu_to_le32(v);
ptr32++; ptr32++;
addr += sizeof(u32); addr += sizeof(u32);
} }
if ((char *)buf + size > (char *)ptr32) { if ((char *)buf + size > (char *)ptr32) {
u32 local; __le32 local;
if (netxen_rom_fast_read(adapter, addr, &v) == -1)
if (netxen_rom_fast_read(adapter, addr, &local) == -1)
return -1; return -1;
local = cpu_to_le32(local); local = cpu_to_le32(v);
memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32); memcpy(ptr32, &local, (char *)buf + size - (char *)ptr32);
} }
return 0; return 0;
} }
int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]) int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[])
{ {
u32 *pmac = (u32 *) & mac[0]; __le32 *pmac = (__le32 *) & mac[0];
if (netxen_get_flash_block(adapter, if (netxen_get_flash_block(adapter,
NETXEN_USER_START + NETXEN_USER_START +
@ -623,7 +623,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[])
FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) { FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) {
return -1; return -1;
} }
if (*mac == ~0ULL) { if (*mac == cpu_to_le64(~0ULL)) {
if (netxen_get_flash_block(adapter, if (netxen_get_flash_block(adapter,
NETXEN_USER_START_OLD + NETXEN_USER_START_OLD +
offsetof(struct netxen_user_old_info, offsetof(struct netxen_user_old_info,
@ -631,7 +631,7 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[])
FLASH_NUM_PORTS * sizeof(u64), FLASH_NUM_PORTS * sizeof(u64),
pmac) == -1) pmac) == -1)
return -1; return -1;
if (*mac == ~0ULL) if (*mac == cpu_to_le64(~0ULL))
return -1; return -1;
} }
return 0; return 0;

7
drivers/net/netxen/netxen_nic_init.c
View File

@ -438,10 +438,11 @@ static int do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
int ret = 0; int ret = 0;
for (addridx = addr; addridx < (addr + size); addridx += 4) { for (addridx = addr; addridx < (addr + size); addridx += 4) {
ret = do_rom_fast_read(adapter, addridx, (int *)bytes); int v;
ret = do_rom_fast_read(adapter, addridx, &v);
if (ret != 0) if (ret != 0)
break; break;
*(int *)bytes = cpu_to_le32(*(int *)bytes); *(__le32 *)bytes = cpu_to_le32(v);
bytes += 4; bytes += 4;
} }
@ -501,7 +502,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
int timeout = 0; int timeout = 0;
int data; int data;
data = le32_to_cpu((*(u32*)bytes)); data = le32_to_cpu((*(__le32*)bytes));
ret = do_rom_fast_write(adapter, addridx, data); ret = do_rom_fast_write(adapter, addridx, data);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
drivers/net/netxen/netxen_nic_main.c
View File

@ -277,7 +277,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct netxen_recv_context *recv_ctx = NULL; struct netxen_recv_context *recv_ctx = NULL;
struct netxen_rcv_desc_ctx *rcv_desc = NULL; struct netxen_rcv_desc_ctx *rcv_desc = NULL;
struct netxen_cmd_buffer *cmd_buf_arr = NULL; struct netxen_cmd_buffer *cmd_buf_arr = NULL;
u64 mac_addr[FLASH_NUM_PORTS + 1]; __le64 mac_addr[FLASH_NUM_PORTS + 1];
int valid_mac = 0; int valid_mac = 0;
u32 val; u32 val;
int pci_func_id = PCI_FUNC(pdev->devfn); int pci_func_id = PCI_FUNC(pdev->devfn);