Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions drivers/accel/amdxdna/amdxdna_pci_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@ MODULE_FIRMWARE("amdnpu/17f1_10/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_10/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_13/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_13/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_14/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_14/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_15/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f1_15/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_10/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_10/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_13/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_13/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_14/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_14/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_15/npu.dev.sbin");
MODULE_FIRMWARE("amdnpu/17f2_15/cert.dev.sbin");
MODULE_FIRMWARE("amdnpu/1b0a_00/npu.dev.sbin");
Expand Down Expand Up @@ -107,6 +111,9 @@ static const struct amdxdna_device_id amdxdna_ids[] = {
{ 0x17f1, 0x13, &dev_npu9_classic_info },
{ 0x17f2, 0x13, &dev_npu9_pf_info },
{ 0x17f3, 0x13, &dev_npu9_vf_info },
{ 0x17f1, 0x14, &dev_npu10_classic_info },
{ 0x17f2, 0x14, &dev_npu10_pf_info },
{ 0x17f3, 0x14, &dev_npu10_vf_info },
{ 0x17f1, 0x15, &dev_npu11_classic_info },
{ 0x17f2, 0x15, &dev_npu11_pf_info },
{ 0x17f3, 0x15, &dev_npu11_vf_info },
Expand Down
3 changes: 3 additions & 0 deletions drivers/accel/amdxdna/amdxdna_pci_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ extern const struct amdxdna_dev_info dev_npu6_info;
extern const struct amdxdna_dev_info dev_npu9_classic_info;
extern const struct amdxdna_dev_info dev_npu9_pf_info;
extern const struct amdxdna_dev_info dev_npu9_vf_info;
extern const struct amdxdna_dev_info dev_npu10_classic_info;
extern const struct amdxdna_dev_info dev_npu10_pf_info;
extern const struct amdxdna_dev_info dev_npu10_vf_info;
extern const struct amdxdna_dev_info dev_npu11_classic_info;
extern const struct amdxdna_dev_info dev_npu11_pf_info;
extern const struct amdxdna_dev_info dev_npu11_vf_info;
Expand Down
45 changes: 45 additions & 0 deletions drivers/accel/amdxdna/npu3_regs.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,51 @@ const struct amdxdna_dev_info dev_npu9_classic_info = {
.async_max_status_code = MAX_AIE4_MSG_STATUS_CODE,
};

const struct amdxdna_dev_info dev_npu10_pf_info = {
.mbox_bar = NPU3_MBOX_BAR,
.sram_bar = NPU3_MBOX_BUFFER_BAR,
.psp_bar = NPU3_PSP_BAR_INDEX,
.smu_bar = NPU3_SMU_BAR_INDEX,
.default_vbnv = "RyzenAI-npu10-pf",
.device_type = AMDXDNA_DEV_TYPE_PF,
.dev_priv = &npu3_dev_priv,
.fw_feature_tbl = npu3_fw_feature_table,
.cert_feature_tbl = npu3_cert_feature_table,
.ops = &aie4_pf_ops,
.luts = &aie4_error_luts,
.async_max_status_code = MAX_AIE4_MSG_STATUS_CODE,
};

const struct amdxdna_dev_info dev_npu10_vf_info = {
.mbox_bar = NPU3_MBOX_BAR,
.sram_bar = NPU3_MBOX_BUFFER_BAR,
.doorbell_bar = NPU3_DOORBELL_BAR,
.default_vbnv = "RyzenAI-npu10-vf",
.device_type = AMDXDNA_DEV_TYPE_UMQ,
.dev_priv = &npu3_dev_vf_priv,
.fw_feature_tbl = npu3_fw_feature_table,
.cert_feature_tbl = npu3_cert_feature_table,
.ops = &aie4_vf_ops,
.luts = &aie4_error_luts,
.async_max_status_code = MAX_AIE4_MSG_STATUS_CODE,
};

const struct amdxdna_dev_info dev_npu10_classic_info = {
.mbox_bar = NPU3_MBOX_BAR,
.sram_bar = NPU3_MBOX_BUFFER_BAR,
.psp_bar = NPU3_PSP_BAR_INDEX,
.smu_bar = NPU3_SMU_BAR_INDEX,
.doorbell_bar = NPU3_DOORBELL_BAR,
.default_vbnv = "RyzenAI-npu10",
.device_type = AMDXDNA_DEV_TYPE_UMQ,
.dev_priv = &npu3_dev_priv,
.fw_feature_tbl = npu3_fw_feature_table,
.cert_feature_tbl = npu3_cert_feature_table,
.ops = &aie4_classic_ops,
.luts = &aie4_error_luts,
.async_max_status_code = MAX_AIE4_MSG_STATUS_CODE,
};

const struct amdxdna_dev_info dev_npu11_pf_info = {
.mbox_bar = NPU3_MBOX_BAR,
.sram_bar = NPU3_MBOX_BUFFER_BAR,
Expand Down
32 changes: 32 additions & 0 deletions tools/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,38 @@
"version": "1.5.0.39",
"fw_name": "cert.dev.sbin"
},
{
"device": "npu10",
"url": "https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/17f1_14/npu.sbin.2.9.0.1",
"pci_device_id": "17f1",
"pci_revision_id": "14",
"version": "2.9.0.1",
"fw_name": "npu.dev.sbin"
},
{
"device": "npu10",
"url": "https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/17f1_14/cert.sbin.1.5.0.39",
"pci_device_id": "17f1",
"pci_revision_id": "14",
"version": "1.5.0.39",
"fw_name": "cert.dev.sbin"
},
{
"device": "npu10",
"url": "https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/17f2_14/npu.sbin.2.9.0.1",
"pci_device_id": "17f2",
"pci_revision_id": "14",
"version": "2.9.0.1",
"fw_name": "npu.dev.sbin"
},
{
"device": "npu10",
"url": "https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/17f2_14/cert.sbin.1.5.0.39",
"pci_device_id": "17f2",
"pci_revision_id": "14",
"version": "1.5.0.39",
"fw_name": "cert.dev.sbin"
},
{
"device": "npu11",
"url": "https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/17f1_13/npu.sbin.2.5.0.172",
Expand Down