On Wed, 21 Aug 2024, Mario Limonciello wrote: > On 8/21/2024 10:04, Shyam Sundar S K wrote: > > PMC driver has capability to get the IP information, idle mask values and > > STB data from the PMFW. Extend this support to the platforms that belong > > to family 1Ah model 60h series. > > > > Co-developed-by: Sanket Goswami <Sanket.Goswami@xxxxxxx> > > Signed-off-by: Sanket Goswami <Sanket.Goswami@xxxxxxx> > > Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@xxxxxxx> > > Reviewed-by: Mario Limonciello <mario.limonciello@xxxxxxx> > > This is actually a fix for another commit in 6.11. Hans, Ilpo, can you please > take it in fixes? > > Fixes: 426463d94d45d ("platform/x86/amd/pmc: Send OS_HINT command for new AMD > platform") For that, a proper justification is necessary in the commit message (but I guess Shyam was going to improve that too while respinning given the other replies). -- i. > > --- > > drivers/platform/x86/amd/pmc/pmc.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/platform/x86/amd/pmc/pmc.c > > b/drivers/platform/x86/amd/pmc/pmc.c > > index c3e51f0a5c33..bbb8edb62e00 100644 > > --- a/drivers/platform/x86/amd/pmc/pmc.c > > +++ b/drivers/platform/x86/amd/pmc/pmc.c > > @@ -359,6 +359,7 @@ static void amd_pmc_get_ip_info(struct amd_pmc_dev *dev) > > dev->smu_msg = 0x538; > > break; > > case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT: > > + case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT: > > dev->num_ips = 22; > > dev->s2d_msg_id = 0xDE; > > dev->smu_msg = 0x938; > > @@ -597,6 +598,7 @@ static int amd_pmc_idlemask_read(struct amd_pmc_dev > > *pdev, struct device *dev, > > val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_YC); > > break; > > case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT: > > + case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT: > > val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_1AH); > > break; > > default: > > @@ -630,6 +632,7 @@ static bool amd_pmc_is_stb_supported(struct amd_pmc_dev > > *dev) > > case AMD_CPU_ID_CB: > > case AMD_CPU_ID_PS: > > case PCI_DEVICE_ID_AMD_1AH_M20H_ROOT: > > + case PCI_DEVICE_ID_AMD_1AH_M60H_ROOT: > > return true; > > default: > > return false; >