From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Chengming Gui <Jack.Gui@amd.com>,
Hawking Zhang <Hawking.Zhang@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie,
daniel@ffwll.ch, Likun.Gao@amd.com, john.clements@amd.com,
candice.li@amd.com, guchun.chen@amd.com, tao.zhou1@amd.com,
Bokun.Zhang@amd.com, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.15 17/21] drm/amd/amdgpu: skip ucode loading if ucode_size == 0
Date: Sat, 10 Sep 2022 17:17:48 -0400 [thread overview]
Message-ID: <20220910211752.70291-17-sashal@kernel.org> (raw)
In-Reply-To: <20220910211752.70291-1-sashal@kernel.org>
From: Chengming Gui <Jack.Gui@amd.com>
[ Upstream commit 39c84b8e929dbd4f63be7e04bf1a2bcd92b44177 ]
Restrict the ucode loading check to avoid frontdoor loading error.
Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 57e9932d8a04e..dcb4ad6ecc37b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2505,7 +2505,7 @@ static int psp_load_smu_fw(struct psp_context *psp)
static bool fw_load_skip_check(struct psp_context *psp,
struct amdgpu_firmware_info *ucode)
{
- if (!ucode->fw)
+ if (!ucode->fw || !ucode->ucode_size)
return true;
if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC &&
--
2.35.1
next prev parent reply other threads:[~2022-09-10 21:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-10 21:17 [PATCH AUTOSEL 5.15 01/21] Input: goodix - add support for GT1158 Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 02/21] platform/surface: aggregator_registry: Add support for Surface Laptop Go 2 Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 03/21] drm/msm/rd: Fix FIFO-full deadlock Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 04/21] hwmon: (pmbus) Use dev_err_probe() to filter -EPROBE_DEFER error messages Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 05/21] dt-bindings: iio: gyroscope: bosch,bmg160: correct number of pins Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 06/21] HID: asus: ROG NKey: Ignore portion of 0x5a report Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 07/21] HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 08/21] hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 09/21] HID: thrustmaster: Add sparco wheel and fix array length Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 10/21] HID: AMD_SFH: Add a DMI quirk entry for Chromebooks Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 11/21] HID: add Lenovo Yoga C630 battery quirk Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 12/21] tg3: Disable tg3 device on system reboot to avoid triggering AER Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 13/21] gpio: mockup: remove gpio debugfs when remove device Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 14/21] ieee802154: cc2520: add rc code in cc2520_tx() Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 15/21] Input: iforce - add support for Boeder Force Feedback Wheel Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 16/21] nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change() Sasha Levin
2022-09-10 21:17 ` Sasha Levin [this message]
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 18/21] net: dsa: hellcreek: Print warning only once Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 19/21] perf/arm_pmu_platform: fix tests for platform_get_irq() failure Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 20/21] platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Sasha Levin
2022-09-10 21:17 ` [PATCH AUTOSEL 5.15 21/21] usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220910211752.70291-17-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Bokun.Zhang@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=Jack.Gui@amd.com \
--cc=Likun.Gao@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=candice.li@amd.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=guchun.chen@amd.com \
--cc=john.clements@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tao.zhou1@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox