-#include <hal/ahci/hba.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
#include <klibc/string.h>
+
+#include <hal/ahci/hba.h>
+
#include <lib/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/valloc.h>
-#include <lunaix/syslog.h>
-
-#include <lunaix/blkpart_gpt.h>
-
#include <lunaix/spike.h>
+#include <lunaix/syslog.h>
#define BLOCK_EREAD 1
#define BLOCK_ESIG 2
static struct cake_pile* lbd_pile;
static struct block_dev** dev_registry;
static struct twifs_node* blk_sysroot;
+static struct device* blk_parent_dev;
int free_slot = 0;
dev_registry = vcalloc(sizeof(struct block_dev*), MAX_DEV);
free_slot = 0;
blk_sysroot = twifs_dir_node(NULL, "block");
+ blk_parent_dev = device_addcat(NULL, "block");
}
int
}
req = blkio_vrd(vbuf, rd_block, NULL, NULL, 0);
- blkio_commit(bdev->blkio, req);
-
- pwait(&req->wait);
+ blkio_commit(bdev->blkio, req, BLKIO_WAIT);
if (!(errno = req->errcode)) {
memcpy(buf, head_buf + r, rd_size);
__block_write(struct device* dev, void* buf, size_t offset, size_t len)
{
struct block_dev* bdev = (struct block_dev*)dev->underlay;
- size_t bsize = bdev->blk_size, rd_block = offset / bsize + bdev->start_lba,
+ size_t bsize = bdev->blk_size, wr_block = offset / bsize + bdev->start_lba,
r = offset % bsize, wr_size = 0;
- if (!(len = MIN(len, ((size_t)bdev->end_lba - rd_block + 1) * bsize))) {
+ if (!(len = MIN(len, ((size_t)bdev->end_lba - wr_block + 1) * bsize))) {
return 0;
}
vbuf_alloc(&vbuf, buf + wr_size, llen);
}
- req = blkio_vwr(vbuf, rd_block, NULL, NULL, 0);
- blkio_commit(bdev->blkio, req);
-
- pwait(&req->wait);
+ req = blkio_vwr(vbuf, wr_block, NULL, NULL, 0);
+ blkio_commit(bdev->blkio, req, BLKIO_WAIT);
int errno = req->errcode;
if (!errno) {
return errno;
}
+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;
+
+ u32_t lba = offset / bdev->blk_size + bdev->start_lba;
+ u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+
+ if (rd_lba <= lba) {
+ return 0;
+ }
+
+ rd_lba -= lba;
+
+ vbuf_alloc(&vbuf, buf, rd_lba * bdev->blk_size);
+
+ struct blkio_req* req = blkio_vrd(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;
+ }
+
+ blkio_free_req(req);
+ vbuf_free(vbuf);
+ return errno;
+}
+
+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;
+
+ u32_t lba = offset / bdev->blk_size + bdev->start_lba;
+ u32_t rd_lba = MIN(lba + PG_SIZE / bdev->blk_size, bdev->end_lba);
+
+ if (rd_lba <= lba) {
+ return 0;
+ }
+
+ rd_lba -= lba;
+
+ vbuf_alloc(&vbuf, buf, rd_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;
+ }
+
+ blkio_free_req(req);
+ vbuf_free(vbuf);
+ return errno;
+}
+
+int
+__block_rd_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
+{
+ struct vecbuf* vbuf = NULL;
+ 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) {
+ errno = count;
+ } else {
+ errno = -errno;
+ }
+
+ blkio_free_req(req);
+ vbuf_free(vbuf);
+
+ return errno;
+}
+
+int
+__block_wr_lb(struct block_dev* bdev, void* buf, u64_t start, size_t count)
+{
+ struct vecbuf* vbuf = NULL;
+ 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) {
+ errno = count;
+ } else {
+ errno = -errno;
+ }
+
+ blkio_free_req(req);
+ vbuf_free(vbuf);
+
+ return errno;
+}
+
+void*
+block_alloc_buf(struct block_dev* bdev)
+{
+ return valloc(bdev->blk_size);
+}
+
+void
+block_free_buf(struct block_dev* bdev, void* buf)
+{
+ return vfree(buf);
+}
+
struct block_dev*
block_alloc_dev(const char* blk_id, void* driver, req_handler ioreq_handler)
{
bdev->blkio = blkio_newctx(ioreq_handler);
bdev->driver = driver;
bdev->blkio->driver = driver;
+ bdev->ops = (struct block_dev_ops){ .block_read = __block_rd_lb,
+ .block_write = __block_wr_lb };
return bdev;
}
errno = blkpart_probegpt(bdev->dev);
if (errno < 0) {
- kprintf(KERROR "Fail to parse partition table (%d)\n", errno);
+ kprintf(KERROR "Fail to parse partition table (%d)", errno);
} else if (!errno) {
// TODO try other PT parser...
}
return errno;
error:
- kprintf(KERROR "Fail to mount block device: %s (%x)\n", bdev->name, -errno);
+ kprintf(KERROR "Fail to mount block device: %s (%x)", bdev->name, -errno);
return errno;
}
return 0;
}
- struct device* dev = device_addvol(NULL, bdev, "sd%c", 'a' + free_slot);
- dev->write = __block_write;
- dev->read = __block_read;
+ struct device* dev = device_allocvol(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);
+
+ device_register(dev, bdev->class, "sd%c", 'a' + free_slot);
dev_registry[free_slot++] = bdev;
+
+ strcpy(bdev->bdev_id, dev->name_val);
+
return 1;
}
struct block_dev* pbdev = cake_grab(lbd_pile);
memcpy(pbdev, bdev, sizeof(*bdev));
- struct device* dev =
- device_addvol(NULL, pbdev, "%sp%d", bdev->bdev_id, index + 1);
- dev->write = __block_write;
- dev->read = __block_read;
+ struct device* dev = device_allocvol(NULL, pbdev);
+ dev->ops.write = __block_write;
+ dev->ops.write_page = __block_write_page;
+ dev->ops.read = __block_read;
+ dev->ops.read_page = __block_read_page;
pbdev->start_lba = start_lba;
pbdev->end_lba = end_lba;
llist_append(&bdev->parts, &pbdev->parts);
+ device_register(dev, pbdev->class, "%sp%d", bdev->bdev_id, index + 1);
+
return pbdev;
}
\ No newline at end of file
git://scm.lunaixsky.com / lunaix-os.git / blobdiff