Commit cf1ac483 authored by Huisong Li's avatar Huisong Li Committed by Zhang Zekun
Browse files

ACPI: PCC: Setup PCC Opregion handler only if platform interrupt is available 

mainline inclusion
from mainline-v6.2-rc1
commit a10b1c99
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VPZ8

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



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

Currently, PCC OpRegion handler depends on the availability of platform
interrupt to be functional currently. If it is not available, the OpRegion
can't be executed successfully or the desired outcome won't be possible.
So let's reject setting up the PCC OpRegion handler on the platform if
it doesn't support or have platform interrupt available.

Signed-off-by: default avatarHuisong Li <lihuisong@huawei.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
parent 015a1605

drivers/acpi/acpi_pcc.c

+29 −18
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, 
	struct pcc_data *data;

	struct acpi_pcc_info *ctx = handler_context;

	struct pcc_mbox_chan *pcc_chan;

	static acpi_status ret;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)
@@ -69,23 +70,35 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, 
	if (IS_ERR(data->pcc_chan)) {

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

		       ctx->subspace_id);

		kfree(data);

		return AE_NOT_FOUND;

		ret = AE_NOT_FOUND;

		goto err_free_data;

	}



	pcc_chan = data->pcc_chan;

	if (!pcc_chan->mchan->mbox->txdone_irq) {

		pr_err("This channel-%d does not support interrupt.\n",

		       ctx->subspace_id);

		ret = AE_SUPPORT;

		goto err_free_channel;

	}

	data->pcc_comm_addr = acpi_os_ioremap(pcc_chan->shmem_base_addr,

					      pcc_chan->shmem_size);

	if (!data->pcc_comm_addr) {

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

		       ctx->subspace_id);

		pcc_mbox_free_channel(data->pcc_chan);

		kfree(data);

		return AE_NO_MEMORY;

		ret = AE_NO_MEMORY;

		goto err_free_channel;

	}



	*region_context = data;

	return AE_OK;



err_free_channel:

	pcc_mbox_free_channel(data->pcc_chan);

err_free_data:

	kfree(data);



	return ret;

}



static acpi_status
@@ -106,7 +119,6 @@ acpi_pcc_address_space_handler(u32 function, acpi_physical_address addr, 
	if (ret < 0)

		return AE_ERROR;



	if (data->pcc_chan->mchan->mbox->txdone_irq) {

	/*

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

	 * processor could be much slower to reply. So add an arbitrary
@@ -119,7 +131,6 @@ acpi_pcc_address_space_handler(u32 function, acpi_physical_address addr, 
		pr_err("PCC command executed timeout!\n");

		return AE_TIME;

	}

	}



	mbox_chan_txdone(data->pcc_chan->mchan, ret);