2 files changed, 30 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 87d52060fec0..2eb8f92704b4 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -83,6 +83,7 @@ enum ps3_dev_type {
         PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
         PS3_DEV_TYPE_SB_GPIO = 6,
         PS3_DEV_TYPE_STOR_FLASH = TYPE_RBC,     /* 14 */
+        PS3_DEV_TYPE_STOR_DUMMY = 32,
         PS3_DEV_TYPE_NOACCESS = 255,
 };
 
diff --git a/arch/powerpc/platforms/ps3/repository.c b/arch/powerpc/platforms/ps3/repository.c
index 8cc37cfea0f2..1c94824f7b63 100644
--- a/arch/powerpc/platforms/ps3/repository.c
+++ b/arch/powerpc/platforms/ps3/repository.c
@@ -349,6 +349,35 @@ int ps3_repository_find_device(struct ps3_repository_device *repo)
                 return result;
         }
 
+        if (tmp.bus_type == PS3_BUS_TYPE_STORAGE) {
+                /*
+                 * A storage device may show up in the repository before the
+                 * hypervisor has finished probing its type and regions
+                 */
+                unsigned int num_regions;
+
+                if (tmp.dev_type == PS3_DEV_TYPE_STOR_DUMMY) {
+                        pr_debug("%s:%u storage device not ready\n", __func__,
+                                 __LINE__);
+                        return -ENODEV;
+                }
+
+                result = ps3_repository_read_stor_dev_num_regions(tmp.bus_index,
+                                                                  tmp.dev_index,
+                                                                  &num_regions);
+                if (result) {
+                        pr_debug("%s:%d read_stor_dev_num_regions failed\n",
+                                 __func__, __LINE__);
+                        return result;
+                }
+
+                if (!num_regions) {
+                        pr_debug("%s:%u storage device has no regions yet\n",
+                                 __func__, __LINE__);
+                        return -ENODEV;
+                }
+        }
+
         result = ps3_repository_read_dev_id(tmp.bus_index, tmp.dev_index,
                 &tmp.dev_id);