| Message ID | 20230103221852.22813-6-mario.limonciello@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Recover from failure to probe GPU | expand |
On 1/4/2023 3:48 AM, Mario Limonciello wrote: > All microcode runs a basic validation after it's been loaded. Each > IP block as part of init will run both. > > Introduce a wrapper for request_firmware and amdgpu_ucode_validate. > This wrapper will also remap any error codes from request_firmware > to -ENODEV. This is so that early_init will fail if firmware couldn't > be loaded instead of the IP block being disabled. > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > --- > v3-v4: > * New patch > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 24 +++++++++++++++++++++++ > drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + > 2 files changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c > index eafcddce58d3..8c4a7b09e344 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c > @@ -1312,3 +1312,27 @@ void amdgpu_ucode_ip_version_decode(struct amdgpu_device *adev, int block_type, > > snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, rev); > } > + > +/* > + * amdgpu_ucode_load - Load and validate amdgpu microcode > + * > + * @adev: amdgpu device > + * @fw: pointer to load firmware to > + * @fw_name: firmware to load > + * > + * This is a helper that will use request_firmware and amdgpu_ucode_validate > + * to load and run basic validation on firmware. If the load fails, remap > + * the error code to -ENODEV, so that early_init functions will fail to load. > + */ > +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct firmware **fw, char *fw_name) 'load' also takes a different meaning of loading firmware to ASIC. Maybe keep it as 'get' and keep another corresponding common 'put' for release_firmware? Thanks, Lijo > +{ > + int err = request_firmware(fw, fw_name, adev->dev); > + > + if (err) > + return -ENODEV; > + err = amdgpu_ucode_validate(*fw); > + if (err) > + dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); > + > + return err; > +} > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h > index 552e06929229..b9139fb44506 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h > @@ -544,6 +544,7 @@ void amdgpu_ucode_print_sdma_hdr(const struct common_firmware_header *hdr); > void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr); > void amdgpu_ucode_print_gpu_info_hdr(const struct common_firmware_header *hdr); > int amdgpu_ucode_validate(const struct firmware *fw); > +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct firmware **fw, char *fw_name); > bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr, > uint16_t hdr_major, uint16_t hdr_minor); >
Am 04.01.23 um 05:53 schrieb Lazar, Lijo: > > > On 1/4/2023 3:48 AM, Mario Limonciello wrote: >> All microcode runs a basic validation after it's been loaded. Each >> IP block as part of init will run both. >> >> Introduce a wrapper for request_firmware and amdgpu_ucode_validate. >> This wrapper will also remap any error codes from request_firmware >> to -ENODEV. This is so that early_init will fail if firmware couldn't >> be loaded instead of the IP block being disabled. >> >> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> >> --- >> v3-v4: >> * New patch >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 24 +++++++++++++++++++++++ >> drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + >> 2 files changed, 25 insertions(+) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> index eafcddce58d3..8c4a7b09e344 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c >> @@ -1312,3 +1312,27 @@ void amdgpu_ucode_ip_version_decode(struct >> amdgpu_device *adev, int block_type, >> snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, >> rev); >> } >> + >> +/* >> + * amdgpu_ucode_load - Load and validate amdgpu microcode >> + * >> + * @adev: amdgpu device >> + * @fw: pointer to load firmware to >> + * @fw_name: firmware to load >> + * >> + * This is a helper that will use request_firmware and >> amdgpu_ucode_validate >> + * to load and run basic validation on firmware. If the load fails, >> remap >> + * the error code to -ENODEV, so that early_init functions will fail >> to load. >> + */ >> +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct >> firmware **fw, char *fw_name) > > 'load' also takes a different meaning of loading firmware to ASIC. > Maybe keep it as 'get' and keep another corresponding common 'put' for > release_firmware? get/put are usually used for reference counting, how about sticking with request/release instead? That's used by the underlying functionality as well IIRC. Christian. > > Thanks, > Lijo > >> +{ >> + int err = request_firmware(fw, fw_name, adev->dev); >> + >> + if (err) >> + return -ENODEV; >> + err = amdgpu_ucode_validate(*fw); >> + if (err) >> + dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); >> + >> + return err; >> +} >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> index 552e06929229..b9139fb44506 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h >> @@ -544,6 +544,7 @@ void amdgpu_ucode_print_sdma_hdr(const struct >> common_firmware_header *hdr); >> void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header >> *hdr); >> void amdgpu_ucode_print_gpu_info_hdr(const struct >> common_firmware_header *hdr); >> int amdgpu_ucode_validate(const struct firmware *fw); >> +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct >> firmware **fw, char *fw_name); >> bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr, >> uint16_t hdr_major, uint16_t hdr_minor);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index eafcddce58d3..8c4a7b09e344 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -1312,3 +1312,27 @@ void amdgpu_ucode_ip_version_decode(struct amdgpu_device *adev, int block_type, snprintf(ucode_prefix, len, "%s_%d_%d_%d", ip_name, maj, min, rev); } + +/* + * amdgpu_ucode_load - Load and validate amdgpu microcode + * + * @adev: amdgpu device + * @fw: pointer to load firmware to + * @fw_name: firmware to load + * + * This is a helper that will use request_firmware and amdgpu_ucode_validate + * to load and run basic validation on firmware. If the load fails, remap + * the error code to -ENODEV, so that early_init functions will fail to load. + */ +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct firmware **fw, char *fw_name) +{ + int err = request_firmware(fw, fw_name, adev->dev); + + if (err) + return -ENODEV; + err = amdgpu_ucode_validate(*fw); + if (err) + dev_dbg(adev->dev, "\"%s\" failed to validate\n", fw_name); + + return err; +} diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h index 552e06929229..b9139fb44506 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h @@ -544,6 +544,7 @@ void amdgpu_ucode_print_sdma_hdr(const struct common_firmware_header *hdr); void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr); void amdgpu_ucode_print_gpu_info_hdr(const struct common_firmware_header *hdr); int amdgpu_ucode_validate(const struct firmware *fw); +int amdgpu_ucode_load(struct amdgpu_device *adev, const struct firmware **fw, char *fw_name); bool amdgpu_ucode_hdr_version(union amdgpu_firmware_header *hdr, uint16_t hdr_major, uint16_t hdr_minor);
All microcode runs a basic validation after it's been loaded. Each IP block as part of init will run both. Introduce a wrapper for request_firmware and amdgpu_ucode_validate. This wrapper will also remap any error codes from request_firmware to -ENODEV. This is so that early_init will fail if firmware couldn't be loaded instead of the IP block being disabled. Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- v3-v4: * New patch --- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 24 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + 2 files changed, 25 insertions(+)