NetXen: 64-bit memory fixes and driver cleanup
Subsystems (2)
PATCH 3/5 NetXen: 64-bit memory fixes and driver cleanup
NetXen: 1G/10G Ethernet Driver updates
- These fixes take care of driver on machines with >4G memory
- Driver cleanup
Signed-off-by Amit S. Kale <[email protected]>
Signed-off-by Don Fry <[email protected]>
drivers/net/netxen/netxen_nic_ethtool.c renamed from drivers/net/netxen.two/netxen_nic_ethtool.c +10 -9
@@ -6,12 +6,12 @@* modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -118,7 +118,7 @@ netxen_nic_get_drvinfo(struct net_deviceu32 fw_minor =0 ;u32 fw_build =0 ; -strncpy (drvinfo->driver,"netxen_nic" ,32 ); +strncpy (drvinfo->driver, netxen_nic_driver_name,32 );strncpy (drvinfo->version,NETXEN_NIC_LINUX_VERSIONID ,32 ); fw_major =readl (NETXEN_CRB_NORMALIZE (adapter,NETXEN_FW_VERSION_MAJOR ));
@@ -211,7 +211,6 @@ netxen_nic_get_settings(struct net_devicprintk ("ERROR: Unsupported board model %d\n" , (netxen_brdtype_t ) boardinfo->board_type);return -EIO ; - }return 0 ;
@@ -461,20 +460,22 @@ netxen_nic_get_ringparam(struct net_devi {struct netxen_port *port =netdev_priv (dev);struct netxen_adapter *adapter = port->adapter; -int i, j; +int i; ring->rx_pending =0 ; + ring->rx_jumbo_pending =0 ;for (i =0 ; i <MAX_RCV_CTX ; ++i) { -for (j =0 ; j <NUM_RCV_DESC_RINGS ; j++) - ring->rx_pending += - adapter->recv_ctx[i].rcv_desc[j].rcv_pending; + ring->rx_pending += adapter->recv_ctx[i]. + rcv_desc[RCV_DESC_NORMAL_CTXID ].rcv_pending; + ring->rx_jumbo_pending += adapter->recv_ctx[i]. + rcv_desc[RCV_DESC_JUMBO_CTXID ].rcv_pending; } ring->rx_max_pending = adapter->max_rx_desc_count; ring->tx_max_pending = adapter->max_tx_desc_count; + ring->rx_jumbo_max_pending = adapter->max_jumbo_rx_desc_count; ring->rx_mini_max_pending =0 ; ring->rx_mini_pending =0 ; - ring->rx_jumbo_max_pending =0 ; ring->rx_jumbo_pending =0 ; }
drivers/net/netxen/netxen_nic.h renamed from drivers/net/netxen.two/netxen_nic.h +28 -13
108 lines not on this page · raw message
drivers/net/netxen/netxen_nic_hw.c renamed from drivers/net/netxen.two/netxen_nic_hw.c +5 -5
@@ -650,7 +650,7 @@ void netxen_nic_reg_write(struct netxen_ addr =NETXEN_CRB_NORMALIZE (adapter, off);DPRINTK (INFO ,"writing to base %lx offset %llx addr %p data %x\n" , -pci_base (adapter, off), off, addr); +pci_base (adapter, off), off, addr, val);writel (val, addr); }
@@ -662,7 +662,7 @@ int netxen_nic_reg_read(struct netxen_ad addr =NETXEN_CRB_NORMALIZE (adapter, off);DPRINTK (INFO ,"reading from base %lx offset %llx addr %p\n" , - adapter->ahw.pci_base, off, addr); +pci_base (adapter, off), off, addr); val =readl (addr);writel (val, addr);
@@ -675,7 +675,7 @@ void netxen_nic_write_w0(struct netxen_avoid __iomem *addr;netxen_nic_pci_change_crbwindow (adapter,0 ); - addr = (void __iomem *)(pci_base_offset (adapter, index)); + addr =pci_base_offset (adapter, index);writel (value, addr);netxen_nic_pci_change_crbwindow (adapter,1 ); }
@@ -685,7 +685,7 @@ void netxen_nic_read_w0(struct netxen_ad {void __iomem *addr; - addr = (void __iomem *)(pci_base_offset (adapter, index)); + addr =pci_base_offset (adapter, index);netxen_nic_pci_change_crbwindow (adapter,0 ); *value =readl (addr);
@@ -865,7 +865,7 @@ netxen_crb_writelit_adapter(struct netxewritel (data,NETXEN_CRB_NORMALIZE (adapter, off)); }else {netxen_nic_pci_change_crbwindow (adapter,0 ); - addr = (void __iomem *)(pci_base_offset (adapter, off)); + addr =pci_base_offset (adapter, off);writel (data, addr);netxen_nic_pci_change_crbwindow (adapter,1 ); }
drivers/net/netxen/netxen_nic_hw.h renamed from drivers/net/netxen.two/netxen_nic_hw.h +2 -2
@@ -83,8 +83,8 @@ struct netxen_adapter;#define NETXEN_PCI_MAPSIZE_BYTES (NETXEN_PCI_MAPSIZE << 20)#define NETXEN_NIC_LOCKED_READ_REG (X ,Y ) \ - addr = pci_base_offset(adapter, (X)); \ - *(u32 *)Y = readl(addr); + addr = pci_base_offset(adapter, X); \ + *(u32 *)Y = readl((void __iomem*) addr);struct netxen_port ;void netxen_nic_set_link_parameters (struct netxen_port *port);
drivers/net/netxen/netxen_nic_init.c renamed from drivers/net/netxen.two/netxen_nic_init.c +47 -4
99 lines not on this page · raw message
drivers/net/netxen/netxen_nic_isr.c renamed from drivers/net/netxen.two/netxen_nic_isr.c +1 -2
@@ -68,8 +68,7 @@ struct net_device_stats *netxen_nic_get_void netxen_indicate_link_status (struct netxen_adapter *adapter,u32 portno,u32 link) { -struct netxen_port *pport = adapter->port[portno]; -struct net_device *netdev = pport->netdev; +struct net_device *netdev = (adapter->port[portno])->netdev;if (link)netif_carrier_on (netdev);
drivers/net/netxen/netxen_nic_main.c renamed from drivers/net/netxen.two/netxen_nic_main.c +195 -9
301 lines not on this page · raw message
drivers/net/netxen/netxen_nic_phan_reg.h renamed from drivers/net/netxen.two/netxen_nic_phan_reg.h +5 -5
@@ -85,17 +85,17 @@#define CRB_TX_PKT_TIMER NETXEN_NIC_REG(0x94)#define CRB_RX_PKT_CNT NETXEN_NIC_REG(0x98)#define CRB_RX_TMR_CNT NETXEN_NIC_REG(0x9c) -#define CRB_INT_THRESH NETXEN_NIC_REG(0xa4) +#define CRB_INT_THRESH NETXEN_NIC_REG(0xa4)/* Register for communicating XG link status */ #define CRB_XG_STATE NETXEN_NIC_REG(0xa0)/* Register for communicating card temperature */ /* Upper 16 bits are temperature value. Lower 16 bits are the state */ -#define CRB_TEMP_STATE NETXEN_NIC_REG(0xa8) -#define nx_get_temp_val (x) ((x) >> 16) -#define nx_get_temp_state (x) ((x) & 0xffff) -#define nx_encode_temp (val, state) (((val) << 16) | (state)) +#define CRB_TEMP_STATE NETXEN_NIC_REG(0xa8) +#define nx_get_temp_val (x) ((x) >> 16) +#define nx_get_temp_state (x) ((x) & 0xffff) +#define nx_encode_temp (val, state) (((val) << 16) | (state))/* Debug registers for controlling NIC pkt gen agent */ #define CRB_AGENT_GO NETXEN_NIC_REG(0xb0)
Signature · 2 lines
Don Fry [email protected]