From: Sunil V L <sunilvl@xxxxxxxxxxxxxxxx> Add ACPI support for the RISC-V SBI message proxy (MPXY) based mailbox driver. Signed-off-by: Sunil V L <sunilvl@xxxxxxxxxxxxxxxx> Signed-off-by: Anup Patel <apatel@xxxxxxxxxxxxxxxx> --- drivers/mailbox/riscv-sbi-mpxy-mbox.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/riscv-sbi-mpxy-mbox.c b/drivers/mailbox/riscv-sbi-mpxy-mbox.c index 4021f62ff487..0ce89970c5bd 100644 --- a/drivers/mailbox/riscv-sbi-mpxy-mbox.c +++ b/drivers/mailbox/riscv-sbi-mpxy-mbox.c @@ -5,6 +5,7 @@ * Copyright (C) 2024 Ventana Micro Systems Inc. */ +#include <linux/acpi.h> #include <asm/sbi.h> #include <linux/cpu.h> #include <linux/err.h> @@ -12,6 +13,7 @@ #include <linux/jump_label.h> #include <linux/kernel.h> #include <linux/mailbox_controller.h> +#include <linux/irqchip/riscv-imsic.h> #include <linux/mailbox/riscv-rpmi-message.h> #include <linux/mm.h> #include <linux/module.h> @@ -924,8 +926,16 @@ static int mpxy_mbox_probe(struct platform_device *pdev) * then we need to set it explicitly before using any platform * MSI functions. */ - if (is_of_node(dev->fwnode)) + if (is_of_node(dev->fwnode)) { of_msi_configure(dev, to_of_node(dev->fwnode)); + } else { + struct irq_domain *msi_domain; + + msi_domain = irq_find_matching_fwnode(imsic_acpi_get_fwnode(dev), + DOMAIN_BUS_PLATFORM_MSI); + if (msi_domain) + dev_set_msi_domain(dev, msi_domain); + } } /* Setup MSIs for mailbox (if required) */ @@ -970,6 +980,10 @@ static int mpxy_mbox_probe(struct platform_device *pdev) return rc; } +#ifdef CONFIG_ACPI + if (!acpi_disabled) + acpi_dev_clear_dependencies(ACPI_COMPANION(dev)); +#endif dev_info(dev, "mailbox registered with %d channels\n", mbox->channel_count); return 0; @@ -989,10 +1003,19 @@ static const struct of_device_id mpxy_mbox_of_match[] = { }; MODULE_DEVICE_TABLE(of, mpxy_mbox_of_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id mpxy_mbox_acpi_match[] = { + { "RSCV0005", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, mpxy_mbox_acpi_match); +#endif + static struct platform_driver mpxy_mbox_driver = { .driver = { .name = "riscv-sbi-mpxy-mbox", .of_match_table = mpxy_mbox_of_match, + .acpi_match_table = ACPI_PTR(mpxy_mbox_acpi_match), }, .probe = mpxy_mbox_probe, .remove = mpxy_mbox_remove, -- 2.43.0