summaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/Boot/amd64-desktop.make5
-rw-r--r--dev/Boot/src/HEL/AMD64/EFIBootStartup.cc21
-rw-r--r--dev/Boot/src/HEL/ARM64/EFIBootStartup.cc2
-rw-r--r--dev/Boot/src/Root/TQ/OSFont.ttfbin42752 -> 0 bytes
-rw-r--r--dev/Kernel/FirmwareKit/Handover.h2
-rw-r--r--dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc133
-rw-r--r--dev/Kernel/src/KernelMain.cc1
7 files changed, 100 insertions, 64 deletions
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index e6002760..34cebd31 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/Boot/amd64-desktop.make
@@ -26,8 +26,7 @@ endif
BIOS=OVMF.fd
IMG=epm-master-1.img
-IMG_2=epm-slave.img
-IMG_3=epm-master-2.img
+IMG_2=epm-master-2.img
EMU_FLAGS=-net none -smp 4 -m 8G -M q35 \
-bios $(BIOS) -drive \
@@ -83,7 +82,7 @@ compile-amd64:
.PHONY: run-efi-amd64-ahci
run-efi-amd64-ahci:
- $(EMU) $(EMU_FLAGS) -hda $(IMG)
+ $(EMU) $(EMU_FLAGS) -hdd $(IMG_2) -device piix3-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0
.PHONY: run-efi-amd64-ata
run-efi-amd64-ata:
diff --git a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
index 81d57ea2..1cf3cb29 100644
--- a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
@@ -294,32 +294,13 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
EFI::Stop();
}
- Boot::BFileReader ttf_font(L"TQ\\OSFont.ttf", image_handle);
-
- ttf_font.ReadAll(0);
-
- if (ttf_font.Blob())
- {
- handover_hdr->f_KernelImage = reader_kernel.Blob();
- handover_hdr->f_KernelSz = reader_kernel.Size();
- handover_hdr->f_FontImage = ttf_font.Blob();
- handover_hdr->f_FontSz = ttf_font.Size();
- }
- else
- {
- fb_init();
- FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
-
- EFI::Stop();
- }
-
EFI::ExitBootServices(map_key, image_handle);
// ---------------------------------------------------- //
// Finally load the OS kernel.
// ---------------------------------------------------- //
- kernel_thread->Start(handover_hdr, NO);
+ kernel_thread->Start(handover_hdr, YES);
CANT_REACH();
}
diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
index 87b2dc34..93de9a59 100644
--- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
@@ -213,7 +213,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle,
EFI::ExitBootServices(map_key, image_handle);
- kernel_thread.Start(handover_hdr, NO);
+ kernel_thread.Start(handover_hdr, YES);
}
CANT_REACH();
diff --git a/dev/Boot/src/Root/TQ/OSFont.ttf b/dev/Boot/src/Root/TQ/OSFont.ttf
deleted file mode 100644
index e9a6dbb0..00000000
--- a/dev/Boot/src/Root/TQ/OSFont.ttf
+++ /dev/null
Binary files differ
diff --git a/dev/Kernel/FirmwareKit/Handover.h b/dev/Kernel/FirmwareKit/Handover.h
index edd0f8d6..252f2d38 100644
--- a/dev/Kernel/FirmwareKit/Handover.h
+++ b/dev/Kernel/FirmwareKit/Handover.h
@@ -66,8 +66,6 @@ namespace Kernel::HEL
SizeT f_KernelSz;
VoidPtr f_StartupImage;
SizeT f_StartupSz;
- VoidPtr f_FontImage;
- SizeT f_FontSz;
WideChar f_FirmwareVendorName[32];
SizeT f_FirmwareVendorLen;
diff --git a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc
index a0d65c3a..db97f19b 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc
@@ -15,6 +15,8 @@
*
*/
+#include "KernelKit/DebugOutput.h"
+#include "NewKit/Defines.h"
#include <KernelKit/UserProcessScheduler.h>
#include <KernelKit/LPC.h>
@@ -34,8 +36,8 @@
#define kSataLBAMode (1 << 6)
-#define kAhciSRBsy 0x80
-#define kAhciSRDrq 0x08
+#define kAhciSRBsy (0x80)
+#define kAhciSRDrq (0x08)
#define kAhciPortCnt 32
@@ -47,7 +49,8 @@ enum
};
STATIC Kernel::PCI::Device kPCIDevice;
-STATIC HbaPort* kSATAPort = nullptr;
+STATIC HbaMem* kSATAPort = nullptr;
+STATIC Kernel::SizeT kSATAPortIdx = 0UL;
STATIC Kernel::Lba kCurrentDiskSectorCount = 0UL;
template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify>
@@ -116,13 +119,52 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented)
{
kcout << "Port is SATA.\r";
- kSATAPort = &mem_ahci->Ports[ahci_index];
+ kSATAPortIdx = ahci_index;
+ kSATAPort = mem_ahci;
- while (kSATAPort->Cmd & HBA_PxCMD_CR)
- ;
+ kSATAPort->Ports[kSATAPortIdx].Cmd &= ~HBA_PxCMD_ST;
+ kSATAPort->Ports[kSATAPortIdx].Cmd &= ~HBA_PxCMD_FRE;
- kSATAPort->Cmd |= HBA_PxCMD_FRE;
- kSATAPort->Cmd |= HBA_PxCMD_ST;
+ while (YES)
+ {
+ if (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_FR)
+ continue;
+ if (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_CR)
+ continue;
+
+ break;
+ }
+
+ const auto kAHCIBaseAddress = mib_cast(4);
+
+ kSATAPort->Ports[kSATAPortIdx].Clb = kAHCIBaseAddress + (kSATAPortIdx << 10);
+ kSATAPort->Ports[kSATAPortIdx].Clbu = 0;
+
+ rt_set_memory((VoidPtr)((UIntPtr)kSATAPort->Ports[kSATAPortIdx].Clb), 0, 1024);
+
+ kSATAPort->Ports[kSATAPortIdx].Fb = kAHCIBaseAddress + (32 << 10) + (kSATAPortIdx << 8);
+ kSATAPort->Ports[kSATAPortIdx].Fbu = 0;
+
+ rt_set_memory((VoidPtr)((UIntPtr)kSATAPort->Ports[kSATAPortIdx].Fb), 0, 256);
+
+ HbaCmdHeader* cmdheader = (HbaCmdHeader*)((UIntPtr)kSATAPort->Ports[kSATAPortIdx].Clb);
+
+ for (int i = 0; i < 32; i++)
+ {
+ cmdheader[i].Prdtl = 8;
+
+ cmdheader[i].Ctba = kAHCIBaseAddress + (40 << 10) + (kSATAPortIdx << 13) + (i << 8);
+ cmdheader[i].Ctbau = 0;
+
+ rt_set_memory((VoidPtr)(UIntPtr)cmdheader[i].Ctba, 0, 256);
+ }
+
+ while (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_CR)
+ {
+ }
+
+ kSATAPort->Ports[kSATAPortIdx].Cmd |= HBA_PxCMD_FRE;
+ kSATAPort->Ports[kSATAPortIdx].Cmd |= HBA_PxCMD_ST;
drv_calculate_disk_geometry();
@@ -150,23 +192,22 @@ Kernel::Boolean drv_std_detected(Kernel::Void)
Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer)
{
- lba /= sector_sz;
-
drv_std_input_output<YES, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer);
}
Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer)
{
- lba /= sector_sz;
-
drv_std_input_output<NO, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer);
}
static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept
{
- Kernel::UInt32 slots = (port->Sact | port->Ci);
+ if (port == nullptr)
+ return -1;
- for (Kernel::Int32 i = 0; i < kAhciPortCnt; i++)
+ Kernel::UInt32 slots = (kSATAPort->Ports[kSATAPortIdx].Sact | kSATAPort->Ports[kSATAPortIdx].Ci);
+
+ for (Kernel::Int32 i = 0; i < ((kSATAPort->Cap & 0x1F) + 1); i++)
{
if ((slots & 1) == 0)
return i;
@@ -183,60 +224,76 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff
if (!CommandOrCTRL)
return;
- volatile HbaCmdHeader* command_header = (HbaCmdHeader*)kSATAPort->Clb;
+ kSATAPort->Ports[kSATAPortIdx].Is = -1;
+
+ auto slot = 0L;
- auto slot = drv_find_cmd_slot(kSATAPort);
+ slot = drv_find_cmd_slot(&kSATAPort->Ports[kSATAPortIdx]);
if (slot == -1)
return;
+ volatile HbaCmdHeader* command_header = ((volatile HbaCmdHeader*)((Kernel::UInt64)kSATAPort->Ports[kSATAPortIdx].Clb + kSATAPort->Ports[kSATAPortIdx].Clbu));
+
command_header += slot;
+ MUST_PASS(command_header);
+
command_header->Cfl = sizeof(FisRegH2D) / sizeof(Kernel::UInt32);
command_header->Write = Write;
command_header->Prdtl = (Kernel::UInt16)((size_buffer - 1) >> 4) + 1;
- volatile HbaCmdTbl* command_table = (HbaCmdTbl*)(command_header->Ctba);
+ volatile HbaCmdTbl* command_table = (volatile HbaCmdTbl*)((Kernel::UInt64)command_header->Ctba + command_header->Ctbau);
- command_table->PrdtEntries[0].Dba = (*(Kernel::UInt32*)buffer & __UINT32_MAX__);
- command_table->PrdtEntries[0].Dbau = ((*(Kernel::UInt32*)buffer >> 8) & __UINT32_MAX__);
- command_table->PrdtEntries[0].Dbc = size_buffer - 1;
- command_table->PrdtEntries[0].InterruptBit = 1;
+ MUST_PASS(command_table);
- volatile FisRegH2D* h2d_fis = (FisRegH2D*)(&command_table->Cfis);
-
- if (CommandOrCTRL)
+ for (Kernel::SizeT i = 0; i < (command_header->Prdtl - 1); i++)
{
- h2d_fis->Command = Write ? kAHCICmdWriteDmaEx : kAHCICmdReadDmaEx;
-
- if (Identify)
- h2d_fis->Command = kAHCICmdIdentify;
+ command_table->PrdtEntries[i].Dba = ((Kernel::UInt32)(Kernel::UInt64)buffer & 0xFFFFFFFF);
+ command_table->PrdtEntries[i].Dbau = (((Kernel::UInt64)buffer >> 32) & 0xFFFFFFFF);
+ command_table->PrdtEntries[i].Dbc = (size_buffer - 1);
+ command_table->PrdtEntries[i].InterruptBit = YES;
- h2d_fis->CmdOrCtrl = 1;
+ size_buffer -= 16;
+ buffer += kib_cast(4);
}
+ volatile FisRegH2D* h2d_fis = (volatile FisRegH2D*)((Kernel::UInt64)command_table->Cfis);
+
h2d_fis->FisType = kFISTypeRegH2D;
- h2d_fis->Device = kSataLBAMode;
+ h2d_fis->CmdOrCtrl = YES;
+
+ h2d_fis->Command = Write ? kAHCICmdWriteDmaEx : kAHCICmdReadDmaEx;
+
+ if (Identify)
+ h2d_fis->Command = kAHCICmdIdentify;
- h2d_fis->Lba0 = lba & 0xFF;
+ h2d_fis->Lba0 = lba;
h2d_fis->Lba1 = lba >> 8;
h2d_fis->Lba2 = lba >> 16;
h2d_fis->Lba3 = lba >> 24;
+ h2d_fis->Device = kSataLBAMode;
+
h2d_fis->CountLow = sector_sz & 0xFF;
h2d_fis->CountHigh = (sector_sz >> 8) & 0xFF;
- kSATAPort->Ci = (1 << slot);
-
- while ((kSATAPort->Ci & (1 << slot)) != 0)
+ while ((kSATAPort->Ports[kSATAPortIdx].Tfd & (kAhciSRBsy | kAhciSRDrq)))
{
- if (kSATAPort->Is & HBA_ERR_TFE)
- {
- kcout << "AHCI: Task file disk error, setting global err...\r";
+ kcout << "waiting for slot to be ready\r\n";
+ }
+
+ kSATAPort->Is = 0xFFFFFFFF;
+ kSATAPort->Ports[kSATAPortIdx].Ci |= 1 << slot;
- err_global_get() = Kernel::kErrorUnrecoverableDisk;
+ while (kSATAPort->Ports[kSATAPortIdx].Ci & (1 << slot))
+ {
+ kcout << Kernel::number(slot) << endl;
+ if (kSATAPort->Is & (1 << 30)) // check for task file error.
+ {
+ Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component.");
return;
}
}
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc
index af835183..993f066a 100644
--- a/dev/Kernel/src/KernelMain.cc
+++ b/dev/Kernel/src/KernelMain.cc
@@ -30,6 +30,7 @@ namespace Kernel::Detail
/// @brief Filesystem auto formatter, additional checks are also done by the class.
class NeFilesystemInstaller final
{
+ private:
Kernel::NeFileSystemParser* mNeFS{nullptr};
Kernel::NeFileSystemJournal mJournal;
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 04:49:17 +0000