Commit 634a24d8 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amd/powerplay: update all printk to pr_* on smumgr 



Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b5c11b8e

drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c

+14 −14
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static int cz_send_msg_to_smc_async(struct pp_smumgr *smumgr, 
	result = SMUM_WAIT_FIELD_UNEQUAL(smumgr,

					SMU_MP1_SRBM2P_RESP_0, CONTENT, 0);

	if (result != 0) {

		printk(KERN_ERR "[ powerplay ] cz_send_msg_to_smc_async failed\n");

		pr_err("cz_send_msg_to_smc_async failed\n");

		return result;

	}
@@ -100,12 +100,12 @@ static int cz_set_smc_sram_address(struct pp_smumgr *smumgr, 
		return -EINVAL;



	if (0 != (3 & smc_address)) {

		printk(KERN_ERR "[ powerplay ] SMC address must be 4 byte aligned\n");

		pr_err("SMC address must be 4 byte aligned\n");

		return -EINVAL;

	}



	if (limit <= (smc_address + 3)) {

		printk(KERN_ERR "[ powerplay ] SMC address beyond the SMC RAM area\n");

		pr_err("SMC address beyond the SMC RAM area\n");

		return -EINVAL;

	}
@@ -147,7 +147,7 @@ static int cz_request_smu_load_fw(struct pp_smumgr *smumgr) 
	uint32_t smc_address;



	if (!smumgr->reload_fw) {

		printk(KERN_INFO "[ powerplay ] skip reloading...\n");

		pr_info("skip reloading...\n");

		return 0;

	}
@@ -198,7 +198,7 @@ static int cz_check_fw_load_finish(struct pp_smumgr *smumgr, 
	}



	if (i >= smumgr->usec_timeout) {

		printk(KERN_ERR "[ powerplay ] SMU check loaded firmware failed.\n");

		pr_err("SMU check loaded firmware failed.\n");

		return -EINVAL;

	}
@@ -267,13 +267,13 @@ static int cz_start_smu(struct pp_smumgr *smumgr) 


	ret = cz_request_smu_load_fw(smumgr);

	if (ret)

		printk(KERN_ERR "[ powerplay] SMU firmware load failed\n");

		pr_err("SMU firmware load failed\n");



	cz_check_fw_load_finish(smumgr, fw_to_check);



	ret = cz_load_mec_firmware(smumgr);

	if (ret)

		printk(KERN_ERR "[ powerplay ] Mec Firmware load failed\n");

		pr_err("Mec Firmware load failed\n");



	return ret;

}
@@ -406,7 +406,7 @@ static int cz_smu_populate_single_scratch_task( 
			break;



	if (i >= cz_smu->scratch_buffer_length) {

		printk(KERN_ERR "[ powerplay ] Invalid Firmware Type\n");

		pr_err("Invalid Firmware Type\n");

		return -EINVAL;

	}
@@ -443,7 +443,7 @@ static int cz_smu_populate_single_ucode_load_task( 
			break;



	if (i >= cz_smu->driver_buffer_length) {

		printk(KERN_ERR "[ powerplay ] Invalid Firmware Type\n");

		pr_err("Invalid Firmware Type\n");

		return -EINVAL;

	}
@@ -774,7 +774,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) 
		CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SCRATCH,

		UCODE_ID_RLC_SCRATCH_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		printk(KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n");

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

	}
@@ -782,14 +782,14 @@ static int cz_smu_init(struct pp_smumgr *smumgr) 
		CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_ARAM,

		UCODE_ID_RLC_SRM_ARAM_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		printk(KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n");

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

	}

	if (0 != cz_smu_populate_single_scratch_entry(smumgr,

		CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_DRAM,

		UCODE_ID_RLC_SRM_DRAM_SIZE_BYTE,

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		printk(KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n");

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

	}
@@ -797,7 +797,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) 
		CZ_SCRATCH_ENTRY_UCODE_ID_POWER_PROFILING,

		sizeof(struct SMU8_MultimediaPowerLogData),

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		printk(KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n");

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

	}
@@ -805,7 +805,7 @@ static int cz_smu_init(struct pp_smumgr *smumgr) 
		CZ_SCRATCH_ENTRY_SMU8_FUSION_CLKTABLE,

		sizeof(struct SMU8_Fusion_ClkTable),

		&cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {

		printk(KERN_ERR "[ powerplay ] Error when Populate Firmware Entry.\n");

		pr_err("Error when Populate Firmware Entry.\n");

		return -1;

	}

	cz_smu_construct_toc(smumgr);

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c

+2 −2
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member) 
			return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);

		}

	}

	printk(KERN_WARNING "can't get the offset of type %x member %x\n", type, member);

	pr_warning("can't get the offset of type %x member %x\n", type, member);

	return 0;

}
@@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value) 
		return SMU73_MAX_LEVELS_MVDD;

	}



	printk(KERN_WARNING "can't get the mac of %x\n", value);

	pr_warning("can't get the mac of %x\n", value);

	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

+4 −4
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int fiji_setup_pwr_virus(struct pp_smumgr *smumgr) 
			result = 0;

			break;

		default:

			printk(KERN_ERR "Table Exit with Invalid Command!");

			pr_err("Table Exit with Invalid Command!");

			priv->avfs.AvfsBtcStatus = AVFS_BTC_VIRUS_FAIL;

			result = -1;

			break;
@@ -202,13 +202,13 @@ static int fiji_start_avfs_btc(struct pp_smumgr *smumgr) 
				priv->avfs.AvfsBtcStatus = AVFS_BTC_COMPLETED_UNSAVED;

				result = 0;

			} else {

				printk(KERN_ERR "[AVFS][fiji_start_avfs_btc] Attempt"

				pr_err("[AVFS][fiji_start_avfs_btc] Attempt"

						" to Enable AVFS Failed!");

				smum_send_msg_to_smc(smumgr, PPSMC_MSG_DisableAvfs);

				result = -1;

			}

		} else {

			printk(KERN_ERR "[AVFS][fiji_start_avfs_btc] "

			pr_err("[AVFS][fiji_start_avfs_btc] "

					"PerformBTC SMU msg failed");

			result = -1;

		}
@@ -384,7 +384,7 @@ static int fiji_avfs_event_mgr(struct pp_smumgr *smumgr, bool smu_started) 
	case AVFS_BTC_NOTSUPPORTED: /* Do nothing */

		break;

	default:

		printk(KERN_ERR "[AVFS] Something is broken. See log!");

		pr_err("[AVFS] Something is broken. See log!");

		break;

	}

	return 0;

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c

+4 −4
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr, 


	if (0 != result) {

		smu_data->smc_state_table.GraphicsBootLevel = 0;

		printk(KERN_ERR "[ powerplay ] VBIOS did not find boot engine clock value \

		pr_err("VBIOS did not find boot engine clock value \

			in dependency table. Using Graphics DPM level 0!");

		result = 0;

	}
@@ -1556,7 +1556,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr, 


	if (0 != result) {

		smu_data->smc_state_table.MemoryBootLevel = 0;

		printk(KERN_ERR "[ powerplay ] VBIOS did not find boot engine clock value \

		pr_err("VBIOS did not find boot engine clock value \

			in dependency table. Using Memory DPM level 0!");

		result = 0;

	}
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member) 
			return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);

		}

	}

	printk(KERN_WARNING "can't get the offset of type %x member %x\n", type, member);

	pr_warning("can't get the offset of type %x member %x\n", type, member);

	return 0;

}
@@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value) 
		return SMU71_MAX_LEVELS_MVDD;

	}



	printk(KERN_WARNING "can't get the mac of %x\n", value);

	pr_warning("can't get the mac of %x\n", value);

	return 0;

}

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static int iceland_start_smu(struct pp_smumgr *smumgr) 
		return result;



	if (!smu7_is_smc_ram_running(smumgr)) {

		printk("smu not running, upload firmware again \n");

		pr_info("smu not running, upload firmware again \n");

		result = iceland_smu_upload_firmware_image(smumgr);

		if (result)

			return result;

CRA Git | Maintained and supported by SUSTech CRA and CCSE