drm/amdgpu: Add flag to make VBIOS read optional

Certain SOCs may not need much data from VBIOS. Some data like VBIOS
version used will be missed but it doesn't affect functionality. Add a
flag to make VBIOS image optional.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index e0aea865f76bb92d58d24a38645ae3cc7dd0e1b0..a3f8f20da7ffcf390e566a193713b8c6126048da 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -103,6 +103,7 @@ MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
 #define AMDGPU_PCIE_DATA_FALLBACK (0x3C >> 2)
 
 #define AMDGPU_VBIOS_SKIP (1U << 0)
+#define AMDGPU_VBIOS_OPTIONAL (1U << 1)
 
 static const struct drm_driver amdgpu_kms_driver;
 
@@ -1391,6 +1392,14 @@ static void amdgpu_block_invalid_wreg(struct amdgpu_device *adev,
        BUG();
 }
 
+static uint32_t amdgpu_device_get_vbios_flags(struct amdgpu_device *adev)
+{
+       if (hweight32(adev->aid_mask) && (adev->flags & AMD_IS_APU))
+               return AMDGPU_VBIOS_SKIP;
+
+       return 0;
+}
+
 /**
  * amdgpu_device_asic_init - Wrapper for atom asic_init
  *
@@ -1400,18 +1409,28 @@ static void amdgpu_block_invalid_wreg(struct amdgpu_device *adev,
  */
 static int amdgpu_device_asic_init(struct amdgpu_device *adev)
 {
+       uint32_t flags;
+       bool optional;
        int ret;
 
        amdgpu_asic_pre_asic_init(adev);
+       flags = amdgpu_device_get_vbios_flags(adev);
+       optional = !!(flags & (AMDGPU_VBIOS_OPTIONAL | AMDGPU_VBIOS_SKIP));
 
        if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 3) ||
            amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 4, 4) ||
            amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 5, 0) ||
            amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(11, 0, 0)) {
                amdgpu_psp_wait_for_bootloader(adev);
+               if (optional && !adev->bios)
+                       return 0;
+
                ret = amdgpu_atomfirmware_asic_init(adev, true);
                return ret;
        } else {
+               if (optional && !adev->bios)
+                       return 0;
+
                return amdgpu_atom_asic_init(adev->mode_info.atom_context);
        }
 
@@ -1700,14 +1719,6 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)
        return 0;
 }
 
-static uint32_t amdgpu_device_get_vbios_flags(struct amdgpu_device *adev)
-{
-       if (hweight32(adev->aid_mask) && (adev->flags & AMD_IS_APU))
-               return AMDGPU_VBIOS_SKIP;
-
-       return 0;
-}
-
 /*
  * GPU helpers function.
  */
@@ -1730,6 +1741,8 @@ bool amdgpu_device_need_post(struct amdgpu_device *adev)
        flags = amdgpu_device_get_vbios_flags(adev);
        if (flags & AMDGPU_VBIOS_SKIP)
                return false;
+       if ((flags & AMDGPU_VBIOS_OPTIONAL) && !adev->bios)
+               return false;
 
        if (amdgpu_passthrough(adev)) {
                /* for FIJI: In whole GPU pass-through virtualization case, after VM reboot
@@ -2700,14 +2713,27 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
                        skip_bios = !!(bios_flags & AMDGPU_VBIOS_SKIP);
                        /* Read BIOS */
                        if (!skip_bios) {
-                               if (!amdgpu_get_bios(adev))
+                               bool optional =
+                                       !!(bios_flags & AMDGPU_VBIOS_OPTIONAL);
+                               if (!amdgpu_get_bios(adev) && !optional)
                                        return -EINVAL;
 
-                               r = amdgpu_atombios_init(adev);
-                               if (r) {
-                                       dev_err(adev->dev, "amdgpu_atombios_init failed\n");
-                                       amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL, 0, 0);
-                                       return r;
+                               if (optional && !adev->bios)
+                                       dev_info(
+                                               adev->dev,
+                                               "VBIOS image optional, proceeding without VBIOS image");
+
+                               if (adev->bios) {
+                                       r = amdgpu_atombios_init(adev);
+                                       if (r) {
+                                               dev_err(adev->dev,
+                                                       "amdgpu_atombios_init failed\n");
+                                               amdgpu_vf_error_put(
+                                                       adev,
+                                                       AMDGIM_ERROR_VF_ATOMBIOS_INIT_FAIL,
+                                                       0, 0);
+                                               return r;
+                                       }
                                }
                        }
 
@@ -4742,10 +4768,11 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
        /* free i2c buses */
        amdgpu_i2c_fini(adev);
 
-       if (amdgpu_emu_mode != 1)
-               amdgpu_atombios_fini(adev);
-
-       amdgpu_bios_release(adev);
+       if (adev->bios) {
+               if (amdgpu_emu_mode != 1)
+                       amdgpu_atombios_fini(adev);
+               amdgpu_bios_release(adev);
+       }
 
        kfree(adev->fru_info);
        adev->fru_info = NULL;
@@ -5371,7 +5398,8 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev)
        u32 i;
        int ret = 0;
 
-       amdgpu_atombios_scratch_regs_engine_hung(adev, true);
+       if (adev->bios)
+               amdgpu_atombios_scratch_regs_engine_hung(adev, true);
 
        dev_info(adev->dev, "GPU mode1 reset\n");
 
@@ -5413,7 +5441,8 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev)
                goto mode1_reset_failed;
        }
 
-       amdgpu_atombios_scratch_regs_engine_hung(adev, false);
+       if (adev->bios)
+               amdgpu_atombios_scratch_regs_engine_hung(adev, false);
 
        return 0;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
index 09c9194d5bd58dff567761abc0bb05ea3c34d5d4..89109eb2ce1603d960ac4f10e1f843d628b0452a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c
@@ -63,10 +63,10 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr)
                switch (adev->asic_type) {
                case CHIP_VEGA20:
                        /* D161 and D163 are the VG20 server SKUs */
-                       if (strnstr(atom_ctx->vbios_pn, "D161",
-                                   sizeof(atom_ctx->vbios_pn)) ||
-                           strnstr(atom_ctx->vbios_pn, "D163",
-                                   sizeof(atom_ctx->vbios_pn))) {
+                       if (atom_ctx && (strnstr(atom_ctx->vbios_pn, "D161",
+                                                sizeof(atom_ctx->vbios_pn)) ||
+                                        strnstr(atom_ctx->vbios_pn, "D163",
+                                                sizeof(atom_ctx->vbios_pn)))) {
                                if (fru_addr)
                                        *fru_addr = FRU_EEPROM_MADDR_6;
                                return true;
@@ -78,8 +78,8 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr)
                        return false;
                }
        case IP_VERSION(11, 0, 7):
-               if (strnstr(atom_ctx->vbios_pn, "D603",
-                           sizeof(atom_ctx->vbios_pn))) {
+               if (atom_ctx && strnstr(atom_ctx->vbios_pn, "D603",
+                                       sizeof(atom_ctx->vbios_pn))) {
                        if (strnstr(atom_ctx->vbios_pn, "D603GLXE",
                                    sizeof(atom_ctx->vbios_pn))) {
                                return false;
@@ -94,8 +94,8 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev, u32 *fru_addr)
                }
        case IP_VERSION(13, 0, 2):
                /* All Aldebaran SKUs have an FRU */
-               if (!strnstr(atom_ctx->vbios_pn, "D673",
-                            sizeof(atom_ctx->vbios_pn)))
+               if (atom_ctx && !strnstr(atom_ctx->vbios_pn, "D673",
+                                        sizeof(atom_ctx->vbios_pn)))
                        if (fru_addr)
                                *fru_addr = FRU_EEPROM_MADDR_6;
                return true;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
index 723c655bb4d5cd9c5adf135773e610981bee4dc6..83b54efcaa877c3fa4337f6460dcaa78b8c5cbfb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
@@ -177,7 +177,7 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev,
        if (!control)
                return false;
 
-       if (amdgpu_atomfirmware_ras_rom_addr(adev, &i2c_addr)) {
+       if (adev->bios && amdgpu_atomfirmware_ras_rom_addr(adev, &i2c_addr)) {
                /* The address given by VBIOS is an 8-bit, wire-format
                 * address, i.e. the most significant byte.
                 *