Commit 6d5bb17d authored by Sudeep Holla's avatar Sudeep Holla Committed by Huisong Li
Browse files

soc: kunpeng_hccs: Migrate to use generic PCC shmem related macros 

mainline inclusion
from mainline-v6.7-rc1
commit a46e42c097982e258f89c64c5f52f30994bcfeda
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8GQ30
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a46e42c097982e258f89c64c5f52f30994bcfeda



--------------------------------

Use the newly defined common and generic PCC shared memory region
related macros in this driver to replace the locally defined ones.

Cc: Huisong Li <lihuisong@huawei.com>
Reviewed-by: default avatarHuisong Li <lihuisong@huawei.com>
Link: https://lore.kernel.org/r/20230927-pcc_defines-v2-4-0b8ffeaef2e5@arm.com


Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 5005913f

drivers/soc/hisilicon/kunpeng_hccs.c

+2 −6
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 


#include "kunpeng_hccs.h"



/* PCC defines */

#define HCCS_PCC_SIGNATURE_MASK		0x50434300

#define HCCS_PCC_STATUS_CMD_COMPLETE	BIT(0)



/*

 * Arbitrary retries in case the remote processor is slow to respond

 * to PCC commands
@@ -187,7 +183,7 @@ static int hccs_check_chan_cmd_complete(struct hccs_dev *hdev) 
	 * deadline_us(timeout_us) until PCC command complete bit is set(cond)

	 */

	ret = readw_poll_timeout(&comm_base->status, status,

				 status & HCCS_PCC_STATUS_CMD_COMPLETE,

				 status & PCC_STATUS_CMD_COMPLETE,

				 HCCS_POLL_STATUS_TIME_INTERVAL_US,

				 cl_info->deadline_us);

	if (unlikely(ret))
@@ -208,7 +204,7 @@ static int hccs_pcc_cmd_send(struct hccs_dev *hdev, u8 cmd, 
	int ret;



	/* Write signature for this subspace */

	tmp.signature = HCCS_PCC_SIGNATURE_MASK | hdev->chan_id;

	tmp.signature = PCC_SIGNATURE | hdev->chan_id;

	/* Write to the shared command region */

	tmp.command = cmd;

	/* Clear cmd complete bit */