aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile5
-rw-r--r--src/kernel/kernel.c4
-rw-r--r--src/kernel/net/network.h13
-rw-r--r--src/kernel/net/rtl8139.c99
-rw-r--r--src/kernel/pci/pci.c138
-rw-r--r--src/kernel/pci/pci.h108
-rw-r--r--src/kernel/syscall/actions/sys_write.c2
7 files changed, 366 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c0c2d7a..6d2afa9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ DIR := $(shell pwd)/cross
export PREFIX := $(DIR)/opt
export TARGET := i686-elf
export PATH := $(PREFIX)/bin:$(PATH)
+export NETWORK := rtl8139
clean:
@-rm -rf ./build ./iso
@@ -24,7 +25,7 @@ build: clean
stripped=$$(echo "$${line}" | sed -r 's/\//_/g'); \
stripped=$${stripped#??????}; \
stripped=$${stripped%%?}o; \
- i686-elf-gcc -c ./"$${line}" -o ./build/kernel/"$${stripped}" -I ./src -std=gnu99 -ffreestanding -O3 -Wall -Wextra -Wno-unused-parameter || exit; \
+ i686-elf-gcc -c ./"$${line}" -o ./build/kernel/"$${stripped}" -I ./src -std=gnu99 -ffreestanding -O3 -Wall -Wextra -Wno-unused-parameter -D ${NETWORK} || exit; \
done <./build/tmp; \
rm ./build/tmp; \
i686-elf-gcc -T ./src/kernel/linker.ld -I ./src -o ./build/melvix.bin -std=gnu99 -ffreestanding -O2 -nostdlib ./build/kernel/*.o || exit; \
@@ -85,7 +86,7 @@ cross:
test: build debug
-QEMU_OPTIONS := -no-reboot -vga std -smp $$(nproc) -serial stdio -rtc base=localtime -m 256M
+QEMU_OPTIONS := -no-reboot -vga std -smp $$(nproc) -serial stdio -rtc base=localtime -m 256M -net nic,model=rtl8139,macaddr=42:42:42:42:42:42 -net user
debug:
@echo "Starting simulation..."
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index f1b2df8..27f5ad9 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -15,6 +15,8 @@
#include <kernel/fs/atapi_pio.h>
#include <kernel/lib/stdlib/liballoc.h>
#include <kernel/lib/stdio.h>
+#include <kernel/pci/pci.h>
+#include <kernel/net/network.h>
extern void jump_userspace();
@@ -39,6 +41,8 @@ void kernel_main()
timer_install();
mouse_install();
keyboard_install();
+ pci_remap();
+ network_install();
asm ("sti");
// Get hardware information
diff --git a/src/kernel/net/network.h b/src/kernel/net/network.h
new file mode 100644
index 0000000..11a11e0
--- /dev/null
+++ b/src/kernel/net/network.h
@@ -0,0 +1,13 @@
+#ifndef MELVIX_NETWORK_H
+#define MELVIX_NETWORK_H
+
+void rtl8139_install();
+
+void network_install()
+{
+#ifdef rtl8139
+ rtl8139_install();
+#endif
+}
+
+#endif
diff --git a/src/kernel/net/rtl8139.c b/src/kernel/net/rtl8139.c
new file mode 100644
index 0000000..a233004
--- /dev/null
+++ b/src/kernel/net/rtl8139.c
@@ -0,0 +1,99 @@
+#include <kernel/io/io.h>
+#include <kernel/pci/pci.h>
+#include <kernel/system.h>
+#include <kernel/interrupts/interrupts.h>
+#include <kernel/lib/stdlib/liballoc.h>
+
+int rtl_irq = 0;
+uint8_t mac[6];
+uint8_t *rtl_rx_buffer;
+uint32_t rtl_iobase = 0;
+uint32_t rtl_device_pci = 0x00000000;
+
+void find_rtl(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *extra)
+{
+ if ((vendor_id == 0x10ec) && (device_id == 0x8139)) {
+ *((uint32_t *) extra) = device;
+ }
+}
+
+void rtl8139_irq_handler(struct regs *r)
+{
+ serial_write("RTL INT!\n");
+ uint16_t status = inw(rtl_iobase + 0x3E);
+ if (!status) return;
+ outw(rtl_iobase + 0x3E, status);
+
+ if (status & 0x01 || status & 0x02) {
+ while ((inw(rtl_iobase + 0x37) & 0x01) == 0) {
+ serial_write("RECEIVE\n");
+ // RECEIVE
+ }
+ }
+}
+
+int rtl8139_init(void)
+{
+ if (rtl_device_pci) {
+ uint16_t command_reg = pci_read_field(rtl_device_pci, PCI_COMMAND, 4);
+
+ if (command_reg & (1 << 2)) {
+ } else {
+ command_reg |= (1 << 2);
+ pci_write_field(rtl_device_pci, PCI_COMMAND, 4, command_reg);
+ }
+
+ rtl_irq = pci_get_interrupt(rtl_device_pci);
+ irq_install_handler(rtl_irq, rtl8139_irq_handler);
+
+ uint32_t rtl_bar0 = pci_read_field(rtl_device_pci, PCI_BAR0, 4);
+ // uint32_t rtl_bar1 = pci_read_field(rtl_device_pci, PCI_BAR1, 4);
+
+ rtl_iobase = 0x00000000;
+
+ if (rtl_bar0 & 0x00000001)
+ rtl_iobase = rtl_bar0 & 0xFFFFFFFC;
+ else
+ warn("RTL8139 should be using an I/O BAR!");
+
+ // Get mac address
+ for (int i = 0; i < 6; ++i)
+ mac[i] = inb(rtl_iobase + 0x00 + i);
+ info("Mac address: %2x:%2x:%2x:%2x:%2x:%2x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+ // Activate (turn on)
+ outb(rtl_iobase + 0x52, 0x0);
+
+ // Reset
+ outb(rtl_iobase + 0x37, 0x10);
+ while ((inb(rtl_iobase + 0x37) & 0x10) != 0) {}
+
+ // Set receive buffer
+ rtl_rx_buffer = kmalloc(8192 + 16);
+ outl(rtl_iobase + 0x30, (uintptr_t) rtl_rx_buffer);
+
+ // Enable ISR
+ outw(rtl_iobase + 0x3C, 0x0005);
+
+ // Accept packets
+ outl(rtl_iobase + 0x44, 0xf | (1 << 7));
+
+ // Enable receive and transmitter
+ outb(rtl_iobase + 0x37, 0x0C);
+ } else {
+ return -1;
+ }
+ return 0;
+}
+
+void rtl8139_install()
+{
+ pci_scan(&find_rtl, -1, &rtl_device_pci);
+ if (!rtl_device_pci) {
+ warn("No rtl8139 network card found");
+ return;
+ }
+
+ if (rtl8139_init() == 0)
+ info("Installed rtl8139 network driver");
+} \ No newline at end of file
diff --git a/src/kernel/pci/pci.c b/src/kernel/pci/pci.c
new file mode 100644
index 0000000..5a6f060
--- /dev/null
+++ b/src/kernel/pci/pci.c
@@ -0,0 +1,138 @@
+#include <kernel/pci/pci.h>
+#include <stdint.h>
+#include <kernel/io/io.h>
+#include <kernel/lib/lib.h>
+
+void pci_write_field(uint32_t device, int field, int size, uint32_t value)
+{
+ outl(PCI_ADDRESS_PORT, pci_get_addr(device, field));
+ outl(PCI_VALUE_PORT, value);
+}
+
+uint32_t pci_read_field(uint32_t device, int field, int size)
+{
+ outl(PCI_ADDRESS_PORT, pci_get_addr(device, field));
+
+ if (size == 4) {
+ uint32_t t = inl(PCI_VALUE_PORT);
+ return t;
+ } else if (size == 2) {
+ uint16_t t = inw(PCI_VALUE_PORT + (field & 2));
+ return t;
+ } else if (size == 1) {
+ uint8_t t = inb(PCI_VALUE_PORT + (field & 3));
+ return t;
+ }
+ return 0xFFFF;
+}
+
+uint16_t pci_find_type(uint32_t dev)
+{
+ return (pci_read_field(dev, PCI_CLASS, 1) << 8) | pci_read_field(dev, PCI_SUBCLASS, 1);
+}
+
+void pci_scan_hit(pci_func_t f, uint32_t dev, void *extra)
+{
+ int dev_vend = (int) pci_read_field(dev, PCI_VENDOR_ID, 2);
+ int dev_dvid = (int) pci_read_field(dev, PCI_DEVICE_ID, 2);
+
+ f(dev, dev_vend, dev_dvid, extra);
+}
+
+void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *extra)
+{
+ uint32_t dev = pci_box_device(bus, slot, func);
+ if (type == -1 || type == pci_find_type(dev))
+ pci_scan_hit(f, dev, extra);
+ if (pci_find_type(dev) == PCI_TYPE_BRIDGE)
+ pci_scan_bus(f, type, pci_read_field(dev, PCI_SECONDARY_BUS, 1), extra);
+}
+
+void pci_scan_slot(pci_func_t f, int type, int bus, int slot, void *extra)
+{
+ uint32_t dev = pci_box_device(bus, slot, 0);
+ if (pci_read_field(dev, PCI_VENDOR_ID, 2) == PCI_NONE)
+ return;
+ pci_scan_func(f, type, bus, slot, 0, extra);
+ if (!pci_read_field(dev, PCI_HEADER_TYPE, 1))
+ return;
+ for (int func = 1; func < 8; func++) {
+ dev = pci_box_device(bus, slot, func);
+ if (pci_read_field(dev, PCI_VENDOR_ID, 2) != PCI_NONE)
+ pci_scan_func(f, type, bus, slot, func, extra);
+ }
+}
+
+void pci_scan_bus(pci_func_t f, int type, int bus, void *extra)
+{
+ for (int slot = 0; slot < 32; ++slot)
+ pci_scan_slot(f, type, bus, slot, extra);
+}
+
+void pci_scan(pci_func_t f, int type, void *extra)
+{
+ if ((pci_read_field(0, PCI_HEADER_TYPE, 1) & 0x80) == 0) {
+ pci_scan_bus(f, type, 0, extra);
+ return;
+ }
+
+ for (int func = 0; func < 8; ++func) {
+ uint32_t dev = pci_box_device(0, 0, func);
+ if (pci_read_field(dev, PCI_VENDOR_ID, 2) != PCI_NONE)
+ pci_scan_bus(f, type, func, extra);
+ else
+ break;
+ }
+}
+
+static void find_isa_bridge(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *extra)
+{
+ if (vendor_id == 0x8086 && (device_id == 0x7000 || device_id == 0x7110))
+ *((uint32_t *) extra) = device;
+}
+
+static uint32_t pci_isa = 0;
+static uint8_t pci_remaps[4] = {0};
+
+void pci_remap()
+{
+ pci_scan(&find_isa_bridge, -1, &pci_isa);
+ if (pci_isa) {
+ for (int i = 0; i < 4; ++i) {
+ pci_remaps[i] = pci_read_field(pci_isa, 0x60 + i, 1);
+ if (pci_remaps[i] == 0x80) {
+ pci_remaps[i] = 10 + (i % 1);
+ }
+ }
+ uint32_t out = 0;
+ memcpy(&out, &pci_remaps, 4);
+ pci_write_field(pci_isa, 0x60, 4, out);
+ }
+}
+
+int pci_get_interrupt(uint32_t device)
+{
+ if (pci_isa) {
+ uint32_t irq_pin = pci_read_field(device, 0x3D, 1);
+ if (irq_pin == 0)
+ return pci_read_field(device, PCI_INTERRUPT_LINE, 1);
+ int pirq = (int) (irq_pin + pci_extract_slot(device) - 2) % 4;
+ int int_line = pci_read_field(device, PCI_INTERRUPT_LINE, 1);
+
+ if (pci_remaps[pirq] >= 0x80) {
+ if (int_line == 0xFF) {
+ int_line = 10;
+ pci_write_field(device, PCI_INTERRUPT_LINE, 1, int_line);
+ }
+ pci_remaps[pirq] = int_line;
+ uint32_t out = 0;
+ memcpy(&out, &pci_remaps, 4);
+ pci_write_field(pci_isa, 0x60, 4, out);
+ return int_line;
+ }
+ pci_write_field(device, PCI_INTERRUPT_LINE, 1, pci_remaps[pirq]);
+ return pci_remaps[pirq];
+ } else {
+ return pci_read_field(device, PCI_INTERRUPT_LINE, 1);
+ }
+} \ No newline at end of file
diff --git a/src/kernel/pci/pci.h b/src/kernel/pci/pci.h
new file mode 100644
index 0000000..ed648e1
--- /dev/null
+++ b/src/kernel/pci/pci.h
@@ -0,0 +1,108 @@
+#ifndef MELVIX_PCI_H
+#define MELVIX_PCI_H
+
+#include <stdint.h>
+
+#define PCI_VENDOR_ID 0x00 // 2
+#define PCI_DEVICE_ID 0x02 // 2
+#define PCI_COMMAND 0x04 // 2
+#define PCI_STATUS 0x06 // 2
+#define PCI_REVISION_ID 0x08 // 1
+
+#define PCI_PROG_IF 0x09 // 1
+#define PCI_SUBCLASS 0x0a // 1
+#define PCI_CLASS 0x0b // 1
+#define PCI_CACHE_LINE_SIZE 0x0c // 1
+#define PCI_LATENCY_TIMER 0x0d // 1
+#define PCI_HEADER_TYPE 0x0e // 1
+#define PCI_BIST 0x0f // 1
+#define PCI_BAR0 0x10 // 4
+#define PCI_BAR1 0x14 // 4
+#define PCI_BAR2 0x18 // 4
+#define PCI_BAR3 0x1C // 4
+#define PCI_BAR4 0x20 // 4
+#define PCI_BAR5 0x24 // 4
+
+#define PCI_INTERRUPT_LINE 0x3C // 1
+
+#define PCI_SECONDARY_BUS 0x19 // 1
+
+#define PCI_HEADER_TYPE_DEVICE 0
+#define PCI_HEADER_TYPE_BRIDGE 1
+#define PCI_HEADER_TYPE_CARDBUS 2
+
+#define PCI_TYPE_BRIDGE 0x0604
+#define PCI_TYPE_SATA 0x0106
+
+#define PCI_ADDRESS_PORT 0xCF8
+#define PCI_VALUE_PORT 0xCFC
+
+#define PCI_NONE 0xFFFF
+
+typedef void (*pci_func_t)(uint32_t device, uint16_t vendor_id, uint16_t device_id, void *extra);
+
+struct pci_device_descriptor {
+ uint32_t port_base;
+ uint32_t interrupt;
+
+ uint8_t bus;
+ uint8_t slot;
+ uint8_t function;
+
+ uint16_t vendor_id;
+ uint16_t device_id;
+
+ uint8_t class_id;
+ uint8_t subclass_id;
+ uint8_t interface_id;
+
+ uint8_t revision;
+};
+
+static inline int pci_extract_bus(uint32_t device)
+{
+ return (uint8_t) ((device >> 16));
+}
+
+static inline int pci_extract_slot(uint32_t device)
+{
+ return (uint8_t) ((device >> 8));
+}
+
+static inline int pci_extract_func(uint32_t device)
+{
+ return (uint8_t) (device);
+}
+
+static inline uint32_t pci_get_addr(uint32_t device, int field)
+{
+ return 0x80000000 | (pci_extract_bus(device) << 16) | (pci_extract_slot(device) << 11) |
+ (pci_extract_func(device) << 8) | ((field) & 0xFC);
+}
+
+static inline uint32_t pci_box_device(int bus, int slot, int func)
+{
+ return (uint32_t) ((bus << 16) | (slot << 8) | func);
+}
+
+uint32_t pci_read_field(uint32_t device, int field, int size);
+
+void pci_write_field(uint32_t device, int field, int size, uint32_t value);
+
+uint16_t pci_find_type(uint32_t dev);
+
+void pci_scan_hit(pci_func_t f, uint32_t dev, void *extra);
+
+void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *extra);
+
+void pci_scan_slot(pci_func_t f, int type, int bus, int slot, void *extra);
+
+void pci_scan_bus(pci_func_t f, int type, int bus, void *extra);
+
+void pci_scan(pci_func_t f, int type, void *extra);
+
+void pci_remap();
+
+int pci_get_interrupt(uint32_t device);
+
+#endif
diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c
index e0db9b0..f159335 100644
--- a/src/kernel/syscall/actions/sys_write.c
+++ b/src/kernel/syscall/actions/sys_write.c
@@ -1,4 +1,4 @@
-#include <stdint-gcc.h>
+#include <stdint.h>
#include <kernel/lib/stdio.h>
#include <kernel/lib/string.h>
#include <kernel/io/io.h>