From b47754d44bb21955d272bd2ee09e68130050849f Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Thu, 5 Nov 2026 11:15:36 +0800 Subject: [PATCH] =?UTF-8?q?[sdio]=20=E5=9C=A8=E5=9D=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E8=AE=BE=E7=BD=AE=E5=9D=97=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=20(#11886)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用块设备配置完成后的实际块大小初始化存储参数。 --- components/drivers/sdio/dev_block.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/drivers/sdio/dev_block.c b/components/drivers/sdio/dev_block.c index f0437c10c2..1ac4ad98d0 100644 --- a/components/drivers/sdio/dev_block.c +++ b/components/drivers/sdio/dev_block.c @@ -111,7 +111,7 @@ static int card_busy_detect(struct rt_mmcsd_card *card, unsigned int timeout_ms, rt_int32_t mmcsd_num_wr_blocks(struct rt_mmcsd_card *card) { rt_int32_t err; - rt_uint32_t blocks; + rt_uint32_t blocks = 0; struct rt_mmcsd_req req; struct rt_mmcsd_cmd cmd; @@ -391,7 +391,6 @@ rt_int32_t rt_mmcsd_blk_probe(struct rt_mmcsd_card *card) max_blk_size = host->max_blk_count * host->max_blk_size; blk_dev->max_req_size = (max_dma_size < max_blk_size ? max_dma_size : max_blk_size) / MMCSD_SECTOR_SIZE; blk_dev->geometry.bytes_per_sector = MMCSD_SECTOR_SIZE; - blk_dev->geometry.block_size = card->card_blksize; blk_dev->geometry.sector_count = card->card_capacity * (1024 / MMCSD_SECTOR_SIZE); /* Set blk size before partitions probe, Why? */ @@ -399,6 +398,12 @@ rt_int32_t rt_mmcsd_blk_probe(struct rt_mmcsd_card *card) { goto _fail; } + /* + * mmcsd_set_blksize() configured the card for MMCSD_SECTOR_SIZE transfers. + * Report that value, not card->card_blksize (the CSD read block length), + * as the block size used by the block layer. + */ + blk_dev->geometry.block_size = MMCSD_SECTOR_SIZE; rt_thread_mdelay(1); #ifdef RT_USING_DM