add support for a ton of additional intel e1000 derived cards

Author: braindigitalis

modules/e1000/e1000.c

@@ -50,7 +50,6 @@ bool e1000_detect_eeprom() {
 	return eerprom_exists;
 }
 
-
 uint32_t e1000_read_eeprom(uint8_t addr) {
 	uint16_t data = 0;
 	uint32_t tmp = 0;
@@ -304,23 +303,18 @@ bool e1000_start(pci_dev_t *pci_device) {
 	// Cache actual detected device ID
 	e1000_device_id = pci_read(*pci_device, PCI_DEVICE_ID);
 
-	// Reject unsupported devices
-	if (e1000_device_id != E1000_82540EM && e1000_device_id != E1000_82541PI) {
-		dprintf("e1000: Attempt to start unsupported device ID\n");
-		return false;
-	}
-
-	if (e1000_detect_eeprom()) {
+	if ((e1000_device_id == E1000_82540EM || e1000_device_id == E1000_82541PI) && e1000_detect_eeprom()) {
 		if (!e1000_read_mac_address()) {
 			dprintf("e1000: Failed to read device MAC\n");
 			return false;
 		}
 	} else {
-		uint8_t *mem_base_mac = (uint8_t *) (mem_base + 0x5400);
+		uint8_t *mem_base_mac = (uint8_t *) (mem_base + REG_RAL0);
 		for (int i = 0; i < 6; ++i) {
 			mac[i] = mem_base_mac[i];
 		}
 	}
+	dprintf("e1000: MAC %02x:%02x:%02x:%02x:%02x:%02x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
 	interrupts_off();
 	e1000_up();
@@ -411,7 +405,20 @@ void init_e1000() {
 	bool found = false;
 
 	// Try supported devices only
-	const uint16_t supported[] = {E1000_82540EM, E1000_82541PI};
+	const uint16_t supported[] = {
+		E1000_82540EM,
+		E1000_82541PI,
+		E1000_82577LM,
+		E1000_I217,
+		E1000_82567LM,
+		E1000_82567LM_2,
+		E1000_82567LM_3,
+		E1000_82574L,
+		E1000_82579LM,
+		E1000_82583V,
+		E1000_I218LM,
+		E1000_I219LM,
+	};
 	for (size_t i = 0; i < sizeof(supported) / sizeof(supported[0]); i++) {
 		pci_device = pci_get_device(INTEL_VEND, supported[i], -1);
 		if (!pci_not_found(pci_device)) {

modules/e1000/e1000.h

@@ -5,14 +5,22 @@
  */
 #pragma once
 
-#include "kernel.h"
+#include <kernel.h>
+
+#define INTEL_VEND     	(uint32_t)0x8086  /* Vendor ID for Intel */
+#define E1000_82540EM  	(uint32_t)0x100E  /* Device ID for the e1000 Qemu, Bochs, and VirtualBox emulated NICs */
+#define E1000_I217     	(uint32_t)0x153A  /* Device ID for Intel I217 */
+#define E1000_82577LM  	(uint32_t)0x10EA  /* Device ID for Intel 82577LM */
+#define E1000_82541PI  	(uint32_t)0x107C  /* Device ID for Intel 82541PI */
+#define E1000_82567LM	(uint32_t)0x10F5  /* Device ID for Intel 82567LM */
+#define E1000_82567LM_2 (uint32_t)0x10CC  /* Device ID for Intel 82567LM v2 */
+#define E1000_82567LM_3 (uint32_t)0x10DE  /* Device ID for Intel 82567LM v3 */
+#define E1000_82574L    (uint32_t)0x10D3  /* Intel 82574L PCIe Gigabit Controller */
+#define E1000_82579LM   (uint32_t)0x1502  /* Intel 82579LM PCH-LAN Controller */
+#define E1000_82583V    (uint32_t)0x150C  /* Intel 82583V PCIe Gigabit Controller */
+#define E1000_I218LM    (uint32_t)0x15A2  /* Intel I218-LM PCH-LAN Controller */
+#define E1000_I219LM    (uint32_t)0x15E3  /* Intel I219-LM PCH-LAN Controller */
 
-#define INTEL_VEND     (uint32_t)0x8086  // Vendor ID for Intel
-#define E1000_82540EM  (uint32_t)0x100E  // Device ID for the e1000 Qemu, Bochs, and VirtualBox emulated NICs
-#define E1000_I217     (uint32_t)0x153A  // Device ID for Intel I217
-#define E1000_82577LM  (uint32_t)0x10EA  // Device ID for Intel 82577LM
-#define E1000_82541PI  (uint32_t)0x107C  // Device ID for Intel 82541PI
- 
 
 #define REG_CTRL        0x0000
 #define REG_STATUS      0x0008
@@ -33,6 +41,7 @@
 #define REG_TXDESCLEN   0x3808
 #define REG_TXDESCHEAD  0x3810
 #define REG_TXDESCTAIL  0x3818
+#define REG_RAL0	0x5400
 
 #define ICR_TXDW	1 << 0)
 #define ICR_TXQE	(1 << 1)