完善硬盘驱动程序

diff --git a/drivers/ata.c b/drivers/ata.c
index 20a03610234ecb8fc160f92ac0d8142fc933d0bd..01e32d13e6ddd7966a6914e16b593104ba3f83fa 100644 (file)
--- a/drivers/ata.c
+++ b/drivers/ata.c
@@ -14,7 +14,11 @@
 #include <types.h>
 
 extern ide_pci_controller_t ide_pci_controller;
-void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *);
+
+#define ATA_TIMEOUT 10  // 10次时钟中断
+
+void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *dest);
+int ata_pio_read_ext(int dev, uint64_t pos, uint16_t count, int timeout, void *dest);
 
 void *mbr_buf;
 void ata_test(uint64_t nr) {
@@ -45,6 +49,9 @@ void ata_read_identify(int dev) {  // 这里所用的dev是逻辑编号 ATA0、A
     while (1) {
         u8 status = inb(REG_STATUS(dev));
         printk("hard disk status: %x %x\n", status, REG_STATUS(dev));
+        if (status == 0) {
+            panic("no ata device");
+        }
         if ((status & ATA_STATUS_BSY) == 0 && (status & ATA_STATUS_DRQ) != 0) {
             break;
         }
@@ -73,34 +80,48 @@ void ata_read_identify(int dev) {  // 这里所用的dev是逻辑编号 ATA0、A
     // TODO REMOVE
     mbr_buf = kmalloc(SECT_SIZE, 0);
     // ata_test(0);
+
+    // ata_pio_read_ext(0, 0, 1, ATA_TIMEOUT, mbr_buf);
+    // uint16_t *p = (uint16_t *)mbr_buf;
+    // for (int i = 0; i < 256; i++) {
+    //     if (i % 12 == 0) {
+    //         printk("\n>%03d ", i);
+    //     }
+    //     printk("%04x ", p[i]);
+    // }
 }
 
 // ATA_CMD_READ_DMA_EXT
-void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *addr) {
+void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *dest) {
     // 停止DMA
     outb(PCI_IDE_CMD_STOP, ide_pci_controller.bus_cmd);
 
     // 配置描述符表
-    unsigned long paddr = va2pa(addr);
-    ide_pci_controller.prdt[0].phys_addr = paddr;
+    unsigned long dest_paddr = va2pa(dest);
+    ide_pci_controller.prdt[0].phys_addr = dest_paddr;
     ide_pci_controller.prdt[0].byte_count = SECT_SIZE;
     ide_pci_controller.prdt[0].reserved = 0;
     ide_pci_controller.prdt[0].eot = 1;
     outl(va2pa(ide_pci_controller.prdt), ide_pci_controller.bus_prdt);
 
-    printk("paddr: %x prdt: %x %x prdte %x %x\n", paddr, ide_pci_controller.prdt, va2pa(ide_pci_controller.prdt),
+    printk("paddr: %x prdt: %x %x prdte %x %x\n", dest_paddr, ide_pci_controller.prdt, va2pa(ide_pci_controller.prdt),
            ide_pci_controller.prdt[0].phys_addr, *(((unsigned int *)ide_pci_controller.prdt) + 1));
 
     // 清除中断位和错误位
     // 这里清除的方式是是设置1后清除
     outb(PCI_IDE_STATUS_INTR | PCI_IDE_STATUS_ERR, ide_pci_controller.bus_status);
 
-    // 选择DRIVE
-    outb(ATA_LBA48_DEVSEL(dev), REG_DEVICE(dev));
-
     // 不再设置nIEN，DMA需要中断
     outb(0x00, REG_CTL(dev));
 
+    // 等待硬盘不BUSY
+    while (inb(REG_STATUS(dev)) & ATA_STATUS_BSY) {
+        nop();
+    }
+
+    // 选择DRIVE
+    outb(ATA_LBA48_DEVSEL(dev), REG_DEVICE(dev));
+
     // 先写扇区数的高字节
     outb((count >> 8) & 0xFF, REG_NSECTOR(dev));
 
@@ -117,6 +138,11 @@ void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *addr) {
     outb((pos >> 8) & 0xFF, REG_LBAM(dev));
     outb((pos >> 16) & 0xFF, REG_LBAH(dev));
 
+    // 等待硬盘READY
+    while (inb(REG_STATUS(dev)) & ATA_STATUS_RDY == 0) {
+        nop();
+    }
+
     outb(ATA_CMD_READ_DMA_EXT, REG_CMD(dev));
 
     // 这一句非常重要，如果不加这一句
@@ -132,6 +158,62 @@ void ata_dma_read_ext(int dev, uint64_t pos, uint16_t count, void *addr) {
     outb(PCI_IDE_CMD_WRITE | PCI_IDE_CMD_START, ide_pci_controller.bus_cmd);
 }
 
+// ATA_CMD_READ_PIO_EXT
+int ata_pio_read_ext(int dev, uint64_t pos, uint16_t count, int timeout, void *dest) {
+    // PIO读，禁用中断
+    outb(ATA_CTL_NIEN, REG_CTL(dev));
+
+    // 等待硬盘不BUSY
+    while (inb(REG_STATUS(dev)) & ATA_STATUS_BSY) {
+        nop();
+    }
+
+    // 选择DRIVE
+    outb(ATA_LBA48_DEVSEL(dev), REG_DEVICE(dev));
+
+    // 先写扇区数的高字节
+    outb((count >> 8) & 0xFF, REG_NSECTOR(dev));
+
+    // 接着写LBA48，高三个字节
+    outb((pos >> 24) & 0xFF, REG_LBAL(dev));
+    outb((pos >> 32) & 0xFF, REG_LBAM(dev));
+    outb((pos >> 40) & 0xFF, REG_LBAH(dev));
+
+    // 再写扇区数的低字节
+    outb((count >> 0) & 0xFF, REG_NSECTOR(dev));
+
+    // 接着写LBA48，低三个字节
+    outb((pos >> 0) & 0xFF, REG_LBAL(dev));
+    outb((pos >> 8) & 0xFF, REG_LBAM(dev));
+    outb((pos >> 16) & 0xFF, REG_LBAH(dev));
+
+    while (inb(REG_STATUS(dev)) & ATA_STATUS_RDY == 0) {
+        nop();
+    }
+
+    outb(ATA_CMD_READ_PIO_EXT, REG_CMD(dev));
+
+    while (timeout > 0) {
+        timeout--;
+
+        u8 status = inb(REG_STATUS(dev));
+        if ((status & ATA_STATUS_BSY) == 0 && (status & ATA_STATUS_DRQ) != 0) {
+            break;
+        }
+
+        asm("sti;hlt;");
+    }
+    asm("cli");
+
+    if (timeout == 0) {
+        return -1;
+    }
+
+    insl(REG_DATA(dev), dest, (SECT_SIZE * count) / sizeof(uint32_t));
+
+    return 0;
+}
+
 uint8_t ata_pci_bus_status() {
     uint8_t st = 0;
     st = inb(ide_pci_controller.bus_status);

diff --git a/include/system.h b/include/system.h
index 5726b370614ab0d052085922cbcb7e8c33fb5b10..6746bcf744b942563ee43bde14c16f70f4e8dc25 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -75,6 +75,7 @@ extern char gdtr[6], idtr[6];
 
 #define cli() __asm__ __volatile__("cli")
 #define sti() __asm__ __volatile__("sti")
+#define nop() asm volatile("nop")
 #define disableIRQ() cli()
 #define enableIRQ() sti()
 

diff --git a/kernel/setup.c b/kernel/setup.c
index df344dde70a32ce02164f7cffe591d294107b841..bffaa0f23f421b08c46d46b8ecc1da9d0a25e76c 100644 (file)
--- a/kernel/setup.c
+++ b/kernel/setup.c
@@ -77,7 +77,7 @@ void setup_kernel() {
     printl(MPL_TITLE, "                                 SYSTEM MONITOR");
     printl(MPL_ROOTDEV, "root device %08x", system.root_dev);
 
-    // setup_tasks();
+    setup_tasks();
 
     setup_irqs();
 
@@ -93,9 +93,7 @@ void setup_kernel() {
     extern tty_t monitor_tty;
     tty_switch(&monitor_tty);
 
-    while (1) {
-        asm("sti;hlt;");
-    }
+    return;
 
     setup_fs();
 }