Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

virtio-blk: add VIRTIO_BLK_F_BLK_SIZE feature

Browse Source 
Support configure the virtio block device block size to other value
(default value is 512)

Signed-off-by: wangyongrong <wangyongrong@xiaomi.com>
This commit is contained in:
wangyongrong
2024-06-03 15:39:17 +08:00
committed by Xiang Xiao
parent ef58c71582
commit f6f151a8e1
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/virtio/virtio-blk.c
+20 -4
View File
@@ -44,6 +44,7 @@
/* Block feature bits */ /* Block feature bits */
#define VIRTIO_BLK_F_RO 5 /* Disk is read-only */ #define VIRTIO_BLK_F_RO 5 /* Disk is read-only */
#define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available */
#define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */ #define VIRTIO_BLK_F_FLUSH 9 /* Cache flush command support */
/* Block request type */ /* Block request type */
@@ -60,7 +61,8 @@
/* Block device sector size */ /* Block device sector size */
#define VIRTIO_BLK_SECTOR_SIZE 512 #define VIRTIO_BLK_SECTOR_BITS 9
#define VIRTIO_BLK_SECTOR_SIZE (1UL << VIRTIO_BLK_SECTOR_BITS)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@@ -117,6 +119,7 @@ struct virtio_blk_priv_s
FAR struct virtio_blk_resp_s *resp; /* Virtio block in header */ FAR struct virtio_blk_resp_s *resp; /* Virtio block in header */
mutex_t lock; /* Lock */ mutex_t lock; /* Lock */
uint64_t nsectors; /* Sectore numbers */ uint64_t nsectors; /* Sectore numbers */
uint32_t block_size; /* Block size */
char name[NAME_MAX]; /* Device name */ char name[NAME_MAX]; /* Device name */
}; };
@@ -250,7 +253,8 @@ static ssize_t virtio_blk_rdwr(FAR struct virtio_blk_priv_s *priv,
priv->req->type = write ? VIRTIO_BLK_T_OUT : VIRTIO_BLK_T_IN; priv->req->type = write ? VIRTIO_BLK_T_OUT : VIRTIO_BLK_T_IN;
priv->req->reserved = 0; priv->req->reserved = 0;
priv->req->sector = startsector; priv->req->sector = startsector *
priv->block_size >> VIRTIO_BLK_SECTOR_BITS;
priv->resp->status = VIRTIO_BLK_S_IOERR; priv->resp->status = VIRTIO_BLK_S_IOERR;
/* Fill the virtqueue buffer: /* Fill the virtqueue buffer:
@@ -262,7 +266,7 @@ static ssize_t virtio_blk_rdwr(FAR struct virtio_blk_priv_s *priv,
vb[0].buf = priv->req; vb[0].buf = priv->req;
vb[0].len = VIRTIO_BLK_REQ_HEADER_SIZE; vb[0].len = VIRTIO_BLK_REQ_HEADER_SIZE;
vb[1].buf = buffer; vb[1].buf = buffer;
vb[1].len = nsectors * VIRTIO_BLK_SECTOR_SIZE; vb[1].len = nsectors * priv->block_size;
vb[2].buf = priv->resp; vb[2].buf = priv->resp;
vb[2].len = VIRTIO_BLK_RESP_HEADER_SIZE; vb[2].len = VIRTIO_BLK_RESP_HEADER_SIZE;
readnum = write ? 2 : 1; readnum = write ? 2 : 1;
@@ -392,7 +396,7 @@ static int virtio_blk_geometry(FAR struct inode *inode,
geometry->geo_mediachanged = false; geometry->geo_mediachanged = false;
geometry->geo_writeenabled = true; geometry->geo_writeenabled = true;
geometry->geo_nsectors = priv->nsectors; geometry->geo_nsectors = priv->nsectors;
geometry->geo_sectorsize = VIRTIO_BLK_SECTOR_SIZE; geometry->geo_sectorsize = priv->block_size;
ret = OK; ret = OK;
} }
@@ -528,6 +532,7 @@ static int virtio_blk_init(FAR struct virtio_blk_priv_s *priv,
virtio_set_status(vdev, VIRTIO_CONFIG_STATUS_DRIVER); virtio_set_status(vdev, VIRTIO_CONFIG_STATUS_DRIVER);
virtio_negotiate_features(vdev, (1UL << VIRTIO_BLK_F_RO) | virtio_negotiate_features(vdev, (1UL << VIRTIO_BLK_F_RO) |
(1UL << VIRTIO_BLK_F_BLK_SIZE) |
(1UL << VIRTIO_BLK_F_FLUSH)); (1UL << VIRTIO_BLK_F_FLUSH));
virtio_set_status(vdev, VIRTIO_CONFIG_FEATURES_OK); virtio_set_status(vdev, VIRTIO_CONFIG_FEATURES_OK);
@@ -601,6 +606,17 @@ static int virtio_blk_probe(FAR struct virtio_device *vdev)
&priv->nsectors); &priv->nsectors);
vrtinfo("Virio blk capacity=%" PRIu64 " sectors\n", priv->nsectors); vrtinfo("Virio blk capacity=%" PRIu64 " sectors\n", priv->nsectors);
if (virtio_has_feature(vdev, VIRTIO_BLK_F_BLK_SIZE))
{
virtio_read_config_member(priv->vdev, struct virtio_blk_config_s,
blk_size, &priv->block_size);
vrtinfo("Virio blk block_size=%" PRIu32 "\n", priv->block_size);
}
else
{
priv->block_size = VIRTIO_BLK_SECTOR_SIZE;
}
/* Register block driver */ /* Register block driver */
snprintf(priv->name, NAME_MAX, "/dev/virtblk%d", g_virtio_blk_idx); snprintf(priv->name, NAME_MAX, "/dev/virtblk%d", g_virtio_blk_idx);