Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v2] platform/x86: amd-pmc: Export Idlemask values based on
 the APU
To:     Sanket Goswami <Sanket.Goswami@amd.com>, hdegoede@redhat.com,
        mgross@linux.intel.com
Cc:     platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org,
        "Limonciello, Mario" <Mario.Limonciello@amd.com>
References: <20210916124002.2529-1-Sanket.Goswami@amd.com>
From:   Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Message-ID: <de42f717-4cb1-6056-bec1-b46271bbcab8@amd.com>
Date:   Thu, 16 Sep 2021 18:30:49 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <20210916124002.2529-1-Sanket.Goswami@amd.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-GB
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ak1rYTU5cnY1bS9zYzBnS3ZnMUhYOGJSR2FXSm5XSUphajZyOU9rVWd1Z0tY?=
 =?utf-8?B?eStTbjYwZUZnYlMzOHN2R0FQdTg3REM5ZUJEcnJReEZPKzBNc2hmbFU4RUhY?=
 =?utf-8?B?QlZuWjliM01HYnVSM1duRG5xR1RsNTU0S29ibkQ0ZStzNlpTN3V6eVZtNys1?=
 =?utf-8?B?aHNCRVBhdXBZOWlmUHNoWVp1Rmwrcy9seUtDcWFjVEEwei92Uk1neW5GaU1G?=
 =?utf-8?B?aGd6L3plUFlhbThwUXRvc3Q2TmJkYnpuZjVDdys4MCtPT0tvaXQwT1duNW5w?=
 =?utf-8?B?WmFSKzBiR0NxUTdQa2JHbHVPZXBXZEs2MExrNjR1enpMd0FXa05ZOW80bkNQ?=
 =?utf-8?B?Zm9yQ1VudEx5czkydkY4RXFGNzI0L0lmRXdWNGhmTTBKbnlIVk9yNndPNXJ1?=
 =?utf-8?B?ditMbjVVMXZYZDRpSU9KNkVLWDk3eHdwOVVqNUxDOUJWMmVqSVFzeEpUODJI?=
 =?utf-8?B?aWNKMGZ3TmhVbXJOdHZiZVRKK1JZY2ZZeERjblkwSEN6ekdsQVdIK3hTZCtL?=
 =?utf-8?B?cXFFRXhydEF6Rk9rbXd5Z2hRU0wxRTBwZkxSb2t1ajRydEplWXdLMzBCUHBo?=
 =?utf-8?B?ZGZKdXhORDlzSm9QRXNweXhxeVJxMUh2ekQ0cFJjTDMxeUJTaERJdGprbnA4?=
 =?utf-8?B?TnF2ZndWc3JsenN2dERrVGx3QkcwdnU1Uk93TWF6RjZ5OHNmK3FOMlVmcXZ5?=
 =?utf-8?B?NDBZNE9haDY1RjZneXZNMXBkNnhDSnZJdWNGN1BFSitmM0drSm1OYTJMRjhi?=
 =?utf-8?B?K3Y2NjUvZEw3ZHh2ekVCRDEwWk5XSldFOTNkempYMHl0UXdtUEFnYURpNXpX?=
 =?utf-8?B?MHBZckEwWHdTK0d2bHlIRGlScVBOcEhmK3JuMzdTZGkreXNyNy90ZmdLZGlu?=
 =?utf-8?B?SjhHN1d2RHVaTEVJc1RTaG5qT1dPT1kwODdBWi83aVU2Q1Q0RTF6eW5yUzdj?=
 =?utf-8?B?bVRTUFcwWmhreEtiV0VBN29IejN0R2FxVXhSVGo3L2pFajBhVWs4N2JzdU9o?=
 =?utf-8?B?bVNDWkczd0dyL2NoeW1zWHJlamVWbXlGUmJ0b3ZmWDNPaVQvWEd0cHpyYWdU?=
 =?utf-8?B?MnZrU25EUmRNVWZBQ1BoS0o5Z2ovN1VzY25KN1lMYTVZNzJaUEErMU5tQ0FB?=
 =?utf-8?B?K2VZMTB6VUdMaGw3TTFzS2VMVjlocVdNS1ZhUnE2SlpZd1YzdVV2MjJmZVI2?=
 =?utf-8?B?cG1JWFlJVTZXR2lLemZnYk13eWNyWjZyS1BwWU9PYVVneFRKRGxGOGlHeXFw?=
 =?utf-8?B?RGVDSVlkbUxSMDdORTJsOWFmcTB1WmlxS2V0bzJPVGtOVFVMTXBCcjVhS0NK?=
 =?utf-8?B?NXlSN2hUaWNIOExiZVBaaTNiQTVORVVYWlpGdEw2Vy90cXdNaTFaRlJQRlVQ?=
 =?utf-8?B?dXZaMFVSOU5LRWlyVTgwc2VIc3RoOXhzYVNXSzNnT1o0aXZIZ0ZuTkl6Mkk5?=
 =?utf-8?B?TEdkZnhOYnlZb2ltbEY0RU82M2g2UWJlUTAvenRWQnlHeHpXaUtYYjdMTm1Q?=
 =?utf-8?B?Zm9qNzQzQnFzZmNMNkpuSGw4b0RqWHNUcjJmWFp0MmZlc1RJKzdJRUJQancv?=
 =?utf-8?B?ZEcvaU82V0I2dGF4bGxUK1l0MFp6ajdTcjF5N2hGUEx3SU9rTlJzZmRVVkM0?=
 =?utf-8?B?STFWeUdmZ0E2andaeXVnUXNjcVk0Z1BqVEpHYW9IbHF6Q284akRFRkFMdkxC?=
 =?utf-8?B?VW1zQ0hORndwWGhnN0tSa2ZaVVhGb0pBTFFrdmtmeXozRlVvanVEcmlRSHdQ?=
 =?utf-8?Q?/4IrrDahJMYF4vHVT+fMIKumvq6Jx4mrP8XQFQn?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7730e8a2-691a-4783-009e-08d979120893
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2021 13:01:01.1054
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KnyOXovknU9dMzUMNZUcupbTLrEmhtprS/yGPG2kyR5FhIgiTGYs+6gKiXx+g1Oan39aJWv5Bj7Wvz8lGTmoqQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5288
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

+Mario

On 9/16/2021 6:10 PM, Sanket Goswami wrote:
> IdleMask is the metric used by the PM firmware to know the status of each
> of the Hardware IP blocks monitored by the PM firmware.
> 
> Knowing this value is key to get the information of s2idle suspend/resume
> status. This value is mapped to PMC scratch registers, retrieve them
> accordingly based on the CPU family and the underlying firmware support.
> 
> Co-developed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
> Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
> ---
> Changes in v2:
> - Add separate routine amd_pmc_idlemask_read to get the value.
> - Address review comments from Mario.
> 
>  drivers/platform/x86/amd-pmc.c | 76 ++++++++++++++++++++++++++++++++++
>  1 file changed, 76 insertions(+)
> 
> diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
> index 3481479a2942..0c970f613e09 100644
> --- a/drivers/platform/x86/amd-pmc.c
> +++ b/drivers/platform/x86/amd-pmc.c
> @@ -29,6 +29,10 @@
>  #define AMD_PMC_REGISTER_RESPONSE	0x980
>  #define AMD_PMC_REGISTER_ARGUMENT	0x9BC
>  
> +/* PMC Scratch Registers */
> +#define AMD_PMC_SCRATCH_REG_CZN		0x94
> +#define AMD_PMC_SCRATCH_REG_YC		0xD14
> +
>  /* Base address of SMU for mapping physical address to virtual address */
>  #define AMD_PMC_SMU_INDEX_ADDRESS	0xB8
>  #define AMD_PMC_SMU_INDEX_DATA		0xBC
> @@ -110,6 +114,10 @@ struct amd_pmc_dev {
>  	u32 base_addr;
>  	u32 cpu_id;
>  	u32 active_ips;
> +/* SMU version information */
> +	u16 major;
> +	u16 minor;
> +	u16 rev;
>  	struct device *dev;
>  	struct mutex lock; /* generic mutex lock */
>  #if IS_ENABLED(CONFIG_DEBUG_FS)
> @@ -201,6 +209,66 @@ static int s0ix_stats_show(struct seq_file *s, void *unused)
>  }
>  DEFINE_SHOW_ATTRIBUTE(s0ix_stats);
>  
> +static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev)
> +{
> +	int rc;
> +	u32 val;
> +
> +	rc = amd_pmc_send_cmd(dev, 0, &val, SMU_MSG_GETSMUVERSION, 1);
> +	if (rc)
> +		return rc;
> +
> +	dev->major = (val >> 16) & GENMASK(15, 0);
> +	dev->minor = (val >> 8) & GENMASK(7, 0);
> +	dev->rev = (val >> 0) & GENMASK(7, 0);
> +
> +	dev_dbg(dev->dev, "SMU version is %u.%u.%u\n", dev->major, dev->minor, dev->rev);
> +
> +	return 0;
> +}
> +
> +static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev,
> +				 struct seq_file *s)
> +{
> +	u32 val;
> +
> +	switch (pdev->cpu_id) {
> +	case AMD_CPU_ID_CZN:
> +		val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_CZN);
> +		break;
> +	case AMD_CPU_ID_YC:
> +		val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_YC);
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	if (dev)
> +		dev_dbg(pdev->dev, "SMU idlemask s0i3: 0x%x\n", val);
> +
> +	if (s)
> +		seq_printf(s, "SMU idlemask : 0x%x\n", val);
> +
> +	return 0;
> +}
> +
> +static int amd_pmc_idlemask_show(struct seq_file *s, void *unused)
> +{
> +	struct amd_pmc_dev *dev = s->private;
> +	int rc;
> +
> +	if (dev->major > 56 || (dev->major >= 55 && dev->minor >= 37)) {
> +		rc = amd_pmc_idlemask_read(dev, NULL, s);
> +		if (rc)
> +			return rc;
> +	} else {
> +		seq_puts(s, "Unsupported SMU version for Idlemask\n");
> +	}
> +
> +	return 0;
> +}
> +DEFINE_SHOW_ATTRIBUTE(amd_pmc_idlemask);
> +
>  static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
>  {
>  	debugfs_remove_recursive(dev->dbgfs_dir);
> @@ -213,6 +281,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
>  			    &smu_fw_info_fops);
>  	debugfs_create_file("s0ix_stats", 0644, dev->dbgfs_dir, dev,
>  			    &s0ix_stats_fops);
> +	debugfs_create_file("amd_pmc_idlemask", 0644, dev->dbgfs_dir, dev,
> +			    &amd_pmc_idlemask_fops);
>  }
>  #else
>  static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
> @@ -349,6 +419,8 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
>  	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0);
>  	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0);
>  
> +	/* Dump the IdleMask before we send hint to SMU */
> +	amd_pmc_idlemask_read(pdev, dev, NULL);
>  	msg = amd_pmc_get_os_hint(pdev);
>  	rc = amd_pmc_send_cmd(pdev, 1, NULL, msg, 0);
>  	if (rc)
> @@ -371,6 +443,9 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
>  	if (rc)
>  		dev_err(pdev->dev, "resume failed\n");
>  
> +	/* Dump the IdleMask to see the blockers */
> +	amd_pmc_idlemask_read(pdev, dev, NULL);
> +
>  	return 0;
>  }
>  
> @@ -457,6 +532,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
>  	if (err)
>  		dev_err(dev->dev, "SMU debugging info not supported on this platform\n");
>  
> +	amd_pmc_get_smu_version(dev);
>  	platform_set_drvdata(pdev, dev);
>  	amd_pmc_dbgfs_register(dev);
>  	return 0;
> 

Looks good to me.

Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>