RT-Thread
/
rt-thread
mirror of https://github.com/RT-Thread/rt-thread
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[DM/FIXUP] Fixup NVME build 

1. Fixup Kconfig show order.
2. Fix `RT_DECLARE_IRQ_AFFINITY` to `RT_IRQ_AFFINITY_DECLARE`
3. Remove warning.

Signed-off-by: GuEe-GUI <2991707448@qq.com>
This commit is contained in:
GuEe-GUI 2024-12-11 19:40:08 +08:00 committed by Rbb666
parent d248a3a288
commit 0ede1d6c65
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/drivers/Kconfig
View File

@ -25,8 +25,8 @@ rsource "led/Kconfig"
rsource "mailbox/Kconfig"
rsource "phye/Kconfig"
rsource "ata/Kconfig"
rsource "block/Kconfig"
rsource "nvme/Kconfig"
rsource "block/Kconfig"
rsource "scsi/Kconfig"
rsource "regulator/Kconfig"
rsource "reset/Kconfig"

10
components/drivers/nvme/nvme.c
View File

@ -578,7 +578,7 @@ static rt_err_t nvme_blk_sync(struct rt_blk_disk *disk)
static rt_err_t nvme_blk_erase(struct rt_blk_disk *disk)
{
rt_err_t err;
rt_err_t err = RT_EOK;
rt_ssize_t slba, lbas, max_lbas;
struct rt_nvme_command cmd;
struct rt_nvme_device *ndev = rt_disk_to_nvme_device(disk);
@ -955,7 +955,7 @@ static rt_err_t nvme_setup_io_queues(struct rt_nvme_controller *nvme)
int irq, cpuid = 0;
char name[RT_NAME_MAX];
rt_bool_t affinity_fixup = RT_FALSE;
RT_DECLARE_IRQ_AFFINITY(affinity) = { 0 };
RT_IRQ_AFFINITY_DECLARE(affinity) = { 0 };
struct rt_nvme_queue *queue;
nvme->io_queue_max = nvme->irqs_nr > 1 ? nvme->irqs_nr - 1 : 1;
@ -1052,7 +1052,7 @@ static void nvme_remove_devices(struct rt_nvme_controller *nvme)
static rt_err_t nvme_scan_device(struct rt_nvme_controller *nvme,
rt_size_t number_of_ns)
{
rt_err_t err;
rt_err_t err = RT_EOK;
rt_uint32_t lbaf;
struct rt_nvme_id_ns *id = RT_NULL;
@ -1272,8 +1272,8 @@ static int nvme_queue_affinify_fixup(void)
{
int cpuid = rt_hw_cpu_id();
struct rt_nvme_controller *nvme;
RT_DECLARE_IRQ_AFFINITY(affinity) = { 0 };
RT_DECLARE_IRQ_AFFINITY(current_affinity) = { 0 };
RT_IRQ_AFFINITY_DECLARE(affinity) = { 0 };
RT_IRQ_AFFINITY_DECLARE(current_affinity) = { 0 };
RT_IRQ_AFFINITY_SET(affinity, cpuid);