From 4a3a7f1827b20b4656ff3ce3be3e27c221f2a293 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 1 Nov 2022 04:00:29 +0200 Subject: [PATCH] Added AHCI driver stub --- Disk/AHCI/AHCI.cpp | 83 +++++++++++++++++++++++++++ Disk/AHCI/Makefile | 100 +++++++++++++++++++++++++++++++++ Disk/AHCI/arch/amd64/linker.ld | 42 ++++++++++++++ Disk/Makefile | 5 ++ Makefile | 3 +- 5 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 Disk/AHCI/AHCI.cpp create mode 100644 Disk/AHCI/Makefile create mode 100644 Disk/AHCI/arch/amd64/linker.ld create mode 100644 Disk/Makefile diff --git a/Disk/AHCI/AHCI.cpp b/Disk/AHCI/AHCI.cpp new file mode 100644 index 0000000..6dc2adf --- /dev/null +++ b/Disk/AHCI/AHCI.cpp @@ -0,0 +1,83 @@ +#include +#include +#include + +#include "../../../Kernel/DAPI.hpp" +#include "../../../Kernel/Fex.hpp" + +extern "C" int DriverEntry(KernelAPI *Data); +int CallbackHandler(KernelCallback *Data); + +HEAD(FexFormatType_Driver, FexOSType_Fennix, DriverEntry); + +#pragma GCC diagnostic ignored "-Wmissing-field-initializers" + +__attribute__((section(".extended"))) FexExtended ExtendedHeader = { + .Driver = { + .Name = "AHCI", + .Type = FexDriverType_Storage, + .Callback = CallbackHandler, + .Bind = { + .Type = BIND_PCI, + .PCI = { + .VendorID = {0x8086, 0x15AD}, + .DeviceID = {0x2922, 0x2829, 0x07E0}, + .Class = 0x1, + .SubClass = 0x6, + .ProgIF = 0x1, + }}}}; + +KernelAPI *KAPI; + +/* --------------------------------------------------------------------------------------------------------- */ + +struct BARData +{ + uint8_t Type; + uint64_t IOBase; + uint64_t MemoryBase; +}; + +PCIDeviceHeader *PCIBaseAddress; + +int DriverEntry(KernelAPI *Data) +{ + if (!Data) + return INVALID_KERNEL_API; + if (Data->Version.Major < 0 || Data->Version.Minor < 0 || Data->Version.Patch < 0) + return KERNEL_API_VERSION_NOT_SUPPORTED; + KAPI = Data; + return OK; +} + +int CallbackHandler(KernelCallback *Data) +{ + switch (Data->Reason) + { + case AcknowledgeReason: + { + KAPI->Util.DebugPrint(((char *)"Kernel acknowledged the driver." + KAPI->Info.Offset), KAPI->Info.DriverUID); + break; + } + case ConfigurationReason: + { + KAPI->Util.DebugPrint(((char *)"Kernel received configuration data." + KAPI->Info.Offset), KAPI->Info.DriverUID); + PCIBaseAddress = reinterpret_cast(Data->RawPtr); + break; + } + case InterruptReason: + { + break; + } + case SendReason: + { + break; + } + default: + { + KAPI->Util.DebugPrint(((char *)"Unknown reason." + KAPI->Info.Offset), KAPI->Info.DriverUID); + break; + } + } + return OK; +} diff --git a/Disk/AHCI/Makefile b/Disk/AHCI/Makefile new file mode 100644 index 0000000..48cf01d --- /dev/null +++ b/Disk/AHCI/Makefile @@ -0,0 +1,100 @@ +# Config file +include ../../../Makefile.conf + +FILENAME = ahci.fex + +CC = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc +CPP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++ +LD = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)ld +AS = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)as +OBJDUMP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)objdump + +GIT_COMMIT = $(shell git rev-parse HEAD) +GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD) + +ifeq ($(OSARCH), amd64) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), i686) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*") +else ifeq ($(OSARCH), aarch64) +S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*") +endif +HEADERS = $(sort $(dir $(wildcard ../../include/*))) +OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o) +INCLUDE_DIR = ../../include + +LDFLAGS := \ + -fPIC -fno-pie \ + -Wl,-static,--no-dynamic-linker,-ztext \ + -nostdlib -nodefaultlibs -nolibc \ + -zmax-page-size=0x1000 \ + -Wl,-Map file.map -shared + +WARNCFLAG = -Wall -Wextra + +CFLAGS := \ + -I$(INCLUDE_DIR) \ + -DGIT_COMMIT='"$(GIT_COMMIT)"' \ + -DGIT_COMMIT_SHORT='"$(GIT_COMMIT_SHORT)"' + +ifeq ($(OSARCH), amd64) + +CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow \ + -mno-red-zone -mno-sse -mno-sse2 \ + -march=x86-64 -pipe -ffunction-sections \ + -mcmodel=kernel -msoft-float -fno-builtin +LDFLAGS += -Tarch/amd64/linker.ld + +else ifeq ($(OSARCH), i686) + +CFLAGS += -fPIC -fno-pie -mno-80387 -mno-mmx -mno-3dnow \ + -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections \ + -march=i686 -pipe -msoft-float -fno-builtin +LDFLAGS += -Tarch/i686/linker.ld + +else ifeq ($(OSARCH), aarch64) + +CFLAGS += -pipe -fno-builtin -fPIC +LDFLAGS += -Tarch/aarch64/linker.ld + +endif + +build: $(FILENAME) +ifeq ($(OSARCH), amd64) + $(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map +else ifeq ($(OSARCH), i686) + +else ifeq ($(OSARCH), aarch64) + +endif + mv $(FILENAME) ../../out/$(FILENAME) + +$(FILENAME): $(OBJ) + $(CC) $(LDFLAGS) $(OBJ) -o $@ + +%.o: %.c $(HEADERS) + $(info Compiling $<) + $(CC) $(CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@ + +%.o: %.cpp $(HEADERS) + $(info Compiling $<) + $(CPP) $(CFLAGS) $(WARNCFLAG) -std=c++20 -fexceptions -c $< -o $@ -fno-rtti + +%.o: %.S + $(info Compiling $<) +ifeq ($(OSARCH), amd64) + $(AS) -o $@ $< +else ifeq ($(OSARCH), i686) + $(AS) -o $@ $< +else ifeq ($(OSARCH), aarch64) + $(AS) -o $@ $< +endif + +clean: + rm -f *.o file.map file_dump.map $(OBJ) diff --git a/Disk/AHCI/arch/amd64/linker.ld b/Disk/AHCI/arch/amd64/linker.ld new file mode 100644 index 0000000..511369e --- /dev/null +++ b/Disk/AHCI/arch/amd64/linker.ld @@ -0,0 +1,42 @@ +/* EXPERIMENTAL */ + +OUTPUT_FORMAT(binary) +OUTPUT_ARCH(i386:x86-64) + +ENTRY(DriverEntry) + +SECTIONS +{ + .header : + { + *(.header .header.*) + *(.extended .extended.*) + } + + .text : + { + *(.text .text.*) + } + + .data : + { + *(.data .data.*) + } + + .rodata : + { + *(.rodata .rodata.*) + } + + .bss : + { + *(COMMON) + *(.bss .bss.*) + } + + /DISCARD/ : + { + *(.eh_frame) + *(.note .note.*) + } +} diff --git a/Disk/Makefile b/Disk/Makefile new file mode 100644 index 0000000..dda9077 --- /dev/null +++ b/Disk/Makefile @@ -0,0 +1,5 @@ +build: + make --quiet -C AHCI build + +clean: + make -C AHCI clean diff --git a/Makefile b/Makefile index 24c84f1..63eed7e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ build: mkdir -p out - touch out/dummy.fex + make --quiet -C Disk build make --quiet -C Audio build make --quiet -C FileSystem build make --quiet -C Generic build @@ -12,6 +12,7 @@ prepare: clean: rm -rf out + make -C Disk clean make -C Audio clean make -C FileSystem clean make -C Generic clean