[PATCH] drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp

[Hou, Xiaomeng (Matthew)]

[AMD Official Use Only]

>
>-----Original Message-----
>From: Lazar, Lijo <Lijo.Lazar at amd.com> 
>Sent: Thursday, July 1, 2021 4:51 PM
>To: Hou, Xiaomeng (Matthew) <Xiaomeng.Hou at amd.com>; amd-gfx at lists.freedesktop.org
>Cc: Wang, Kevin(Yang) <Kevin1.Wang at amd.com>; Liu, Aaron <Aaron.Liu at amd.com>
>Subject: Re: [PATCH] drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp
>
>One minor comment below.
>
>Reviewed-by: Lijo Lazar <lijo.lazar at amd.com>
>
>
>On 7/1/2021 2:01 PM, Xiaomeng Hou wrote:
>> Since there's nothing special in smu implementation for yellow carp, 
>> it's better to reuse the common smu_v13_0 interfaces and drop the 
>> specific smu_v13_0_1.c|h files.
>> 
>> Signed-off-by: Xiaomeng Hou <Xiaomeng.Hou at amd.com>
>> ---
>>   drivers/gpu/drm/amd/pm/inc/smu_v13_0.h        |   1 +
>>   drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h      |  57 ----
>>   drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile   |   2 +-
>>   .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c    |  26 ++
>>   .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c  | 311 ------------------
>>   .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c  |  39 ++-
>>   6 files changed, 59 insertions(+), 377 deletions(-)
>>   delete mode 100644 drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h
>>   delete mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_1.c
>> 
>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h 
>> b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
>> index 6119a36b2cba..3fea2430dec0 100644
>> --- a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
>> +++ b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
>> @@ -26,6 +26,7 @@
>>   #include "amdgpu_smu.h"
>>   
>>   #define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF
>> +#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x03
>>   #define SMU13_DRIVER_IF_VERSION_ALDE 0x07
>>   
>>   /* MP Apertures */
>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h 
>> b/drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h
>> deleted file mode 100644
>> index b6c976a4d578..000000000000
>> --- a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h
>> +++ /dev/null
>> @@ -1,57 +0,0 @@
>> -/*
>> - * Copyright 2020 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 __SMU_V13_0_1_H__
>> -#define __SMU_V13_0_1_H__
>> -
>> -#include "amdgpu_smu.h"
>> -
>> -#define SMU13_0_1_DRIVER_IF_VERSION_INV 0xFFFFFFFF -#define 
>> SMU13_0_1_DRIVER_IF_VERSION_YELLOW_CARP 0x3
>> -
>> -/* MP Apertures */
>> -#define MP0_Public			0x03800000
>> -#define MP0_SRAM			0x03900000
>> -#define MP1_Public			0x03b00000
>> -#define MP1_SRAM			0x03c00004
>> -
>> -/* address block */
>> -#define smnMP1_FIRMWARE_FLAGS		0x3010024
>> -
>> -
>> -#if defined(SWSMU_CODE_LAYER_L2) || defined(SWSMU_CODE_LAYER_L3)
>> -
>> -int smu_v13_0_1_check_fw_status(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_check_fw_version(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_fini_smc_tables(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_get_vbios_bootup_values(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_set_default_dpm_tables(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_set_driver_table_location(struct smu_context *smu);
>> -
>> -int smu_v13_0_1_gfx_off_control(struct smu_context *smu, bool 
>> enable); -#endif -#endif diff --git 
>> a/drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile 
>> b/drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile
>> index 9b3a8503f5cd..d4c4c495762c 100644
>> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile
>> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile
>> @@ -23,7 +23,7 @@
>>   # Makefile for the 'smu manager' sub-component of powerplay.
>>   # It provides the smu management services for the driver.
>>   
>> -SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o 
>> yellow_carp_ppt.o
>> +SMU13_MGR = smu_v13_0.o aldebaran_ppt.o yellow_carp_ppt.o
>>   
>>   AMD_SWSMU_SMU13MGR = $(addprefix 
>> $(AMD_SWSMU_PATH)/smu13/,$(SMU13_MGR))
>>   
>> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c 
>> b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
>> index a3dc7194aaf8..cbce982f2717 100644
>> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
>> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
>> @@ -41,6 +41,8 @@
>>   
>>   #include "asic_reg/thm/thm_13_0_2_offset.h"
>>   #include "asic_reg/thm/thm_13_0_2_sh_mask.h"
>> +#include "asic_reg/mp/mp_13_0_1_offset.h"
>> +#include "asic_reg/mp/mp_13_0_1_sh_mask.h"
>
>If the offsets are same, are these files still needed or can they be not included/dropped completely?

Yes, I noticed the offsets/masks are actually same between mp_13_0_1/2, I am not sure if we could drop the header files completely, or I just not include them in this patch? @Liu, Aaron, do you have any comment? Are these header files there for future possible distinction?

Regards,
Matthew 
>
>Thanks,
>Lijo
>