Merge tag 'drivers-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / soc / qcom / mdt_loader.c

diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c
index eba7f76..bda170d 100644 (file)
--- a/drivers/soc/qcom/mdt_loader.c
+++ b/drivers/soc/qcom/mdt_loader.c
@@ -166,6 +166,8 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
                metadata = qcom_mdt_read_metadata(fw, &metadata_len);
                if (IS_ERR(metadata)) {
                        ret = PTR_ERR(metadata);
+                       dev_err(dev, "error %d reading firmware %s metadata\n",
+                               ret, fw_name);
                        goto out;
                }
 
@@ -173,7 +175,9 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
 
                kfree(metadata);
                if (ret) {
-                       dev_err(dev, "invalid firmware metadata\n");
+                       /* Invalid firmware metadata */
+                       dev_err(dev, "error %d initializing firmware %s\n",
+                               ret, fw_name);
                        goto out;
                }
        }
@@ -199,7 +203,9 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
                        ret = qcom_scm_pas_mem_setup(pas_id, mem_phys,
                                                     max_addr - min_addr);
                        if (ret) {
-                               dev_err(dev, "unable to setup relocation\n");
+                               /* Unable to set up relocation */
+                               dev_err(dev, "error %d setting up firmware %s\n",
+                                       ret, fw_name);
                                goto out;
                        }
                }
@@ -243,9 +249,8 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
                if (phdr->p_filesz && phdr->p_offset < fw->size) {
                        /* Firmware is large enough to be non-split */
                        if (phdr->p_offset + phdr->p_filesz > fw->size) {
-                               dev_err(dev,
-                                       "failed to load segment %d from truncated file %s\n",
-                                       i, firmware);
+                               dev_err(dev, "file %s segment %d would be truncated\n",
+                                       fw_name, i);
                                ret = -EINVAL;
                                break;
                        }
@@ -257,7 +262,8 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw,
                        ret = request_firmware_into_buf(&seg_fw, fw_name, dev,
                                                        ptr, phdr->p_filesz);
                        if (ret) {
-                               dev_err(dev, "failed to load %s\n", fw_name);
+                               dev_err(dev, "error %d loading %s\n",
+                                       ret, fw_name);
                                break;
                        }