drm/amd/psp: Add C2P registers to mp_13_0_2 header
Subsystems (2)
Alex Deucher
maintainerPATCH 1/4 drm/amd/psp: Add C2P registers to mp_13_0_2 header
From: Andrey Grodzovsky <[email protected]>
--- .../include/asic_reg/mp/mp_13_0_2_offset.h | 48 +++++++++++++ .../include/asic_reg/mp/mp_13_0_2_sh_mask.h | 72 +++++++++++++++++++ 2 files changed, 120 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_offset.h +48 -0
@@ -172,6 +172,54 @@#define regMP0_SMN_C2PMSG_102_BASE_IDX 0#define regMP0_SMN_C2PMSG_103 0x00a7#define regMP0_SMN_C2PMSG_103_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_104 0x00a8 +#define regMP0_SMN_C2PMSG_104_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_105 0x00a9 +#define regMP0_SMN_C2PMSG_105_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_106 0x00aa +#define regMP0_SMN_C2PMSG_106_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_107 0x00ab +#define regMP0_SMN_C2PMSG_107_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_108 0x00ac +#define regMP0_SMN_C2PMSG_108_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_109 0x00ad +#define regMP0_SMN_C2PMSG_109_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_110 0x00ae +#define regMP0_SMN_C2PMSG_110_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_111 0x00af +#define regMP0_SMN_C2PMSG_111_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_112 0x00b0 +#define regMP0_SMN_C2PMSG_112_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_113 0x00b1 +#define regMP0_SMN_C2PMSG_113_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_114 0x00b2 +#define regMP0_SMN_C2PMSG_114_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_115 0x00b3 +#define regMP0_SMN_C2PMSG_115_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_116 0x00b4 +#define regMP0_SMN_C2PMSG_116_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_117 0x00b5 +#define regMP0_SMN_C2PMSG_117_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_118 0x00b6 +#define regMP0_SMN_C2PMSG_118_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_119 0x00b7 +#define regMP0_SMN_C2PMSG_119_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_120 0x00b8 +#define regMP0_SMN_C2PMSG_120_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_121 0x00b9 +#define regMP0_SMN_C2PMSG_121_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_122 0x00ba +#define regMP0_SMN_C2PMSG_122_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_123 0x00bb +#define regMP0_SMN_C2PMSG_123_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_124 0x00bc +#define regMP0_SMN_C2PMSG_124_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_125 0x00bd +#define regMP0_SMN_C2PMSG_125_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_126 0x00be +#define regMP0_SMN_C2PMSG_126_BASE_IDX 0 +#define regMP0_SMN_C2PMSG_127 0x00bf +#define regMP0_SMN_C2PMSG_127_BASE_IDX 0#define regMP0_SMN_IH_CREDIT 0x00c1#define regMP0_SMN_IH_CREDIT_BASE_IDX 0#define regMP0_SMN_IH_SW_INT 0x00c2
drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h +72 -0
78 lines not on this page · raw message
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 2/4 drm/amdgpu/psp: Add VBIOS flash handler
From: Andrey Grodzovsky <[email protected]>
Add psp vbflash function for psp v13.
v2: fix warnings
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 ++ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 74 ++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +5 -0
@@ -129,6 +129,7 @@ struct psp_funcsvoid (*ring_set_wptr)(struct psp_context *psp,uint32_t value);int (*load_usbc_pd_fw)(struct psp_context *psp,uint64_t fw_pri_mc_addr);int (*read_usbc_pd_fw)(struct psp_context *psp,uint32_t *fw_ver); +int (*update_spirom)(struct psp_context *psp,uint64_t fw_pri_mc_addr); };#define AMDGPU_XGMI_MAX_CONNECTED_NODES 64
@@ -417,6 +418,10 @@ struct amdgpu_psp_funcs { ((psp)->funcs->read_usbc_pd_fw ? \ (psp)->funcs->read_usbc_pd_fw((psp), fw_ver) : -EINVAL) +#define psp_update_spirom (psp, fw_pri_mc_addr) \ + ((psp)->funcs->update_spirom ? \ + (psp)->funcs->update_spirom((psp), fw_pri_mc_addr) : -EINVAL) +extern const struct amd_ip_funcs psp_ip_funcs;extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +73 -1
92 lines not on this page · raw message
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 3/4 drm/amdgpu/psp: Add vbflash sysfs interface support
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Add sysfs interface to copy VBIOS.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 117 +++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 ++ 4 files changed, 134 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1013,6 +1013,7 @@ struct amdgpu_device {bool pm_sysfs_en;bool ucode_sysfs_en; +bool psp_sysfs_en;/* Chip product information */ char product_number[16 ];
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +10 -0
@@ -3868,6 +3868,14 @@ int amdgpu_device_init(struct amdgpu_device *adev, }else adev->ucode_sysfs_en = true; + r =amdgpu_psp_sysfs_init (adev); +if (r) { + adev->psp_sysfs_en = false; +if (!amdgpu_sriov_vf (adev)) +DRM_ERROR ("Creating psp sysfs failed\n" ); + }else + adev->psp_sysfs_en = true; +/* * Register gpu instance before amdgpu_device_enable_mgpu_fan_boost. * Otherwise the mgpu fan boost feature will be skipped due to the
@@ -4000,6 +4008,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)amdgpu_pm_sysfs_fini (adev);if (adev->ucode_sysfs_en)amdgpu_ucode_sysfs_fini (adev); +if (adev->psp_sysfs_en) +amdgpu_psp_sysfs_fini (adev);sysfs_remove_files (&adev->dev->kobj, amdgpu_dev_attributes);/* disable ras feature must before hw fini */
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +117 -0
135 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
@@ -372,6 +372,9 @@ struct psp_contextstruct psp_memory_training_context mem_train_ctx;uint32_t boot_cfg_bitmask; + +char *vbflash_tmp_buf; +size_t vbflash_image_size; };struct amdgpu_psp_funcs {
@@ -501,4 +504,7 @@ int psp_load_fw_list(struct psp_context *psp,void psp_copy_fw (struct psp_context *psp,uint8_t *start_addr,uint32_t bin_size);int is_psp_fw_valid (struct psp_bin_desc bin); + +int amdgpu_psp_sysfs_init (struct amdgpu_device *adev); +void amdgpu_psp_sysfs_fini (struct amdgpu_device *adev);#endif
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 4/4 drm/amdgpu: add sysfs to shows psp vbflash status
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Add new sysfs interface to shows the status of psp vbflash status.
V2: rename the sysfs interface, and set more return value.
(0: not start; 1: in progress; MBX115 value when vbflash finish)
V3: warning fixes
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 25 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 ++++++ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 ++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +25 -0
@@ -3453,6 +3453,8 @@ static ssize_t amdgpu_psp_vbflash_write(struct file *filp, struct kobject *kobj,struct drm_device *ddev =dev_get_drvdata (dev);struct amdgpu_device *adev =drm_to_adev (ddev); + adev->psp.vbflash_done = false; +/* Safeguard against memory drain */ if (adev->psp.vbflash_image_size >AMD_VBIOS_FILE_MAX_SIZE_B ) {dev_err (adev->dev,"File size cannot exceed %u" ,AMD_VBIOS_FILE_MAX_SIZE_B );
@@ -3524,6 +3526,23 @@ static ssize_t amdgpu_psp_vbflash_read(struct file *filp, struct kobject *kobj,return 0 ; } +static ssize_t amdgpu_psp_vbflash_status (struct device *dev, +struct device_attribute *attr, +char *buf) +{ +struct drm_device *ddev =dev_get_drvdata (dev); +struct amdgpu_device *adev =drm_to_adev (ddev); +uint32_t vbflash_status; + + vbflash_status =psp_vbflash_status (&adev->psp); +if (!adev->psp.vbflash_done) + vbflash_status =0 ; +else if (adev->psp.vbflash_done && !(vbflash_status &0x80000000 )) + vbflash_status =1 ; + +return sysfs_emit (buf,"0x%x\n" , vbflash_status); +} +static const struct bin_attribute psp_vbflash_bin_attr = { .attr = {.name ="psp_vbflash" , .mode =0664 }, .size =0 ,
@@ -3531,6 +3550,8 @@ static const struct bin_attribute psp_vbflash_bin_attr = { .read = amdgpu_psp_vbflash_read, }; +static DEVICE_ATTR(psp_vbflash_status, 0444, amdgpu_psp_vbflash_status, NULL); +int amdgpu_psp_sysfs_init (struct amdgpu_device *adev) {int ret =0 ;
@@ -3549,6 +3570,9 @@ int amdgpu_psp_sysfs_init(struct amdgpu_device *adev) ret =sysfs_create_bin_file (&adev->dev->kobj, &psp_vbflash_bin_attr);if (ret)dev_err (adev->dev,"Failed to create device file psp_vbflash" ); + ret =device_create_file (adev->dev, &dev_attr_psp_vbflash_status); +if (ret) +dev_err (adev->dev,"Failed to create device file psp_vbflash_status" );return ret;default :return 0 ;
@@ -3586,6 +3610,7 @@ static int psp_sysfs_init(struct amdgpu_device *adev)void amdgpu_psp_sysfs_fini (struct amdgpu_device *adev) {sysfs_remove_bin_file (&adev->dev->kobj, &psp_vbflash_bin_attr); +device_remove_file (adev->dev, &dev_attr_psp_vbflash_status); }static void psp_sysfs_fini (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +6 -0
@@ -130,6 +130,7 @@ struct psp_funcsint (*load_usbc_pd_fw)(struct psp_context *psp,uint64_t fw_pri_mc_addr);int (*read_usbc_pd_fw)(struct psp_context *psp,uint32_t *fw_ver);int (*update_spirom)(struct psp_context *psp,uint64_t fw_pri_mc_addr); +int (*vbflash_stat)(struct psp_context *psp); };#define AMDGPU_XGMI_MAX_CONNECTED_NODES 64
@@ -375,6 +376,7 @@ struct psp_contextchar *vbflash_tmp_buf;size_t vbflash_image_size; +bool vbflash_done; };struct amdgpu_psp_funcs {
@@ -425,6 +427,10 @@ struct amdgpu_psp_funcs { ((psp)->funcs->update_spirom ? \ (psp)->funcs->update_spirom((psp), fw_pri_mc_addr) : -EINVAL) +#define psp_vbflash_status (psp) \ + ((psp)->funcs->vbflash_stat ? \ + (psp)->funcs->vbflash_stat((psp)) : -EINVAL) +extern const struct amd_ip_funcs psp_ip_funcs;extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +14 -1
@@ -487,6 +487,9 @@ static int psp_v13_0_exec_spi_cmd(struct psp_context *psp, int cmd)/* Ring the doorbell */ WREG32_SOC15 (MP0 ,0 , regMP0_SMN_C2PMSG_73,1 ); +if (cmd ==C2PMSG_CMD_SPI_UPDATE_FLASH_IMAGE ) +return 0 ; + ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_115),MBOX_READY_FLAG ,MBOX_READY_MASK , false);if (ret) {
@@ -529,6 +532,8 @@ int psp_v13_0_update_spirom(struct psp_context *psp, uint64_t fw_pri_mc_addr)if (ret)return ret; + psp->vbflash_done = true; + ret =psp_v13_0_exec_spi_cmd (psp,C2PMSG_CMD_SPI_UPDATE_FLASH_IMAGE );if (ret)return ret;
@@ -536,6 +541,13 @@ int psp_v13_0_update_spirom(struct psp_context *psp, uint64_t fw_pri_mc_addr)return 0 ; } +int psp_v13_0_vbflash_status (struct psp_context *psp) +{ +struct amdgpu_device *adev = psp->adev; + +return RREG32_SOC15 (MP0 ,0 , regMP0_SMN_C2PMSG_115); +} +static const struct psp_funcs psp_v13_0_funcs = { .init_microcode = psp_v13_0_init_microcode, .bootloader_load_kdb = psp_v13_0_bootloader_load_kdb,
@@ -553,7 +565,8 @@ static const struct psp_funcs psp_v13_0_funcs = { .ring_set_wptr = psp_v13_0_ring_set_wptr, .load_usbc_pd_fw = psp_v13_0_load_usbc_pd_fw, .read_usbc_pd_fw = psp_v13_0_read_usbc_pd_fw, - .update_spirom = psp_v13_0_update_spirom + .update_spirom = psp_v13_0_update_spirom, + .vbflash_stat = psp_v13_0_vbflash_status };void psp_v13_0_set_psp_funcs (struct psp_context *psp)
Signature · 1 line
2.35.1