ACPI platform MSI, interrupt producer/consumer and its example mbi-gen
Subsystems (6)
Hanjun Guo
maintainerv2 cover ACPI platform MSI, interrupt producer/consumer and its example mbi-gen
From: Hanjun Guo <[email protected]>
With platform msi support landed in the kernel, and the introduction of IORT for GICv3 ITS (PCI MSI) [1], the framework for platform msi is ready, this patch set add few patches to enable the ACPI platform msi support.
For platform device connecting to ITS on arm platform, we have IORT table with the named componant node to describe the mappings of paltform device and ITS, so we can retrieve the dev id and find its parent irqdomain (ITS) from IORT table (simlar with the ACPI ITS support).
With acpi platform msi supported, we add the ACPI support for irqchip mbi-gen, which use this framework to form its stacked irqdomain, below is the mbi-gen's topology in the system:
| ---------------| |------------------| | | MSI | | wired interrupt(s) | ITS |<-----------------| MBI-GEN |<----------------------------- IO device(s) | | | |<----------------------------- IO device(s) ------------------ -------------------
So with ACPI platform MSI support, we can build the stacked domain for mbi-gen which represented its mappings with the named componant in IORT, but we still missing the connectings of devices to mbi-gen as in ACPI world devices connect to main interrupt controller in MADT in default.
In ACPI 6.1, section 19.6.62, Interrupt Resource Descriptor Macro,
Interrupt (ResourceUsage, EdgeLevel, ActiveLevel, Shared, ResourceSourceIndex, ResourceSource, DescriptorName) { InterruptList } => Buffer
For the arguement ResourceUsage and DescriptorName, which means:
ResourceUsage describes whether the device consumes the specified interrupt ( ResourceConsumer ) or produces it for use by a child device ( ResourceProducer ).
If nothing is specified, then ResourceConsumer is assumed.
DescriptorName evaluates to a name string which refers to the entire resource descriptor.
So it can be used for devices connecting to a specific interrupt prodcucer instead of the main interrupt controller in MADT, we can define:
Interrupt(ResourceConsumer,..., "\_SB.IRQP") {12,14,....},
then get the interrupt producer with the full path name "\_SB.IRQP".
v2:
- Fix the bug of if multi Interrupt() resoures in single _PRS, we need to calculate all the irq numbers (I missed it in previous version);
- Rebased on Marc's irq/irqchip-4.9 branch and Lorenzo's v5 SMMu patches (also Robin's SMMu patches)
- Add patch irqchip: mbigen: promote mbigen init.
This is the RFC version 2 and we still needs to address:
- we need to deal with the device topology as:
NC (named componant) -> SMMU -> ITS.
Comments are warmly welcomed!
Thanks
Hanjun
Hanjun Guo (9):
irqchip: gicv3-its: platform-msi: refactor its_pmsi_prepare()
ACPI: platform-msi: retrieve dev id from IORT
irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare
for ACPI
irqchip: gicv3-its: platform-msi: scan MADT to create platform msi
domain
ACPI: platform: setup MSI domain for ACPI based platform device
msi: platform: make platform_msi_create_device_domain() ACPI aware
ACPI: irq: introduce interrupt producer
irqchip: mbigen: Add ACPI support
irqchip: mbigen: promote mbigen init
Kefeng Wang (2):
irqchip: mbigen: drop module owner
irqchip: mbigen: introduce mbigen_of_create_domain()
drivers/acpi/arm64/iort.c | 31 ++++++- drivers/acpi/gsi.c | 10 ++- drivers/acpi/resource.c | 85 +++++++++++++------ drivers/base/platform-msi.c | 20 ++++- drivers/base/platform.c | 2 + drivers/irqchip/irq-gic-v3-its-platform-msi.c | 107 ++++++++++++++++++------ drivers/irqchip/irq-mbigen.c | 115 ++++++++++++++++++++++---- include/acpi/acpi_bus.h | 1 + include/linux/acpi_iort.h | 8 ++ include/linux/msi.h | 1 + 10 files changed, 305 insertions(+), 75 deletions(-)
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 1/11 irqchip: gicv3-its: platform-msi: refactor its_pmsi_prepare()
From: Hanjun Guo <[email protected]>
Adding ACPI support for platform MSI, we need to retrieve the dev id in ACPI way instead of device tree, we already have a well formed function its_pmsi_prepare() to get the dev id but it's OF dependent, so collect OF related code and put them into a single function to make its_pmsi_prepare() more friendly to ACPI later.
--- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/irqchip/irq-gic-v3-its-platform-msi.c +16 -7
@@ -24,15 +24,11 @@ static struct irq_chip its_pmsi_irq_chip = { .name = "ITS-pMSI", }; -static int its_pmsi_prepare (struct irq_domain *domain,struct device *dev, -int nvec,msi_alloc_info_t *info) +static int of_pmsi_get_dev_id (struct irq_domain *domain,struct device *dev, +u32 *dev_id) { -struct msi_domain_info *msi_info; -u32 dev_id;int ret, index =0 ; - msi_info =msi_get_domain_info (domain->parent); -/* Suck the DeviceID out of the msi-parent property */ do { struct of_phandle_args args;
@@ -43,11 +39,24 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev,if (args.np ==irq_domain_get_of_node (domain)) {if (WARN_ON (args.args_count !=1 ))return -EINVAL ; - dev_id = args.args[0 ]; + *dev_id = args.args[0 ];break ; } }while (!ret); +return ret; +} + +static int its_pmsi_prepare (struct irq_domain *domain,struct device *dev, +int nvec,msi_alloc_info_t *info) +{ +struct msi_domain_info *msi_info; +u32 dev_id; +int ret; + + msi_info =msi_get_domain_info (domain->parent); + + ret =of_pmsi_get_dev_id (domain, dev, &dev_id);if (ret)return ret;
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 2/11 ACPI: platform-msi: retrieve dev id from IORT
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
For devices connecting to ITS, it needs dev id to identify itself, and this dev id is represented in the IORT table in named componant node [1] for platform devices, so in this patch we will scan the IORT to retrieve device's dev id.
Introduce iort_pmsi_get_dev_id() with pointer dev passed in for that purpose.
[1]: https://static.docs.arm.com/den0049/b/DEN0049B_IO_Remapping_Table.pdf
--- drivers/acpi/arm64/iort.c | 26 ++++++++++++++++++++++++++ drivers/irqchip/irq-gic-v3-its-platform-msi.c | 4 +++- include/linux/acpi_iort.h | 8 ++++++++ 3 files changed, 37 insertions(+), 1 deletion(-)
drivers/acpi/arm64/iort.c +26 -0
@@ -408,6 +408,32 @@ u32 iort_msi_map_rid(struct device *dev, u32 req_id) }/** +* iort_pmsi_get_dev_id() - Get the device id for a device +* @dev: The device for which the mapping is to be done. +* @dev_id: The device ID found. +* +* Returns: 0 for successful find a dev id, errors otherwise +*/ +int iort_pmsi_get_dev_id (struct device *dev,u32 *dev_id) +{ +struct acpi_iort_node *node; + +if (!iort_table) +return -ENODEV ; + + node =iort_find_dev_node (dev); +if (!node) { +dev_err (dev,"can't find related IORT node\n" ); +return -ENODEV ; + } + +if ( !iort_node_get_id (node, dev_id,IORT_MSI_TYPE ,0 )) +return -ENODEV ; + +return 0 ; +} + +/** * iort_dev_find_its_id() - Find the ITS identifier for a device * @dev: The device. * @idx: Index of the ITS identifier list.
drivers/irqchip/irq-gic-v3-its-platform-msi.c +3 -1
@@ -16,6 +16,7 @@*/ #include <linux/device.h> +#include <linux/acpi_iort.h> #include <linux/msi.h> #include <linux/of.h> #include <linux/of_irq.h>
@@ -56,7 +57,8 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, msi_info =msi_get_domain_info (domain->parent); - ret =of_pmsi_get_dev_id (domain, dev, &dev_id); + ret = dev->of_node ?of_pmsi_get_dev_id (domain, dev, &dev_id) : +iort_pmsi_get_dev_id (dev, &dev_id);if (ret)return ret;
include/linux/acpi_iort.h +8 -0
@@ -32,6 +32,7 @@ struct fwnode_handle *iort_find_domain_token(int trans_id);#ifdef CONFIG_ACPI_IORT void acpi_iort_init (void );u32 iort_msi_map_rid (struct device *dev,u32 req_id); +int iort_pmsi_get_dev_id (struct device *dev,u32 *dev_id);struct irq_domain *iort_get_device_domain (struct device *dev,u32 req_id);int iort_set_fwnode (struct acpi_iort_node *iort_node,struct fwnode_handle *fwnode);
@@ -42,9 +43,16 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev);static inline void acpi_iort_init (void ) { }static inline u32 iort_msi_map_rid (struct device *dev,u32 req_id) {return req_id; } +static inline struct irq_domain *iort_get_device_domain (struct device *dev,u32 req_id) {return NULL ; } + +static inline int iort_pmsi_get_dev_id (struct device *dev,u32 *dev_id) +{ +return -ENODEV ; +} +static inline int iort_set_fwnode (struct acpi_iort_node *iort_node,struct fwnode_handle *fwnode) {return -ENODEV ; }
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 3/11 irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare for ACPI
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
Introduce its_pmsi_init_one() to refactor the code to isolate ACPI&DT common code to prepare for ACPI later.
--- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 45 ++++++++++++++++----------- 1 file changed, 27 insertions(+), 18 deletions(-)
drivers/irqchip/irq-gic-v3-its-platform-msi.c +27 -18
@@ -84,34 +84,43 @@ static struct of_device_id its_device_id[] = { {}, }; -static int __init its_pmsi_init (void ) +static int __init its_pmsi_init_one (struct fwnode_handle *fwnode, +const char *name) { -struct device_node *np;struct irq_domain *parent; + parent =irq_find_matching_fwnode (fwnode,DOMAIN_BUS_NEXUS ); +if (!parent || !msi_get_domain_info (parent)) { +pr_err ("%s: unable to locate ITS domain\n" , name); +return -ENXIO ; + } + +if (!platform_msi_create_irq_domain (fwnode, &its_pmsi_domain_info, + parent)) { +pr_err ("%s: unable to create platform domain\n" , name); +return -ENXIO ; + } + +pr_info ("Platform MSI: %s domain created\n" , name); +return 0 ; +} + +static void __init its_pmsi_of_init (void ) +{ +struct device_node *np; +for (np =of_find_matching_node (NULL , its_device_id); np; np =of_find_matching_node (np, its_device_id)) {if (!of_property_read_bool (np,"msi-controller" ))continue ; - parent =irq_find_matching_host (np,DOMAIN_BUS_NEXUS ); -if (!parent || !msi_get_domain_info (parent)) { -pr_err ("%s: unable to locate ITS domain\n" , - np->full_name); -continue ; - } - -if (!platform_msi_create_irq_domain (of_node_to_fwnode (np), - &its_pmsi_domain_info, - parent)) { -pr_err ("%s: unable to create platform domain\n" , - np->full_name); -continue ; - } - -pr_info ("Platform MSI: %s domain created\n" , np->full_name); +its_pmsi_init_one (of_node_to_fwnode (np), np->full_name); } +} +static int __init its_pmsi_init (void ) +{ +its_pmsi_of_init ();return 0 ; }early_initcall (its_pmsi_init);
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 4/11 irqchip: gicv3-its: platform-msi: scan MADT to create platform msi domain
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
With the introduction of its_pmsi_init_one(), we can add some code on top for ACPI support of platform MSI.
We are scanning the MADT table to get the ITS entry(ies), then use the information to create the platform msi domain for devices connect to it, just like the PCI MSI for ITS did.
--- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/irqchip/irq-gic-v3-its-platform-msi.c +37 -0
@@ -15,6 +15,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/device.h> #include <linux/acpi_iort.h> #include <linux/msi.h>
@@ -105,6 +106,41 @@ static int __init its_pmsi_init_one(struct fwnode_handle *fwnode,return 0 ; } +#ifdef CONFIG_ACPI +static int __init +its_pmsi_parse_madt (struct acpi_subtable_header *header, +const unsigned long end) +{ +struct acpi_madt_generic_translator *its_entry; +struct fwnode_handle *domain_handle; +const char *node_name; +int err = -ENXIO ; + + its_entry = (struct acpi_madt_generic_translator *)header; + node_name =kasprintf (GFP_KERNEL ,"ITS@0x%lx" , + (long )its_entry->base_address); + domain_handle =iort_find_domain_token (its_entry->translation_id); +if (!domain_handle) { +pr_err ("%s: Unable to locate ITS domain handle\n" , node_name); + goto out; + } + + err =its_pmsi_init_one (domain_handle, node_name); + +out: +kfree (node_name); +return err; +} + +static void __init its_acpi_pmsi_init (void ) +{ +acpi_table_parse_madt (ACPI_MADT_TYPE_GENERIC_TRANSLATOR , + its_pmsi_parse_madt,0 ); +} +#else +static inline void its_acpi_pmsi_init (void ) { } +#endif +static void __init its_pmsi_of_init (void ) {struct device_node *np;
@@ -121,6 +157,7 @@ static void __init its_pmsi_of_init(void)static int __init its_pmsi_init (void ) {its_pmsi_of_init (); +its_acpi_pmsi_init ();return 0 ; }early_initcall (its_pmsi_init);
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 5/11 ACPI: platform: setup MSI domain for ACPI based platform device
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
With the platform msi domain created, we can set up the msi domain for a platform device when it's probed.
This patch introduces acpi_configure_msi_domain(), which retrieves the domain from iort and set it to platform device.
As some platform devices such as an irqchip needs the msi irqdomain to be the interrupt parent domain, we need to get irqdomain before platform device is probed.
--- drivers/acpi/arm64/iort.c | 5 ++++- drivers/base/platform-msi.c | 15 ++++++++++++++- drivers/base/platform.c | 2 ++ include/linux/msi.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-)
drivers/acpi/arm64/iort.c +4 -1
@@ -478,6 +478,7 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) {struct fwnode_handle *handle;int its_id; +enum irq_domain_bus_token bus_token;if (iort_dev_find_its_id (dev, req_id,0 , &its_id))return NULL ;
@@ -486,7 +487,9 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)if (!handle)return NULL ; -return irq_find_matching_fwnode (handle,DOMAIN_BUS_PCI_MSI ); + bus_token =dev_is_pci (dev) ? +DOMAIN_BUS_PCI_MSI :DOMAIN_BUS_PLATFORM_MSI ; +return irq_find_matching_fwnode (handle, bus_token); }static int __get_pci_rid (struct pci_dev *pdev,u16 alias,void *data)
drivers/base/platform-msi.c +14 -1
@@ -17,8 +17,8 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> -#include <linux/idr.h> #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h>
@@ -416,3 +416,16 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,return err; } + +int acpi_configure_msi_domain (struct device *dev) +{ +struct irq_domain *d =NULL ; + + d =iort_get_device_domain (dev,0 ); +if (d) { +dev_set_msi_domain (dev, d); +return 0 ; + } + +return -EINVAL ; +}
drivers/base/platform.c +2 -0
@@ -24,6 +24,7 @@#include <linux/pm_domain.h> #include <linux/idr.h> #include <linux/acpi.h> +#include <linux/msi.h> #include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h>
@@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( pdev->dev.parent = pdevinfo->parent; pdev->dev.fwnode = pdevinfo->fwnode; +acpi_configure_msi_domain (&pdev->dev);if (pdevinfo->dma_mask) {/* * This memory isn't freed when the device is put,
include/linux/msi.h +1 -0
@@ -308,6 +308,7 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,void platform_msi_domain_free (struct irq_domain *domain,unsigned int virq,unsigned int nvec);void *platform_msi_get_host_data (struct irq_domain *domain); +int acpi_configure_msi_domain (struct device *dev);#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */ #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
Signature · 1 line
1.7.12.4
Re: [RFC PATCH v2 05/11] ACPI: platform: setup MSI domain for ACPI based platform device
Quoted 64 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
With the platform msi domain created, we can set up the msi domain for a platform device when it's probed.
This patch introduces
acpi_configure_msi_domain(), which retrieves the domain from iort and set it to platform device.As some platform devices such as an irqchip needs the msi irqdomain to be the interrupt parent domain, we need to get irqdomain before platform device is probed.
Cc Marc Zyngier <[email protected]>Cc Greg KH <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Tomasz Nowicki <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/acpi/arm64/iort.c | 5 ++++- drivers/base/platform-msi.c | 15 ++++++++++++++- drivers/base/platform.c | 2 ++ include/linux/msi.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-)drivers/acpi/arm64/iort.c +4
-1@@ -478,6 +478,7 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) {struct fwnode_handle *handle;int its_id; +enum irq_domain_bus_token bus_token;if (iort_dev_find_its_id (dev, req_id,0 , &its_id))return NULL ;@@ -486,7 +487,9 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)if (!handle)return NULL ; -return irq_find_matching_fwnode (handle,DOMAIN_BUS_PCI_MSI ); + bus_token =dev_is_pci (dev) ? +DOMAIN_BUS_PCI_MSI :DOMAIN_BUS_PLATFORM_MSI ; +return irq_find_matching_fwnode (handle, bus_token); }static int __get_pci_rid (struct pci_dev *pdev,u16 alias,void *data)drivers/base/platform-msi.c +1
-1@@ -17,8 +17,8 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> -#include <linux/idr.h> #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h>
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 424
Quoted 9 lines
drivers/base/platform-msi.c +6
-0@@ -416,3 +416,16 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,return err; } + +int acpi_configure_msi_domain (struct device *dev) +{ +struct irq_domain *d =NULL ; + + d =iort_get_device_domain (dev,0 );
This looks completely wrong. Why RID 0? As far as I can see, 0 is not a special value, and could be something else.
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 431
Quoted 7 lines
drivers/base/platform-msi.c +7
-0+if (d) { +dev_set_msi_domain (dev, d); +return 0 ; + } + +return -EINVAL ; +}
I really hate this, as the platform MSI code is intentionally free of any firmware reference. This should live in the ACPI code.
Quoted 13 lines
drivers/base/platform.c +1
-0@@ -24,6 +24,7 @@#include <linux/pm_domain.h> #include <linux/idr.h> #include <linux/acpi.h> +#include <linux/msi.h> #include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h>
drivers/base/platform.c struct platform_device *platform_device_register_full( · line 504
Quoted 4 lines
drivers/base/platform.c +1
-0@@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( pdev->dev.parent = pdevinfo->parent; pdev->dev.fwnode = pdevinfo->fwnode; +acpi_configure_msi_domain (&pdev->dev);
It feels odd to put this in the generic code, while you could perfectly put the call into acpi_platform.c and keep the firmware stuff away from the generic code.
Quoted 9 lines
drivers/base/platform.c +0
-0if (pdevinfo->dma_mask) {/* * This memory isn't freed when the device is put, include/linux/msi.h +0
-0
include/linux/msi.h int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 314
Quoted 7 lines
include/linux/msi.h +1
-0@@ -308,6 +308,7 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,void platform_msi_domain_free (struct irq_domain *domain,unsigned int virq,unsigned int nvec);void *platform_msi_get_host_data (struct irq_domain *domain); +int acpi_configure_msi_domain (struct device *dev);#endif /* CONFIG_GENERIC_MSI_IRQ_DOMAIN */ #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [RFC PATCH v2 05/11] ACPI: platform: setup MSI domain for ACPI based platform device
Hi Marc,
Thanks for your review, reply inline.
Quoted 66 lines · Marc Zyngier
Quoted 65 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
With the platform msi domain created, we can set up the msi domain for a platform device when it's probed.
This patch introduces
acpi_configure_msi_domain(), which retrieves the domain from iort and set it to platform device.As some platform devices such as an irqchip needs the msi irqdomain to be the interrupt parent domain, we need to get irqdomain before platform device is probed.
Cc Marc Zyngier <[email protected]>Cc Greg KH <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Tomasz Nowicki <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/acpi/arm64/iort.c | 5 ++++- drivers/base/platform-msi.c | 15 ++++++++++++++- drivers/base/platform.c | 2 ++ include/linux/msi.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-)drivers/acpi/arm64/iort.c +4
-1@@ -478,6 +478,7 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) {struct fwnode_handle *handle;int its_id; +enum irq_domain_bus_token bus_token;if (iort_dev_find_its_id (dev, req_id,0 , &its_id))return NULL ;@@ -486,7 +487,9 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)if (!handle)return NULL ; -return irq_find_matching_fwnode (handle,DOMAIN_BUS_PCI_MSI ); + bus_token =dev_is_pci (dev) ? +DOMAIN_BUS_PCI_MSI :DOMAIN_BUS_PLATFORM_MSI ; +return irq_find_matching_fwnode (handle, bus_token); }static int __get_pci_rid (struct pci_dev *pdev,u16 alias,void *data)drivers/base/platform-msi.c +1
-1@@ -17,8 +17,8 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> -#include <linux/idr.h> #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> @@ -416,3 +416,16 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,
Quoted 11 lines
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 424
Quoted 8 lines
drivers/base/platform-msi.c +6
-0return err; } + +int acpi_configure_msi_domain (struct device *dev) +{ +struct irq_domain *d =NULL ; + + d =iort_get_device_domain (dev,0 );This looks completely wrong. Why RID 0? As far as I can see, 0 is not a special value, and could be something else.
You are right. I tried to reuse the API of get irqdomain in IORT for PCI devices, but for platform device, we don't have req id in named component, so I just pass 0 here, I think I need to prepare another API for platform devices.
Quoted 11 lines
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 431
Quoted 8 lines
drivers/base/platform-msi.c +7
-0+if (d) { +dev_set_msi_domain (dev, d); +return 0 ; + } + +return -EINVAL ; +}I really hate this, as the platform MSI code is intentionally free of any firmware reference. This should live in the ACPI code.
Will do, I think locate it in iort.c is better.
Quoted 17 lines
Quoted 17 lines
drivers/base/platform.c +1
-0@@ -24,6 +24,7 @@#include <linux/pm_domain.h> #include <linux/idr.h> #include <linux/acpi.h> +#include <linux/msi.h> #include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h> @@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( pdev->dev.parent = pdevinfo->parent; pdev->dev.fwnode = pdevinfo->fwnode;
Quoted 5 lines
drivers/base/platform.c struct platform_device *platform_device_register_full( · line 504
Quoted 1 line
drivers/base/platform.c +1
-0+acpi_configure_msi_domain (&pdev->dev);It feels odd to put this in the generic code, while you could perfectly put the call into
acpi_platform.cand keep the firmware stuff away from the generic code.
My feeling is the same, I'm still trying to find a new way to do it, but I can't simply put that in acpi_platform.c, because
acpi_create_platform_device()
platform_device_register_full()
platform_device_alloc() --> dev is alloced
...
dev.fwnode is set
(I get the msi domain by the fwnode in acpi_configure_msi_domain)
...
platform_device_add() --> which the device is probed.For devices like irqchip which needs the dev->msi_domain to be set before it's really probed, because it needs the msi domain to be the parent domain.
If I call the function in acpi_create_platform_device() before platform_device_register_full(), we just can't set dev's msi domain, but if call it after platform_device_register_full(), the irqchip like mbigen will not get its parent domain...
DT is using another API for platform device probe, so has no problems like I said above, any suggestions to do it right in ACPI?
Thanks
Hanjun
Re: [RFC PATCH v2 05/11] ACPI: platform: setup MSI domain for ACPI based platform device
Quoted 141 lines · Hanjun Guo
Hi Marc,
Thanks for your review, reply inline.
Quoted 66 lines · Marc Zyngier
Quoted 65 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
With the platform msi domain created, we can set up the msi domain for a platform device when it's probed.
This patch introduces
acpi_configure_msi_domain(), which retrieves the domain from iort and set it to platform device.As some platform devices such as an irqchip needs the msi irqdomain to be the interrupt parent domain, we need to get irqdomain before platform device is probed.
Cc Marc Zyngier <[email protected]>Cc Greg KH <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Tomasz Nowicki <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/acpi/arm64/iort.c | 5 ++++- drivers/base/platform-msi.c | 15 ++++++++++++++- drivers/base/platform.c | 2 ++ include/linux/msi.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-)drivers/acpi/arm64/iort.c +4
-1@@ -478,6 +478,7 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) {struct fwnode_handle *handle;int its_id; +enum irq_domain_bus_token bus_token;if (iort_dev_find_its_id (dev, req_id,0 , &its_id))return NULL ;@@ -486,7 +487,9 @@ struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)if (!handle)return NULL ; -return irq_find_matching_fwnode (handle,DOMAIN_BUS_PCI_MSI ); + bus_token =dev_is_pci (dev) ? +DOMAIN_BUS_PCI_MSI :DOMAIN_BUS_PLATFORM_MSI ; +return irq_find_matching_fwnode (handle, bus_token); }static int __get_pci_rid (struct pci_dev *pdev,u16 alias,void *data)drivers/base/platform-msi.c +1
-1@@ -17,8 +17,8 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> -#include <linux/idr.h> #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> @@ -416,3 +416,16 @@ int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,Quoted 11 lines
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 424
Quoted 8 lines
drivers/base/platform-msi.c +6
-0return err; } + +int acpi_configure_msi_domain (struct device *dev) +{ +struct irq_domain *d =NULL ; + + d =iort_get_device_domain (dev,0 );This looks completely wrong. Why RID 0? As far as I can see, 0 is not a special value, and could be something else.
You are right. I tried to reuse the API of get irqdomain in IORT for PCI devices, but for platform device, we don't have req id in named component, so I just pass 0 here, I think I need to prepare another API for platform devices.
Quoted 11 lines
drivers/base/platform-msi.c int platform_msi_domain_alloc(struct irq_domain *domain, unsigned int virq, · line 431
Quoted 8 lines
drivers/base/platform-msi.c +7
-0+if (d) { +dev_set_msi_domain (dev, d); +return 0 ; + } + +return -EINVAL ; +}I really hate this, as the platform MSI code is intentionally free of any firmware reference. This should live in the ACPI code.
Will do, I think locate it in
iort.cis better.Quoted 17 lines
Quoted 17 lines
drivers/base/platform.c +1
-0@@ -24,6 +24,7 @@#include <linux/pm_domain.h> #include <linux/idr.h> #include <linux/acpi.h> +#include <linux/msi.h> #include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h> @@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( pdev->dev.parent = pdevinfo->parent; pdev->dev.fwnode = pdevinfo->fwnode;Quoted 5 lines
drivers/base/platform.c struct platform_device *platform_device_register_full( · line 504
Quoted 1 line
drivers/base/platform.c +1
-0+acpi_configure_msi_domain (&pdev->dev);It feels odd to put this in the generic code, while you could perfectly put the call into
acpi_platform.cand keep the firmware stuff away from the generic code.My feeling is the same, I'm still trying to find a new way to do it, but I can't simply put that in
acpi_platform.c, because
acpi_create_platform_device()platform_device_register_full() platform_device_alloc() --> dev is alloced ... dev.fwnode is set (I get the msi domain by the fwnode in acpi_configure_msi_domain) ... platform_device_add() --> which the device is probed.For devices like irqchip which needs the
dev->msi_domainto be set before it's really probed, because it needs the msi domain to be the parent domain.
Quoted 8 lines
If I call the function in
acpi_create_platform_device()beforeplatform_device_register_full(), we just can't set dev's msi domain, but if call it afterplatform_device_register_full(), the irqchip like mbigen will not get its parent domain...DT is using another API for platform device probe, so has no problems like I said above, any suggestions to do it right in ACPI?
How about having something that's completely generic and solves the problem once and for all? Something like this:
drivers/base/platform.c +3 -0
@@ -533,6 +533,9 @@ struct platform_device *platform_device_register_full( goto err; } +if (pdevinfo->pre_add_cb) + pdevinfo->pre_add_cb (&pdev->dev); + ret =platform_device_add (pdev);if (ret) { err:
include/linux/platform_device.h +1 -0
@@ -74,6 +74,7 @@ struct platform_device_info {u64 dma_mask;struct property_entry *properties; +void (*pre_add_cb)(struct device *); };extern struct platform_device *platform_device_register_full (const struct platform_device_info *pdevinfo);
Plug pre_add_cb with your ACPI callback where you can do all the processing you want before the device is actually added.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [RFC PATCH v2 05/11] ACPI: platform: setup MSI domain for ACPI based platform device
Quoted 2 lines · Marc Zyngier
Quoted 1 line · Hanjun Guo
Hi Marc,
[...]
Quoted 77 lines
Quoted 38 lines
Quoted 16 lines
Quoted 16 lines
drivers/base/platform.c +1
-0@@ -24,6 +24,7 @@#include <linux/pm_domain.h> #include <linux/idr.h> #include <linux/acpi.h> +#include <linux/msi.h> #include <linux/clk/clk-conf.h> #include <linux/limits.h> #include <linux/property.h> @@ -500,6 +501,7 @@ struct platform_device *platform_device_register_full( pdev->dev.parent = pdevinfo->parent; pdev->dev.fwnode = pdevinfo->fwnode;Quoted 5 lines
drivers/base/platform.c struct platform_device *platform_device_register_full( · line 504
Quoted 1 line
drivers/base/platform.c +1
-0+acpi_configure_msi_domain (&pdev->dev);It feels odd to put this in the generic code, while you could perfectly put the call into
acpi_platform.cand keep the firmware stuff away from the generic code.My feeling is the same, I'm still trying to find a new way to do it, but I can't simply put that in
acpi_platform.c, because
acpi_create_platform_device()platform_device_register_full() platform_device_alloc() --> dev is alloced ... dev.fwnode is set (I get the msi domain by the fwnode in acpi_configure_msi_domain) ... platform_device_add() --> which the device is probed.For devices like irqchip which needs the
dev->msi_domainto be set before it's really probed, because it needs the msi domain to be the parent domain.Quoted 8 lines
If I call the function in
acpi_create_platform_device()beforeplatform_device_register_full(), we just can't set dev's msi domain, but if call it afterplatform_device_register_full(), the irqchip like mbigen will not get its parent domain...DT is using another API for platform device probe, so has no problems like I said above, any suggestions to do it right in ACPI?
How about having something that's completely generic and solves the problem once and for all? Something like this:
drivers/base/platform.c +3
-0@@ -533,6 +533,9 @@ struct platform_device *platform_device_register_full( goto err; } +if (pdevinfo->pre_add_cb) + pdevinfo->pre_add_cb (&pdev->dev); + ret =platform_device_add (pdev);if (ret) { err:include/linux/platform_device.h +1
-0@@ -74,6 +74,7 @@ struct platform_device_info {u64 dma_mask;struct property_entry *properties; +void (*pre_add_cb)(struct device *); };extern struct platform_device *platform_device_register_full (const struct platform_device_info *pdevinfo);
Quoted 2 lines
Plug
pre_add_cbwith your ACPI callback where you can do all the processing you want before the device is actually added.
Great, will do, thank you very much!
Hanjun
Hanjun Guo
maintainerRFC PATCH v2 6/11 msi: platform: make platform_msi_create_device_domain() ACPI aware
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
With the platform msi domain created for ITS, irqchip such as mbi-gen connecting ITS, which needs ctreate its own irqdomain.
Fortunately with the platform msi support upstreamed by Marc, we just need to add minor code to make it run properly.
platform_msi_create_device_domain() is almost ready for ACPI use except of_node_to_fwnode() is for dt only, make it ACPI aware then things will work in both DTS and ACPI.
--- drivers/base/platform-msi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/base/platform-msi.c +3 -2
@@ -338,16 +338,17 @@ platform_msi_create_device_domain(struct device *dev, {struct platform_msi_priv_data *data;struct irq_domain *domain; +struct fwnode_handle *fwnode;int err; data =platform_msi_alloc_priv_data (dev, nvec, write_msi_msg);if (IS_ERR (data))return NULL ; + fwnode = dev->of_node ? &dev->of_node->fwnode : dev->fwnode; data->host_data = host_data; domain =irq_domain_create_hierarchy (dev->msi_domain,0 , nvec, -of_node_to_fwnode (dev->of_node), - ops, data); + fwnode, ops, data);if (!domain) goto free_priv;
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 7/11 ACPI: irq: introduce interrupt producer
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
In ACPI 6.1 spec, section 19.6.62, Interrupt Resource Descriptor Macro,
Interrupt (ResourceUsage, EdgeLevel, ActiveLevel, Shared, ResourceSourceIndex, ResourceSource, DescriptorName) { InterruptList } => Buffer
For the arguement ResourceUsage and DescriptorName, which means:
ResourceUsage describes whether the device consumes the specified interrupt ( ResourceConsumer ) or produces it for use by a child device ( ResourceProducer ).
If nothing is specified, then ResourceConsumer is assumed.
DescriptorName evaluates to a name string which refers to the entire resource descriptor.
So it can be used for devices connecting to a specific interrupt prodcucer instead of the main interrupt controller in MADT. In the real world, we have irqchip such as mbi-gen which connecting to a group of wired interrupts and then issue msi to the ITS, devices connecting to such interrupt controller fit this scope.
For now the irq for ACPI only pointer to the main interrupt controller's irqdomain, for devices not connecting to those irqdomains, which need to present its irq parent, we can use following ASL code to represent it:
Interrupt(ResourceConsumer,..., "\_SB.IRQP") {12,14,....}
then we can parse the interrupt producer with the full path name "\_SB.IRQP".
In order to do that, we introduce a pointer interrupt_producer in struct acpi_device, and fill it when scanning irq resources for acpi device if it specifies the interrupt producer.
But for now when parsing the resources for acpi devices, we don't pass the acpi device for acpi_walk_resoures() in drivers/acpi/resource.c, so introduce a adev in struct res_proc_context to pass it as a context to scan the interrupt resources, then finally pass to acpi_register_gsi() to find its interrupt producer to get the virq from diffrent domains.
With steps above ready, rework acpi_register_gsi() to get other interrupt producer if devices not connecting to main interrupt controller.
Since we often pass NULL to acpi_register_gsi() and there is no interrupt producer for devices connect to gicd on ARM or io-apic on X86, so it will use the default irqdomain for those deivces and no functional changes to those devices.
--- drivers/acpi/gsi.c | 10 ++++-- drivers/acpi/resource.c | 85 ++++++++++++++++++++++++++++++++++--------------- include/acpi/acpi_bus.h | 1 + 3 files changed, 68 insertions(+), 28 deletions(-)
drivers/acpi/gsi.c +8 -2
@@ -55,13 +55,19 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) {struct irq_fwspec fwspec; +struct acpi_device *adev = dev ?to_acpi_device (dev) :NULL ; -if (WARN_ON (!acpi_gsi_domain_id)) { +if (adev && &adev->fwnode && adev->interrupt_producer) +/* devices in DSDT connecting to spefic interrupt producer */ + fwspec.fwnode = adev->interrupt_producer; +else if (acpi_gsi_domain_id) +/* devices connecting to gicd in default */ + fwspec.fwnode = acpi_gsi_domain_id; +else {pr_warn ("GSI: No registered irqchip, giving up\n" );return -EINVAL ; } - fwspec.fwnode = acpi_gsi_domain_id; fwspec.param[0 ] = gsi; fwspec.param[1 ] =acpi_dev_get_irq_type (trigger, polarity); fwspec.param_count =2 ;
drivers/acpi/resource.c +59 -26
139 lines not on this page · raw message
include/acpi/acpi_bus.h +1 -0
@@ -355,6 +355,7 @@ struct acpi_device {int device_type;acpi_handle handle;/* no handle for fixed hardware */ struct fwnode_handle fwnode; +struct fwnode_handle *interrupt_producer;struct acpi_device *parent;struct list_head children;struct list_head node;
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 8/11 irqchip: mbigen: drop module owner
In reply to Hanjun GuoFrom: Kefeng Wang <[email protected]>
Module owner will be set by driver core, so drop it.
--- drivers/irqchip/irq-mbigen.c | 1 - 1 file changed, 1 deletion(-)
drivers/irqchip/irq-mbigen.c +0 -1
@@ -293,7 +293,6 @@ MODULE_DEVICE_TABLE(of, mbigen_of_match);static struct platform_driver mbigen_platform_driver = { .driver = { .name ="Hisilicon MBIGEN-V2" , - .owner =THIS_MODULE , .of_match_table = mbigen_of_match, }, .probe = mbigen_device_probe,
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 9/11 irqchip: mbigen: introduce mbigen_of_create_domain()
In reply to Hanjun GuoFrom: Kefeng Wang <[email protected]>
Introduce mbigen_of_create_domain() to consolidate OF related code and prepare for ACPI later.
--- drivers/irqchip/irq-mbigen.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)
drivers/irqchip/irq-mbigen.c +27 -15
@@ -236,27 +236,15 @@ static struct irq_domain_ops mbigen_domain_ops = { .free = irq_domain_free_irqs_common, }; -static int mbigen_device_probe (struct platform_device *pdev) +static int mbigen_of_create_domain (struct platform_device *pdev, +struct mbigen_device *mgn_chip) { -struct mbigen_device *mgn_chip; +struct device *parent;struct platform_device *child;struct irq_domain *domain;struct device_node *np; -struct device *parent; -struct resource *res;u32 num_pins; - mgn_chip =devm_kzalloc (&pdev->dev,sizeof (*mgn_chip),GFP_KERNEL ); -if (!mgn_chip) -return -ENOMEM ; - - mgn_chip->pdev = pdev; - - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - mgn_chip->base =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (mgn_chip->base)) -return PTR_ERR (mgn_chip->base); -for_each_child_of_node (pdev->dev.of_node, np) {if (!of_property_read_bool (np,"interrupt-controller" ))continue ;
@@ -280,6 +268,30 @@ static int mbigen_device_probe(struct platform_device *pdev)return -ENOMEM ; } +return 0 ; +} + +static int mbigen_device_probe (struct platform_device *pdev) +{ +struct mbigen_device *mgn_chip; +struct resource *res; +int err; + + mgn_chip =devm_kzalloc (&pdev->dev,sizeof (*mgn_chip),GFP_KERNEL ); +if (!mgn_chip) +return -ENOMEM ; + + mgn_chip->pdev = pdev; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + mgn_chip->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mgn_chip->base)) +return PTR_ERR (mgn_chip->base); + + err =mbigen_of_create_domain (pdev, mgn_chip); +if (err) +return err; +platform_set_drvdata (pdev, mgn_chip);return 0 ; }
Signature · 1 line
1.7.12.4
Hanjun Guo
maintainerRFC PATCH v2 10/11 irqchip: mbigen: Add ACPI support
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
With the preparation of platform msi support and interrupt producer in DSDT, we can add mbigen ACPI support now.
We are using _PRS methd to indicate number of irq pins instead of num_pins in DT.
For mbi-gen,
Device(MBI0) {
Name(_HID, "HISI0152")
Name(_UID, Zero)
Name(_CRS, ResourceTemplate() {
Memory32Fixed(ReadWrite, 0xa0080000, 0x10000)
})
Name (_PRS, ResourceTemplate() {
Interrupt(ResourceProducer,...) {12,14,....}
})
}For devices,
Device(COM0) {
Name(_HID, "ACPIIDxx")
Name(_UID, Zero)
Name(_CRS, ResourceTemplate() {
Memory32Fixed(ReadWrite, 0xb0030000, 0x10000)
Interrupt(ResourceConsumer,..., "\_SB.MBI0") {12}
})
}With the helpe of platform msi and interrupt producer, then devices will get the virq from mbi-gen's irqdomain.
--- drivers/irqchip/irq-mbigen.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-)
drivers/irqchip/irq-mbigen.c +67 -3
@@ -16,6 +16,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/module.h>
@@ -180,7 +181,7 @@ static int mbigen_domain_translate(struct irq_domain *d, unsigned long *hwirq, unsigned int *type) { - if (is_of_node(fwspec->fwnode)) { + if (is_of_node(fwspec->fwnode) || is_acpi_device_node(fwspec->fwnode)) { if (fwspec->param_count != 2) return -EINVAL;
@@ -271,6 +272,54 @@ static int mbigen_of_create_domain(struct platform_device *pdev,return 0 ; } +#ifdef CONFIG_ACPI +static acpi_status mbigen_acpi_process_resource (struct acpi_resource *ares, +void *context) +{ +struct acpi_resource_extended_irq *ext_irq; +u32 *num_irqs = context; + +switch (ares->type) { +case ACPI_RESOURCE_TYPE_EXTENDED_IRQ : + ext_irq = &ares->data.extended_irq; + *num_irqs += ext_irq->interrupt_count; +break ; +default : +break ; + } + +return AE_OK ; +} + +static int mbigen_acpi_create_domain (struct platform_device *pdev, +struct mbigen_device *mgn_chip) +{ +struct irq_domain *domain; +u32 num_msis =0 ; +acpi_status status; + + status =acpi_walk_resources (ACPI_HANDLE (&pdev->dev),METHOD_NAME__PRS , + mbigen_acpi_process_resource, &num_msis); +if (ACPI_FAILURE (status) || num_msis ==0 ) +return -EINVAL ; + + domain =platform_msi_create_device_domain (&pdev->dev, num_msis, + mbigen_write_msg, + &mbigen_domain_ops, + mgn_chip); +if (!domain) +return -ENOMEM ; + +return 0 ; +} +#else +static int mbigen_acpi_create_domain (struct platform_device *pdev, +struct mbigen_device *mgn_chip) +{ +return -ENODEV ; +} +#endif +static int mbigen_device_probe (struct platform_device *pdev) {struct mbigen_device *mgn_chip;
@@ -288,9 +337,17 @@ static int mbigen_device_probe(struct platform_device *pdev)if (IS_ERR (mgn_chip->base))return PTR_ERR (mgn_chip->base); - err =mbigen_of_create_domain (pdev, mgn_chip); -if (err) +if (IS_ENABLED (CONFIG_OF ) && pdev->dev.of_node) + err =mbigen_of_create_domain (pdev, mgn_chip); +else if (ACPI_COMPANION (&pdev->dev)) + err =mbigen_acpi_create_domain (pdev, mgn_chip); +else + err = -EINVAL ; + +if (err) { +dev_err (&pdev->dev,"Failed to create mbi-gen@%p irqdomain" , mgn_chip->base);return err; + }platform_set_drvdata (pdev, mgn_chip);return 0 ;
@@ -302,10 +359,17 @@ static const struct of_device_id mbigen_of_match[] = { };MODULE_DEVICE_TABLE (of, mbigen_of_match); +static const struct acpi_device_id mbigen_acpi_match[] = { + {"HISI0152" ,0 }, + {} +}; +MODULE_DEVICE_TABLE (acpi, mbigen_acpi_match); +static struct platform_driver mbigen_platform_driver = { .driver = { .name ="Hisilicon MBIGEN-V2" , .of_match_table = mbigen_of_match, + .acpi_match_table =ACPI_PTR (mbigen_acpi_match), }, .probe = mbigen_device_probe, };
Signature · 1 line
1.7.12.4
Re: [RFC PATCH v2 10/11] irqchip: mbigen: Add ACPI support
Quoted 9 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
With the preparation of platform msi support and interrupt producer in DSDT, we can add mbigen ACPI support now.
We are using
_PRSmethd to indicate number of irq pins instead ofnum_pinsin DT.For mbi-gen,
Quoted 10 lines
Device(MBI0) {
Name(_HID, "HISI0152")
Name(_UID, Zero)
Name(_CRS, ResourceTemplate() {
Memory32Fixed(ReadWrite, 0xa0080000, 0x10000)
})
Name (_PRS, ResourceTemplate() {
Interrupt(ResourceProducer,...) {12,14,....}
})Since I know next to nothing about all of this, I'm going to play the village idiot. What makes it legal to use _PRS as a way to describe the interrupts that are exposed by MBI0? Looking at the 6.0 spec, I do not see why the interrupts would be put there instead of _CRS, and why you'd have a _PRS at all.
Also, are you going to exhaustively describe all the possible interrupts via this method? Knowing that the mbigen can expose thousands of interrupts, I find it slightly mad. Can't you express a range?
Quoted 129 lines
}For devices,
Device(COM0) { Name(_HID, "ACPIIDxx") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xb0030000, 0x10000) Interrupt(ResourceConsumer,..., "\_SB.MBI0") {12} }) }With the helpe of platform msi and interrupt producer, then devices will get the virq from mbi-gen's irqdomain.
Cc Marc Zyngier <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ma Jun <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/irqchip/irq-mbigen.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-)drivers/irqchip/irq-mbigen.c +64
-3@@ -16,6 +16,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/module.h> @@ -180,7 +181,7 @@ static int mbigen_domain_translate(struct irq_domain *d, unsigned long *hwirq, unsigned int *type) { - if (is_of_node(fwspec->fwnode)) { + if (is_of_node(fwspec->fwnode) || is_acpi_device_node(fwspec->fwnode)) { if (fwspec->param_count != 2) return -EINVAL;@@ -271,6 +272,54 @@ static int mbigen_of_create_domain(struct platform_device *pdev,return 0 ; } +#ifdef CONFIG_ACPI +static acpi_status mbigen_acpi_process_resource (struct acpi_resource *ares, +void *context) +{ +struct acpi_resource_extended_irq *ext_irq; +u32 *num_irqs = context; + +switch (ares->type) { +case ACPI_RESOURCE_TYPE_EXTENDED_IRQ : + ext_irq = &ares->data.extended_irq; + *num_irqs += ext_irq->interrupt_count; +break ; +default : +break ; + } + +return AE_OK ; +} + +static int mbigen_acpi_create_domain (struct platform_device *pdev, +struct mbigen_device *mgn_chip) +{ +struct irq_domain *domain; +u32 num_msis =0 ; +acpi_status status; + + status =acpi_walk_resources (ACPI_HANDLE (&pdev->dev),METHOD_NAME__PRS , + mbigen_acpi_process_resource, &num_msis); +if (ACPI_FAILURE (status) || num_msis ==0 ) +return -EINVAL ; + + domain =platform_msi_create_device_domain (&pdev->dev, num_msis, + mbigen_write_msg, + &mbigen_domain_ops, + mgn_chip); +if (!domain) +return -ENOMEM ; + +return 0 ; +} +#else +static int mbigen_acpi_create_domain (struct platform_device *pdev, +struct mbigen_device *mgn_chip) +{ +return -ENODEV ; +} +#endif +static int mbigen_device_probe (struct platform_device *pdev) {struct mbigen_device *mgn_chip;@@ -288,9 +337,17 @@ static int mbigen_device_probe(struct platform_device *pdev)if (IS_ERR (mgn_chip->base))return PTR_ERR (mgn_chip->base); - err =mbigen_of_create_domain (pdev, mgn_chip); -if (err) +if (IS_ENABLED (CONFIG_OF ) && pdev->dev.of_node) + err =mbigen_of_create_domain (pdev, mgn_chip); +else if (ACPI_COMPANION (&pdev->dev)) + err =mbigen_acpi_create_domain (pdev, mgn_chip); +else + err = -EINVAL ; + +if (err) { +dev_err (&pdev->dev,"Failed to create mbi-gen@%p irqdomain" , mgn_chip->base);return err; + }platform_set_drvdata (pdev, mgn_chip);return 0 ;@@ -302,10 +359,17 @@ static const struct of_device_id mbigen_of_match[] = { };MODULE_DEVICE_TABLE (of, mbigen_of_match); +static const struct acpi_device_id mbigen_acpi_match[] = { + {"HISI0152" ,0 }, + {} +};
drivers/irqchip/irq-mbigen.c static const struct of_device_id mbigen_of_match[] = { · line 375
Quoted 10 lines
drivers/irqchip/irq-mbigen.c +3
-0+MODULE_DEVICE_TABLE (acpi, mbigen_acpi_match); +static struct platform_driver mbigen_platform_driver = { .driver = { .name ="Hisilicon MBIGEN-V2" , .of_match_table = mbigen_of_match, + .acpi_match_table =ACPI_PTR (mbigen_acpi_match), }, .probe = mbigen_device_probe, };
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [RFC PATCH v2 10/11] irqchip: mbigen: Add ACPI support
Hi Marc,
Quoted 21 lines · Marc Zyngier
Quoted 9 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
With the preparation of platform msi support and interrupt producer in DSDT, we can add mbigen ACPI support now.
We are using
_PRSmethd to indicate number of irq pins instead ofnum_pinsin DT.For mbi-gen,
Quoted 10 lines
Device(MBI0) { Name(_HID, "HISI0152") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xa0080000, 0x10000) }) Name (_PRS, ResourceTemplate() { Interrupt(ResourceProducer,...) {12,14,....} })
Quoted 5 lines
Since I know next to nothing about all of this, I'm going to play the village idiot. What makes it legal to use
_PRSas a way to describe the interrupts that are exposed by MBI0? Looking at the 6.0 spec, I do not see why the interrupts would be put there instead of_CRS, and why you'd have a_PRSat all.
_PRS describes possible resource settings for the device, which returns a list of a device's possible resource settings such as memory range, interrupt descriptors, and the format of the data in a _PRS object follows the same format as _CRS object (ACPI 6.1, section 6.2.12), so Interrupts can be put in the _PRS.
And in ACPI 6.1, section 6.2, it describes the _PRS usage:
"Some resources, however, may be shared amongst several devices. To describe this, devices that share a resource (resource consumers) must use the extended resource descriptors (0x7-0xA) described in Section 6.4.3, ?Large Resource Data Type.? These descriptors point to a single device object (resource producer) that claims the shared resource in its _PRS."
As mbigen is a interrupt producer which provide interrupt resoures for devices, which matches the usage of _PRS in the spec.
Quoted 4 lines
Also, are you going to exhaustively describe all the possible interrupts via this method? Knowing that the mbigen can expose thousands of interrupts, I find it slightly mad. Can't you express a range?
Yes, a little bit mad. I can't express a interrupt range in ACPI at least in current version of spec. But that just adding more lines of ACPI DSDT code, it's fine to me. or we need to use _DSD to present similar property "num_pins" in ACPI which I avoid using.
Thanks
Hanjun
Hanjun Guo
maintainerRFC PATCH v2 11/11 irqchip: mbigen: promote mbigen init
In reply to Hanjun GuoFrom: Hanjun Guo <[email protected]>
mbigen is an irqchip and it needs to be probed before devices, same logic is used for SMMU and etc., let's use arch_initcall instead of platform init for mbigen.
--- drivers/irqchip/irq-mbigen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/irqchip/irq-mbigen.c +5 -1
@@ -374,7 +374,11 @@ static struct platform_driver mbigen_platform_driver = { .probe = mbigen_device_probe, }; -module_platform_driver (mbigen_platform_driver); +static __init int mbigen_init (void ) +{ +return platform_driver_register (&mbigen_platform_driver); +} +arch_initcall (mbigen_init);MODULE_AUTHOR ("Jun Ma <[email protected]>" );MODULE_AUTHOR ("Yun Wu <[email protected]>" );
Signature · 1 line
1.7.12.4
Re: [RFC PATCH v2 11/11] irqchip: mbigen: promote mbigen init
Quoted 22 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
mbigen is an irqchip and it needs to be probed before devices, same logic is used for SMMU and etc., let's use
arch_initcallinstead of platform init for mbigen.Cc Marc Zyngier <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ma Jun <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/irqchip/irq-mbigen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/irqchip/irq-mbigen.c +0
-0@@ -374,7 +374,11 @@ static struct platform_driver mbigen_platform_driver = { .probe = mbigen_device_probe, };
drivers/irqchip/irq-mbigen.c static struct platform_driver mbigen_platform_driver = { · line 384
Quoted 10 lines
drivers/irqchip/irq-mbigen.c +5
-1-module_platform_driver (mbigen_platform_driver); +static __init int mbigen_init (void ) +{ +return platform_driver_register (&mbigen_platform_driver); +} +arch_initcall (mbigen_init);MODULE_AUTHOR ("Jun Ma <[email protected]>" );MODULE_AUTHOR ("Yun Wu <[email protected]>" );
I've already NACKed such a patch in the past, and I will carry on NACKing it until all the other avenues (like properly tracking device dependencies) have been explored and have been proven not to be fit for purpose.
Rafael had proposed something around this subject last year, and I've been repeatedly advising you to work with him and others to make it happen. You can choose to ignore this advise, but that doesn't make this patch an acceptable approach.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Re: [RFC PATCH v2 11/11] irqchip: mbigen: promote mbigen init
Quoted 30 lines · Marc Zyngier
Quoted 29 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
mbigen is an irqchip and it needs to be probed before devices, same logic is used for SMMU and etc., let's use
arch_initcallinstead of platform init for mbigen.Cc Marc Zyngier <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ma Jun <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/irqchip/irq-mbigen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/irqchip/irq-mbigen.c +5
-1@@ -374,7 +374,11 @@ static struct platform_driver mbigen_platform_driver = { .probe = mbigen_device_probe, }; -module_platform_driver (mbigen_platform_driver); +static __init int mbigen_init (void ) +{ +return platform_driver_register (&mbigen_platform_driver); +} +arch_initcall (mbigen_init);
Quoted 8 lines
drivers/irqchip/irq-mbigen.c static struct platform_driver mbigen_platform_driver = { · line 384
Quoted 3 lines
drivers/irqchip/irq-mbigen.c +0
-0MODULE_AUTHOR ("Jun Ma <[email protected]>" );MODULE_AUTHOR ("Yun Wu <[email protected]>" );I've already NACKed such a patch in the past, and I will carry on NACKing it until all the other avenues (like properly tracking device dependencies) have been explored and have been proven not to be fit for purpose.
I'd happy to work on this to make progress.
Quoted 2 lines
Rafael had proposed something around this subject last year, and I've
Sorry, obviously I missed something, could you give me the link about Rafael's patches? I will pull back and test it on our hardware.
Quoted 3 lines
been repeatedly advising you to work with him and others to make it happen. You can choose to ignore this advise, but that doesn't make this patch an acceptable approach.
OK, I will drop this patch in next version, and work on the generic solution instead.
Thanks
Hanjun
Re: [RFC PATCH v2 11/11] irqchip: mbigen: promote mbigen init
Quoted 40 lines · Hanjun Guo
Quoted 30 lines · Marc Zyngier
Quoted 29 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
mbigen is an irqchip and it needs to be probed before devices, same logic is used for SMMU and etc., let's use
arch_initcallinstead of platform init for mbigen.Cc Marc Zyngier <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ma Jun <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/irqchip/irq-mbigen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/irqchip/irq-mbigen.c +5
-1@@ -374,7 +374,11 @@ static struct platform_driver mbigen_platform_driver = { .probe = mbigen_device_probe, }; -module_platform_driver (mbigen_platform_driver); +static __init int mbigen_init (void ) +{ +return platform_driver_register (&mbigen_platform_driver); +} +arch_initcall (mbigen_init);Quoted 8 lines
drivers/irqchip/irq-mbigen.c static struct platform_driver mbigen_platform_driver = { · line 384
Quoted 3 lines
drivers/irqchip/irq-mbigen.c +0
-0MODULE_AUTHOR ("Jun Ma <[email protected]>" );MODULE_AUTHOR ("Yun Wu <[email protected]>" );I've already NACKed such a patch in the past, and I will carry on NACKing it until all the other avenues (like properly tracking device dependencies) have been explored and have been proven not to be fit for purpose.
Quoted 7 lines
I'd happy to work on this to make progress.
Quoted 2 lines
Rafael had proposed something around this subject last year, and I've
Sorry, obviously I missed something, could you give me the link about Rafael's patches? I will pull back and test it on our hardware.
Please see this discussion from almost a year ago:
https://patchwork.kernel.org/patch/7407401/
in which I give the existing pointers and explain why I'm pushing back on things like this patch.
Quoted 7 lines
Quoted 4 lines
been repeatedly advising you to work with him and others to make it happen. You can choose to ignore this advise, but that doesn't make this patch an acceptable approach.
OK, I will drop this patch in next version, and work on the generic solution instead.
That'd be the ideal thing, and that's what I suggested when we did meet in BKK earlier this year. Obviously, I didn't convey my point clearly enough.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Hanjun Guo
maintainerRe: [RFC PATCH v2 11/11] irqchip: mbigen: promote mbigen init
Quoted 42 lines · Marc Zyngier
Quoted 41 lines · Hanjun Guo
Quoted 30 lines · Marc Zyngier
Quoted 29 lines · Hanjun Guo
From: Hanjun Guo <[email protected]>
mbigen is an irqchip and it needs to be probed before devices, same logic is used for SMMU and etc., let's use
arch_initcallinstead of platform init for mbigen.Cc Marc Zyngier <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ma Jun <[email protected]>Signed-off-by Hanjun Guo <[email protected]>--- drivers/irqchip/irq-mbigen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/irqchip/irq-mbigen.c +5
-1@@ -374,7 +374,11 @@ static struct platform_driver mbigen_platform_driver = { .probe = mbigen_device_probe, }; -module_platform_driver (mbigen_platform_driver); +static __init int mbigen_init (void ) +{ +return platform_driver_register (&mbigen_platform_driver); +} +arch_initcall (mbigen_init);Quoted 7 lines
drivers/irqchip/irq-mbigen.c static struct platform_driver mbigen_platform_driver = { · line 384
Quoted 3 lines
drivers/irqchip/irq-mbigen.c +0
-0MODULE_AUTHOR ("Jun Ma <[email protected]>" );MODULE_AUTHOR ("Yun Wu <[email protected]>" );I've already NACKed such a patch in the past, and I will carry on NACKing it until all the other avenues (like properly tracking device dependencies) have been explored and have been proven not to be fit for purpose.
I'd happy to work on this to make progress.
Quoted 1 line
Rafael had proposed something around this subject last year, and I've
Quoted 8 lines
Quoted 2 lines
Sorry, obviously I missed something, could you give me the link about Rafael's patches? I will pull back and test it on our hardware.
Please see this discussion from almost a year ago:
https://patchwork.kernel.org/patch/7407401/
in which I give the existing pointers and explain why I'm pushing back on things like this patch.
We (Majun and me ) will look into it, thanks!
Hanjun