Commit 76b5c138 authored by Sudeep Holla's avatar Sudeep Holla Committed by Huisong
Browse files

mailbox: pcc: Rename doorbell ack to platform interrupt ack register 

mainline inclusion
from mainline-v5.16-rc1
commit f92ae90e
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=f92ae90e52bb09d6856ef2785773be59dd633f85



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

The specification refers this register and associated bitmask as platform
interrupt acknowledge register. Let us rename it so that it is easier to
map and understand.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent 94e62591

drivers/mailbox/pcc.c

+17 −16
Original line number Diff line number Diff line
@@ -69,14 +69,15 @@ static struct mbox_chan *pcc_mbox_channels; 
 *

 * @chan: PCC channel information with Shared Memory Region info

 * @db_vaddr: cached virtual address for doorbell register

 * @db_ack_vaddr: cached virtual address for doorbell ack register

 * @db_irq: doorbell interrupt

 * @plat_irq_ack_vaddr: cached virtual address for platform interrupt

 *	acknowledge register

 * @plat_irq: platform interrupt

 */

struct pcc_chan_info {

	struct pcc_mbox_chan chan;

	void __iomem *db_vaddr;

	void __iomem *db_ack_vaddr;

	int db_irq;

	void __iomem *plat_irq_ack_vaddr;

	int plat_irq;

};



#define to_pcc_chan_info(c) container_of(c, struct pcc_chan_info, chan)
@@ -194,12 +195,12 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p) 
		doorbell_ack_preserve = pcct2_ss->ack_preserve_mask;

		doorbell_ack_write = pcct2_ss->ack_write_mask;



		ret = read_register(pchan->db_ack_vaddr,

		ret = read_register(pchan->plat_irq_ack_vaddr,

				    &doorbell_ack_val, doorbell_ack->bit_width);

		if (ret)

			return IRQ_NONE;



		ret = write_register(pchan->db_ack_vaddr,

		ret = write_register(pchan->plat_irq_ack_vaddr,

				     (doorbell_ack_val & doorbell_ack_preserve)

					| doorbell_ack_write,

				     doorbell_ack->bit_width);
@@ -252,14 +253,14 @@ pcc_mbox_request_channel(struct mbox_client *cl, int subspace_id) 


	spin_unlock_irqrestore(&chan->lock, flags);



	if (pchan->db_irq > 0) {

	if (pchan->plat_irq > 0) {

		int rc;



		rc = devm_request_irq(dev, pchan->db_irq, pcc_mbox_irq, 0,

		rc = devm_request_irq(dev, pchan->plat_irq, pcc_mbox_irq, 0,

				      MBOX_IRQ_NAME, chan);

		if (unlikely(rc)) {

			dev_err(dev, "failed to register PCC interrupt %d\n",

				pchan->db_irq);

				pchan->plat_irq);

			pcc_mbox_free_channel(&pchan->chan);

			return ERR_PTR(rc);

		}
@@ -284,8 +285,8 @@ void pcc_mbox_free_channel(struct pcc_mbox_chan *pchan) 
	if (!chan || !chan->cl)

		return;



	if (pchan_info->db_irq > 0)

		devm_free_irq(chan->mbox->dev, pchan_info->db_irq, chan);

	if (pchan_info->plat_irq > 0)

		devm_free_irq(chan->mbox->dev, pchan_info->plat_irq, chan);



	spin_lock_irqsave(&chan->lock, flags);

	chan->cl = NULL;
@@ -396,9 +397,9 @@ static int pcc_parse_subspace_irq(struct pcc_chan_info *pchan, 
		return 0;



	pcct_ss = (struct acpi_pcct_hw_reduced *)pcct_entry;

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

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

					    (u32)pcct_ss->flags);

	if (pchan->db_irq <= 0) {

	if (pchan->plat_irq <= 0) {

		pr_err("PCC GSI %d not registered\n",

		       pcct_ss->platform_interrupt);

		return -EINVAL;
@@ -407,10 +408,10 @@ static int pcc_parse_subspace_irq(struct pcc_chan_info *pchan, 
	if (pcct_ss->header.type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {

		struct acpi_pcct_hw_reduced_type2 *pcct2_ss = (void *)pcct_ss;



		pchan->db_ack_vaddr =

		pchan->plat_irq_ack_vaddr =

			acpi_os_ioremap(pcct2_ss->platform_ack_register.address,

					pcct2_ss->platform_ack_register.bit_width / 8);

		if (!pchan->db_ack_vaddr) {

		if (!pchan->plat_irq_ack_vaddr) {

			pr_err("Failed to ioremap PCC ACK register\n");

			return -ENOMEM;

		}