Commit 9c6959ec authored by Sudeep Holla's avatar Sudeep Holla Committed by Huisong
Browse files

mailbox: pcc: Consolidate subspace interrupt information parsing 

mainline inclusion
from mainline-v5.16-rc1
commit 319bfb35
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6Z91B
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.3-rc2&id=319bfb35bd1dbc1b67e577c9893b9e8b29650b19



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

Extended PCC subspaces(Type 3 and 4) differ from generic(Type 0) and
HW-Reduced Communication(Type 1 and 2) subspace structures. However some
fields share same offsets and same type of structure can be use to extract
the fields. In order to simplify that, let us move all the IRQ related
information parsing into pcc_parse_subspace_irq and consolidate there.
It will be easier to extend it if required within the same.

Reviewed-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent 55d7ee6b

drivers/mailbox/pcc.c

+19 −19
Original line number Original line Diff line number Diff line
@@ -401,18 +401,26 @@ static int parse_pcc_subspace(union acpi_subtable_headers *header, 




/**

/**

 * pcc_parse_subspace_irq - Parse the PCC IRQ and PCC ACK register

 * pcc_parse_subspace_irq - Parse the PCC IRQ and PCC ACK register

 *		There should be one entry per PCC client.

 *

 * @id: PCC subspace index.

 * @pchan: Pointer to the PCC channel info structure.

 * @pcct_ss: Pointer to the ACPI subtable header under the PCCT.

 * @pcct_entry: Pointer to the ACPI subtable header.

 *

 *

 * Return: 0 for Success, else errno.

 * Return: 0 for Success, else errno.

 *

 *

 * This gets called for each entry in the PCC table.

 * There should be one entry per PCC channel. This gets called for each

 * entry in the PCC table. This uses PCCY Type1 structure for all applicable

 * types(Type 1-4) to fetch irq

 */

 */

static int pcc_parse_subspace_irq(int id, struct acpi_pcct_hw_reduced *pcct_ss)

static int pcc_parse_subspace_irq(struct pcc_chan_info *pchan,

				  struct acpi_subtable_header *pcct_entry)

{

{

	struct pcc_chan_info *pchan = chan_info + id;

	struct acpi_pcct_hw_reduced *pcct_ss;



	if (pcct_entry->type < ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE ||

	    pcct_entry->type > ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE)

		return 0;





	pcct_ss = (struct acpi_pcct_hw_reduced *)pcct_entry;

	pchan->db_irq = pcc_map_interrupt(pcct_ss->platform_interrupt,

	pchan->db_irq = pcc_map_interrupt(pcct_ss->platform_interrupt,

					  (u32)pcct_ss->flags);

					  (u32)pcct_ss->flags);

	if (pchan->db_irq <= 0) {

	if (pchan->db_irq <= 0) {
@@ -421,8 +429,7 @@ static int pcc_parse_subspace_irq(int id, struct acpi_pcct_hw_reduced *pcct_ss) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	if (pcct_ss->header.type

	if (pcct_ss->header.type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {

		== ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {

		struct acpi_pcct_hw_reduced_type2 *pcct2_ss = (void *)pcct_ss;

		struct acpi_pcct_hw_reduced_type2 *pcct2_ss = (void *)pcct_ss;





		pchan->db_ack_vaddr =

		pchan->db_ack_vaddr =
@@ -506,18 +513,11 @@ static int __init acpi_pcc_probe(void) 
		struct acpi_pcct_subspace *pcct_ss;

		struct acpi_pcct_subspace *pcct_ss;

		pcc_mbox_channels[i].con_priv = pcct_entry;

		pcc_mbox_channels[i].con_priv = pcct_entry;





		if (pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE ||

		    pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {

			struct acpi_pcct_hw_reduced *pcct_hrss;



			pcct_hrss = (struct acpi_pcct_hw_reduced *) pcct_entry;



		if (pcc_mbox_ctrl.txdone_irq) {

		if (pcc_mbox_ctrl.txdone_irq) {

				rc = pcc_parse_subspace_irq(i, pcct_hrss);

			rc = pcc_parse_subspace_irq(pchan, pcct_entry);

			if (rc < 0)

			if (rc < 0)

				goto err;

				goto err;

		}

		}

		}

		pcct_ss = (struct acpi_pcct_subspace *) pcct_entry;

		pcct_ss = (struct acpi_pcct_subspace *) pcct_entry;





		/* If doorbell is in system memory cache the virt address */

		/* If doorbell is in system memory cache the virt address */