Remove e1000 network driver as module

The driver has been moved to libe1k

Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>

7 files changed, 2 insertions, 1211 deletions

diff --git a/board-js2x/romfs/boot_rom.ffs b/board-js2x/romfs/boot_rom.ffs
index 7be7803..d1bb50a 100644
--- a/board-js2x/romfs/boot_rom.ffs
+++ b/board-js2x/romfs/boot_rom.ffs
@@ -21,4 +21,3 @@ bootinfo	board-js2x/llfw/Cboot.bin	0		0
 rtas		board-js2x/rtas/rtas.bin	0		0
 snk		clients/net-snk.client		0		0
 net_bcm 	drivers/bcm57xx/net_bcm57xx.elf	0		0
-net_e1000	drivers/e1k/net_e1k.elf		0		0
diff --git a/board-qemu/Makefile b/board-qemu/Makefile
index b9109fe..eb43787 100644
--- a/board-qemu/Makefile
+++ b/board-qemu/Makefile
@@ -10,7 +10,7 @@
 # *     IBM Corporation - initial implementation
 # ****************************************************************************/
 
-BOARD_TARGETS = tools_build romfs_build clients_build netdrivers stage1 subdirs
+BOARD_TARGETS = tools_build romfs_build clients_build stage1 subdirs
 
 SUBDIRS = slof
 
@@ -37,9 +37,6 @@ stage1:	common-libs
 	@echo " ====== Building llfw ======"
 	$(MAKE) -C llfw RELEASE=-DRELEASE=\"\\\"$(RELEASE)\\\"\"
 
-netdrivers: common-libs
-	$(MAKE) -C ../drivers/e1k
-
 clean_here:
 	rm -f ../slof/OF.ffs
 	rm -f ../boot_rom.bin
diff --git a/board-qemu/romfs/boot_rom.ffs b/board-qemu/romfs/boot_rom.ffs
index 7ef46f4..3cdb7d3 100644
--- a/board-qemu/romfs/boot_rom.ffs
+++ b/board-qemu/romfs/boot_rom.ffs
@@ -18,4 +18,3 @@ xvect		slof/xvect.bin			0			0
 ofw_main	board-qemu/slof/paflof		0			0
 bootinfo	board-qemu/llfw/Cboot.bin	0			0
 snk		clients/net-snk.client		0			0
-net_e1000	drivers/e1k/net_e1k.elf		0			0
diff --git a/drivers/Makefile b/drivers/Makefile
index 6fd4430..93b04c2 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -16,7 +16,7 @@ ifndef TOP
 endif
 include $(TOP)/make.rules
 
-SUBDIRS=common bcm57xx e1k
+SUBDIRS=common bcm57xx
 CLEANSUBDIRS = $(SUBDIRS) 
 
 
diff --git a/drivers/e1k/Makefile b/drivers/e1k/Makefile
deleted file mode 100644
index 3fa2e2f..0000000
--- a/drivers/e1k/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2007, 2011 IBM Corporation
-# * All rights reserved.
-# * This program and the accompanying materials
-# * are made available under the terms of the BSD License
-# * which accompanies this distribution, and is available at
-# * http://www.opensource.org/licenses/bsd-license.php
-# *
-# * Contributors:
-# *     IBM Corporation - initial implementation
-# ****************************************************************************/
-
-ifndef TOP
-  TOP = $(shell while ! test -e make.rules; do cd ..  ; done; pwd)
-  export TOP
-endif
-include $(TOP)/make.rules
-
-CPPFLAGS = -I. -I$(TOP)/include -I$(TOP)/clients/net-snk/include \
-	   -I$(TOP)/lib/libc/include -I../common
-
-SRCS   = e1k.c
-
-COMMONOBJS = ../common/module_entry.o
-
-OBJS   += $(COMMONOBJS) $(SRCS:.c=.o)
-
-
-all:	Makefile.dep net_e1k.elf
-
-net_e1k.elf: $(OBJS) $(TOP)/lib/libc.a
-	$(LD) $(LDFLAGS) $^ -o $@ -T ../common/module.lds -N -q
-	$(STRIP) --strip-unneeded $@
-
-# A rule for making the object files in the common directory:
-../common/%.o: ../common/%.c
-	$(MAKE) -C ../common all
-
-
-clean:
-	$(RM) -f *.o *.a *.i *.elf
-
-distclean : clean
-	rm -f Makefile.dep
-
-
-# Rules for creating the dependency file:
-depend:
-	$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCS) > Makefile.dep
-Makefile.dep:
-	$(MAKE) depend
-
-# Include dependency file if available:
-ifneq (,$(wildcard Makefile.dep))
-include Makefile.dep
-endif
diff --git a/drivers/e1k/e1k.c b/drivers/e1k/e1k.c
deleted file mode 100644
index a606b71..0000000
--- a/drivers/e1k/e1k.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation
- * All rights reserved.
- * This program and the accompanying materials
- * are made available under the terms of the BSD License
- * which accompanies this distribution, and is available at
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * Contributors:
- *     IBM Corporation - initial implementation
- *****************************************************************************/
-/*
- * e1000 Gigabit Ethernet Driver for SLOF
- *
- * Reference:
- *   PCI/PCI-X Family of Gigabit Ethernet Controllers
- *   Software Developer's Manual Rev. 3.3, Intel, December 2006
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <byteorder.h>
-#include "e1k.h"
-
-
-/*
- * local defines
- ******************************************************************************
- */
-#define E1K_NUM_RX_DESC	128	// do not change
-#define E1K_NUM_TX_DESC	128	// do not change
-#define E1K_BUF_SIZE	2096	// do not change
-
-#define NUM_MAC_ADDR	16	// number of mac address register pairs
-#define EEPROM_MAC_OFFS	0	// position of mac address in eeprom
-
-/*
- * local types
- ******************************************************************************
- */
-typedef struct {
-	uint32_t m_dev_u32;
-	uint64_t m_devmsk_u64;
-	char *m_name;
-}	e1k_dev_t;
-
-/*
- * e1k common data structures
- */
-
-/*
- * transmit buffer descriptor
- */
-typedef struct {
-	uint64_t m_buffer_u64;
-	uint16_t m_len_u16;
-	uint8_t m_cso_u08;
-	uint8_t m_cmd_u08;
-	uint8_t m_sta_u08;
-	uint8_t m_css_u08;
-	uint16_t m_spe_u16;
-}	__attribute__ ((packed)) e1k_tx_desc_st;
-
-
-/*
- * receive buffer descriptor
- */
-typedef struct {
-	uint64_t m_buffer_u64;
-	uint16_t m_len_u16;
-	uint16_t m_csm_u16;
-	uint8_t m_sta_u08;
-	uint8_t m_err_u08;
-	uint16_t m_spe_u16;
-}	__attribute__ ((packed)) e1k_rx_desc_st;
-
-/*
- * e1k device structure
- */
-typedef struct {
-	/*
-	 * device identification mask
-	 */
-	uint64_t	m_device_u64;
-
-	/*
-	 * memory mapped base address of NIC
-	 */
-	uint64_t	m_baseaddr_u64;
-
-	/*
-	 * transmit & receive rings
-	 * must be 16 byte aligned
-	 */
-	e1k_tx_desc_st	m_tx_ring_pst[E1K_NUM_TX_DESC];
-	e1k_rx_desc_st	m_rx_ring_pst[E1K_NUM_RX_DESC];
-
-	/*
-	 * transmit & receive buffers
-	 * must be 16 byte aligned
-	 */
-	uint8_t		m_tx_buffer_pu08[E1K_NUM_TX_DESC][E1K_BUF_SIZE];
-	uint8_t		m_rx_buffer_pu08[E1K_NUM_RX_DESC][E1K_BUF_SIZE];
-
-	/*
-	 * next receive descriptor index
-	 */
-	uint32_t	m_rx_next_u32;
-
-	/*
-	 * command register storage
-	 */
-	uint16_t	m_com_r_u16;
-
-	/*
-	 * padding to make the size of the structure a multiple of 16 byte
-	 */
-	uint16_t	m_pad16_u16;
-	uint64_t	m_pad64_u32;
-
-	/*
-	 * PCI related data
-	 */
-	uint64_t	pcicfg_puid;
-	uint8_t		pcicfg_bus;
-	uint8_t		pcicfg_devfn;
-}	__attribute__ ((packed)) e1k_st;
-
-/*
- * local constants
- ******************************************************************************
- */
-#define E1K_82540	((uint64_t) 0x1)
-#define E1K_82541	((uint64_t) 0x2)
-#define E1K_82544	((uint64_t) 0x4)
-#define E1K_82545	((uint64_t) 0x8)
-#define E1K_82546	((uint64_t) 0x10)
-#define E1K_82547	((uint64_t) 0x20)
-
-#define IS_82541	((m_e1k.m_device_u64 & E1K_82541) != 0)
-#define IS_82546	((m_e1k.m_device_u64 & E1K_82546) != 0)
-#define IS_82547	((m_e1k.m_device_u64 & E1K_82547) != 0)
-
-static const e1k_dev_t e1k_dev[] = {
-	{ 0x1019, E1K_82547, "82547EI/GI Copper" },
-	{ 0x101A, E1K_82547, "82547EI Mobile" },
-	{ 0x1010, E1K_82546, "52546EB Copper, Dual Port" },
-	{ 0x1012, E1K_82546, "82546EB Fiber, Dual Port" },
-/*	{ 0x101D, E1K_82546, "82546EB Copper, Quad Port" }, */
-	{ 0x1079, E1K_82546, "82546GB Copper, Dual Port" },
-	{ 0x107A, E1K_82546, "82546GB Fiber, Dual Port" },
-	{ 0x107B, E1K_82546, "82546GB SerDes, Dual Port" },
-	{ 0x100F, E1K_82545, "82545EM Copper" },
-	{ 0x1011, E1K_82545, "82545EM Fiber" },
-	{ 0x1026, E1K_82545, "82545GM Copper" },
-	{ 0x1027, E1K_82545, "82545GM Fiber" },
-	{ 0x1028, E1K_82545, "82545GM SerDes" },
-	{ 0x1107, E1K_82544, "82544EI Copper" },
-	{ 0x1112, E1K_82544, "82544GC Copper" },
-	{ 0x1013, E1K_82541, "82541EI Copper" },
-	{ 0x1018, E1K_82541, "82541EI Mobile" },
-	{ 0x1076, E1K_82541, "82541GI Copper" },
-	{ 0x1077, E1K_82541, "82541GI Mobile" },
-	{ 0x1078, E1K_82541, "82541ER Copper" },
-	{ 0x107C, E1K_82541, "82541PI" },
-	{ 0x1015, E1K_82540, "82540EM Mobile" },
-	{ 0x1016, E1K_82540, "82540EP Mobile" },
-	{ 0x1017, E1K_82540, "82540EP Desktop" },
-	{ 0x100E, E1K_82540, "82540EM Desktop" },
-	{ 0     , 0 }
-};
-
-/*
- * local variables
- ******************************************************************************
- */
-static e1k_st	m_e1k __attribute__ ((aligned(16)));
-static long dma_offset;
-
-/*
- * global functions
- ******************************************************************************
- */
-int
-check_driver(pci_config_t *pci_conf);
-
-
-/*
- * snk module interface
- ******************************************************************************
- */
-static int e1k_init(void);
-static int e1k_term(void);
-static int e1k_xmit(char *f_buffer_pc, int f_len_i);
-static int e1k_receive(char *f_buffer_pc, int f_len_i);
-static int e1k_ioctl(int request, void* data);
-
-snk_module_t snk_module_interface = {
-	.version = 1,
-	.type    = MOD_TYPE_NETWORK,
-	.running = 0,
-	.init    = e1k_init,
-	.term    = e1k_term,
-	.write   = e1k_xmit,
-	.read    = e1k_receive,
-	.ioctl   = e1k_ioctl
-};
-
-
-/**
- * Translate virtual to "physical" address, ie. an address
- * which can be used for DMA transfers.
- */
-static uint64_t
-virt2dma(void *addr)
-{
-	return (uint64_t)addr + dma_offset;
-}
-
-static void *
-dma2virt(uint64_t addr)
-{
-	return (void *)(addr - dma_offset);
-}
-
-
-/*
- * local inline functions for e1k register access
- ******************************************************************************
- */
-static uint32_t
-e1k_rd32(uint16_t f_offs_u16)
-{	// caution: shall only be used after initialization!
-	return bswap_32(rd32(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16));
-}
-
-/* not used so far
-static uint16_t
-e1k_rd16(uint16_t f_offs_u16)
-{	// caution: shall only be used after initialization!
-	return bswap_16(rd16(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16));
-}*/
-
-/* not used so far
-static uint8_t
-e1k_rd08(uint16_t f_offs_u16)
-{	// caution: shall only be used after initialization!
-	return rd08(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16);
-}*/
-
-static void
-e1k_wr32(uint16_t f_offs_u16, uint32_t f_val_u32)
-{	// caution: shall only be used after initialization!
-	wr32(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16, bswap_32(f_val_u32));
-}
-
-/* not used so far
-static void
-e1k_wr16(uint16_t f_offs_u16, uint16_t f_val_u16)
-{	// caution: shall only be used after initialization!
-	wr16(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16, bswap_16(f_val_u16));
-}*/
-
-/* not used so far
-static void
-e1k_wr08(uint16_t f_offs_u16, uint8_t f_val_u08)
-{	// caution: shall only be used after initialization!
-	wr08(m_e1k.m_baseaddr_u64 + (uint64_t) f_offs_u16, f_val_u08);
-}*/
-
-static void
-e1k_setb32(uint16_t f_offs_u16, uint32_t f_mask_u32)
-{
-	uint32_t v;
-
-	v  = e1k_rd32(f_offs_u16);
-	v |= f_mask_u32;
-	e1k_wr32(f_offs_u16, v);
-}
-
-/* not used so far
-static void
-e1k_setb16(uint16_t f_offs_u16, uint16_t f_mask_u16)
-{
-	uint16_t v;
-	v  = e1k_rd16(f_offs_u16);
-	v |= f_mask_u16;
-	e1k_wr16(f_offs_u16, v);
-}*/
-
-/* not used so far
-static void
-e1k_setb08(uint16_t f_offs_u16, uint8_t f_mask_u08)
-{
-	uint8_t v;
-	v  = e1k_rd08(f_offs_u16);
-	v |= f_mask_u08;
-	e1k_wr08(f_offs_u16, v);
-}*/
-
-static void
-e1k_clrb32(uint16_t f_offs_u16, uint32_t f_mask_u32)
-{
-	uint32_t v;
-
-	v  = e1k_rd32(f_offs_u16);
-	v &= ~f_mask_u32;
-	e1k_wr32(f_offs_u16, v);
-}
-
-/* not used so far
-static void
-e1k_clrb16(uint16_t f_offs_u16, uint16_t f_mask_u16)
-{
-	uint16_t v;
-
-	v  = e1k_rd16(f_offs_u16);
-	v &= ~f_mask_u16;
-	e1k_wr16(f_offs_u16, v);
-}*/
-
-/* not used so far
-static void
-e1k_clrb08(uint16_t f_offs_u16, uint8_t f_mask_u08)
-{
-	uint8_t v;
-	v  = e1k_rd08(f_offs_u16);
-	v &= ~f_mask_u08;
-	e1k_wr08(f_offs_u16, v);
-}*/
-
-static int32_t
-e1k_eep_rd16(uint8_t f_offs_u08, uint16_t *f_data_pu16)
-{
-	uint32_t i;
-	uint32_t v;
-	int32_t done_shft;
-	int32_t addr_shft;
-
-	if(IS_82541 || IS_82547) {
-		addr_shft = 2;
-		done_shft = 1;
-	} else {
-		addr_shft = 8;
-		done_shft = 4;
-	}
-
-	/*
-	 * initiate eeprom read
-	 */
-	e1k_wr32(EERD, ((uint32_t) f_offs_u08 << addr_shft) |	// address
-		  BIT32(0));					// start read
-
-	/*
-	 * wait for read done bit to be set
-	 */
-	i = 1000;
-	v = e1k_rd32(EERD);
-	while ((--i) &&
-	       ((v & BIT32(done_shft)) == 0)) {
-		ms_delay(1);
-		v = e1k_rd32(EERD);
-	}
-
-	/*
-	 * return on error
-	 */
-	if ((v & BIT32(done_shft)) == 0) {
-		return -1;
-	}
-	
-	/*
-	 * return data
-	 */
-	*f_data_pu16 = (uint16_t) ((v >> 16) & 0xffff);
-
-	return 0;
-}
-
-/*
- * ring initialization
- */
-static void
-e1k_init_receiver(void)
-{
-	uint32_t i;
-	uint64_t addr;
-
-	/*
-	 * disable receiver for initialization
-	 */
-	e1k_wr32(RCTL, 0);
-
-	/*
-	 * clear receive desciptors and setup buffer pointers
-	 */
-	for (i = 0; i < E1K_NUM_RX_DESC; i++) {
-		memset((uint8_t *) &m_e1k.m_rx_ring_pst[i], 0,
-			sizeof(e1k_rx_desc_st));
-		mb();
-
-		m_e1k.m_rx_ring_pst[i].m_buffer_u64 =
-			bswap_64(virt2dma(&m_e1k.m_rx_buffer_pu08[i][0]));
-	}
-
-	/*
-	 * initialize previously received index
-	 */
-	m_e1k.m_rx_next_u32 = 0;
-
-	/*
-	 * setup the base address and the length of the rx descriptor ring
-	 */
-	addr = virt2dma(&m_e1k.m_rx_ring_pst[0]);
-	e1k_wr32(RDBAH, (uint32_t) ((uint64_t) addr >> 32));
-	e1k_wr32(RDBAL, (uint32_t) ((uint64_t) addr & 0xffffffff));
-	e1k_wr32(RDLEN, E1K_NUM_RX_DESC * sizeof(e1k_rx_desc_st));
-
-	/*
-	 * setup the rx head and tail descriptor indices
-	 */
-	e1k_wr32(RDH, 0);
-	e1k_wr32(RDT, E1K_NUM_RX_DESC - 1);
-
-	/*
-	 * setup the receive delay timer register
-	 */
-	e1k_wr32(RDTR, 0);
-
-	/*
-	 * setup the receive control register
-	 */
-	e1k_wr32(RCTL,  BIT32( 1) |	// enable receiver
-			BIT32( 4) |	// enable multicast reception
-			BIT32(15));	// broadcast accept mode
-					// packet size 2048
-					// no buffer extension
-}
-
-static void
-e1k_init_transmitter(void)
-{
-	uint32_t i;
-	uint64_t addr;
-
-	/*
-	 * clear transmit desciptors and setup buffer pointers
-	 */
-	for (i = 0; i < E1K_NUM_TX_DESC; i++) {
-		memset((uint8_t *) &m_e1k.m_tx_ring_pst[i], 0,
-			sizeof(e1k_tx_desc_st));
-		mb();
-
-		m_e1k.m_tx_ring_pst[i].m_buffer_u64 =
-			bswap_64(virt2dma(&m_e1k.m_tx_buffer_pu08[i][0]));
-	}
-
-	/*
-	 * setup the base address and the length of the tx descriptor ring
-	 */
-	addr = virt2dma(&m_e1k.m_tx_ring_pst[0]);
-	e1k_wr32(TDBAH, (uint32_t) ((uint64_t) addr >> 32));
-	e1k_wr32(TDBAL, (uint32_t) ((uint64_t) addr & 0xffffffff));
-	e1k_wr32(TDLEN, E1K_NUM_TX_DESC * sizeof(e1k_tx_desc_st));
-
-	/*
-	 * setup the rx head and tail descriptor indices
-	 */
-	e1k_wr32(TDH, 0);
-	e1k_wr32(TDT, 0);
-
-	/*
-	 * initialize the transmit control register
-	 */
-	e1k_wr32(TCTL, BIT32(1) |			// enable transmitter
-			BIT32(3) |			// pad short packets
-			((uint32_t) 0x0f <<  4) |	// collision threshold
-			((uint32_t) 0x40 << 12));	// collision distance
-}
-
-static int32_t
-e1k_mac_init(uint8_t *f_mac_pu08)
-{
-	uint32_t l_ah_u32;
-	uint32_t l_al_u32;
-	uint32_t i;
-	uint32_t v;
-
-	/*
-	 * Use MAC address from device tree if possible
-	 */
-	for (i = 0, v = 0; i < 6; i++) {
-		v += (uint32_t) f_mac_pu08[i];
-	}
-
-	if (v != 0) {
-		/*
-		 * use passed mac address for transmission to nic
-		 */
-		l_al_u32  = ((uint32_t) f_mac_pu08[3] << 24);
-		l_al_u32 |= ((uint32_t) f_mac_pu08[2] << 16);
-		l_al_u32 |= ((uint32_t) f_mac_pu08[1] <<  8);
-		l_al_u32 |= ((uint32_t) f_mac_pu08[0] <<  0);
-		l_ah_u32  = ((uint32_t) f_mac_pu08[5] <<  8);
-		l_ah_u32 |= ((uint32_t) f_mac_pu08[4] <<  0);
-	} else {
-		/*
-		 * read mac address from eeprom
-		 */
-		uint16_t w[3];	// 3 16 bit words from eeprom
-
-		for (i = 0; i < 3; i++) {
-			if (e1k_eep_rd16(EEPROM_MAC_OFFS + i, &w[i]) != 0) {
-				printk("Failed to read MAC address from EEPROM!\n");
-				return -1;
-			}
-		}
-
-		/*
-		 * invert the least significant bit for 82546 dual port
-		 * if the second device is in use (remember word is byteswapped)
-		 */
-		if ((IS_82546) &&
-		    ((e1k_rd32(STATUS) & BIT32(2)) != 0)) {
-			w[2] ^= (uint16_t) 0x100;
-		}
-
-		/*
-		 * store mac address for transmission to nic
-		 */
-		l_ah_u32  = ((uint32_t) w[2] <<  0);
-		l_al_u32  = ((uint32_t) w[1] << 16);
-		l_al_u32 |= ((uint32_t) w[0] <<  0);
-
-		/*
-		 * return mac address
-		 * mac address in eeprom is stored byteswapped
-		 */
-		f_mac_pu08[1] = (uint8_t) ((w[0] >> 8) & 0xff);
-		f_mac_pu08[0] = (uint8_t) ((w[0] >> 0) & 0xff);
-		f_mac_pu08[3] = (uint8_t) ((w[1] >> 8) & 0xff);
-		f_mac_pu08[2] = (uint8_t) ((w[1] >> 0) & 0xff);
-		f_mac_pu08[5] = (uint8_t) ((w[2] >> 8) & 0xff);
-		f_mac_pu08[4] = (uint8_t) ((w[2] >> 0) & 0xff);
-	}
-
-	/*
-	 * insert mac address in receive address register
-	 * and set AV bit
-	 */
-	e1k_wr32(RAL0, l_al_u32);
-	e1k_wr32(RAH0, l_ah_u32 | BIT32(31));
-
-	/*
-	 * clear remaining receive address registers
-	 */
-	for (i = 1; i < NUM_MAC_ADDR; i++) {
-		e1k_wr32(RAL0 + i * sizeof(uint64_t), 0);
-		e1k_wr32(RAH0 + i * sizeof(uint64_t), 0);
-	}
-
-	return 0;
-}
-
-
-/*
- * interface
- ******************************************************************************
- */
-  
-/*
- * e1k_receive
- */
-static int
-e1k_receive(char *f_buffer_pc, int f_len_i)
-{
-	uint32_t	l_rdh_u32 = e1k_rd32(RDH);	// this includes needed dummy read
-	e1k_rx_desc_st	*rx;
-	int		l_ret_i;
-
-	#ifdef E1K_DEBUG
-	#ifdef E1K_SHOW_RCV_DATA
-	int		i;
-	#endif
-	#endif
-
-	/*
-	 * check whether new packets have arrived
-	 */
-	if (m_e1k.m_rx_next_u32 == l_rdh_u32) {
-		return 0;
-	}
-
-	/*
-	 * get a pointer to the next rx descriptor for ease of use
-	 */
-	rx = &m_e1k.m_rx_ring_pst[m_e1k.m_rx_next_u32];
-
-	/*
-	 * check whether the descriptor done bit is set
-	 */
-	if ((rx->m_sta_u08 & 0x1) == 0) {
-		return 0;
-	}
-
-	/*
-	 * get the length of the packet, throw away checksum
-	 */
-	l_ret_i = (int) bswap_16(rx->m_len_u16) - (int) 4;
-
-	/*
-	 * copy the data
-	 */
-	memcpy((uint8_t *) f_buffer_pc, dma2virt(bswap_64(rx->m_buffer_u64)),
-		(size_t) l_ret_i);
-
-	#ifdef E1K_DEBUG
-	#if defined(E1K_SHOW_RCV) || defined(E1K_SHOW_RCV_DATA)
-	printk("e1k: %d bytes received\n", l_ret_i);
-	#endif
-
-	#ifdef E1K_SHOW_RCV_DATA
-	for (i = 0; i < l_ret_i; i++) {
-
-		if ((i & 0x1f) == 0) {
-			printk("\n       ");
-		}
-
-		printk("%02X ", f_buffer_pc[i]);
-	}
-
-	printk("\n\n");
-	#endif
-	#endif
-
-	/*
-	 * clear descriptor for reusage, but leave buffer pointer untouched
-	 */
-	memset((uint8_t *) &rx->m_len_u16, 0,
-		sizeof(e1k_rx_desc_st) - sizeof(uint64_t));
-	mb();
-
-	/*
-	 * write new tail pointer
-	 */
-	e1k_wr32(RDT, m_e1k.m_rx_next_u32);
-
-	/*
-	 * update next receive index
-	 */
-	m_e1k.m_rx_next_u32 = (m_e1k.m_rx_next_u32 + 1) & (E1K_NUM_RX_DESC - 1);
-
-	return l_ret_i;
-}
-
-static int
-e1k_xmit(char *f_buffer_pc, int f_len_i)
-{
-	uint32_t	l_tdh_u32 = e1k_rd32(TDH);
-	uint32_t	l_tdt_u32 = e1k_rd32(TDT);
-	uint32_t	l_pre_u32 = (l_tdh_u32 + (E1K_NUM_TX_DESC - 1)) &
-				    (E1K_NUM_TX_DESC - 1);
-	e1k_tx_desc_st	*tx;
-	#if defined(E1K_DEBUG) && defined(E1K_SHOW_XMIT_DATA)
-	int		i;
-	#endif
-
-	/*
-	 * check for available buffers
-	 */
-	if (l_pre_u32 == l_tdt_u32) {
-		return 0;
-	}
-
-	/*
-	 * get a pointer to the next tx descriptor for ease of use
-	 */
-	tx = &m_e1k.m_tx_ring_pst[l_tdt_u32];
-
-	/*
-	 * copy the data
-	 */
-	memcpy(dma2virt(bswap_64(tx->m_buffer_u64)), (uint8_t *) f_buffer_pc,
-		(size_t) f_len_i);
-
-	/*
-	 * insert length & command flags
-	 */
-	tx->m_len_u16 = bswap_16((uint16_t) f_len_i);
-	tx->m_cmd_u08 = (BIT08(0) |		// EOP
-			  BIT08(1));		// IFCS
-	tx->m_sta_u08 = 0;
-	mb();
-
-	/*
-	 * update tail index
-	 */
-	l_tdt_u32 = (l_tdt_u32 + 1) & (E1K_NUM_TX_DESC - 1);
-	e1k_wr32(TDT, l_tdt_u32);
-
-	#ifdef E1K_DEBUG
-	#if defined(E1K_SHOW_XMIT) || defined(E1K_SHOW_XMIT_DATA)
-	printk("e1k: %d bytes transmitted\n", bswap_16(tx->m_len_u16));
-	#endif
-
-	#ifdef E1K_SHOW_XMIT_DATA
-	for (i = 0; i < bswap_16(tx->m_len_u16); i++) {
-
-		if ((i & 0x1f) == 0) {
-			printk("\n       ");
-		}
-
-		f_buffer_pc = dma2virt(bswap_64(tx->m_buffer_u64));
-		printk("%02X ", f_buffer_pc[i]);
-	}
-
-	printk("\n\n");
-	#endif
-	#endif
-
-	return f_len_i;
-}
-
-int
-check_driver(pci_config_t *pci_conf)
-{
-	uint64_t i;
-
-	/*
-	 * checks whether the driver is handling this device
-	 * by verifying vendor & device id
-	 * vendor id 0x8086 == Intel
-	 */
-	if (pci_conf->vendor_id != 0x8086) {
-		#ifdef E1K_DEBUG
-		printk("e1k: netdevice with vendor id %04X not supported\n",
-			pci_conf->vendor_id);
-		#endif
-		return -1;
-	}
-
-	for (i = 0; e1k_dev[i].m_dev_u32 != 0; i++) {
-		if (e1k_dev[i].m_dev_u32 == (uint32_t) pci_conf->device_id) {
-			break;
-		}
-	}
-
-	if (e1k_dev[i].m_dev_u32 == 0) {
-		#ifdef E1K_DEBUG
-		printk("e1k: netdevice with device id %04X not supported\n",
-			pci_conf->device_id);
-		#endif
-		return -1;
-	}
-
-	/*
-	 * initialize static variables
-	 */
-	m_e1k.m_device_u64   = e1k_dev[i].m_devmsk_u64;
-	m_e1k.m_baseaddr_u64 = 0;
-	m_e1k.pcicfg_puid    = pci_conf->puid;
-	m_e1k.pcicfg_bus     = pci_conf->bus;
-	m_e1k.pcicfg_devfn   = pci_conf->devfn;
-
-	// success
-	#ifdef E1K_DEBUG
-	printk("e1k: found device %s\n", e1k_dev[i].m_name);
-	#endif
-
-	return 0;
-}
-
-static int
-e1k_init(void)
-{
-	uint32_t i;
-	uint32_t v;
-	char *mac_addr = snk_module_interface.mac_addr;
-
-	if (snk_module_interface.running != 0) {
-		return 0;
-	}
-
-	#ifdef E1K_DEBUG
-	printk("\ne1k: initializing\n");
-	#endif
-
-	dma_offset = snk_kernel_interface->dma_map_in(&m_e1k, sizeof(m_e1k), 0);
-	#ifdef E1K_DEBUG
-	printk("e1k: dma offset: %lx - %lx = %lx\n", dma_offset, (long)&m_e1k,
-		dma_offset - (long)&m_e1k);
-	#endif
-	dma_offset = dma_offset - (long)&m_e1k;
-
-	/*
-	 * setup register & memory base addresses of NIC
-	 */
-	m_e1k.m_baseaddr_u64 = (uint64_t) ((uint32_t) ~0xf & (uint32_t)
-		snk_kernel_interface->pci_config_read(m_e1k.pcicfg_puid,
-							4,
-							m_e1k.pcicfg_bus,
-							m_e1k.pcicfg_devfn,
-							PCI_BAR1_R));
-	#ifdef E1K_DEBUG
-	printk("e1k: base address register = 0x%lx\n", m_e1k.m_baseaddr_u64);
-	#endif
-
-	snk_kernel_interface->translate_addr(((void *) &m_e1k.m_baseaddr_u64));
-
-#ifdef E1K_DEBUG
-	printk("e1k: PCI-Puid  = 0x%llX\n", m_e1k.pcicfg_puid);
-	printk("e1k: PCI-Bus   = 0x%X\n", m_e1k.pcicfg_bus);
-	printk("e1k: PCI-DevFn = 0x%X\n", m_e1k.pcicfg_devfn);
-	printk("e1k: device's register base address = 0x%lx\n",
-		m_e1k.m_baseaddr_u64);
-#endif
-
-	/*
-	 * e1k hardware initialization
-	 */
-
-	/*
-	 * save pci command register
-	 */
-	m_e1k.m_com_r_u16 = (uint16_t)
-		snk_kernel_interface->pci_config_read(m_e1k.pcicfg_puid,
-							2,
-							m_e1k.pcicfg_bus,
-							m_e1k.pcicfg_devfn,
-							PCI_COM_R);
-
-/*
- * bus mastering does not need to be enabled, it is already set
-	// enable bus master & memory space in command reg
-	i = (BIT32(10) | BIT32(2) | BIT32(1));
-	snk_kernel_interface->pci_config_write(m_e1k.pcicfg_puid,
-						2,
-						m_e1k.pcicfg_bus,
-						m_e1k.pcicfg_devfn,
-						PCI_COM_R,
-						(int) i);
-*/
-
-	/*
-	 * at first disable all interrupts
-	 */
-	e1k_wr32(IMC, (uint32_t) ~0);
-
-	/*
-	 * check for link up
-	 */
-	#ifdef E1K_DEBUG
-	printk("e1k: checking link status..\n");
-	#endif
-
-	i = 50;
-	v = e1k_rd32(STATUS);
-	while ((--i) &&
-	       ((v & BIT32(1)) == 0)) {
-		ms_delay(100);
-		v = e1k_rd32(STATUS);
-	}
-
-	if ((v & BIT32(1)) == 0) {
-		#ifdef E1K_DEBUG
-		printk("e1k: link is down.\n");
-		printk("       terminating.\n");
-		#endif
-
-		return -1;
-	}
-
-	#ifdef E1K_DEBUG
-	printk("e1k: link is up\n");
-
-	switch ((v >> 6) & 0x3) {
-		case 0: {
-			printk("       10 Mb/s\n");
-		}	break;
-		case 1: {
-			printk("       100 Mb/s\n");
-		}	break;
-		case 2:
-		case 3: {
-			printk("       1000 Mb/s\n");
-		}	break;
-	}
-
-	if ((v & BIT32(0)) == 0) {
-		printk("       half-duplex\n");
-	} else {
-		printk("       full-duplex\n");
-	}
-	#endif
-
-	/*
-	 * initialize mac address
-	 */
-	#ifdef E1K_DEBUG
-	printk("e1k: initializing mac address.. ");
-	#endif
-	if (e1k_mac_init((uint8_t *)mac_addr) != 0) {
-		#ifdef E1K_DEBUG
-		printk("failed.\n");
-		printk("       terminating.\n");
-		#endif
-
-		return -1;
-	}
-
-	#ifdef E1K_DEBUG
-	printk("done.\n");
-	printk("       mac address = %02X:%02X:%02X:%02X:%02X:%02X\n",
-		mac_addr[0], mac_addr[1], mac_addr[2],
-		mac_addr[3], mac_addr[4], mac_addr[5]);
-	#endif
-
-	/*
-	 * initialize transmitter
-	 */
-	#ifdef E1K_DEBUG
-	printk("e1k: initializing transmitter.. ");
-	#endif
-	e1k_init_transmitter();
-	#ifdef E1K_DEBUG
-	printk("done.\n");
-	#endif
-
-	/*
-	 * initialize receiver
-	 */
-	#ifdef E1K_DEBUG
-	printk("e1k: initializing receiver.. ");
-	#endif
-	e1k_init_receiver();
-	#ifdef E1K_DEBUG
-	printk("done.\n");
-	printk("e1k: initialization complete\n");
-	#endif
-
-	snk_module_interface.running = 1;
-
-	return 0;
-}
-
-static int
-e1k_reset(void)
-{
-	/*
-	 * reset the PHY
-	 */
-	e1k_setb32(CTRL, BIT32(31));
-	ms_delay(10);
-
-	/*
-	 * reset the MAC
-	 */
-	e1k_setb32(CTRL, BIT32(26));
-	ms_delay(10);
-
-	return 0;
-}
-
-static int 
-e1k_term(void)
-{
-	if (snk_module_interface.running == 0) {
-		return 0;
-	}
-
-	#ifdef E1K_DEBUG
-	printk("e1k: shutdown.. ");
-	#endif
-
-	/*
-	 * disable receiver & transmitter
-	 */
-	e1k_wr32(RCTL, 0);
-	e1k_wr32(TCTL, 0);
-	ms_delay(10);
-
-	/*
-	 * reset the ring indices
-	 */
-	e1k_wr32(RDH, 0);
-	e1k_wr32(RDT, 0);
-	e1k_wr32(TDH, 0);
-	e1k_wr32(TDT, 0);
-
-	/*
-	 * disable receive address
-	 */
-	e1k_clrb32(RAH0, BIT32(31));
-
-	/*
-	 * reset the mac/phy
-	 */
-	e1k_reset();
-
-	/*
-	 * reset pci command register
-	 */
-	snk_kernel_interface->pci_config_write(m_e1k.pcicfg_puid,
-						2,
-						m_e1k.pcicfg_bus,
-						m_e1k.pcicfg_devfn,
-						PCI_COM_R,
-						(int) m_e1k.m_com_r_u16);
-
-	/*
-	 * Disable DMA translation
-	 */
-	snk_kernel_interface->dma_map_out(&m_e1k, virt2dma(&m_e1k),
-					  sizeof(m_e1k));
-
-	#ifdef E1K_DEBUG
-	printk("done.\n");
-	#endif
-
-	snk_module_interface.running = 0;
-	return 0;
-}
-
-static int
-e1k_ioctl(int request, void* data)
-{
-	return 0;
-}
diff --git a/drivers/e1k/e1k.h b/drivers/e1k/e1k.h
deleted file mode 100644
index 6d2d3a9..0000000
--- a/drivers/e1k/e1k.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation
- * All rights reserved.
- * This program and the accompanying materials
- * are made available under the terms of the BSD License
- * which accompanies this distribution, and is available at
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * Contributors:
- *     IBM Corporation - initial implementation
- *****************************************************************************/
-/*
- * Definitions for the e1000 Gigabit Ethernet Driver for SLOF
- */
-
-#include "netdriver_int.h"
-
-// compiler switches
-
-// Debug switches
-//#define E1K_DEBUG		// main debug switch, w/o it the other ones don't work
-//#define E1K_SHOW_RCV
-//#define E1K_SHOW_RCV_DATA
-//#define E1K_SHOW_XMIT
-//#define E1K_SHOW_XMIT_DATA
-
-/*
- * pci register offsets
- */
-// PCI command register
-#define PCI_COM_R               ((uint16_t) 0x0004)
-// PCI Cache Line Size register
-#define PCI_CACHELS_R           ((uint16_t) 0x000c)
-// PCI bar1 register
-#define PCI_BAR1_R              ((uint16_t) 0x0010)
-// PCI bar2 register
-#define PCI_BAR2_R              ((uint16_t) 0x0014)
-// PCI bar1 register
-#define PCI_SUBID_R             ((uint16_t) 0x002e)
-
-/*
- * e1000 register offsets
- */
-// Device Control register
-#define CTRL			((uint16_t) 0x0000)
-// Device Status register
-#define STATUS			((uint16_t) 0x0008)
-// Eeprom Read register
-#define EERD			((uint16_t) 0x0014)
-// Interrupt Mask Clear register
-#define IMC			((uint16_t) 0x00d8)
-// Receive Control register
-#define RCTL			((uint16_t) 0x0100)
-// Receive Descriptor Base Address Low register
-#define RDBAL			((uint16_t) 0x2800)
-// Receive Descriptor Base Address High register
-#define RDBAH			((uint16_t) 0x2804)
-// Receive Descriptor Length register
-#define RDLEN			((uint16_t) 0x2808)
-// Receive Descriptor Head register
-#define RDH			((uint16_t) 0x2810)
-// Receive Descriptor Tail register
-#define RDT			((uint16_t) 0x2818)
-// Receive Delay Timer register
-#define RDTR			((uint16_t) 0x2820)
-// Transmit Control register
-#define TCTL			((uint16_t) 0x0400)
-// Transmit Descriptor Base Address Low register
-#define TDBAL			((uint16_t) 0x3800)
-// Transmit Descriptor Base Address High register
-#define TDBAH			((uint16_t) 0x3804)
-// Transmit Descriptor Length register
-#define TDLEN			((uint16_t) 0x3808)
-// Transmit Descriptor Head register
-#define TDH			((uint16_t) 0x3810)
-// Transmit Descriptor Tail register
-#define TDT			((uint16_t) 0x3818)
-// Receive Address Low register
-#define RAL0			((uint16_t) 0x5400)
-// Receive Address High register
-#define RAH0			((uint16_t) 0x5404)
-
-
-/*
- * useful def's
- */
-#define rd08(a) 	(uint8_t) snk_kernel_interface->io_read((void*)(a),1)
-#define rd16(a) 	(uint16_t) snk_kernel_interface->io_read((void*)(a),2)
-#define rd32(a) 	(uint32_t) snk_kernel_interface->io_read((void*)(a),4)
-#define wr08(a,v)	snk_kernel_interface->io_write((void*)(a),(uint32_t)(v),1)
-#define wr16(a,v)	snk_kernel_interface->io_write((void*)(a),(uint32_t)(v),2)
-#define wr32(a,v)	snk_kernel_interface->io_write((void*)(a),(uint32_t)(v),4)
-#define printk		snk_kernel_interface->print
-#define us_delay	snk_kernel_interface->us_delay
-#define ms_delay	snk_kernel_interface->ms_delay
-
-#define BIT08(bit)	((uint8_t) 0x1 << (bit))
-#define BIT16(bit)	((uint16_t) 0x1 << (bit))
-#define BIT32(bit)	((uint32_t) 0x1 << (bit))
-
-
-/*
- * type definition
- */
-
-extern snk_kernel_t	*snk_kernel_interface;
-
-
-/*
- * inline functions
- */
-
-/**
- * memory barrier function implementation
- */
-static inline void
-mb(void)
-{
-	asm volatile("sync" ::: "memory");
-}