Commit 39932ef7 authored by John Clements's avatar John Clements Committed by Alex Deucher
Browse files

drm/amdgpu: set RAS EEPROM address from VBIOS 

update to latest atombios fw table

[Backport to 5.14 - Alex]

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1670


Signed-off-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com&gt;.>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent ad89c9aa

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

+40 −0
Original line number Diff line number Diff line
@@ -468,6 +468,46 @@ bool amdgpu_atomfirmware_dynamic_boot_config_supported(struct amdgpu_device *ade 
	return (fw_cap & ATOM_FIRMWARE_CAP_DYNAMIC_BOOT_CFG_ENABLE) ? true : false;

}



/*

 * Helper function to query RAS EEPROM address

 *

 * @adev: amdgpu_device pointer

 *

 * Return true if vbios supports ras rom address reporting

 */

bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_device *adev, uint8_t* i2c_address)

{

	struct amdgpu_mode_info *mode_info = &adev->mode_info;

	int index;

	u16 data_offset, size;

	union firmware_info *firmware_info;

	u8 frev, crev;



	if (i2c_address == NULL)

		return false;



	*i2c_address = 0;



	index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,

			firmwareinfo);



	if (amdgpu_atom_parse_data_header(adev->mode_info.atom_context,

				index, &size, &frev, &crev, &data_offset)) {

		/* support firmware_info 3.4 + */

		if ((frev == 3 && crev >=4) || (frev > 3)) {

			firmware_info = (union firmware_info *)

				(mode_info->atom_context->bios + data_offset);

			*i2c_address = firmware_info->v34.ras_rom_i2c_slave_addr;

		}

	}



	if (*i2c_address != 0)

		return true;



	return false;

}





union smu_info {

	struct atom_smu_info_v3_1 v31;

};

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int amdgpu_atomfirmware_get_clock_info(struct amdgpu_device *adev); 
int amdgpu_atomfirmware_get_gfx_info(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_sram_ecc_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_ras_rom_addr(struct amdgpu_device *adev, uint8_t* i2c_address);

bool amdgpu_atomfirmware_mem_training_supported(struct amdgpu_device *adev);

bool amdgpu_atomfirmware_dynamic_boot_config_supported(struct amdgpu_device *adev);

int amdgpu_atomfirmware_get_fw_reserved_fb_size(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "amdgpu_ras.h"

#include <linux/bits.h>

#include "atom.h"

#include "amdgpu_atomfirmware.h"



#define EEPROM_I2C_TARGET_ADDR_VEGA20		0xA0

#define EEPROM_I2C_TARGET_ADDR_ARCTURUS		0xA8
@@ -96,6 +97,9 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
	if (!i2c_addr)

		return false;



	if (amdgpu_atomfirmware_ras_rom_addr(adev, (uint8_t*)i2c_addr))

		return true;



	switch (adev->asic_type) {

	case CHIP_VEGA20:

		*i2c_addr = EEPROM_I2C_TARGET_ADDR_VEGA20;

drivers/gpu/drm/amd/include/atomfirmware.h

+1 −1
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ struct atom_firmware_info_v3_4 { 
	uint8_t  board_i2c_feature_id;            // enum of atom_board_i2c_feature_id_def

	uint8_t  board_i2c_feature_gpio_id;       // i2c id find in gpio_lut data table gpio_id

	uint8_t  board_i2c_feature_slave_addr;

	uint8_t  reserved3;

	uint8_t  ras_rom_i2c_slave_addr;

	uint16_t bootup_mvddq_mv;

	uint16_t bootup_mvpp_mv;

	uint32_t zfbstartaddrin16mb;