Commit 629bd33c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/si: Add support for new ucode format (v3) 



This adds SI support for the new ucode format.

v2: add size validation, integrate debug info
v3: update to latest version

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent de515822

drivers/gpu/drm/radeon/radeon.h

+1 −0
Original line number Diff line number Diff line
@@ -2306,6 +2306,7 @@ struct radeon_device { 
	const struct firmware *smc_fw;	/* SMC firmware */

	const struct firmware *uvd_fw;	/* UVD firmware */

	const struct firmware *vce_fw;	/* VCE firmware */

	bool new_fw;

	struct r600_vram_scratch vram_scratch;

	int msi_enabled; /* msi enabled */

	struct r600_ih ih; /* r6/700 interrupt ring */

drivers/gpu/drm/radeon/si.c

+334 −120
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ MODULE_FIRMWARE("radeon/TAHITI_mc.bin"); 
MODULE_FIRMWARE("radeon/TAHITI_mc2.bin");

MODULE_FIRMWARE("radeon/TAHITI_rlc.bin");

MODULE_FIRMWARE("radeon/TAHITI_smc.bin");



MODULE_FIRMWARE("radeon/tahiti_pfp.bin");

MODULE_FIRMWARE("radeon/tahiti_me.bin");

MODULE_FIRMWARE("radeon/tahiti_ce.bin");

MODULE_FIRMWARE("radeon/tahiti_mc.bin");

MODULE_FIRMWARE("radeon/tahiti_rlc.bin");

MODULE_FIRMWARE("radeon/tahiti_smc.bin");



MODULE_FIRMWARE("radeon/PITCAIRN_pfp.bin");

MODULE_FIRMWARE("radeon/PITCAIRN_me.bin");

MODULE_FIRMWARE("radeon/PITCAIRN_ce.bin");
@@ -49,6 +57,14 @@ MODULE_FIRMWARE("radeon/PITCAIRN_mc.bin"); 
MODULE_FIRMWARE("radeon/PITCAIRN_mc2.bin");

MODULE_FIRMWARE("radeon/PITCAIRN_rlc.bin");

MODULE_FIRMWARE("radeon/PITCAIRN_smc.bin");



MODULE_FIRMWARE("radeon/pitcairn_pfp.bin");

MODULE_FIRMWARE("radeon/pitcairn_me.bin");

MODULE_FIRMWARE("radeon/pitcairn_ce.bin");

MODULE_FIRMWARE("radeon/pitcairn_mc.bin");

MODULE_FIRMWARE("radeon/pitcairn_rlc.bin");

MODULE_FIRMWARE("radeon/pitcairn_smc.bin");



MODULE_FIRMWARE("radeon/VERDE_pfp.bin");

MODULE_FIRMWARE("radeon/VERDE_me.bin");

MODULE_FIRMWARE("radeon/VERDE_ce.bin");
@@ -56,6 +72,14 @@ MODULE_FIRMWARE("radeon/VERDE_mc.bin"); 
MODULE_FIRMWARE("radeon/VERDE_mc2.bin");

MODULE_FIRMWARE("radeon/VERDE_rlc.bin");

MODULE_FIRMWARE("radeon/VERDE_smc.bin");



MODULE_FIRMWARE("radeon/verde_pfp.bin");

MODULE_FIRMWARE("radeon/verde_me.bin");

MODULE_FIRMWARE("radeon/verde_ce.bin");

MODULE_FIRMWARE("radeon/verde_mc.bin");

MODULE_FIRMWARE("radeon/verde_rlc.bin");

MODULE_FIRMWARE("radeon/verde_smc.bin");



MODULE_FIRMWARE("radeon/OLAND_pfp.bin");

MODULE_FIRMWARE("radeon/OLAND_me.bin");

MODULE_FIRMWARE("radeon/OLAND_ce.bin");
@@ -63,6 +87,14 @@ MODULE_FIRMWARE("radeon/OLAND_mc.bin"); 
MODULE_FIRMWARE("radeon/OLAND_mc2.bin");

MODULE_FIRMWARE("radeon/OLAND_rlc.bin");

MODULE_FIRMWARE("radeon/OLAND_smc.bin");



MODULE_FIRMWARE("radeon/oland_pfp.bin");

MODULE_FIRMWARE("radeon/oland_me.bin");

MODULE_FIRMWARE("radeon/oland_ce.bin");

MODULE_FIRMWARE("radeon/oland_mc.bin");

MODULE_FIRMWARE("radeon/oland_rlc.bin");

MODULE_FIRMWARE("radeon/oland_smc.bin");



MODULE_FIRMWARE("radeon/HAINAN_pfp.bin");

MODULE_FIRMWARE("radeon/HAINAN_me.bin");

MODULE_FIRMWARE("radeon/HAINAN_ce.bin");
@@ -71,6 +103,13 @@ MODULE_FIRMWARE("radeon/HAINAN_mc2.bin"); 
MODULE_FIRMWARE("radeon/HAINAN_rlc.bin");

MODULE_FIRMWARE("radeon/HAINAN_smc.bin");



MODULE_FIRMWARE("radeon/hainan_pfp.bin");

MODULE_FIRMWARE("radeon/hainan_me.bin");

MODULE_FIRMWARE("radeon/hainan_ce.bin");

MODULE_FIRMWARE("radeon/hainan_mc.bin");

MODULE_FIRMWARE("radeon/hainan_rlc.bin");

MODULE_FIRMWARE("radeon/hainan_smc.bin");



static u32 si_get_cu_active_bitmap(struct radeon_device *rdev, u32 se, u32 sh);

static void si_pcie_gen3_enable(struct radeon_device *rdev);

static void si_program_aspm(struct radeon_device *rdev);
@@ -1470,14 +1509,28 @@ static const u32 hainan_io_mc_regs[TAHITI_IO_MC_REGS_SIZE][2] = { 
/* ucode loading */

int si_mc_load_microcode(struct radeon_device *rdev)

{

	const __be32 *fw_data;

	const __be32 *fw_data = NULL;

	const __le32 *new_fw_data = NULL;

	u32 running, blackout = 0;

	u32 *io_mc_regs;

	u32 *io_mc_regs = NULL;

	const __le32 *new_io_mc_regs = NULL;

	int i, regs_size, ucode_size;



	if (!rdev->mc_fw)

		return -EINVAL;



	if (rdev->new_fw) {

		const struct mc_firmware_header_v1_0 *hdr =

			(const struct mc_firmware_header_v1_0 *)rdev->mc_fw->data;



		radeon_ucode_print_mc_hdr(&hdr->header);

		regs_size = le32_to_cpu(hdr->io_debug_size_bytes) / (4 * 2);

		new_io_mc_regs = (const __le32 *)

			(rdev->mc_fw->data + le32_to_cpu(hdr->io_debug_array_offset_bytes));

		ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes) / 4;

		new_fw_data = (const __le32 *)

			(rdev->mc_fw->data + le32_to_cpu(hdr->header.ucode_array_offset_bytes));

	} else {

		ucode_size = rdev->mc_fw->size / 4;



		switch (rdev->family) {
@@ -1503,6 +1556,8 @@ int si_mc_load_microcode(struct radeon_device *rdev) 
			regs_size = TAHITI_IO_MC_REGS_SIZE;

			break;

		}

		fw_data = (const __be32 *)rdev->mc_fw->data;

	}



	running = RREG32(MC_SEQ_SUP_CNTL) & RUN_MASK;
@@ -1518,13 +1573,21 @@ int si_mc_load_microcode(struct radeon_device *rdev) 


		/* load mc io regs */

		for (i = 0; i < regs_size; i++) {

			if (rdev->new_fw) {

				WREG32(MC_SEQ_IO_DEBUG_INDEX, le32_to_cpup(new_io_mc_regs++));

				WREG32(MC_SEQ_IO_DEBUG_DATA, le32_to_cpup(new_io_mc_regs++));

			} else {

				WREG32(MC_SEQ_IO_DEBUG_INDEX, io_mc_regs[(i << 1)]);

				WREG32(MC_SEQ_IO_DEBUG_DATA, io_mc_regs[(i << 1) + 1]);

			}

		}

		/* load the MC ucode */

		fw_data = (const __be32 *)rdev->mc_fw->data;

		for (i = 0; i < ucode_size; i++)

		for (i = 0; i < ucode_size; i++) {

			if (rdev->new_fw)

				WREG32(MC_SEQ_SUP_PGM, le32_to_cpup(new_fw_data++));

			else

				WREG32(MC_SEQ_SUP_PGM, be32_to_cpup(fw_data++));

		}



		/* put the engine back into the active state */

		WREG32(MC_SEQ_SUP_CNTL, 0x00000008);
@@ -1553,18 +1616,19 @@ int si_mc_load_microcode(struct radeon_device *rdev) 
static int si_init_microcode(struct radeon_device *rdev)

{

	const char *chip_name;

	const char *rlc_chip_name;

	const char *new_chip_name;

	size_t pfp_req_size, me_req_size, ce_req_size, rlc_req_size, mc_req_size;

	size_t smc_req_size, mc2_req_size;

	char fw_name[30];

	int err;

	int new_fw = 0;



	DRM_DEBUG("\n");



	switch (rdev->family) {

	case CHIP_TAHITI:

		chip_name = "TAHITI";

		rlc_chip_name = "TAHITI";

		new_chip_name = "tahiti";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;

		ce_req_size = SI_CE_UCODE_SIZE * 4;
@@ -1575,7 +1639,7 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_PITCAIRN:

		chip_name = "PITCAIRN";

		rlc_chip_name = "PITCAIRN";

		new_chip_name = "pitcairn";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;

		ce_req_size = SI_CE_UCODE_SIZE * 4;
@@ -1586,7 +1650,7 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_VERDE:

		chip_name = "VERDE";

		rlc_chip_name = "VERDE";

		new_chip_name = "verde";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;

		ce_req_size = SI_CE_UCODE_SIZE * 4;
@@ -1597,7 +1661,7 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_OLAND:

		chip_name = "OLAND";

		rlc_chip_name = "OLAND";

		new_chip_name = "oland";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;

		ce_req_size = SI_CE_UCODE_SIZE * 4;
@@ -1607,7 +1671,7 @@ static int si_init_microcode(struct radeon_device *rdev) 
		break;

	case CHIP_HAINAN:

		chip_name = "HAINAN";

		rlc_chip_name = "HAINAN";

		new_chip_name = "hainan";

		pfp_req_size = SI_PFP_UCODE_SIZE * 4;

		me_req_size = SI_PM4_UCODE_SIZE * 4;

		ce_req_size = SI_CE_UCODE_SIZE * 4;
@@ -1618,8 +1682,11 @@ static int si_init_microcode(struct radeon_device *rdev) 
	default: BUG();

	}



	DRM_INFO("Loading %s Microcode\n", chip_name);

	DRM_INFO("Loading %s Microcode\n", new_chip_name);



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", new_chip_name);

	err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_pfp.bin", chip_name);

		err = request_firmware(&rdev->pfp_fw, fw_name, rdev->dev);

		if (err)
@@ -1631,7 +1698,21 @@ static int si_init_microcode(struct radeon_device *rdev) 
			err = -EINVAL;

			goto out;

		}

	} else {

		err = radeon_ucode_validate(rdev->pfp_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", new_chip_name);

	err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_me.bin", chip_name);

		err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);

		if (err)
@@ -1642,7 +1723,21 @@ static int si_init_microcode(struct radeon_device *rdev) 
			       rdev->me_fw->size, fw_name);

			err = -EINVAL;

		}

	} else {

		err = radeon_ucode_validate(rdev->me_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_ce.bin", new_chip_name);

	err = request_firmware(&rdev->ce_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_ce.bin", chip_name);

		err = request_firmware(&rdev->ce_fw, fw_name, rdev->dev);

		if (err)
@@ -1653,8 +1748,22 @@ static int si_init_microcode(struct radeon_device *rdev) 
			       rdev->ce_fw->size, fw_name);

			err = -EINVAL;

		}

	} else {

		err = radeon_ucode_validate(rdev->ce_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", rlc_chip_name);

	snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", new_chip_name);

	err = request_firmware(&rdev->rlc_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_rlc.bin", chip_name);

		err = request_firmware(&rdev->rlc_fw, fw_name, rdev->dev);

		if (err)

			goto out;
@@ -1664,7 +1773,21 @@ static int si_init_microcode(struct radeon_device *rdev) 
			       rdev->rlc_fw->size, fw_name);

			err = -EINVAL;

		}

	} else {

		err = radeon_ucode_validate(rdev->rlc_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", new_chip_name);

	err = request_firmware(&rdev->mc_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc2.bin", chip_name);

		err = request_firmware(&rdev->mc_fw, fw_name, rdev->dev);

		if (err) {
@@ -1681,7 +1804,21 @@ static int si_init_microcode(struct radeon_device *rdev) 
			err = -EINVAL;

		}

		DRM_INFO("%s: %zu bytes\n", fw_name, rdev->mc_fw->size);

	} else {

		err = radeon_ucode_validate(rdev->mc_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", new_chip_name);

	err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);

	if (err) {

		snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);

		err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);

		if (err) {
@@ -1697,7 +1834,26 @@ static int si_init_microcode(struct radeon_device *rdev) 
			       rdev->smc_fw->size, fw_name);

			err = -EINVAL;

		}

	} else {

		err = radeon_ucode_validate(rdev->smc_fw);

		if (err) {

			printk(KERN_ERR

			       "si_cp: validation failed for firmware \"%s\"\n",

			       fw_name);

			goto out;

		} else {

			new_fw++;

		}

	}



	if (new_fw == 0) {

		rdev->new_fw = false;

	} else if (new_fw < 6) {

		printk(KERN_ERR "si_fw: mixing new and old firmware!\n");

		err = -EINVAL;

	} else {

		rdev->new_fw = true;

	}

out:

	if (err) {

		if (err != -EINVAL)
@@ -3282,14 +3438,56 @@ static void si_cp_enable(struct radeon_device *rdev, bool enable) 


static int si_cp_load_microcode(struct radeon_device *rdev)

{

	const __be32 *fw_data;

	int i;



	if (!rdev->me_fw || !rdev->pfp_fw)

	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->ce_fw)

		return -EINVAL;



	si_cp_enable(rdev, false);



	if (rdev->new_fw) {

		const struct gfx_firmware_header_v1_0 *pfp_hdr =

			(const struct gfx_firmware_header_v1_0 *)rdev->pfp_fw->data;

		const struct gfx_firmware_header_v1_0 *ce_hdr =

			(const struct gfx_firmware_header_v1_0 *)rdev->ce_fw->data;

		const struct gfx_firmware_header_v1_0 *me_hdr =

			(const struct gfx_firmware_header_v1_0 *)rdev->me_fw->data;

		const __le32 *fw_data;

		u32 fw_size;



		radeon_ucode_print_gfx_hdr(&pfp_hdr->header);

		radeon_ucode_print_gfx_hdr(&ce_hdr->header);

		radeon_ucode_print_gfx_hdr(&me_hdr->header);



		/* PFP */

		fw_data = (const __le32 *)

			(rdev->pfp_fw->data + le32_to_cpu(pfp_hdr->header.ucode_array_offset_bytes));

		fw_size = le32_to_cpu(pfp_hdr->header.ucode_size_bytes) / 4;

		WREG32(CP_PFP_UCODE_ADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_PFP_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_PFP_UCODE_ADDR, 0);



		/* CE */

		fw_data = (const __le32 *)

			(rdev->ce_fw->data + le32_to_cpu(ce_hdr->header.ucode_array_offset_bytes));

		fw_size = le32_to_cpu(ce_hdr->header.ucode_size_bytes) / 4;

		WREG32(CP_CE_UCODE_ADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_CE_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_CE_UCODE_ADDR, 0);



		/* ME */

		fw_data = (const __be32 *)

			(rdev->me_fw->data + le32_to_cpu(me_hdr->header.ucode_array_offset_bytes));

		fw_size = le32_to_cpu(me_hdr->header.ucode_size_bytes) / 4;

		WREG32(CP_ME_RAM_WADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_ME_RAM_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_ME_RAM_WADDR, 0);

	} else {

		const __be32 *fw_data;



		/* PFP */

		fw_data = (const __be32 *)rdev->pfp_fw->data;

		WREG32(CP_PFP_UCODE_ADDR, 0);
@@ -3310,6 +3508,7 @@ static int si_cp_load_microcode(struct radeon_device *rdev) 
		for (i = 0; i < SI_PM4_UCODE_SIZE; i++)

			WREG32(CP_ME_RAM_DATA, be32_to_cpup(fw_data++));

		WREG32(CP_ME_RAM_WADDR, 0);

	}



	WREG32(CP_PFP_UCODE_ADDR, 0);

	WREG32(CP_CE_UCODE_ADDR, 0);
@@ -5592,7 +5791,6 @@ static void si_enable_lbpw(struct radeon_device *rdev, bool enable) 
static int si_rlc_resume(struct radeon_device *rdev)

{

	u32 i;

	const __be32 *fw_data;



	if (!rdev->rlc_fw)

		return -EINVAL;
@@ -5615,11 +5813,27 @@ static int si_rlc_resume(struct radeon_device *rdev) 
	WREG32(RLC_MC_CNTL, 0);

	WREG32(RLC_UCODE_CNTL, 0);



	fw_data = (const __be32 *)rdev->rlc_fw->data;

	if (rdev->new_fw) {

		const struct rlc_firmware_header_v1_0 *hdr =

			(const struct rlc_firmware_header_v1_0 *)rdev->rlc_fw->data;

		u32 fw_size = le32_to_cpu(hdr->header.ucode_size_bytes) / 4;

		const __le32 *fw_data = (const __le32 *)

			(rdev->rlc_fw->data + le32_to_cpu(hdr->header.ucode_array_offset_bytes));



		radeon_ucode_print_rlc_hdr(&hdr->header);



		for (i = 0; i < fw_size; i++) {

			WREG32(RLC_UCODE_ADDR, i);

			WREG32(RLC_UCODE_DATA, le32_to_cpup(fw_data++));

		}

	} else {

		const __be32 *fw_data =

			(const __be32 *)rdev->rlc_fw->data;

		for (i = 0; i < SI_RLC_UCODE_SIZE; i++) {

			WREG32(RLC_UCODE_ADDR, i);

			WREG32(RLC_UCODE_DATA, be32_to_cpup(fw_data++));

		}

	}

	WREG32(RLC_UCODE_ADDR, 0);



	si_enable_lbpw(rdev, si_lbpw_supported(rdev));

drivers/gpu/drm/radeon/si_smc.c

+37 −25
Original line number Diff line number Diff line
@@ -219,6 +219,17 @@ int si_load_smc_ucode(struct radeon_device *rdev, u32 limit) 
	if (!rdev->smc_fw)

		return -EINVAL;



	if (rdev->new_fw) {

		const struct smc_firmware_header_v1_0 *hdr =

			(const struct smc_firmware_header_v1_0 *)rdev->smc_fw->data;



		radeon_ucode_print_smc_hdr(&hdr->header);



		ucode_start_address = le32_to_cpu(hdr->ucode_start_addr);

		ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes);

		src = (const u8 *)

			(rdev->smc_fw->data + le32_to_cpu(hdr->header.ucode_array_offset_bytes));

	} else {

		switch (rdev->family) {

		case CHIP_TAHITI:

			ucode_start_address = TAHITI_SMC_UCODE_START;
@@ -244,11 +255,12 @@ int si_load_smc_ucode(struct radeon_device *rdev, u32 limit) 
			DRM_ERROR("unknown asic in smc ucode loader\n");

			BUG();

		}

		src = (const u8 *)rdev->smc_fw->data;

	}



	if (ucode_size & 3)

		return -EINVAL;



	src = (const u8 *)rdev->smc_fw->data;

	spin_lock_irqsave(&rdev->smc_idx_lock, flags);

	WREG32(SMC_IND_INDEX_0, ucode_start_address);

	WREG32_P(SMC_IND_ACCESS_CNTL, AUTO_INCREMENT_IND_0, ~AUTO_INCREMENT_IND_0);