Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
accel/amdxdna: Use a different name for latest firmware
Using legacy driver with latest firmware causes a power off issue.
Fix this by assigning a different filename (npu_7.sbin) to the latest
firmware. The driver attempts to load the latest firmware first and falls
back to the previous firmware version if loading fails.
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/5009
Fixes: f1eac46fe5f7 ("accel/amdxdna: Update firmware version check for latest firmware")
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://patch.msgid.link/20260225204752.2711734-1-lizhi.hou@amd.com
+26
-5
+19
-1
drivers/accel/amdxdna/aie2_pci.c
+19
-1
drivers/accel/amdxdna/aie2_pci.c
···
32
32
module_param(aie2_max_col, uint, 0600);
33
33
MODULE_PARM_DESC(aie2_max_col, "Maximum column could be used");
34
34
35
+
static char *npu_fw[] = {
36
+
"npu_7.sbin",
37
+
"npu.sbin"
38
+
};
39
+
35
40
/*
36
41
* The management mailbox channel is allocated by firmware.
37
42
* The related register and ring buffer information is on SRAM BAR.
···
494
489
struct psp_config psp_conf;
495
490
const struct firmware *fw;
496
491
unsigned long bars = 0;
492
+
char *fw_full_path;
497
493
int i, nvec, ret;
498
494
499
495
if (!hypervisor_is_type(X86_HYPER_NATIVE)) {
···
509
503
ndev->priv = xdna->dev_info->dev_priv;
510
504
ndev->xdna = xdna;
511
505
512
-
ret = request_firmware(&fw, ndev->priv->fw_path, &pdev->dev);
506
+
for (i = 0; i < ARRAY_SIZE(npu_fw); i++) {
507
+
fw_full_path = kasprintf(GFP_KERNEL, "%s%s", ndev->priv->fw_path, npu_fw[i]);
508
+
if (!fw_full_path)
509
+
return -ENOMEM;
510
+
511
+
ret = firmware_request_nowarn(&fw, fw_full_path, &pdev->dev);
512
+
kfree(fw_full_path);
513
+
if (!ret) {
514
+
XDNA_INFO(xdna, "Load firmware %s%s", ndev->priv->fw_path, npu_fw[i]);
515
+
break;
516
+
}
517
+
}
518
+
513
519
if (ret) {
514
520
XDNA_ERR(xdna, "failed to request_firmware %s, ret %d",
515
521
ndev->priv->fw_path, ret);
+3
drivers/accel/amdxdna/amdxdna_pci_drv.c
+3
drivers/accel/amdxdna/amdxdna_pci_drv.c
···
23
23
MODULE_FIRMWARE("amdnpu/17f0_10/npu.sbin");
24
24
MODULE_FIRMWARE("amdnpu/17f0_11/npu.sbin");
25
25
MODULE_FIRMWARE("amdnpu/17f0_20/npu.sbin");
26
+
MODULE_FIRMWARE("amdnpu/1502_00/npu_7.sbin");
27
+
MODULE_FIRMWARE("amdnpu/17f0_10/npu_7.sbin");
28
+
MODULE_FIRMWARE("amdnpu/17f0_11/npu_7.sbin");
26
29
27
30
/*
28
31
* 0.0: Initial version
+1
-1
drivers/accel/amdxdna/npu1_regs.c
+1
-1
drivers/accel/amdxdna/npu1_regs.c
+1
-1
drivers/accel/amdxdna/npu4_regs.c
+1
-1
drivers/accel/amdxdna/npu4_regs.c
+1
-1
drivers/accel/amdxdna/npu5_regs.c
+1
-1
drivers/accel/amdxdna/npu5_regs.c
···
63
63
#define NPU5_SRAM_BAR_BASE MMNPU_APERTURE1_BASE
64
64
65
65
static const struct amdxdna_dev_priv npu5_dev_priv = {
66
-
.fw_path = "amdnpu/17f0_11/npu.sbin",
66
+
.fw_path = "amdnpu/17f0_11/",
67
67
.rt_config = npu4_default_rt_cfg,
68
68
.dpm_clk_tbl = npu4_dpm_clk_table,
69
69
.fw_feature_tbl = npu4_fw_feature_table,
+1
-1
drivers/accel/amdxdna/npu6_regs.c
+1
-1
drivers/accel/amdxdna/npu6_regs.c
···
63
63
#define NPU6_SRAM_BAR_BASE MMNPU_APERTURE1_BASE
64
64
65
65
static const struct amdxdna_dev_priv npu6_dev_priv = {
66
-
.fw_path = "amdnpu/17f0_10/npu.sbin",
66
+
.fw_path = "amdnpu/17f0_10/",
67
67
.rt_config = npu4_default_rt_cfg,
68
68
.dpm_clk_tbl = npu4_dpm_clk_table,
69
69
.fw_feature_tbl = npu4_fw_feature_table,