Commit 72de33f8 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move IP discovery data to mman 



It's related to the memory manager so move it there.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cacbbe7c

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

+0 −5
Original line number Diff line number Diff line
@@ -920,11 +920,6 @@ struct amdgpu_device { 
	/* display related functionality */

	struct amdgpu_display_manager dm;



	/* discovery */

	uint8_t				*discovery_bin;

	uint32_t			discovery_tmr_size;

	struct amdgpu_bo		*discovery_memory;



	/* mes */

	bool                            enable_mes;

	struct amdgpu_mes               mes;

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

+2 −2
Original line number Diff line number Diff line
@@ -1568,7 +1568,7 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 


	adev->firmware.gpu_info_fw = NULL;



	if (adev->discovery_bin) {

	if (adev->mman.discovery_bin) {

		amdgpu_discovery_get_gfx_info(adev);



		/*
@@ -3428,7 +3428,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);

	if (IS_ENABLED(CONFIG_PERF_EVENTS))

		amdgpu_pmu_fini(adev);

	if (adev->discovery_bin)

	if (adev->mman.discovery_bin)

		amdgpu_discovery_fini(adev);

}

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

+27 −27
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *bin 
	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;



	amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,

				  adev->discovery_tmr_size, false);

				  adev->mman.discovery_tmr_size, false);

	return 0;

}
@@ -168,18 +168,18 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
	uint16_t checksum;

	int r;



	adev->discovery_tmr_size = DISCOVERY_TMR_SIZE;

	adev->discovery_bin = kzalloc(adev->discovery_tmr_size, GFP_KERNEL);

	if (!adev->discovery_bin)

	adev->mman.discovery_tmr_size = DISCOVERY_TMR_SIZE;

	adev->mman.discovery_bin = kzalloc(adev->mman.discovery_tmr_size, GFP_KERNEL);

	if (!adev->mman.discovery_bin)

		return -ENOMEM;



	r = amdgpu_discovery_read_binary(adev, adev->discovery_bin);

	r = amdgpu_discovery_read_binary(adev, adev->mman.discovery_bin);

	if (r) {

		DRM_ERROR("failed to read ip discovery binary\n");

		goto out;

	}



	bhdr = (struct binary_header *)adev->discovery_bin;

	bhdr = (struct binary_header *)adev->mman.discovery_bin;



	if (le32_to_cpu(bhdr->binary_signature) != BINARY_SIGNATURE) {

		DRM_ERROR("invalid ip discovery binary signature\n");
@@ -192,7 +192,7 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
	size = bhdr->binary_size - offset;

	checksum = bhdr->binary_checksum;



	if (!amdgpu_discovery_verify_checksum(adev->discovery_bin + offset,

	if (!amdgpu_discovery_verify_checksum(adev->mman.discovery_bin + offset,

					      size, checksum)) {

		DRM_ERROR("invalid ip discovery binary checksum\n");

		r = -EINVAL;
@@ -202,7 +202,7 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
	info = &bhdr->table_list[IP_DISCOVERY];

	offset = le16_to_cpu(info->offset);

	checksum = le16_to_cpu(info->checksum);

	ihdr = (struct ip_discovery_header *)(adev->discovery_bin + offset);

	ihdr = (struct ip_discovery_header *)(adev->mman.discovery_bin + offset);



	if (le32_to_cpu(ihdr->signature) != DISCOVERY_TABLE_SIGNATURE) {

		DRM_ERROR("invalid ip discovery data table signature\n");
@@ -210,7 +210,7 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
		goto out;

	}



	if (!amdgpu_discovery_verify_checksum(adev->discovery_bin + offset,

	if (!amdgpu_discovery_verify_checksum(adev->mman.discovery_bin + offset,

					      ihdr->size, checksum)) {

		DRM_ERROR("invalid ip discovery data table checksum\n");

		r = -EINVAL;
@@ -220,9 +220,9 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
	info = &bhdr->table_list[GC];

	offset = le16_to_cpu(info->offset);

	checksum = le16_to_cpu(info->checksum);

	ghdr = (struct gpu_info_header *)(adev->discovery_bin + offset);

	ghdr = (struct gpu_info_header *)(adev->mman.discovery_bin + offset);



	if (!amdgpu_discovery_verify_checksum(adev->discovery_bin + offset,

	if (!amdgpu_discovery_verify_checksum(adev->mman.discovery_bin + offset,

				              ghdr->size, checksum)) {

		DRM_ERROR("invalid gc data table checksum\n");

		r = -EINVAL;
@@ -232,16 +232,16 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
	return 0;



out:

	kfree(adev->discovery_bin);

	adev->discovery_bin = NULL;

	kfree(adev->mman.discovery_bin);

	adev->mman.discovery_bin = NULL;



	return r;

}



void amdgpu_discovery_fini(struct amdgpu_device *adev)

{

	kfree(adev->discovery_bin);

	adev->discovery_bin = NULL;

	kfree(adev->mman.discovery_bin);

	adev->mman.discovery_bin = NULL;

}



int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev)
@@ -265,8 +265,8 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
		return r;

	}



	bhdr = (struct binary_header *)adev->discovery_bin;

	ihdr = (struct ip_discovery_header *)(adev->discovery_bin +

	bhdr = (struct binary_header *)adev->mman.discovery_bin;

	ihdr = (struct ip_discovery_header *)(adev->mman.discovery_bin +

			le16_to_cpu(bhdr->table_list[IP_DISCOVERY].offset));

	num_dies = le16_to_cpu(ihdr->num_dies);
@@ -274,7 +274,7 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 


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

		die_offset = le16_to_cpu(ihdr->die_info[i].die_offset);

		dhdr = (struct die_header *)(adev->discovery_bin + die_offset);

		dhdr = (struct die_header *)(adev->mman.discovery_bin + die_offset);

		num_ips = le16_to_cpu(dhdr->num_ips);

		ip_offset = die_offset + sizeof(*dhdr);
@@ -288,7 +288,7 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
				le16_to_cpu(dhdr->die_id), num_ips);



		for (j = 0; j < num_ips; j++) {

			ip = (struct ip *)(adev->discovery_bin + ip_offset);

			ip = (struct ip *)(adev->mman.discovery_bin + ip_offset);

			num_base_address = ip->num_base_address;



			DRM_DEBUG("%s(%d) #%d v%d.%d.%d:\n",
@@ -337,24 +337,24 @@ int amdgpu_discovery_get_ip_version(struct amdgpu_device *adev, int hw_id, 
	uint16_t num_ips;

	int i, j;



	if (!adev->discovery_bin) {

	if (!adev->mman.discovery_bin) {

		DRM_ERROR("ip discovery uninitialized\n");

		return -EINVAL;

	}



	bhdr = (struct binary_header *)adev->discovery_bin;

	ihdr = (struct ip_discovery_header *)(adev->discovery_bin +

	bhdr = (struct binary_header *)adev->mman.discovery_bin;

	ihdr = (struct ip_discovery_header *)(adev->mman.discovery_bin +

			le16_to_cpu(bhdr->table_list[IP_DISCOVERY].offset));

	num_dies = le16_to_cpu(ihdr->num_dies);



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

		die_offset = le16_to_cpu(ihdr->die_info[i].die_offset);

		dhdr = (struct die_header *)(adev->discovery_bin + die_offset);

		dhdr = (struct die_header *)(adev->mman.discovery_bin + die_offset);

		num_ips = le16_to_cpu(dhdr->num_ips);

		ip_offset = die_offset + sizeof(*dhdr);



		for (j = 0; j < num_ips; j++) {

			ip = (struct ip *)(adev->discovery_bin + ip_offset);

			ip = (struct ip *)(adev->mman.discovery_bin + ip_offset);



			if (le16_to_cpu(ip->hw_id) == hw_id) {

				if (major)
@@ -377,13 +377,13 @@ int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev) 
	struct binary_header *bhdr;

	struct gc_info_v1_0 *gc_info;



	if (!adev->discovery_bin) {

	if (!adev->mman.discovery_bin) {

		DRM_ERROR("ip discovery uninitialized\n");

		return -EINVAL;

	}



	bhdr = (struct binary_header *)adev->discovery_bin;

	gc_info = (struct gc_info_v1_0 *)(adev->discovery_bin +

	bhdr = (struct binary_header *)adev->mman.discovery_bin;

	gc_info = (struct gc_info_v1_0 *)(adev->mman.discovery_bin +

			le16_to_cpu(bhdr->table_list[GC].offset));



	adev->gfx.config.max_shader_engines = le32_to_cpu(gc_info->gc_num_se);

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

+10 −10
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ static void amdgpu_ttm_training_data_block_init(struct amdgpu_device *adev) 
	memset(ctx, 0, sizeof(*ctx));



	ctx->c2p_train_data_offset =

		ALIGN((adev->gmc.mc_vram_size - adev->discovery_tmr_size - SZ_1M), SZ_1M);

		ALIGN((adev->gmc.mc_vram_size - adev->mman.discovery_tmr_size - SZ_1M), SZ_1M);

	ctx->p2c_train_data_offset =

		(adev->gmc.mc_vram_size - GDDR6_MEM_TRAINING_OFFSET);

	ctx->train_data_size =
@@ -1864,10 +1864,10 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
	 * Otherwise, fallback to legacy approach to check and reserve tmr block for ip

	 * discovery data and G6 memory training data respectively

	 */

	adev->discovery_tmr_size =

	adev->mman.discovery_tmr_size =

		amdgpu_atomfirmware_get_fw_reserved_fb_size(adev);

	if (!adev->discovery_tmr_size)

		adev->discovery_tmr_size = DISCOVERY_TMR_OFFSET;

	if (!adev->mman.discovery_tmr_size)

		adev->mman.discovery_tmr_size = DISCOVERY_TMR_OFFSET;



	if (mem_train_support) {

		/* reserve vram for mem train according to TMR location */
@@ -1887,14 +1887,14 @@ static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev) 
	}



	ret = amdgpu_bo_create_kernel_at(adev,

				adev->gmc.real_vram_size - adev->discovery_tmr_size,

				adev->discovery_tmr_size,

				adev->gmc.real_vram_size - adev->mman.discovery_tmr_size,

				adev->mman.discovery_tmr_size,

				AMDGPU_GEM_DOMAIN_VRAM,

				&adev->discovery_memory,

				&adev->mman.discovery_memory,

				NULL);

	if (ret) {

		DRM_ERROR("alloc tmr failed(%d)!\n", ret);

		amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);

		amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL);

		return ret;

	}
@@ -1968,7 +1968,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	 * If IP discovery enabled, a block of memory should be

	 * reserved for IP discovey.

	 */

	if (adev->discovery_bin) {

	if (adev->mman.discovery_bin) {

		r = amdgpu_ttm_reserve_tmr(adev);

		if (r)

			return r;
@@ -2066,7 +2066,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	if (adev->mman.keep_stolen_vga_memory)

		amdgpu_bo_free_kernel(&adev->mman.stolen_vga_memory, NULL, NULL);

	/* return the IP Discovery TMR memory back to VRAM */

	amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);

	amdgpu_bo_free_kernel(&adev->mman.discovery_memory, NULL, NULL);

	amdgpu_ttm_fw_reserve_vram_fini(adev);



	if (adev->mman.aper_base_kaddr)

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

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ struct amdgpu_mman { 
	uint64_t		stolen_extended_size;

	struct amdgpu_bo	*stolen_extended_memory;

	bool			keep_stolen_vga_memory;



	/* discovery */

	uint8_t				*discovery_bin;

	uint32_t			discovery_tmr_size;

	struct amdgpu_bo		*discovery_memory;

};



struct amdgpu_copy_mem {