X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/6f6da1abb22dff69dbb710bd2fd9d95f083f2b43..270869139db617e29a35bb9ded41087bb702f9ac:/lunaix-os/kernel/block/block.c

diff --git a/lunaix-os/kernel/block/block.c b/lunaix-os/kernel/block/block.c
index 76ef778..73fc9db 100644
--- a/lunaix-os/kernel/block/block.c
+++ b/lunaix-os/kernel/block/block.c
@@ -1,15 +1,15 @@
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
 #include <klibc/string.h>
 
 #include <hal/ahci/hba.h>
 
-#include <lib/crc.h>
+#include <klibc/crc.h>
 
 #include <lunaix/blkpart_gpt.h>
 #include <lunaix/block.h>
 #include <lunaix/fs/twifs.h>
 #include <lunaix/mm/cake.h>
-#include <lunaix/mm/page.h>
+#include <lunaix/mm/pagetable.h>
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 #include <lunaix/syslog.h>
@@ -26,7 +26,7 @@ LOG_MODULE("BLOCK")
 static struct cake_pile* lbd_pile;
 static struct block_dev** dev_registry;
 static struct twifs_node* blk_sysroot;
-static struct device* blk_parent_dev;
+static struct device_cat* blk_parent_dev;
 
 int free_slot = 0;
 
@@ -47,12 +47,31 @@ block_init()
     blk_parent_dev = device_addcat(NULL, "block");
 }
 
+static int
+__block_commit(struct blkio_context* blkio, struct blkio_req* req, int flags)
+{
+    int errno;
+    
+    blkio_bindctx(req, blkio);
+    blkio_mark_nfoc(req);
+    blkio_commit(req, flags);
+
+    if ((errno = req->errcode)) {
+        errno = -errno;
+    }
+
+    vbuf_free(req->vbuf);
+    blkio_free_req(req);
+    return errno;
+}
+
 int
 __block_read(struct device* dev, void* buf, size_t offset, size_t len)
 {
     int errno;
-    struct block_dev* bdev = (struct block_dev*)dev->underlay;
-    size_t bsize = bdev->blk_size, rd_block = offset / bsize + bdev->start_lba,
+    struct block_dev* bdev = block_dev(dev);
+    size_t bsize = bdev->blk_size, 
+           rd_block = offset / bsize + bdev->start_lba,
            r = offset % bsize, rd_size = 0;
 
     if (!(len = MIN(len, ((size_t)bdev->end_lba - rd_block + 1) * bsize))) {
@@ -78,28 +97,23 @@ __block_read(struct device* dev, void* buf, size_t offset, size_t len)
     }
 
     req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
-    if (!(errno = req->errcode)) {
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
         memcpy(buf, head_buf + r, rd_size);
         errno = len;
-    } else {
-        errno = -errno;
     }
 
     if (head_buf) {
         vfree(head_buf);
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
     return errno;
 }
 
 int
 __block_write(struct device* dev, void* buf, size_t offset, size_t len)
 {
-    struct block_dev* bdev = (struct block_dev*)dev->underlay;
+    struct block_dev* bdev = block_dev(dev);
     size_t bsize = bdev->blk_size, wr_block = offset / bsize + bdev->start_lba,
            r = offset % bsize, wr_size = 0;
 
@@ -126,21 +140,16 @@ __block_write(struct device* dev, void* buf, size_t offset, size_t len)
     }
 
     req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
         errno = len;
-    } else {
-        errno = -errno;
     }
 
     if (tmp_buf) {
         vfree(tmp_buf);
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
     return errno;
 }
 
@@ -148,10 +157,10 @@ int
 __block_read_page(struct device* dev, void* buf, size_t offset)
 {
     struct vecbuf* vbuf = NULL;
-    struct block_dev* bdev = (struct block_dev*)dev->underlay;
+    struct block_dev* bdev = block_dev(dev);
 
     u32_t lba = offset / bdev->blk_size + bdev->start_lba;
-    u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+    u32_t rd_lba = MIN(lba + PAGE_SIZE / bdev->blk_size, bdev->end_lba);
 
     if (rd_lba <= lba) {
         return 0;
@@ -163,17 +172,11 @@ __block_read_page(struct device* dev, void* buf, size_t offset)
 
     struct blkio_req* req = blkio_vrd(vbuf, lba, NULL, NULL, 0);
 
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
-
-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
         errno = rd_lba * bdev->blk_size;
-    } else {
-        errno = -errno;
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
     return errno;
 }
 
@@ -181,32 +184,26 @@ int
 __block_write_page(struct device* dev, void* buf, size_t offset)
 {
     struct vecbuf* vbuf = NULL;
-    struct block_dev* bdev = (struct block_dev*)dev->underlay;
+    struct block_dev* bdev = block_dev(dev);
 
     u32_t lba = offset / bdev->blk_size + bdev->start_lba;
-    u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+    u32_t wr_lba = MIN(lba + PAGE_SIZE / bdev->blk_size, bdev->end_lba);
 
-    if (rd_lba <= lba) {
+    if (wr_lba <= lba) {
         return 0;
     }
 
-    rd_lba -= lba;
+    wr_lba -= lba;
 
-    vbuf_alloc(&vbuf, buf, rd_lba * bdev->blk_size);
+    vbuf_alloc(&vbuf, buf, wr_lba * bdev->blk_size);
 
     struct blkio_req* req = blkio_vwr(vbuf, lba, NULL, NULL, 0);
 
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
-
-    int errno = req->errcode;
-    if (!errno) {
-        errno = rd_lba * bdev->blk_size;
-    } else {
-        errno = -errno;
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
+        errno = wr_lba * bdev->blk_size;
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
     return errno;
 }
 
@@ -217,18 +214,12 @@ __block_rd_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vrd(vbuf, start, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
         errno = count;
-    } else {
-        errno = -errno;
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
-
     return errno;
 }
 
@@ -239,18 +230,12 @@ __block_wr_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
     vbuf_alloc(&vbuf, buf, bdev->blk_size * count);
 
     struct blkio_req* req = blkio_vwr(vbuf, start, NULL, NULL, 0);
-    blkio_commit(bdev->blkio, req, BLKIO_WAIT);
 
-    int errno = req->errcode;
-    if (!errno) {
+    int errno;
+    if (!(errno = __block_commit(bdev->blkio, req, BLKIO_WAIT))) {
         errno = count;
-    } else {
-        errno = -errno;
     }
 
-    blkio_free_req(req);
-    vbuf_free(vbuf);
-
     return errno;
 }
 
@@ -295,7 +280,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
 
     errno = blkpart_probegpt(bdev->dev);
     if (errno < 0) {
-        kprintf(KERROR "Fail to parse partition table (%d)\n", errno);
+        ERROR("Fail to parse partition table (%d)", errno);
     } else if (!errno) {
         // TODO try other PT parser...
     }
@@ -307,7 +292,7 @@ block_mount(struct block_dev* bdev, devfs_exporter fs_export)
     return errno;
 
 error:
-    kprintf(KERROR "Fail to mount block device: %s (%x)\n", bdev->name, -errno);
+    ERROR("Fail to mount block device: %s (%x)", bdev->name, -errno);
     return errno;
 }
 
@@ -318,16 +303,19 @@ __block_register(struct block_dev* bdev)
         return 0;
     }
 
-    struct device* dev =
-      device_addvol(blk_parent_dev, bdev->class, bdev, "sd%c", 'a' + free_slot);
+    struct device* dev = device_allocvol(dev_meta(blk_parent_dev), bdev);
     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
     dev->ops.read_page = __block_read_page;
 
     bdev->dev = dev;
-    strcpy(bdev->bdev_id, dev->name_val);
+
+    register_device(dev, bdev->class, "sd%c", 'a' + free_slot);
     dev_registry[free_slot++] = bdev;
+
+    strcpy(bdev->bdev_id, dev->name_val);
+
     return 1;
 }
 
@@ -341,8 +329,7 @@ blk_mount_part(struct block_dev* bdev,
     struct block_dev* pbdev = cake_grab(lbd_pile);
     memcpy(pbdev, bdev, sizeof(*bdev));
 
-    struct device* dev = device_addvol(
-      NULL, pbdev->class, pbdev, "%sp%d", bdev->bdev_id, index + 1);
+    struct device* dev = device_allocvol(NULL, pbdev);
     dev->ops.write = __block_write;
     dev->ops.write_page = __block_write_page;
     dev->ops.read = __block_read;
@@ -359,5 +346,7 @@ blk_mount_part(struct block_dev* bdev,
 
     llist_append(&bdev->parts, &pbdev->parts);
 
+    register_device(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);
+
     return pbdev;
 }
\ No newline at end of file