Commit cc947bf9 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: Process any VBIOS RAS EEPROM address 



We can now process any RAS EEPROM address from
VBIOS. Generalize so as to compute the top three
bits of the 19-bit EEPROM address, from any byte
returned as the "i2c address" from VBIOS.

Cc: John Clements <john.clements@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Cc: Alex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6a355a2

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

+13 −12
Original line number Diff line number Diff line
@@ -114,21 +114,22 @@ static bool __get_eeprom_i2c_addr_arct(struct amdgpu_device *adev, 
static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev,

				  struct amdgpu_ras_eeprom_control *control)

{

	u8 i2c_addr;



	if (!control)

		return false;



	control->i2c_address = 0;



	if (amdgpu_atomfirmware_ras_rom_addr(adev, (uint8_t*)&control->i2c_address))

	{

		if (control->i2c_address == 0xA0)

			control->i2c_address = 0;

		else if (control->i2c_address == 0xA8)

			control->i2c_address = 0x40000;

		else {

			dev_warn(adev->dev, "RAS EEPROM I2C address not supported");

			return false;

		}

	if (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.

		 *

		 * Normalize it to a 19-bit EEPROM address. Remove the

		 * device type identifier and make it a 7-bit address;

		 * then make it a 19-bit EEPROM address. See top of

		 * amdgpu_eeprom.c.

		 */

		i2c_addr = (i2c_addr & 0x0F) >> 1;

		control->i2c_address = ((u32) i2c_addr) << 16;



		return true;

	}