[DM/FEATURE] Support SCSI bus (#9592)

* [DM/FEATURE] Support block for SCSI
1. Support SD and CD-ROM.
2. SD will port to UFS and ATA device.

Signed-off-by: GuEe-GUI <2991707448@qq.com>
This commit is contained in:
GUI
2024-11-22 16:59:37 +08:00
committed by GitHub
parent c055261177
commit 42a41c696d
13 changed files with 2296 additions and 2 deletions
+7
View File
@@ -162,6 +162,13 @@ endif
bool "Using devfs for device objects"
default y
if RT_USING_DFS_V1
config RT_USING_DFS_ISO9660
bool "Using ISO9660 filesystem"
depends on RT_USING_MEMHEAP
default n
endif
config RT_USING_DFS_ROMFS
bool "Enable ReadOnly file system on flash"
default n
@@ -0,0 +1,11 @@
# RT-Thread building script for component
from building import *
cwd = GetCurrentDir()
src = Glob('*.c')
CPPPATH = [cwd]
group = DefineGroup('Filesystem', src, depend = ['RT_USING_DFS', 'RT_USING_DFS_ISO9660'], CPPPATH = CPPPATH)
Return('group')
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,16 @@
/*
* Copyright (c) 2006-2023, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2023-02-25 GuEe-GUI the first version
*/
#ifndef __DFS_ISO9660_H__
#define __DFS_ISO9660_H__
int dfs_iso9660_init(void);
#endif /* __DFS_ISO9660_H__ */
+2 -2
View File
@@ -322,8 +322,8 @@ int dfs_mount(const char *device_name,
/* open device, but do not check the status of device */
if (dev_id != NULL)
{
if (rt_device_open(fs->dev_id,
RT_DEVICE_OFLAG_RDWR) != RT_EOK)
if (rt_device_open(fs->dev_id, RT_DEVICE_OFLAG_RDWR) != RT_EOK &&
rt_device_open(fs->dev_id, RT_DEVICE_OFLAG_RDONLY) != RT_EOK)
{
/* The underlying device has error, clear the entry. */
dfs_lock();
+1
View File
@@ -22,6 +22,7 @@ rsource "graphic/Kconfig"
rsource "hwcrypto/Kconfig"
rsource "wlan/Kconfig"
rsource "block/Kconfig"
rsource "scsi/Kconfig"
rsource "virtio/Kconfig"
rsource "dma/Kconfig"
rsource "mfd/Kconfig"
File diff suppressed because it is too large Load Diff
+4
View File
@@ -67,6 +67,10 @@ extern "C" {
#include "drivers/pic.h"
#endif
#ifdef RT_USING_SCSI
#include "drivers/scsi.h"
#endif
#ifdef RT_MFD_SYSCON
#include "drivers/syscon.h"
#endif
+20
View File
@@ -0,0 +1,20 @@
menuconfig RT_USING_SCSI
bool "Using Small Computer System Interface (SCSI)"
depends on RT_USING_DM
default n
config RT_SCSI_SD
bool "SD device on SCSI"
depends on RT_USING_SCSI
depends on RT_USING_BLK
default y
config RT_SCSI_CDROM
bool "CD-ROM device on SCSI"
depends on RT_USING_SCSI
depends on RT_USING_BLK
default y
if RT_USING_SCSI
osource "$(SOC_DM_SCSI_DIR)/Kconfig"
endif
+21
View File
@@ -0,0 +1,21 @@
from building import *
group = []
if not GetDepend(['RT_USING_SCSI']):
Return('group')
cwd = GetCurrentDir()
CPPPATH = [cwd + '/../include']
src = ['scsi.c']
if GetDepend(['RT_SCSI_SD']):
src += ['scsi_sd.c']
if GetDepend(['RT_SCSI_CDROM']):
src += ['scsi_cdrom.c']
group = DefineGroup('DeviceDrivers', src, depend = [''], CPPPATH = CPPPATH)
Return('group')
File diff suppressed because it is too large Load Diff
+136
View File
@@ -0,0 +1,136 @@
/*
* Copyright (c) 2006-2023, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2023-02-25 GuEe-GUI the first version
*/
#include <rthw.h>
#include <rtthread.h>
#include <rtdevice.h>
#define DBG_TAG "scsi.blk"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
struct scsi_cdrom
{
struct rt_blk_disk parent;
struct rt_scsi_device *sdev;
int cdrom_id;
struct rt_device_blk_geometry geometry;
};
#define raw_to_scsi_cdrom(raw) rt_container_of(raw, struct scsi_cdrom, parent)
static struct rt_dm_ida cdrom_ida = RT_DM_IDA_INIT(CUSTOM);
static struct rt_dm_ida scsi_cdrom_ida = RT_DM_IDA_INIT(SCSI_CDROM);
static rt_ssize_t scsi_cdrom_read(struct rt_blk_disk *disk, rt_off_t sector,
void *buffer, rt_size_t sector_count)
{
rt_err_t err;
struct scsi_cdrom *scdrom = raw_to_scsi_cdrom(disk);
struct rt_scsi_device *sdev = scdrom->sdev;
sector_count &= RT_UINT32_MAX;
if (sector >> 32)
{
err = rt_scsi_read16(sdev, sector, buffer, sector_count);
}
else
{
err = rt_scsi_read12(sdev, sector, buffer, sector_count);
}
return !err ? sector_count : (rt_ssize_t)err;
}
static rt_err_t scsi_cdrom_getgeome(struct rt_blk_disk *disk,
struct rt_device_blk_geometry *geometry)
{
struct scsi_cdrom *scdrom = raw_to_scsi_cdrom(disk);
rt_memcpy(geometry, &scdrom->geometry, sizeof(scdrom->geometry));
return RT_EOK;
}
static const struct rt_blk_disk_ops scsi_cdrom_ops =
{
.read = scsi_cdrom_read,
.getgeome = scsi_cdrom_getgeome,
};
rt_err_t scsi_cdrom_probe(struct rt_scsi_device *sdev)
{
rt_err_t err;
union
{
struct rt_scsi_read_capacity10_data capacity10;
struct rt_scsi_read_capacity16_data capacity16;
} data;
struct scsi_cdrom *scdrom = rt_calloc(1, sizeof(*scdrom));
if (!scdrom)
{
return -RT_ENOMEM;
}
if ((scdrom->cdrom_id = rt_dm_ida_alloc(&cdrom_ida)) < 0)
{
return -RT_EFULL;
}
sdev->priv = scdrom;
scdrom->sdev = sdev;
scdrom->parent.ida = &scsi_cdrom_ida;
scdrom->parent.read_only = RT_TRUE;
scdrom->parent.parallel_io = RT_FALSE;
scdrom->parent.ops = &scsi_cdrom_ops;
scdrom->parent.max_partitions = RT_BLK_PARTITION_NONE;
if ((err = rt_scsi_read_capacity10(sdev, &data.capacity10)))
{
goto _fail;
}
if (data.capacity10.last_block == 0xffffffff)
{
if ((err = rt_scsi_read_capacity16(sdev, &data.capacity16)))
{
goto _fail;
}
}
scdrom->geometry.bytes_per_sector = sdev->block_size;
scdrom->geometry.block_size = sdev->block_size;
scdrom->geometry.sector_count = sdev->last_block + 1;
rt_dm_dev_set_name(&scdrom->parent.parent, "cdrom%u", scdrom->cdrom_id);
if ((err = rt_hw_blk_disk_register(&scdrom->parent)))
{
goto _fail;
}
return RT_EOK;
_fail:
rt_dm_ida_free(&cdrom_ida, scdrom->cdrom_id);
rt_free(scdrom);
return err;
}
rt_err_t scsi_cdrom_remove(struct rt_scsi_device *sdev)
{
struct scsi_cdrom *scdrom = sdev->priv;
rt_dm_ida_free(&cdrom_ida, scdrom->cdrom_id);
return rt_hw_blk_disk_unregister(&scdrom->parent);
}
File diff suppressed because it is too large Load Diff