Merge tag 'v2025.01-rc3' into next

[u-boot.git] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index f858f09f1a0eabfefcb35a2d038fffa9a106b700..c663e7df94234744c9c3c16d6746dcad869da76f 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -1,14 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007-2008 Semihalf
  *
  * Written by: Rafal Jaworowski <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <config.h>
-#include <common.h>
 #include <api_public.h>
+#include <part.h>
+#include <scsi.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>
@@ -25,7 +26,6 @@
 
 #define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
 
-
 #define ENUM_IDE       0
 #define ENUM_USB       1
 #define ENUM_SCSI      2
@@ -43,7 +43,6 @@ struct stor_spec {
 
 static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
 
-
 void dev_stor_init(void)
 {
 #if defined(CONFIG_IDE)
@@ -60,20 +59,13 @@ void dev_stor_init(void)
        specs[ENUM_MMC].type = DEV_TYP_STOR | DT_STOR_MMC;
        specs[ENUM_MMC].name = "mmc";
 #endif
-#if defined(CONFIG_CMD_SATA)
+#if defined(CONFIG_SATA)
        specs[ENUM_SATA].max_dev = CONFIG_SYS_SATA_MAX_DEVICE;
        specs[ENUM_SATA].enum_started = 0;
        specs[ENUM_SATA].enum_ended = 0;
        specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
        specs[ENUM_SATA].name = "sata";
 #endif
-#if defined(CONFIG_SCSI)
-       specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
-       specs[ENUM_SCSI].enum_started = 0;
-       specs[ENUM_SCSI].enum_ended = 0;
-       specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
-       specs[ENUM_SCSI].name = "scsi";
-#endif
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
        specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
        specs[ENUM_USB].enum_started = 0;
@@ -97,6 +89,7 @@ static int dev_stor_get(int type, int *more, struct device_info *di)
 {
        struct blk_desc *dd;
        int found = 0;
+       int found_last = 0;
        int i = 0;
 
        /* Wasn't configured for this type, return 0 directly */
@@ -109,9 +102,13 @@ static int dev_stor_get(int type, int *more, struct device_info *di)
                        if (di->cookie ==
                            (void *)blk_get_dev(specs[type].name, i)) {
                                i += 1;
+                               found_last = 1;
                                break;
                        }
                }
+
+               if (!found_last)
+                       i = 0;
        }
 
        for (; i < specs[type].max_dev; i++) {
@@ -146,7 +143,6 @@ static int dev_stor_get(int type, int *more, struct device_info *di)
        return found;
 }
 
-
 /* returns: ENUM_IDE, ENUM_USB etc. based on struct blk_desc */
 
 static int dev_stor_type(struct blk_desc *dd)
@@ -161,7 +157,6 @@ static int dev_stor_type(struct blk_desc *dd)
        return ENUM_MAX;
 }
 
-
 /* returns: 0/1 whether cookie points to some device in this group */
 
 static int dev_is_stor(int type, struct device_info *di)
@@ -169,7 +164,6 @@ static int dev_is_stor(int type, struct device_info *di)
        return (dev_stor_type(di->cookie) == type) ? 1 : 0;
 }
 
-
 static int dev_enum_stor(int type, struct device_info *di)
 {
        int found = 0, more = 0;
@@ -295,7 +289,6 @@ static int dev_stor_is_valid(int type, struct blk_desc *dd)
        return 0;
 }
 
-
 int dev_open_stor(void *cookie)
 {
        int type = dev_stor_type(cookie);
@@ -309,7 +302,6 @@ int dev_open_stor(void *cookie)
        return API_ENODEV;
 }
 
-
 int dev_close_stor(void *cookie)
 {
        /*
@@ -319,7 +311,6 @@ int dev_close_stor(void *cookie)
        return 0;
 }
 
-
 lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
 {
        int type;
@@ -342,3 +333,26 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
        return dd->block_read(dd, start, len, buf);
 #endif /* defined(CONFIG_BLK) */
 }
+
+lbasize_t dev_write_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
+{
+       struct blk_desc *dd = (struct blk_desc *)cookie;
+       int type = dev_stor_type(dd);
+
+       if (type == ENUM_MAX)
+               return 0;
+
+       if (!dev_stor_is_valid(type, dd))
+               return 0;
+
+#ifdef CONFIG_BLK
+       return blk_dwrite(dd, start, len, buf);
+#else
+       if (dd->block_write == NULL) {
+               debugf("no block_write() for device 0x%08x\n", cookie);
+               return 0;
+       }
+
+       return dd->block_write(dd, start, len, buf);
+#endif /* defined(CONFIG_BLK) */
+}