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

!636 backport some PCC driver patches 

Merge Pull Request from: @li-huisong 
 
Our team want to upload HCCS driver on Kunpeng SoC, but PCC related codes in ACPI and mailbox
has never been backported from linux master. So we have to backport these codes as belows:
-->
mailbox: pcc: Reset pcc_chan_count to zero in case of PCC probe failure
i2c: xgene-slimpro: Fix wrong pointer passed to PTR_ERR()
mailbox: pcc: Fix spelling mistake "Plaform" -> "Platform"
mailbox: pcc: Fix an invalid-load caught by the address sanitizer
mailbox: pcc: Handle all PCC subtypes correctly in pcc_mbox_irq
mailbox: pcc: Avoid using the uninitialized variable 'dev'
mailbox: pcc: Move bulk of PCCT parsing into pcc_mbox_probe
mailbox: pcc: Add support for PCCT extended PCC subspaces(type 3/4)
mailbox: pcc: Drop handling invalid bit-width in {read,write}_register
mailbox: pcc: Avoid accessing PCCT table in pcc_send_data and pcc_mbox_irq
mailbox: pcc: Add PCC register bundle and associated accessor functions
mailbox: pcc: Rename doorbell ack to platform interrupt ack register
mailbox: pcc: Use PCC mailbox channel pointer instead of standard
mailbox: pcc: Add pcc_mbox_chan structure to hold shared memory region info
mailbox: pcc: Consolidate subspace doorbell register parsing
mailbox: pcc: Consolidate subspace interrupt information parsing
mailbox: pcc: Refactor all PCC channel information into a structure
mailbox: fix various typos in comments 
 
Link:https://gitee.com/openeuler/kernel/pulls/636

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents ddc0d0ec 1fc023e3

drivers/acpi/cppc_acpi.c

+15 −28
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <acpi/cppc_acpi.h>



struct cppc_pcc_data {

	struct mbox_chan *pcc_channel;

	struct pcc_mbox_chan *pcc_channel;

	void __iomem *pcc_comm_addr;

	bool pcc_channel_acquired;

	unsigned int deadline_us;
@@ -295,7 +295,7 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd) 
	pcc_ss_data->platform_owns_pcc = true;



	/* Ring doorbell */

	ret = mbox_send_message(pcc_ss_data->pcc_channel, &cmd);

	ret = mbox_send_message(pcc_ss_data->pcc_channel->mchan, &cmd);

	if (ret < 0) {

		pr_err("Err sending PCC mbox message. ss: %d cmd:%d, ret:%d\n",

		       pcc_ss_id, cmd, ret);
@@ -308,10 +308,10 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd) 
	if (pcc_ss_data->pcc_mrtt)

		pcc_ss_data->last_cmd_cmpl_time = ktime_get();



	if (pcc_ss_data->pcc_channel->mbox->txdone_irq)

		mbox_chan_txdone(pcc_ss_data->pcc_channel, ret);

	if (pcc_ss_data->pcc_channel->mchan->mbox->txdone_irq)

		mbox_chan_txdone(pcc_ss_data->pcc_channel->mchan, ret);

	else

		mbox_client_txdone(pcc_ss_data->pcc_channel, ret);

		mbox_client_txdone(pcc_ss_data->pcc_channel->mchan, ret);



end:

	if (cmd == CMD_WRITE) {
@@ -598,46 +598,33 @@ EXPORT_SYMBOL_GPL(acpi_get_psd_map); 


static int register_pcc_channel(int pcc_ss_idx)

{

	struct acpi_pcct_hw_reduced *cppc_ss;

	struct pcc_mbox_chan *pcc_chan;

	u64 usecs_lat;



	if (pcc_ss_idx >= 0) {

		pcc_data[pcc_ss_idx]->pcc_channel =

			pcc_mbox_request_channel(&cppc_mbox_cl,	pcc_ss_idx);

		pcc_chan = pcc_mbox_request_channel(&cppc_mbox_cl, pcc_ss_idx);



		if (IS_ERR(pcc_data[pcc_ss_idx]->pcc_channel)) {

		if (IS_ERR(pcc_chan)) {

			pr_err("Failed to find PCC channel for subspace %d\n",

			       pcc_ss_idx);

			return -ENODEV;

		}



		/*

		 * The PCC mailbox controller driver should

		 * have parsed the PCCT (global table of all

		 * PCC channels) and stored pointers to the

		 * subspace communication region in con_priv.

		 */

		cppc_ss = (pcc_data[pcc_ss_idx]->pcc_channel)->con_priv;



		if (!cppc_ss) {

			pr_err("No PCC subspace found for %d CPPC\n",

			       pcc_ss_idx);

			return -ENODEV;

		}



		pcc_data[pcc_ss_idx]->pcc_channel = pcc_chan;

		/*

		 * cppc_ss->latency is just a Nominal value. In reality

		 * the remote processor could be much slower to reply.

		 * So add an arbitrary amount of wait on top of Nominal.

		 */

		usecs_lat = NUM_RETRIES * cppc_ss->latency;

		usecs_lat = NUM_RETRIES * pcc_chan->latency;

		pcc_data[pcc_ss_idx]->deadline_us = usecs_lat;

		pcc_data[pcc_ss_idx]->pcc_mrtt = cppc_ss->min_turnaround_time;

		pcc_data[pcc_ss_idx]->pcc_mpar = cppc_ss->max_access_rate;

		pcc_data[pcc_ss_idx]->pcc_nominal = cppc_ss->latency;

		pcc_data[pcc_ss_idx]->pcc_mrtt = pcc_chan->min_turnaround_time;

		pcc_data[pcc_ss_idx]->pcc_mpar = pcc_chan->max_access_rate;

		pcc_data[pcc_ss_idx]->pcc_nominal = pcc_chan->latency;



		pcc_data[pcc_ss_idx]->pcc_comm_addr =

			acpi_os_ioremap(cppc_ss->base_address, cppc_ss->length);

			acpi_os_ioremap(pcc_chan->shmem_base_addr,

					pcc_chan->shmem_size);

		if (!pcc_data[pcc_ss_idx]->pcc_comm_addr) {

			pr_err("Failed to ioremap PCC comm region mem for %d\n",

			       pcc_ss_idx);

drivers/hwmon/xgene-hwmon.c

+13 −22
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ struct slimpro_resp_msg { 
struct xgene_hwmon_dev {

	struct device		*dev;

	struct mbox_chan	*mbox_chan;

	struct pcc_mbox_chan	*pcc_chan;

	struct mbox_client	mbox_client;

	int			mbox_idx;
@@ -652,7 +653,7 @@ static int xgene_hwmon_probe(struct platform_device *pdev) 
			goto out_mbox_free;

		}

	} else {

		struct acpi_pcct_hw_reduced *cppc_ss;

		struct pcc_mbox_chan *pcc_chan;

		const struct acpi_device_id *acpi_id;

		int version;
@@ -671,26 +672,16 @@ static int xgene_hwmon_probe(struct platform_device *pdev) 
		}



		cl->rx_callback = xgene_hwmon_pcc_rx_cb;

		ctx->mbox_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);

		if (IS_ERR(ctx->mbox_chan)) {

		pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);

		if (IS_ERR(pcc_chan)) {

			dev_err(&pdev->dev,

				"PPC channel request failed\n");

			rc = -ENODEV;

			goto out_mbox_free;

		}



		/*

		 * The PCC mailbox controller driver should

		 * have parsed the PCCT (global table of all

		 * PCC channels) and stored pointers to the

		 * subspace communication region in con_priv.

		 */

		cppc_ss = ctx->mbox_chan->con_priv;

		if (!cppc_ss) {

			dev_err(&pdev->dev, "PPC subspace not found\n");

			rc = -ENODEV;

			goto out;

		}

		ctx->pcc_chan = pcc_chan;

		ctx->mbox_chan = pcc_chan->mchan;



		if (!ctx->mbox_chan->mbox->txdone_irq) {

			dev_err(&pdev->dev, "PCC IRQ not supported\n");
@@ -702,16 +693,16 @@ static int xgene_hwmon_probe(struct platform_device *pdev) 
		 * This is the shared communication region

		 * for the OS and Platform to communicate over.

		 */

		ctx->comm_base_addr = cppc_ss->base_address;

		ctx->comm_base_addr = pcc_chan->shmem_base_addr;

		if (ctx->comm_base_addr) {

			if (version == XGENE_HWMON_V2)

				ctx->pcc_comm_addr = (void __force *)ioremap(

							ctx->comm_base_addr,

							cppc_ss->length);

							pcc_chan->shmem_size);

			else

				ctx->pcc_comm_addr = memremap(

							ctx->comm_base_addr,

							cppc_ss->length,

							pcc_chan->shmem_size,

							MEMREMAP_WB);

		} else {

			dev_err(&pdev->dev, "Failed to get PCC comm region\n");
@@ -727,11 +718,11 @@ static int xgene_hwmon_probe(struct platform_device *pdev) 
		}



		/*

		 * cppc_ss->latency is just a Nominal value. In reality

		 * pcc_chan->latency is just a Nominal value. In reality

		 * the remote processor could be much slower to reply.

		 * So add an arbitrary amount of wait on top of Nominal.

		 */

		ctx->usecs_lat = PCC_NUM_RETRIES * cppc_ss->latency;

		ctx->usecs_lat = PCC_NUM_RETRIES * pcc_chan->latency;

	}



	ctx->hwmon_dev = hwmon_device_register_with_groups(ctx->dev,
@@ -757,7 +748,7 @@ static int xgene_hwmon_probe(struct platform_device *pdev) 
	if (acpi_disabled)

		mbox_free_channel(ctx->mbox_chan);

	else

		pcc_mbox_free_channel(ctx->mbox_chan);

		pcc_mbox_free_channel(ctx->pcc_chan);

out_mbox_free:

	kfifo_free(&ctx->async_msg_fifo);
@@ -774,7 +765,7 @@ static int xgene_hwmon_remove(struct platform_device *pdev) 
	if (acpi_disabled)

		mbox_free_channel(ctx->mbox_chan);

	else

		pcc_mbox_free_channel(ctx->mbox_chan);

		pcc_mbox_free_channel(ctx->pcc_chan);



	return 0;

}

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

+12 −21
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct slimpro_i2c_dev { 
	struct i2c_adapter adapter;

	struct device *dev;

	struct mbox_chan *mbox_chan;

	struct pcc_mbox_chan *pcc_chan;

	struct mbox_client mbox_client;

	int mbox_idx;

	struct completion rd_complete;
@@ -467,7 +468,7 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) 
			return PTR_ERR(ctx->mbox_chan);

		}

	} else {

		struct acpi_pcct_hw_reduced *cppc_ss;

		struct pcc_mbox_chan *pcc_chan;

		const struct acpi_device_id *acpi_id;

		int version = XGENE_SLIMPRO_I2C_V1;
@@ -484,24 +485,14 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) 


		cl->tx_block = false;

		cl->rx_callback = slimpro_i2c_pcc_rx_cb;

		ctx->mbox_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);

		if (IS_ERR(ctx->mbox_chan)) {

		pcc_chan = pcc_mbox_request_channel(cl, ctx->mbox_idx);

		if (IS_ERR(pcc_chan)) {

			dev_err(&pdev->dev, "PCC mailbox channel request failed\n");

			return PTR_ERR(ctx->mbox_chan);

			return PTR_ERR(pcc_chan);

		}



		/*

		 * The PCC mailbox controller driver should

		 * have parsed the PCCT (global table of all

		 * PCC channels) and stored pointers to the

		 * subspace communication region in con_priv.

		 */

		cppc_ss = ctx->mbox_chan->con_priv;

		if (!cppc_ss) {

			dev_err(&pdev->dev, "PPC subspace not found\n");

			rc = -ENOENT;

			goto mbox_err;

		}

		ctx->pcc_chan = pcc_chan;

		ctx->mbox_chan = pcc_chan->mchan;



		if (!ctx->mbox_chan->mbox->txdone_irq) {

			dev_err(&pdev->dev, "PCC IRQ not supported\n");
@@ -513,17 +504,17 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) 
		 * This is the shared communication region

		 * for the OS and Platform to communicate over.

		 */

		ctx->comm_base_addr = cppc_ss->base_address;

		ctx->comm_base_addr = pcc_chan->shmem_base_addr;

		if (ctx->comm_base_addr) {

			if (version == XGENE_SLIMPRO_I2C_V2)

				ctx->pcc_comm_addr = memremap(

							ctx->comm_base_addr,

							cppc_ss->length,

							pcc_chan->shmem_size,

							MEMREMAP_WT);

			else

				ctx->pcc_comm_addr = memremap(

							ctx->comm_base_addr,

							cppc_ss->length,

							pcc_chan->shmem_size,

							MEMREMAP_WB);

		} else {

			dev_err(&pdev->dev, "Failed to get PCC comm region\n");
@@ -562,7 +553,7 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev) 
	if (acpi_disabled)

		mbox_free_channel(ctx->mbox_chan);

	else

		pcc_mbox_free_channel(ctx->mbox_chan);

		pcc_mbox_free_channel(ctx->pcc_chan);



	return rc;

}
@@ -576,7 +567,7 @@ static int xgene_slimpro_i2c_remove(struct platform_device *pdev) 
	if (acpi_disabled)

		mbox_free_channel(ctx->mbox_chan);

	else

		pcc_mbox_free_channel(ctx->mbox_chan);

		pcc_mbox_free_channel(ctx->pcc_chan);



	return 0;

}

drivers/mailbox/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ config OMAP_MBOX_KFIFO_SIZE 
	  module parameter).



config ROCKCHIP_MBOX

	bool "Rockchip Soc Intergrated Mailbox Support"

	bool "Rockchip Soc Integrated Mailbox Support"

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	help

	  This driver provides support for inter-processor communication

drivers/mailbox/bcm-flexrm-mailbox.c

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static void flexrm_enqueue_desc(u32 nhpos, u32 nhcnt, u32 reqid, 
	 *

	 * In general use, number of non-HEADER descriptors can easily go

	 * beyond 31. To tackle this situation, we have packet (or request)

	 * extenstion bits (STARTPKT and ENDPKT) in the HEADER descriptor.

	 * extension bits (STARTPKT and ENDPKT) in the HEADER descriptor.

	 *

	 * To use packet extension, the first HEADER descriptor of request

	 * (or packet) will have STARTPKT=1 and ENDPKT=0. The intermediate