Merge remote-tracking branch 'origin/master' into isa/arm64

[lunaix-os.git] / lunaix-os / hal / ahci / ahci.c

diff --git a/lunaix-os/hal/ahci/ahci.c b/lunaix-os/hal/ahci/ahci.c
index 0f1ebf33810fcd1ce9fcadb9a667b497c3458a14..5213a53268becba11eb363428d722c79c281499f 100644 (file)
--- a/lunaix-os/hal/ahci/ahci.c
+++ b/lunaix-os/hal/ahci/ahci.c
@@ -14,16 +14,12 @@
 #include <hal/ahci/scsi.h>
 #include <hal/pci.h>
 
-#include <sys/pci_hba.h>
-#include <sys/port_io.h>
-
 #include <klibc/string.h>
 #include <lunaix/block.h>
-#include <lunaix/isrm.h>
+#include <asm-generic/isrm.h>
 #include <lunaix/mm/mmio.h>
-#include <lunaix/mm/pmm.h>
 #include <lunaix/mm/valloc.h>
-#include <lunaix/mm/vmm.h>
+#include <lunaix/mm/page.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
 
@@ -31,7 +27,7 @@
 #define HBA_CLB_SIZE 1024
 
 #define HBA_MY_IE (HBA_PxINTR_DHR | HBA_PxINTR_TFE | HBA_PxINTR_OF)
-#define AHCI_DEVCLASS DEVCLASS(DEVIF_PCI, DEVFN_STORAGE, DEV_SATA)
+#define AHCI_DEVCLASS DEVCLASS(LUNAIX, STORAGE, SATA)
 
 // #define DO_HBA_FULL_RESET
 
@@ -73,7 +69,7 @@ __hba_reset_port(hba_reg_t* port_reg)
     }
     // 如果port未响应，则继续执行重置
     port_reg[HBA_RPxSCTL] = (port_reg[HBA_RPxSCTL] & ~0xf) | 1;
-    port_delay(100000); // 等待至少一毫秒，差不多就行了
+
     port_reg[HBA_RPxSCTL] &= ~0xf;
 }
 
@@ -128,16 +124,19 @@ ahci_driver_init(struct ahci_driver_param* param)
         __hba_reset_port(port_regs);
 #endif
 
+        struct leaflet* leaflet;
         if (!clbp) {
             // 每页最多4个命令队列
-            clb_pa = pmm_alloc_page(PP_FGLOCKED);
-            clb_pg_addr = (ptr_t)ioremap(clb_pa, 0x1000);
+            leaflet = alloc_leaflet(0);
+            clb_pa = leaflet_addr(leaflet);
+            clb_pg_addr = vmap(leaflet, KERNEL_DATA);
             memset((void*)clb_pg_addr, 0, 0x1000);
         }
         if (!fisp) {
             // 每页最多16个FIS
-            fis_pa = pmm_alloc_page(PP_FGLOCKED);
-            fis_pg_addr = (ptr_t)ioremap(fis_pa, 0x1000);
+            leaflet = alloc_leaflet(0);
+            fis_pa = leaflet_addr(leaflet);
+            fis_pg_addr = vmap(leaflet, KERNEL_DATA);
             memset((void*)fis_pg_addr, 0, 0x1000);
         }
 
@@ -254,6 +253,7 @@ hba_bind_vbuf(struct hba_cmdh* cmdh, struct hba_cmdt* cmdt, struct vecbuf* vbuf)
     do {
         assert_msg(i < HBA_MAX_PRDTE, "HBA: Too many PRDTEs");
         assert_msg(pos->buf.size <= 0x400000U, "HBA: Buffer too big");
+        assert_msg(pos->buf.size, "HBA: expect a non-zero buffer size");
 
         cmdt->entries[i++] =
           (struct hba_prdte){ .data_base = vmm_v2p((ptr_t)pos->buf.buffer),
@@ -409,6 +409,7 @@ int
 ahci_identify_device(struct hba_device* device)
 {
     // 用于重新识别设备（比如在热插拔的情况下）
+    // FIXME this is not right...
     vfree(device);
     return ahci_init_device(device->port);
 }