From patchwork Mon Mar 15 14:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 12139709 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A61FAC433E0 for ; Mon, 15 Mar 2021 14:46:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6802064EE5 for ; Mon, 15 Mar 2021 14:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229692AbhCOOpc (ORCPT ); Mon, 15 Mar 2021 10:45:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238792AbhCOOpA (ORCPT ); Mon, 15 Mar 2021 10:45:00 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4F5AC06175F for ; Mon, 15 Mar 2021 07:44:59 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id 81so33595140iou.11 for ; Mon, 15 Mar 2021 07:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qcipKqoWFtXpAVNkD1RaOe/O477VWQDhGe2XtwR99R8=; b=VOANSum6tBUc4oeU0vZzYdu6gNSlNaS8t0Je6WSl9k/oIRbtXT9x7Su/krafehnybC W4VzQMmEvcCJ+b4wvXh4UHMY3m1eCvB4XMsfEyml896H9eZl+Nm+LFW1sfuVBa8OGgmY noiTsAVuMT0VHM37FHbqEr2i+8YdrCGM/ocJJ8/2lHn3oUog90Smx0d9Rz7C/W7hIbm6 DJ9VDd+oN9jbo+x902kw2OLDa85ueuyDfCSxJUuRvAPlSny2SwSPPKkfk1/ioXENm771 BGBWjvIDTBRiUYRO6ZxwYrfaGB/uhF70kZ3Ub7Hvh92sU4thYI0J3aJ2QHn/nBCgOk7d X9Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qcipKqoWFtXpAVNkD1RaOe/O477VWQDhGe2XtwR99R8=; b=evgMLjptbx8Bo+iU7pGXxyzGxpS0wwjYENAvnhhh1xanTSR98owzZFTgNECjGYJy0V sK06Kj6x01TiVF9FDPwVfETWqu0FcuU9BYV6I4Q51UB5OE6fWdQhzfaqQwat/L3eloyT fcBoauho7DZ3VX7kA5BSLO00RVEAiEQZcAtGjhTIPlZpmRH2TjW4ymVm1xJpHcasYkGK q3Bs/sjpGbklnlFcBTpOsSJFuPhxjMmXGVJukSxFj5nHePaQhUP2JQi9kpCdRY9kDK0C rdEMqQS8jOmLOG9xZUd4HB7BiPNQ9evAoTjUXOrJyRQOw/XD3Bk13Ncqsu1sC7rULad9 nLUw== X-Gm-Message-State: AOAM532rxUwws+al8zLsqQH6rw8EyR4yLINszncb67XNuzi8VNPl6GCj ycsnPfS5Tq4nFHF2mhmrQWfcuDRv7xlOQA== X-Google-Smtp-Source: ABdhPJz7qpMEGoyaaD3AxzRtxEGesDLehqgc8LoD2FkPG8kPHnAtQUj6VwvsoPXmoHi2pb52ETN8gg== X-Received: by 2002:a05:6602:21cd:: with SMTP id c13mr7325782ioc.44.1615819498793; Mon, 15 Mar 2021 07:44:58 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id a4sm6474074iow.55.2021.03.15.07.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 07:44:58 -0700 (PDT) From: Alex Elder To: bjorn.andersson@linaro.org, agross@kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] soc: qcom: mdt_loader: be more informative on errors Date: Mon, 15 Mar 2021 09:44:55 -0500 Message-Id: <20210315144455.1770492-1-elder@linaro.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In __qcom_mdt_load() there are cases where an error occurs that cause a message to be printed. In some of those cases the errno value can be helpful to understand exactly what caused the problem. Print the errno (as well as the firmware file name) where it is helpful, and in a few cases reword the error message. Consistently use the private fw_name for the file name. Signed-off-by: Alex Elder --- drivers/soc/qcom/mdt_loader.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/soc/qcom/mdt_loader.c b/drivers/soc/qcom/mdt_loader.c index 24cd193dec550..22b8116a1c424 100644 --- 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; } } @@ -235,9 +241,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; } @@ -249,7 +254,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; }