Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8172625 authored by rezhu's avatar rezhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: add smu support for ellesmere/baffin 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b304ac83

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

+9 −2
Original line number Diff line number Diff line
@@ -681,9 +681,10 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type) 
		result = AMDGPU_UCODE_ID_CP_MEC1;

		break;

	case CGS_UCODE_ID_CP_MEC_JT2:

		if (adev->asic_type == CHIP_TONGA)

		if (adev->asic_type == CHIP_TONGA || adev->asic_type == CHIP_BAFFIN

		  || adev->asic_type == CHIP_ELLESMERE)

			result = AMDGPU_UCODE_ID_CP_MEC2;

		else if (adev->asic_type == CHIP_CARRIZO)

		else

			result = AMDGPU_UCODE_ID_CP_MEC1;

		break;

	case CGS_UCODE_ID_RLC_G:
@@ -741,6 +742,12 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
		case CHIP_FIJI:

			strcpy(fw_name, "amdgpu/fiji_smc.bin");

			break;

		case CHIP_BAFFIN:

			strcpy(fw_name, "amdgpu/baffin_smc.bin");

			break;

		case CHIP_ELLESMERE:

			strcpy(fw_name, "amdgpu/ellesmere_smc.bin");

			break;

		default:

			DRM_ERROR("SMC firmware not supported\n");

			return -EINVAL;

drivers/gpu/drm/amd/powerplay/smumgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the 'smu manager' sub-component of powerplay.

# It provides the smu management services for the driver.



SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o

SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o ellesmere_smumgr.o



AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))

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

0 → 100644
+969 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/powerplay/smumgr/ellesmere_smumgr.h

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#ifndef _ELLESMERE_SMUMANAGER_H

#define _ELLESMERE_SMUMANAGER_H



#include <ellesmere_ppsmc.h>

#include <pp_endian.h>



struct ellesmere_avfs {

	enum AVFS_BTC_STATUS avfs_btc_status;

	uint32_t           avfs_btc_param;

};



struct ellesmere_buffer_entry {

	uint32_t data_size;

	uint32_t mc_addr_low;

	uint32_t mc_addr_high;

	void *kaddr;

	unsigned long  handle;

};



struct ellesmere_smumgr {

	uint8_t *header;

	uint8_t *mec_image;

	struct ellesmere_buffer_entry smu_buffer;

	struct ellesmere_buffer_entry header_buffer;

	uint32_t soft_regs_start;

	uint8_t *read_rrm_straps;

	uint32_t read_drm_straps_mc_address_high;

	uint32_t read_drm_straps_mc_address_low;

	uint32_t acpi_optimization;

	bool post_initial_boot;

	struct ellesmere_avfs  avfs;

};





int ellesmere_smum_init(struct pp_smumgr *smumgr);



int ellesmere_read_smc_sram_dword(struct pp_smumgr *smumgr, uint32_t smc_addr, uint32_t *value, uint32_t limit);

int ellesmere_write_smc_sram_dword(struct pp_smumgr *smumgr, uint32_t smc_addr, uint32_t value, uint32_t limit);

int ellesmere_copy_bytes_to_smc(struct pp_smumgr *smumgr, uint32_t smc_start_address,

				const uint8_t *src, uint32_t byte_count, uint32_t limit);



#endif

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

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "cz_smumgr.h"

#include "tonga_smumgr.h"

#include "fiji_smumgr.h"

#include "ellesmere_smumgr.h"



int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)

{
@@ -62,6 +63,10 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle) 
		case CHIP_FIJI:

			fiji_smum_init(smumgr);

			break;

		case CHIP_BAFFIN:

		case CHIP_ELLESMERE:

			ellesmere_smum_init(smumgr);

			break;

		default:

			return -EINVAL;

		}