Probably fixed packet dropping

3 files changed, 83 insertions, 63 deletions

diff --git a/Makefile b/Makefile
index fc2dab5..a1a54db 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@
 OPTIMIZATION = -Os
 
 # Remove tree optimizations for kernel
-CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter -fno-tree-loop-vectorize -fno-inline-functions -fno-inline-functions-called-once
+#CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter -fno-tree-loop-vectorize -fno-inline-functions -fno-inline-functions-called-once
 # Remove ipa optimizations for kernel
-CFLAGS_EXTRA += -fno-inline-functions -fno-inline-functions-called-once -fno-reorder-functions -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-ipa-profile -fno-ipa-pure-const -fno-ipa-reference -fno-ipa-reference-addressable -fno-merge-constants -fno-ipa-bit-cp -fno-ipa-cp -fno-ipa-icf -fno-ipa-ra -fno-ipa-sra -fno-ipa-vrp -fno-ipa-cp-clone
-#CFLAGS_EXTRA = -pie -fPIE -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables
+#CFLAGS_EXTRA += -fno-inline-functions -fno-inline-functions-called-once -fno-reorder-functions -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-ipa-profile -fno-ipa-pure-const -fno-ipa-reference -fno-ipa-reference-addressable -fno-merge-constants -fno-ipa-bit-cp -fno-ipa-cp -fno-ipa-icf -fno-ipa-ra -fno-ipa-sra -fno-ipa-vrp -fno-ipa-cp-clone
+CFLAGS_EXTRA = -pie -fPIE -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables
 
 export
 
diff --git a/kernel/drivers/rtl8139.c b/kernel/drivers/rtl8139.c
index ec45bd7..b870825 100644
--- a/kernel/drivers/rtl8139.c
+++ b/kernel/drivers/rtl8139.c
@@ -11,13 +11,15 @@
 #include <print.h>
 #include <rtl8139.h>
 
+static int rtl_irq = 0;
 static u8 mac[6];
-static u8 *rx_buffer;
-
+static u8 *last_packet = NULL;
+static u8 *rtl_rx_buffer;
 static u32 rtl_device_pci = 0;
 static u32 rtl_iobase = 0;
+static u32 cur_rx = 0;
 
-u8 *rtl8139_get_mac(void)
+u8 *rtl8139_get_mac()
 {
 	if (!rtl_device_pci)
 		return NULL;
@@ -25,27 +27,38 @@ u8 *rtl8139_get_mac(void)
 	return mac;
 }
 
-void rtl8139_receive_packet(void)
+void rtl8139_receive_packet()
 {
-	static u32 current_packet_ptr;
-
-	if (!rtl_device_pci)
-		return;
-
-	u16 *t = (u16 *)(rx_buffer + current_packet_ptr);
-	u16 length = *(t + 1);
-	t += 2;
-
-	void *packet = malloc(length);
-	memcpy(packet, t, length);
-	ethernet_handle_packet(packet, length);
-
-	current_packet_ptr = (current_packet_ptr + length + 4 + 3) & (u32)(~3);
-
-	if (current_packet_ptr >= RX_BUF_SIZE)
-		current_packet_ptr -= RX_BUF_SIZE;
-
-	outw((u16)(rtl_iobase + RTL_PORT_RXPTR), (u16)(current_packet_ptr - 0x10));
+	while ((inb(rtl_iobase + RTL_PORT_CMD) & 0x01) == 0) {
+		int offset = cur_rx % 0x2000;
+
+		u32 *buf_start = (u32 *)((u32)rtl_rx_buffer + offset);
+		u32 rx_status = buf_start[0];
+		u32 rx_size = rx_status >> 16;
+
+		if (rx_status & (0x0020 | 0x0010 | 0x0004 | 0x0002)) {
+			print("RX Error\n");
+		} else {
+			u8 *buf_8 = (u8 *)&(buf_start[1]);
+
+			last_packet = malloc(rx_size);
+
+			u32 packet_end = (u32)buf_8 + rx_size;
+			if (packet_end > (u32)rtl_rx_buffer + 0x2000) {
+				u32 s = ((u32)rtl_rx_buffer + 0x2000) - (u32)buf_8;
+				memcpy(last_packet, buf_8, s);
+				memcpy((void *)((u32)last_packet + s), rtl_rx_buffer, rx_size - s);
+			} else {
+				memcpy(last_packet, buf_8, rx_size);
+			}
+
+			u16 *t = (u16 *)(rtl_rx_buffer + cur_rx);
+			ethernet_handle_packet((struct ethernet_packet *)last_packet, *(t + 1));
+		}
+
+		cur_rx = (cur_rx + rx_size + 4 + 3) & ~3;
+		outw(rtl_iobase + RTL_PORT_RXPTR, cur_rx - 16);
+	}
 }
 
 static u8 tsad_array[4] = { 0x20, 0x24, 0x28, 0x2C };
@@ -56,9 +69,8 @@ void rtl8139_send_packet(void *data, u32 len)
 	if (!rtl_device_pci)
 		return;
 
-	/* printf("Sending packet %d\n\n", len); */
-	outl((u16)(rtl_iobase + tsad_array[tx_current]), (u32)data);
-	outl((u16)(rtl_iobase + tsd_array[tx_current++]), len);
+	outl(rtl_iobase + tsad_array[tx_current], (u32)data);
+	outl(rtl_iobase + tsd_array[tx_current++], len);
 	if (tx_current > 3)
 		tx_current = 0;
 }
@@ -72,23 +84,16 @@ void rtl8139_find(u32 device, u16 vendor_id, u16 device_id, void *extra)
 
 void rtl8139_irq_handler()
 {
-	if (!rtl_device_pci)
+	u16 status = inw(rtl_iobase + RTL_PORT_ISR);
+	if (!status)
 		return;
+	outw(rtl_iobase + RTL_PORT_ISR, status);
 
-	/* print("\nRTL INT!\n"); */
-	u16 status = inw((u16)(rtl_iobase + RTL_PORT_ISR));
-
-	outw((u16)(rtl_iobase + RTL_PORT_ISR), 0x5);
-
-	if (status & RTL_TOK) {
-		print("Got response!\n");
-		rtl8139_receive_packet();
-	} else if (status & RTL_ROK) {
+	if (status & 0x01 || status & 0x02)
 		rtl8139_receive_packet();
-	}
 }
 
-void rtl8139_init(void)
+void rtl8139_init()
 {
 	if (!rtl_device_pci)
 		return;
@@ -99,46 +104,63 @@ void rtl8139_init(void)
 		pci_write_field(rtl_device_pci, PCI_COMMAND, command_reg);
 	}
 
+	rtl_irq = pci_get_interrupt(rtl_device_pci);
+	irq_install_handler(rtl_irq, rtl8139_irq_handler);
+
 	u32 rtl_bar0 = pci_read_field(rtl_device_pci, PCI_BAR0, 4);
 	/* u32 rtl_bar1 = pci_read_field(rtl_device_pci, PCI_BAR1, 4); */
 	rtl_iobase = 0;
 
 	if (rtl_bar0 & 0x00000001)
-		rtl_iobase = rtl_bar0 & ((u32)~0x3);
+		rtl_iobase = rtl_bar0 & 0xFFFFFFFC;
 
 	// Get mac address
-	for (u32 i = 0; i < 6; ++i)
-		mac[i] = inb((u16)(rtl_iobase + RTL_PORT_MAC + i));
+	for (int i = 0; i < 6; ++i)
+		mac[i] = inb(rtl_iobase + RTL_PORT_MAC + i);
 	printf("Mac address: %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
 	// Activate
-	outb((u16)(rtl_iobase + RTL_PORT_CONFIG), 0x0);
+	outb(rtl_iobase + RTL_PORT_CONFIG, 0x0);
 
 	// Reset
 	outb((u16)(rtl_iobase + RTL_PORT_CMD), 0x10);
-	while ((inb((u16)(rtl_iobase + RTL_PORT_CMD)) & 0x10) != 0)
+	while ((inb(rtl_iobase + RTL_PORT_CMD) & 0x10) != 0)
 		;
 
 	// Set receive buffer
-	rx_buffer = (u8 *)malloc(RX_BUF_SIZE + 1516);
-	memset(rx_buffer, 0, RX_BUF_SIZE + 1516);
-	outl((u16)(rtl_iobase + RTL_PORT_RBSTART), (u32)rx_buffer);
-
-	// Set TOK and ROK
-	outw((u16)(rtl_iobase + RTL_PORT_IMR), 0x0005);
-
-	// AB+AM+APM+AAP except WRAP
-	outl((u16)(rtl_iobase + RTL_PORT_RCR), 0xf | (1 << 7));
+	rtl_rx_buffer = (u8 *)malloc(0x3000);
+	memset(rtl_rx_buffer, 0, 0x3000);
+	outl(rtl_iobase + RTL_PORT_RBSTART, (u32)rtl_rx_buffer);
+
+	// Enable IRQs
+	outw(rtl_iobase + RTL_PORT_IMR, 0x8000 | /* PCI error */
+						0x4000 | /* PCS timeout */
+						0x40 | /* Rx FIFO over */
+						0x20 | /* Rx underrun */
+						0x10 | /* Rx overflow */
+						0x08 | /* Tx error */
+						0x04 | /* Tx okay */
+						0x02 | /* Rx error */
+						0x01 /* Rx okay */
+	);
+
+	// Configure transmit
+	outl(rtl_iobase + RTL_PORT_TCR, 0);
+
+	// Configure receive
+	outl(rtl_iobase + RTL_PORT_RCR, (0) | /* 8K receive */
+						0x08 | /* broadcast */
+						0x01 /* all physical */
+	);
 
 	// Enable receive and transmit
-	outb((u16)(rtl_iobase + RTL_PORT_CMD), 0x08 | 0x04);
+	outb(rtl_iobase + RTL_PORT_CMD, 0x08 | 0x04);
 
-	// Install interrupt handler
-	int rtl_irq = pci_get_interrupt(rtl_device_pci);
-	irq_install_handler(rtl_irq, rtl8139_irq_handler);
+	// Reset rx statistics
+	outl(rtl_iobase + RTL_PORT_RXMISS, 0);
 }
 
-int rtl8139_install(void)
+int rtl8139_install()
 {
 	pci_scan(&rtl8139_find, -1, &rtl_device_pci);
 
@@ -146,6 +168,5 @@ int rtl8139_install(void)
 		print("Found rtl8139 card\n");
 		rtl8139_init();
 	}
-
-	return (int)rtl_device_pci;
+	return rtl_device_pci;
 }
diff --git a/kernel/features/net.c b/kernel/features/net.c
index 18addbb..be4dd5e 100644
--- a/kernel/features/net.c
+++ b/kernel/features/net.c
@@ -285,7 +285,6 @@ void dhcp_handle_packet(struct dhcp_packet *packet)
 }
 
 // enum tcp_state { TCP_LISTEN, TCP_SYN_SENT, TCP_SYN_RECIEVED, TCP_ESTABLISHED, TCP_FIN_WAIT_1, TCP_FIN_WAIT_2, TCP_CLOSE_WAIT, TCP_CLOSING, TCP_LAST_ACK, TCP_TIME_WAIT, TCP_CLOSED };
-// TODO: Fix TCP retransmission (dropped packages; probably race condition)
 //#define test_http "HTTP/1.1 200"
 #define test_http "HTTP/1.2 200\nContent-Length: 14\nConnection: close\n\n<h1>Hallo</h1>"
 void tcp_handle_packet(struct tcp_packet *packet, u32 dst, int len)