Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jianmin Lv <lvjianmin@loongson.cn>
To:     Thomas Gleixner <tglx@linutronix.de>, Marc Zyngier <maz@kernel.org>
Cc:     linux-kernel@vger.kernel.org, loongarch@lists.linux.dev,
        Jiaxun Yang <jiaxun.yang@flygoat.com>,
        Huacai Chen <chenhuacai@loongson.cn>
Subject: [PATCH V1 1/2] irqchip/loongson-pch-pic: Support to set irq type for ACPI path
Date:   Tue, 16 Aug 2022 10:01:30 +0800
Message-Id: <1660615291-35409-2-git-send-email-lvjianmin@loongson.cn>
In-Reply-To: <1660615291-35409-1-git-send-email-lvjianmin@loongson.cn>
References: <1660615291-35409-1-git-send-email-lvjianmin@loongson.cn>
Precedence: bulk

For ACPI path, the translate callback used IRQ_TYPE_NONE and ignored
the irq type in fwspec->param[1]. For supporting to set type for
irqs of the irqdomain, fwspec->param[1] should be used to get irq
type.

On Loongson platform, the irq trigger type of PCI devices is
high level, so high level triggered type is inputed to acpi_register_gsi
when create irq mapping for PCI devices.

Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
---
 drivers/acpi/pci_irq.c                 |  3 ++-
 drivers/irqchip/irq-loongson-pch-pic.c | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 08e1577..34483b3 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -393,7 +393,8 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 	 * controller and must therefore be considered active high
 	 * as default.
 	 */
-	int polarity = acpi_irq_model == ACPI_IRQ_MODEL_GIC ?
+	int polarity = acpi_irq_model == ACPI_IRQ_MODEL_GIC ||
+		       acpi_irq_model == ACPI_IRQ_MODEL_LPIC ?
 				      ACPI_ACTIVE_HIGH : ACPI_ACTIVE_LOW;
 	char *link = NULL;
 	char link_desc[16];
diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index b6f1392..5067010 100644
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -177,13 +177,15 @@ static int pch_pic_domain_translate(struct irq_domain *d,
 	if (fwspec->param_count < 1)
 		return -EINVAL;
 
-	if (of_node) {
+	if (of_node)
 		*hwirq = fwspec->param[0] + priv->ht_vec_base;
-		*type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
-	} else {
+	else
 		*hwirq = fwspec->param[0] - priv->gsi_base;
+
+	if (fwspec->param_count > 1)
+		*type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
+	else
 		*type = IRQ_TYPE_NONE;
-	}
 
 	return 0;
 }
-- 
1.8.3.1