tests: usbh: msc: Extended msc test suite with error paths

Signed-off-by: Mattia Maldini <mattia.m@embedd.it>

Author: mattiam-del

subsys/usb/host/class/usbh_msc.c

@@ -617,9 +617,9 @@ static int check_sense(struct driver_data *driver_data, uint8_t lun_index)
 		    sense_data.additional_sense_code == SCSI_SENSE_DATA_ASC_NOT_READY_TO_READY) {
 			result = -EAGAIN;
 		}
-		/* Somehow medium was removed */
+		/* Medium error, may disappear on retry */
 		else if (sense_data.sense_key == SCSI_SENSE_DATA_KEY_MEDIUM_ERROR) {
-			result = -ENOMEDIUM;
+			result = -EIO;
 		} else if (sense_data.additional_sense_code ==
 			   SCSI_SENSE_DATA_ASC_MEDIUM_NOT_PRESENT) {
 			result = -ENOMEDIUM;

tests/subsys/usb/msc/CMakeLists.txt

@@ -16,5 +16,5 @@ target_include_directories(app PRIVATE ${ZEPHYR_BASE}/subsys/usb/host)
 target_sources(app PRIVATE src/msc.c)
 
 if(${BOARD} STREQUAL "native_sim")
-    target_sources(app PRIVATE src/ram_disk.c)
+    target_sources(app PRIVATE src/ram_disk.c src/fault_disk.c)
 endif()

tests/subsys/usb/msc/Kconfig

@@ -6,7 +6,7 @@ config SYS_CLOCK_TICKS_PER_SEC
 
 config TEST_NUM_LUN
 	int
-	default 2 if BOARD_NATIVE_SIM
+	default 3 if BOARD_NATIVE_SIM
 	default 1
 
 # Source common USB sample options used to initialize new experimental USB

tests/subsys/usb/msc/prj.conf

@@ -16,8 +16,8 @@ CONFIG_USBH_MSC_CLASS=y
 CONFIG_UART_LINE_CTRL=y
 
 CONFIG_USBD_MSC_CLASS=y
-CONFIG_USBH_MSC_MAX_SUPPORTED_LUN=2
-CONFIG_USBD_MSC_LUNS_PER_INSTANCE=2
+CONFIG_USBH_MSC_MAX_SUPPORTED_LUN=3
+CONFIG_USBD_MSC_LUNS_PER_INSTANCE=3
 CONFIG_USBD_MSC_SCSI_BUFFER_SIZE=1024
 CONFIG_FS_FATFS_MAX_SS=1024
 CONFIG_FILE_SYSTEM=y
@@ -35,7 +35,7 @@ CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_FS_FATFS_CUSTOM_MOUNT_POINT_COUNT=4
 CONFIG_FS_FATFS_CUSTOM_MOUNT_POINTS="RAM0,RAM1,USB0_0,USB0_1"
 
-CONFIG_USBH_MSC_LOG_LEVEL_DBG=y
+CONFIG_USBH_MSC_LOG_LEVEL_INF=y
 CONFIG_USBH_LOG_LEVEL_INF=y
 CONFIG_UHC_DRIVER_LOG_LEVEL_INF=y
 

tests/subsys/usb/msc/src/fault_disk.c

@@ -0,0 +1,142 @@
+/*
+ * SPDX-FileCopyrightText: Copyright 2026 Renesas, Embedd
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <string.h>
+
+#include <zephyr/kernel.h>
+#include <zephyr/usb/class/usbd_msc.h>
+#include <zephyr/drivers/disk.h>
+#include <zephyr/storage/disk_access.h>
+
+#include "fault_disk.h"
+
+#define FAULT_DISK_SECTOR_SIZE  512u
+#define FAULT_DISK_SECTOR_COUNT 64u
+
+/*
+ * `USBD_DEFINE_MSC_LUN(id, ...)` places its LUN in the `usbd_msc_lun` iterable section, which
+ * the linker sorts alphabetically by the resulting `usbd_msc_lun_##id` symbol name (SORT_BY_NAME,
+ * see include/zephyr/linker/iterable_sections.h) -- NOT by declaration/link order. This id is
+ * chosen to sort after ram_disk.c's "ram0"/"ram1" so this LUN lands last (index CONFIG_TEST_NUM_LUN
+ * - 1, i.e. "USB0_2"), matching DISK_DRIVE_NAME_FAULT in msc.c.
+ */
+USBD_DEFINE_MSC_LUN(zzz_fault, FAULT_DISK_NAME, "Zephyr", "FaultDisk", "0.00");
+
+static uint8_t backing[FAULT_DISK_SECTOR_COUNT][FAULT_DISK_SECTOR_SIZE];
+
+/* -1: report the real status; otherwise the DISK_STATUS_* value to report instead */
+static int status_override = -1;
+static bool read_should_fail;
+static bool write_should_fail;
+
+static int fault_disk_init(struct disk_info *disk)
+{
+	ARG_UNUSED(disk);
+
+	return 0;
+}
+
+static int fault_disk_status(struct disk_info *disk)
+{
+	ARG_UNUSED(disk);
+
+	return status_override >= 0 ? status_override : DISK_STATUS_OK;
+}
+
+static int fault_disk_read(struct disk_info *disk, uint8_t *data_buf, uint32_t start_sector,
+			   uint32_t num_sector)
+{
+	ARG_UNUSED(disk);
+
+	if (read_should_fail) {
+		return -EIO;
+	}
+
+	if (start_sector + num_sector > FAULT_DISK_SECTOR_COUNT) {
+		return -EINVAL;
+	}
+
+	memcpy(data_buf, backing[start_sector], (size_t)num_sector * FAULT_DISK_SECTOR_SIZE);
+
+	return 0;
+}
+
+static int fault_disk_write(struct disk_info *disk, const uint8_t *data_buf, uint32_t start_sector,
+			    uint32_t num_sector)
+{
+	ARG_UNUSED(disk);
+
+	if (write_should_fail) {
+		return -EIO;
+	}
+
+	if (start_sector + num_sector > FAULT_DISK_SECTOR_COUNT) {
+		return -EINVAL;
+	}
+
+	memcpy(backing[start_sector], data_buf, (size_t)num_sector * FAULT_DISK_SECTOR_SIZE);
+
+	return 0;
+}
+
+static int fault_disk_ioctl(struct disk_info *disk, uint8_t cmd, void *buff)
+{
+	ARG_UNUSED(disk);
+
+	switch (cmd) {
+	case DISK_IOCTL_GET_SECTOR_COUNT:
+		*(uint32_t *)buff = FAULT_DISK_SECTOR_COUNT;
+		return 0;
+	case DISK_IOCTL_GET_SECTOR_SIZE:
+		*(uint32_t *)buff = FAULT_DISK_SECTOR_SIZE;
+		return 0;
+	case DISK_IOCTL_CTRL_SYNC:
+	case DISK_IOCTL_CTRL_INIT:
+	case DISK_IOCTL_CTRL_DEINIT:
+		return 0;
+	default:
+		return -ENOTSUP;
+	}
+}
+
+static const struct disk_operations fault_disk_ops = {
+	.init = fault_disk_init,
+	.status = fault_disk_status,
+	.read = fault_disk_read,
+	.write = fault_disk_write,
+	.ioctl = fault_disk_ioctl,
+};
+
+static struct disk_info fault_disk_info = {
+	.name = FAULT_DISK_NAME,
+	.ops = &fault_disk_ops,
+};
+
+void fault_disk_setup(void)
+{
+	disk_access_register(&fault_disk_info);
+}
+
+void fault_disk_reset(void)
+{
+	status_override = -1;
+	read_should_fail = false;
+	write_should_fail = false;
+}
+
+void fault_disk_set_status_override(int status)
+{
+	status_override = status;
+}
+
+void fault_disk_set_read_error(bool fail)
+{
+	read_should_fail = fail;
+}
+
+void fault_disk_set_write_error(bool fail)
+{
+	write_should_fail = fail;
+}

tests/subsys/usb/msc/src/fault_disk.h

@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: Copyright 2026 Renesas, Embedd
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef FAULT_DISK_H_INCLUDED
+#define FAULT_DISK_H_INCLUDED
+
+#include <stdbool.h>
+
+/* Disk name as registered with the Disk Access API and exposed as a third MSC LUN */
+#define FAULT_DISK_NAME "FAULT0"
+
+/**
+ * @brief Register the simulated fault-injectable disk
+ */
+void fault_disk_setup(void);
+
+/**
+ * @brief Clear all fault injection, restoring normal disk behavior
+ */
+void fault_disk_reset(void);
+
+/**
+ * @brief Override the value reported by the disk's status callback
+ *
+ * @param status A DISK_STATUS_* value to report, or -1 to report the real (normal) status
+ */
+void fault_disk_set_status_override(int status);
+
+/**
+ * @brief Force (or stop forcing) the next reads to fail
+ *
+ * @param fail true to make reads fail, false to let them succeed normally
+ */
+void fault_disk_set_read_error(bool fail);
+
+/**
+ * @brief Force (or stop forcing) the next writes to fail
+ *
+ * @param fail true to make writes fail, false to let them succeed normally
+ */
+void fault_disk_set_write_error(bool fail);
+
+#endif /* FAULT_DISK_H_INCLUDED */