Unverified Commit 26187503 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2868 backport the patch moving ACPI PCC macro definition to common header file 

Merge Pull Request from: @li-huisong 
 
backport the patch moving ACPI PCC macro definition to common header file, as belows:
a46e42c09798 soc: kunpeng_hccs: Migrate to use generic PCC shmem related macros
2cf39b806be7 hwmon: (xgene) Migrate to use generic PCC shmem related macros
89a4ad1f437c i2c: xgene-slimpro: Migrate to use generic PCC shmem related macros
55d235ebb684 ACPI: PCC: Add PCC shared memory region command and status bitfields 
 
Link:https://gitee.com/openeuler/kernel/pulls/2868

 

Reviewed-by: default avatarFred Kimmy <xweikong@163.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 30db8170 6d5bb17d

drivers/hwmon/xgene-hwmon.c

+5 −11
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ 
	(MSG_TYPE_SET(MSG_TYPE_PWRMGMT) | \

	MSG_SUBTYPE_SET(hndl) | TPC_CMD_SET(cmd) | type)



/* PCC defines */

#define PCC_SIGNATURE_MASK		0x50424300

#define PCCC_GENERATE_DB_INT		BIT(15)

#define PCCS_CMD_COMPLETE		BIT(0)

#define PCCS_SCI_DOORBEL		BIT(1)

#define PCCS_PLATFORM_NOTIFICATION	BIT(3)

/*

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

 * to PCC commands
@@ -142,15 +136,15 @@ static int xgene_hwmon_pcc_rd(struct xgene_hwmon_dev *ctx, u32 *msg) 


	/* Write signature for subspace */

	WRITE_ONCE(generic_comm_base->signature,

		   cpu_to_le32(PCC_SIGNATURE_MASK | ctx->mbox_idx));

		   cpu_to_le32(PCC_SIGNATURE | ctx->mbox_idx));



	/* Write to the shared command region */

	WRITE_ONCE(generic_comm_base->command,

		   cpu_to_le16(MSG_TYPE(msg[0]) | PCCC_GENERATE_DB_INT));

		   cpu_to_le16(MSG_TYPE(msg[0]) | PCC_CMD_GENERATE_DB_INTR));



	/* Flip CMD COMPLETE bit */

	val = le16_to_cpu(READ_ONCE(generic_comm_base->status));

	val &= ~PCCS_CMD_COMPLETE;

	val &= ~PCC_STATUS_CMD_COMPLETE;

	WRITE_ONCE(generic_comm_base->status, cpu_to_le16(val));



	/* Copy the message to the PCC comm space */
@@ -544,7 +538,7 @@ static void xgene_hwmon_pcc_rx_cb(struct mbox_client *cl, void *msg) 
	msg = generic_comm_base + 1;

	/* Check if platform sends interrupt */

	if (!xgene_word_tst_and_clr(&generic_comm_base->status,

				    PCCS_SCI_DOORBEL))

				    PCC_STATUS_SCI_DOORBELL))

		return;



	/*
@@ -566,7 +560,7 @@ static void xgene_hwmon_pcc_rx_cb(struct mbox_client *cl, void *msg) 
	      TPC_CMD(((u32 *)msg)[0]) == TPC_ALARM))) {

		/* Check if platform completes command */

		if (xgene_word_tst_and_clr(&generic_comm_base->status,

					   PCCS_CMD_COMPLETE)) {

					   PCC_STATUS_CMD_COMPLETE)) {

			ctx->sync_msg.msg = ((u32 *)msg)[0];

			ctx->sync_msg.param1 = ((u32 *)msg)[1];

			ctx->sync_msg.param2 = ((u32 *)msg)[2];

drivers/i2c/busses/i2c-xgene-slimpro.c

+4 −12
Original line number Diff line number Diff line
@@ -92,14 +92,6 @@ 


#define SLIMPRO_IIC_MSG_DWORD_COUNT			3



/* PCC related defines */

#define PCC_SIGNATURE			0x50424300

#define PCC_STS_CMD_COMPLETE		BIT(0)

#define PCC_STS_SCI_DOORBELL		BIT(1)

#define PCC_STS_ERR			BIT(2)

#define PCC_STS_PLAT_NOTIFY		BIT(3)

#define PCC_CMD_GENERATE_DB_INT		BIT(15)



struct slimpro_i2c_dev {

	struct i2c_adapter adapter;

	struct device *dev;
@@ -161,11 +153,11 @@ static void slimpro_i2c_pcc_rx_cb(struct mbox_client *cl, void *msg) 


	/* Check if platform sends interrupt */

	if (!xgene_word_tst_and_clr(&generic_comm_base->status,

				    PCC_STS_SCI_DOORBELL))

				    PCC_STATUS_SCI_DOORBELL))

		return;



	if (xgene_word_tst_and_clr(&generic_comm_base->status,

				   PCC_STS_CMD_COMPLETE)) {

				   PCC_STATUS_CMD_COMPLETE)) {

		msg = generic_comm_base + 1;



		/* Response message msg[1] contains the return value. */
@@ -187,10 +179,10 @@ static void slimpro_i2c_pcc_tx_prepare(struct slimpro_i2c_dev *ctx, u32 *msg) 
		   cpu_to_le32(PCC_SIGNATURE | ctx->mbox_idx));



	WRITE_ONCE(generic_comm_base->command,

		   cpu_to_le16(SLIMPRO_MSG_TYPE(msg[0]) | PCC_CMD_GENERATE_DB_INT));

		   cpu_to_le16(SLIMPRO_MSG_TYPE(msg[0]) | PCC_CMD_GENERATE_DB_INTR));



	status = le16_to_cpu(READ_ONCE(generic_comm_base->status));

	status &= ~PCC_STS_CMD_COMPLETE;

	status &= ~PCC_STATUS_CMD_COMPLETE;

	WRITE_ONCE(generic_comm_base->status, cpu_to_le16(status));



	/* Copy the message to the PCC comm space */

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 */

include/acpi/pcc.h

+13 −0
Original line number Diff line number Diff line
@@ -18,7 +18,20 @@ struct pcc_mbox_chan { 
	u16 min_turnaround_time;

};



/* Generic Communications Channel Shared Memory Region */

#define PCC_SIGNATURE			0x50434300

/* Generic Communications Channel Command Field */

#define PCC_CMD_GENERATE_DB_INTR	BIT(15)

/* Generic Communications Channel Status Field */

#define PCC_STATUS_CMD_COMPLETE		BIT(0)

#define PCC_STATUS_SCI_DOORBELL		BIT(1)

#define PCC_STATUS_ERROR		BIT(2)

#define PCC_STATUS_PLATFORM_NOTIFY	BIT(3)

/* Initiator Responder Communications Channel Flags */

#define PCC_CMD_COMPLETION_NOTIFY	BIT(0)



#define MAX_PCC_SUBSPACES	256



#ifdef CONFIG_PCC

extern struct pcc_mbox_chan *

pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id);