On 06/19/2015 08:30 AM, Ashwin Chaugule wrote:

On 16 June 2015 at 09:09, Hanjun Guo hanjun.guo@linaro.org wrote:

...

The gic_root_node defined in ITS driver is not actually used, and the ITS driver seems will not use it in the future, so just remove it.

Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

drivers/irqchip/irq-gic-v3-its.c | 3 --- 1 file changed, 3 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 9687f8a..31c5a27 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -93,7 +93,6 @@ struct its_device {

static LIST_HEAD(its_nodes); static DEFINE_SPINLOCK(its_lock); -static struct device_node *gic_root_node; static struct rdists *gic_rdists;

#define gic_data_rdist() (raw_cpu_ptr(gic_rdists->rdist)) @@ -1554,8 +1553,6 @@ int its_init(struct device_node *node, struct rdists *rdists, }

    gic_rdists = rdists;

•   gic_root_node = node;
  

•   its_alloc_lpi_tables();
    its_lpi_init(rdists->id_bits);
  
  

-- 1.9.1

LGTM..

Yeah, looks downright obvious.

On 16 June 2015 at 09:09, Hanjun Guo hanjun.guo@linaro.org wrote:

Since the only caller of its_init(), gicv3_init_bases(), is a __init function, so mark its_init() as __init too, then recursively mark the function called as __init.

Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

I'm seeing gic_of_init() as the only caller ? 4.1-rc3.

Were you getting section mismatch warnings before this patch? Just curious to know why this change?

Thanks, Ashwin.

---

drivers/irqchip/irq-gic-v3-its.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 31c5a27..6964bf8 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -657,7 +657,7 @@ static int its_chunk_to_lpi(int chunk) return (chunk << IRQS_PER_CHUNK_SHIFT) + 8192; }

-static int its_lpi_init(u32 id_bits) +static int __init its_lpi_init(u32 id_bits) { lpi_chunks = its_lpi_to_chunk(1UL << id_bits);

@@ -1374,7 +1374,8 @@ static int its_force_quiescent(void __iomem *base) } }

-static int its_probe(struct device_node *node, struct irq_domain *parent) +static int __init its_probe(struct device_node *node,

•                       struct irq_domain *parent)
  

{ struct resource res; struct its_node *its; @@ -1537,7 +1538,7 @@ static struct of_device_id its_device_id[] = { {}, };

-int its_init(struct device_node *node, struct rdists *rdists, +int __init its_init(struct device_node *node, struct rdists *rdists, struct irq_domain *parent_domain) { struct device_node *np; -- 1.9.1

---

Linaro-acpi mailing list Linaro-acpi@lists.linaro.org https://lists.linaro.org/mailman/listinfo/linaro-acpi

On 19 June 2015 at 11:00, Ashwin Chaugule ashwin.chaugule@linaro.org wrote:

On 16 June 2015 at 09:09, Hanjun Guo hanjun.guo@linaro.org wrote:

...

Refactor ITS init code to prepare for ACPI

Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

drivers/irqchip/irq-gic-v3-its.c | 126 +++++++++++++++++++++++++-------------- 1 file changed, 80 insertions(+), 46 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 6964bf8..c3652cd 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1374,44 +1374,71 @@ static int its_force_quiescent(void __iomem *base) } }

-static int __init its_probe(struct device_node *node,

•                       struct irq_domain *parent)
  

+static int __init its_init_domain(struct device_node *node, struct its_node *its,

•                           struct irq_domain *parent)
  

+{

•   int err;
  

•   its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
  

•   if (!its->domain)
  

•           return -ENOMEM;
  

•   its->domain->parent = parent;
  

•   its->msi_chip.domain = pci_msi_create_irq_domain(node,
  

•                                           &its_pci_msi_domain_info,
  

•                                           its->domain);
  

•   if (!its->msi_chip.domain) {
  

•           err = -ENOMEM;
  

•           goto out_free_domains;
  

•   }
  

•   if (its->msi_chip.of_node) {
  

•           err = of_pci_msi_chip_add(&its->msi_chip);
  

•           if (err)
  

•                   goto out_free_domains;
  

•   }
  

•   return 0;
  

+out_free_domains:

•   if (its->msi_chip.domain)
  

•           irq_domain_remove(its->msi_chip.domain);
  

•   if (its->domain)
  

•           irq_domain_remove(its->domain);
  

•   return err;
  

+}

+struct its_node * __init its_probe(phys_addr_t phy_base, unsigned long size,

•                           struct device_node *node,
  

•                           struct irq_domain *parent,
  

•                           bool is_msi_controller)
  

{

•   struct resource res;
    struct its_node *its;
    void __iomem *its_base;
    u32 val;
    u64 baser, tmp;
    int err;
  
  

•   err = of_address_to_resource(node, 0, &res);
  

•   if (err) {
  

•           pr_warn("%s: no regs?\n", node->full_name);
  

•           return -ENXIO;
  

•   }
  

•   its_base = ioremap(res.start, resource_size(&res));
  

•   its_base = ioremap(phy_base, size);
    if (!its_base) {
  

•           pr_warn("%s: unable to map registers\n", node->full_name);
  

•           return -ENOMEM;
  

•           pr_warn("Unable to map registers\n");
  

•           return ERR_PTR(-ENOMEM);
    }
  
    val = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;
    if (val != 0x30 && val != 0x40) {
  

•           pr_warn("%s: no ITS detected, giving up\n", node->full_name);
  

•           pr_warn("No ITS detected, giving up\n");
            err = -ENODEV;
            goto out_unmap;
    }
  
    err = its_force_quiescent(its_base);
    if (err) {
  

•           pr_warn("%s: failed to quiesce, giving up\n",
  

•                   node->full_name);
  

•           pr_warn("Failed to quiesce, giving up\n");
            goto out_unmap;
    }
  
  

•   pr_info("ITS: %s\n", node->full_name);
  

•   its = kzalloc(sizeof(*its), GFP_KERNEL);
    if (!its) {
            err = -ENOMEM;
  

@@ -1422,7 +1449,7 @@ static int __init its_probe(struct device_node *node, INIT_LIST_HEAD(&its->entry); INIT_LIST_HEAD(&its->its_device_list); its->base = its_base;

•   its->phys_base = res.start;
  

•   its->phys_base = phy_base;
    its->msi_chip.of_node = node;
    its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1;
  
  

@@ -1469,39 +1496,18 @@ static int __init its_probe(struct device_node *node, writeq_relaxed(0, its->base + GITS_CWRITER); writel_relaxed(GITS_CTLR_ENABLE, its->base + GITS_CTLR);

•   if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) {
  

•           its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its);
  

•           if (!its->domain) {
  

•                   err = -ENOMEM;
  

•                   goto out_free_tables;
  

•           }
  

•           its->domain->parent = parent;
  

•           its->msi_chip.domain = pci_msi_create_irq_domain(node,
  

•                                                            &its_pci_msi_domain_info,
  

•                                                            its->domain);
  

•           if (!its->msi_chip.domain) {
  

•                   err = -ENOMEM;
  

•                   goto out_free_domains;
  

•           }
  

•           err = of_pci_msi_chip_add(&its->msi_chip);
  

•   if (is_msi_controller) {
  

•           err = its_init_domain(node, its, parent);
            if (err)
  

•                   goto out_free_domains;
  

•                   goto out_free_tables;
    }
  
    spin_lock(&its_lock);
    list_add(&its->entry, &its_nodes);
    spin_unlock(&its_lock);
  
  

•   return 0;
  

•   return its;
  
  

-out_free_domains:

•   if (its->msi_chip.domain)
  

•           irq_domain_remove(its->msi_chip.domain);
  

•   if (its->domain)
  

•           irq_domain_remove(its->domain);
  

out_free_tables: its_free_tables(its); out_free_cmd: @@ -1510,8 +1516,36 @@ out_free_its: kfree(its); out_unmap: iounmap(its_base);

•   pr_err("ITS: failed probing %s (%d)\n", node->full_name, err);
  

•   return err;
  

•   return ERR_PTR(err);
  

+}

+static int __init its_of_probe(struct device_node *node,

•                          struct irq_domain *parent)
  

+{

•   struct resource res;
  

•   struct its_node *its;
  

•   int err;
  

•   bool is_msi_controller = false;
  

•   err = of_address_to_resource(node, 0, &res);
  

•   if (err) {
  

•           pr_warn("%s: no regs?\n", node->full_name);
  

•           return -ENXIO;
  

•   }
  

•   if (of_property_read_bool(node, "msi-controller"))
  

•           is_msi_controller = true;
  

•   its = its_probe(res.start, resource_size(&res), node, parent,
  

•                   is_msi_controller);
  

Still grokking, but I think we're passing the DT node pointer around too much. It could probably be split up cleaner such that its_probe() is independent of ACPI or DT, but I'll need to get more surrounding context to be sure.

IIUC, you're probably going to need an its_init_domain() for ACPI, in which case, you could just call the one you have in this patch directly below its_probe() inside its_of_probe(). That way you dont need to pass the node ptr to its_probe() and keep that function generic.

...

•   if (IS_ERR(its)) {
  

•           err = PTR_ERR(its);
  

•           pr_err("ITS: failed probing %s (%d)\n", node->full_name, err);
  

•           return err;
  

•   }
  

•   pr_info("ITS: %s\n", node->full_name);
  

•   return 0;
  

}

static bool gic_rdists_supports_plpis(void) @@ -1545,7 +1579,7 @@ int __init its_init(struct device_node *node, struct rdists *rdists,

    for (np = of_find_matching_node(node, its_device_id); np;
         np = of_find_matching_node(np, its_device_id)) {

•           its_probe(np, parent_domain);
  

•           its_of_probe(np, parent_domain);
    }
  
    if (list_empty(&its_nodes)) {
  

-- 1.9.1

---

Linaro-acpi mailing list Linaro-acpi@lists.linaro.org https://lists.linaro.org/mailman/listinfo/linaro-acpi

On 07/17/2015 05:21 AM, Al Stone wrote:

On 06/16/2015 07:09 AM, Hanjun Guo wrote:

...

Parse ITS entries in MADT table to probe ITS

Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

drivers/irqchip/irq-gic-v3-its.c | 54 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index c3652cd..fa2e828 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -15,6 +15,7 @@

• along with this program. If not, see http://www.gnu.org/licenses/.

*/

+#include <linux/acpi.h> #include <linux/bitmap.h> #include <linux/cpu.h> #include <linux/delay.h> @@ -1567,6 +1568,47 @@ int its_cpu_init(void) return 0; }

+#ifdef CONFIG_ACPI +static struct irq_domain *its_parent __initdata;

+static int __init +gic_acpi_parse_madt_its(struct acpi_subtable_header *header,

• 	const unsigned long end)
  

+{

• struct acpi_madt_generic_translator *its_entry;
• struct its_node *its;
• if (BAD_MADT_ENTRY(header, end))

• return -EINVAL;
  

Off topic a bit....

I'm hoping to get rid of BAD_MADT_ENTRY (see the posted RFC) because of this usage -- every routine that traverses the MADT entries has to insert this instead of having it done once.

ok, I will review your patchset :)

Thanks Hanjun

On 06/16/2015 07:09 AM, Hanjun Guo wrote:

IORT shows representation of IO topology that will be used by ARM based systems. It describes how various components are connected together e.g. which devices are connected to given ITS instance.

This patch implements calls which allow to:

• register/remove ITS as MSI chip
• parse all IORT nodes and form node tree (for easy lookup)
• find ITS (MSI chip) that device is assigned to

Signed-off-by: Tomasz Nowicki tomasz.nowicki@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

---

drivers/acpi/Kconfig | 3 + drivers/acpi/Makefile | 1 + drivers/acpi/iort.c | 272 +++++++++++++++++++++++++++++++++++++++ drivers/acpi/pci_root.c | 2 + drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-gic-v3-its.c | 6 +- include/linux/iort.h | 39 ++++++ 7 files changed, 323 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/iort.c create mode 100644 include/linux/iort.h

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 212735f..749a8c7 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -57,6 +57,9 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT config ACPI_CCA_REQUIRED bool +config IORT_TABLE

• bool

config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 576fbb1..b325d08 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o obj-$(CONFIG_ACPI_BGRT) += bgrt.o obj-$(CONFIG_IRQCHIP) += irq.o +obj-$(CONFIG_IORT_TABLE) += iort.o # processor has its own "processor." module_param namespace processor-y := processor_driver.o processor_throttling.o diff --git a/drivers/acpi/iort.c b/drivers/acpi/iort.c new file mode 100644 index 0000000..01692bb --- /dev/null +++ b/drivers/acpi/iort.c @@ -0,0 +1,272 @@ +/*

• • Copyright (C) 2015, Linaro Ltd.
• • Author: Tomasz Nowicki tomasz.nowicki@linaro.org
• • Author: Hanjun Guo hanjun.guo@linaro.org
• • This program is free software; you can redistribute it and/or modify it
• • under the terms and conditions of the GNU General Public License,
• • version 2, as published by the Free Software Foundation.
• • This program is distributed in the hope it will be useful, but WITHOUT
• • ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
• • FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
• • more details.
• • This file implements early detection/parsing of I/O mapping
• • reported to OS through firmware via I/O Remapping Table (IORT)
• • IORT document number: ARM DEN 0049A
• • These routines are used by ITS and PCI host bridge drivers.
• */

+#define pr_fmt(fmt) "ACPI: IORT: " fmt

+#include <linux/acpi.h> +#include <linux/export.h> +#include <linux/iort.h> +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/msi.h> +#include <linux/mutex.h> +#include <linux/slab.h>

+struct iort_its_msi_chip {

• struct list_head list;
• struct msi_controller *chip;
• u32 id;

+};

+typedef acpi_status (*iort_find_node_callback)

• (struct acpi_iort_node *node, void *context);

+/* pointer to the mapped IORT table */ +static struct acpi_table_header *iort_table;

Do you really want acpi_table_header? Or do you want acpi_table_iort? It's not clear to me which would be better and avoid the most casts.

+static LIST_HEAD(iort_pci_msi_chip_list); +static DEFINE_MUTEX(iort_pci_msi_chip_mutex);

+int iort_pci_msi_chip_add(struct msi_controller *chip, u32 its_id) +{

• struct iort_its_msi_chip *its_msi_chip;
• its_msi_chip = kzalloc(sizeof(*its_msi_chip), GFP_KERNEL);
• if (!its_msi_chip)

• return -ENOMEM;
  

• its_msi_chip->chip = chip;
• its_msi_chip->id = its_id;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_add(&its_msi_chip->list, &iort_pci_msi_chip_list);
• mutex_unlock(&iort_pci_msi_chip_mutex);

The mutex raises a question for me: when is IORT being parsed? If it is only early on (i.e., setup_arch()), we may not even have multiple CPUs to worry about yet and the mutex isn't needed. And if we are that early, do we need to use __init?

If IORT isn't being parsed until after the interpreter is running, then yeah, a mutex is a good idea.

• return 0;

+} +EXPORT_SYMBOL_GPL(iort_pci_msi_chip_add);

+void iort_pci_msi_chip_remove(struct msi_controller *chip) +{

• struct iort_its_msi_chip *its_msi_chip;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_for_each_entry(its_msi_chip, &iort_pci_msi_chip_list, list) {

• if (its_msi_chip->chip == chip) {
  

• 	list_del(&its_msi_chip->list);
  

• 	kfree(its_msi_chip);
  

• 	break;
  

• }
  

• }
• mutex_unlock(&iort_pci_msi_chip_mutex);

+} +EXPORT_SYMBOL_GPL(iort_pci_msi_chip_remove);

+static struct msi_controller *iort_pci_find_msi_chip_by_its(u32 its_id) +{

• struct iort_its_msi_chip *its_msi_chip;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_for_each_entry(its_msi_chip, &iort_pci_msi_chip_list, list) {

• if (its_msi_chip->id == its_id) {
  

• 	mutex_unlock(&iort_pci_msi_chip_mutex);
  

• 	return its_msi_chip->chip;
  

• }
  

• }
• mutex_unlock(&iort_pci_msi_chip_mutex);
• return NULL;

+}

+/**

• • iort_find_root_its_node() - Get PCI root complex, device, or SMMU's
• • parent ITS node.
• • @node: node pointer to PCI root complex, device, or SMMU
• • Returns: parent ITS node pointer on success

• •    NULL on failure
    

• */

+static struct acpi_iort_node * +iort_find_parent_its_node(struct acpi_iort_node *node) +{

• struct acpi_iort_id_mapping *id_map;
• if (!node)

• return NULL;
  

• /* Go upstream until find its parent ITS node */
• while (node->type != ACPI_IORT_NODE_ITS_GROUP) {

• /* TODO: handle multi ID mapping entries */
  

• id_map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node,
  

• 		      node->mapping_offset);
  

• /* Firmware bug! */
  

• if (!id_map->output_reference) {
  

• 	pr_err(FW_BUG "[node %p type %d] ID map has invalid parent reference\n",
  

• 	       node, node->type);
  

• 	return NULL;
  

• }
  

• /* TODO: Components that do not generate MSIs but are connected to an SMMU */
  

• node = ACPI_ADD_PTR(struct acpi_iort_node, iort_table,
  

• 		    id_map->output_reference);
  

• }
• return node;

+}

+/**

• • iort_scan_node() - scan the IORT and call the handler with specific
• • IORT node type
• • @type: IORT node type
• • @callback: callback with specific node type
• • @context: context pass to the callback
• • Returns: node pointer when the callback succeed

• •    NULL on failure
    

• */

+static struct acpi_iort_node * +iort_scan_node(enum acpi_iort_node_type type,

•       iort_find_node_callback callback, void *context)
  

+{

• struct acpi_iort_node *iort_node, *iort_end;
• struct acpi_table_iort *iort;
• int i;
• if (!iort_table)

• return NULL;
  

• /*

• * iort_table and iort both point to the start of IORT table, but
  

• * have different struct types
  

• */
  

• iort = container_of(iort_table, struct acpi_table_iort, header);
• /* Get the first iort node */
• iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort,

• 		 iort->node_offset);
  

• /* pointer to the end of the table */
• iort_end = ACPI_ADD_PTR(struct acpi_iort_node, iort_table,

• 		iort_table->length);
  

• for (i = 0; i < iort->node_count; i++) {

• if (iort_node >= iort_end) {
  

• 	pr_err("iort node pointer overflows, bad table\n");
  

• 	return NULL;
  

• }
  

• if (iort_node->type == type) {
  

• 	if (ACPI_SUCCESS(callback(iort_node, context)))
  

• 		return iort_node;
  

• }
  

• iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node,
  

• 			 iort_node->length);
  

• }
• return NULL;

+}

+static acpi_status +iort_find_pci_rc_callback(struct acpi_iort_node *node, void *context) +{

• struct acpi_iort_root_complex *pci_rc;
• int segment = *(int *)context;
• pci_rc = (struct acpi_iort_root_complex *)node->node_data;
• /*

• * It is assumed that PCI segment numbers have a one-to-one mapping
  

• * with root complexes. Each segment number can represent only one
  

• * root complex.
  

• */
  

• if (pci_rc->pci_segment_number == segment)

• return AE_OK;
  

• return AE_NOT_FOUND;

+}

+/**

• • iort_find_pci_msi_chip() - find the msi controller with root complex's
• • segment number
• • @segment: domain number of this pci root complex
• • @idx: index of the ITS in the ITS group
• • Returns: msi controller bind to the root complex with the segment

• •    NULL on failure
    

• */

+struct msi_controller *iort_find_pci_msi_chip(int segment, unsigned int idx) +{

• struct acpi_iort_its_group *its;
• struct acpi_iort_node *node;
• struct msi_controller *msi_chip;
• node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,

• 	      iort_find_pci_rc_callback, &segment);
  

• if (!node) {

• pr_err("can't find node related to PCI host bridge [segment %d]\n",
  

•        segment);
  

• return NULL;
  

• }
• node = iort_find_parent_its_node(node);
• if (!node) {

• pr_err("can't find ITS parent node for PCI host bridge [segment %d]\n",
  

•        segment);
  

• return NULL;
  

• }
• /* Move to ITS specific data */
• its = (struct acpi_iort_its_group *)node->node_data;
• if (idx > its->its_count) {

• pr_err("requested ITS ID index [%d] is greater than available ITS count [%d]\n",
  

•        idx, its->its_count);
  

• return NULL;
  

• }
• msi_chip = iort_pci_find_msi_chip_by_its(its->identifiers[idx]);
• if (!msi_chip)

• pr_err("can not find ITS chip ID:%d, not registered\n",
  

•        its->identifiers[idx]);
  

• return msi_chip;

+} +EXPORT_SYMBOL_GPL(iort_find_pci_msi_chip);

+/* Get the remapped IORT table */ +static int __init iort_table_detect(void) +{

• acpi_status status;
• if (acpi_disabled)

• return -ENODEV;
  

• status = acpi_get_table(ACPI_SIG_IORT, 0, &iort_table);
• if (ACPI_FAILURE(status)) {

• const char *msg = acpi_format_exception(status);
  

• pr_err("Failed to get table, %s\n", msg);
  

• return -EINVAL;
  

• }
• return 0;

+} +arch_initcall(iort_table_detect); diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 22d0cb7..b1f6d04 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -34,6 +34,7 @@ #include <linux/pci-acpi.h> #include <linux/pci-aspm.h> #include <linux/dmar.h> +#include <linux/iort.h> #include <linux/acpi.h> #include <linux/slab.h> #include <linux/dmi.h> @@ -842,6 +843,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, bus = pci_create_root_bus(NULL, busnum, ops->pci_ops, &info->controller, &info->resources); if (bus) {

• bus->msi = iort_find_pci_msi_chip(root->segment, 0);
  

  pci_scan_child_bus(bus); pci_set_host_bridge_release(to_pci_host_bridge(bus->bridge), acpi_pci_root_release_info, info);

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 0dd64c5..7dddfee 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -26,6 +26,7 @@ config ARM_GIC_V3 config ARM_GIC_V3_ITS bool select PCI_MSI_IRQ_DOMAIN

• select IORT_TABLE if (ACPI && PCI_MSI)

The number of Kconfig options is mind boggling these days :/. Do we need to select on a GICv3 option, too?

config ARM_NVIC bool diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index fa2e828..141c645 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -20,6 +20,7 @@ #include <linux/cpu.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/iort.h> #include <linux/log2.h> #include <linux/mm.h> #include <linux/msi.h> @@ -1588,8 +1589,11 @@ gic_acpi_parse_madt_its(struct acpi_subtable_header *header, /* ITS works as msi controller in ACPI case */ its = its_probe(its_entry->base_address, 2 * SZ_64K, NULL, its_parent, true);

• if (!IS_ERR(its))

• if (!IS_ERR(its)) {

• iort_pci_msi_chip_add(&its->msi_chip,
  

• 		      its_entry->translation_id);
  

  return 0;
• }

pr_err("ACPI: failed probing num %d ITS\n", its_entry->translation_id); return PTR_ERR(its); diff --git a/include/linux/iort.h b/include/linux/iort.h new file mode 100644 index 0000000..7b83a03 --- /dev/null +++ b/include/linux/iort.h @@ -0,0 +1,39 @@ +/*

• • Copyright (C) 2015, Linaro Ltd.
• • Author: Tomasz Nowicki tomasz.nowicki@linaro.org
• • This program is free software; you can redistribute it and/or modify it
• • under the terms and conditions of the GNU General Public License,
• • version 2, as published by the Free Software Foundation.
• • This program is distributed in the hope it will be useful, but WITHOUT
• • ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
• • FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
• • more details.
• • You should have received a copy of the GNU General Public License along with
• • this program; if not, write to the Free Software Foundation, Inc., 59 Temple
• • Place - Suite 330, Boston, MA 02111-1307 USA.
• */

+#ifndef __IORT_H__ +#define __IORT_H__

+struct msi_controller;

+#ifdef CONFIG_IORT_TABLE +int iort_pci_msi_chip_add(struct msi_controller *chip, u32 its_id); +void iort_pci_msi_chip_remove(struct msi_controller *chip); +struct msi_controller *iort_find_pci_msi_chip(int segment, unsigned int idx); +#else +static inline int +iort_pci_msi_chip_add(struct msi_controller *chip, u32 its_id) { return -ENODEV; }

+static inline void +iort_pci_msi_chip_remove(struct msi_controller *chip) { }

+static struct msi_controller * +iort_find_pci_msi_chip(int segment, unsigned int idx) { return NULL; } +#endif

+#endif /* __IORT_H__ */

On 17.07.2015 10:20, Hanjun Guo wrote:

On 07/17/2015 05:32 AM, Al Stone wrote:

...

On 06/16/2015 07:09 AM, Hanjun Guo wrote:

...

IORT shows representation of IO topology that will be used by ARM based systems. It describes how various components are connected together e.g. which devices are connected to given ITS instance.

This patch implements calls which allow to:

• register/remove ITS as MSI chip
• parse all IORT nodes and form node tree (for easy lookup)
• find ITS (MSI chip) that device is assigned to

Signed-off-by: Tomasz Nowicki tomasz.nowicki@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org

---

drivers/acpi/Kconfig | 3 + drivers/acpi/Makefile | 1 + drivers/acpi/iort.c | 272 +++++++++++++++++++++++++++++++++++++++ drivers/acpi/pci_root.c | 2 + drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-gic-v3-its.c | 6 +- include/linux/iort.h | 39 ++++++ 7 files changed, 323 insertions(+), 1 deletion(-) create mode 100644 drivers/acpi/iort.c create mode 100644 include/linux/iort.h

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 212735f..749a8c7 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -57,6 +57,9 @@ config ACPI_SYSTEM_POWER_STATES_SUPPORT config ACPI_CCA_REQUIRED bool

+config IORT_TABLE

• bool
• config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 576fbb1..b325d08 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_ACPI_EC_DEBUGFS) += ec_sys.o obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o obj-$(CONFIG_ACPI_BGRT) += bgrt.o obj-$(CONFIG_IRQCHIP) += irq.o +obj-$(CONFIG_IORT_TABLE) += iort.o

# processor has its own "processor." module_param namespace processor-y := processor_driver.o processor_throttling.o diff --git a/drivers/acpi/iort.c b/drivers/acpi/iort.c new file mode 100644 index 0000000..01692bb --- /dev/null +++ b/drivers/acpi/iort.c @@ -0,0 +1,272 @@ +/*

• • Copyright (C) 2015, Linaro Ltd.
• • Author: Tomasz Nowicki tomasz.nowicki@linaro.org
• • Author: Hanjun Guo hanjun.guo@linaro.org
• • This program is free software; you can redistribute it and/or

modify it

• • under the terms and conditions of the GNU General Public License,
• • version 2, as published by the Free Software Foundation.
• • This program is distributed in the hope it will be useful, but

WITHOUT

• • ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or

• • FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public

License for

• • more details.
• • This file implements early detection/parsing of I/O mapping
• • reported to OS through firmware via I/O Remapping Table (IORT)
• • IORT document number: ARM DEN 0049A
• • These routines are used by ITS and PCI host bridge drivers.
• */

+#define pr_fmt(fmt) "ACPI: IORT: " fmt

+#include <linux/acpi.h> +#include <linux/export.h> +#include <linux/iort.h> +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/msi.h> +#include <linux/mutex.h> +#include <linux/slab.h>

+struct iort_its_msi_chip {

• struct list_head list;
• struct msi_controller *chip;

Just to let you know, Marc is trying to remove struct msi_controller [1] and we need to rework this patch set based on that patch set.

...

...

• u32 id;

+};

+typedef acpi_status (*iort_find_node_callback)

• (struct acpi_iort_node *node, void *context);

+/* pointer to the mapped IORT table */ +static struct acpi_table_header *iort_table;

Do you really want acpi_table_header? Or do you want acpi_table_iort? It's not clear to me which would be better and avoid the most casts.

yes, we need the pointer to the mem-remapped iort table then no need to remap it later when using it.

...

...

+static LIST_HEAD(iort_pci_msi_chip_list); +static DEFINE_MUTEX(iort_pci_msi_chip_mutex);

+int iort_pci_msi_chip_add(struct msi_controller *chip, u32 its_id) +{

• struct iort_its_msi_chip *its_msi_chip;
• its_msi_chip = kzalloc(sizeof(*its_msi_chip), GFP_KERNEL);
• if (!its_msi_chip)

•    return -ENOMEM;
  

• its_msi_chip->chip = chip;
• its_msi_chip->id = its_id;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_add(&its_msi_chip->list, &iort_pci_msi_chip_list);
• mutex_unlock(&iort_pci_msi_chip_mutex);

The mutex raises a question for me: when is IORT being parsed? If it is only early on (i.e., setup_arch()), we may not even have multiple CPUs to worry about yet and the mutex isn't needed. And if we are that early, do we need to use __init?

If IORT isn't being parsed until after the interpreter is running, then yeah, a mutex is a good idea.

Good question. This iort_pci_msi_chip_add() is only called by __init function and with only one CPU running as I know, I will rework this patch set as I said above, we don't need struct msi_controller anymore, something else will be needed.

Not sure here, but you may have a look at analogous solution for FDT, I believe mutex is used there as well.

Tomasz

...

...

• return 0;

+} +EXPORT_SYMBOL_GPL(iort_pci_msi_chip_add);

+void iort_pci_msi_chip_remove(struct msi_controller *chip) +{

• struct iort_its_msi_chip *its_msi_chip;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_for_each_entry(its_msi_chip, &iort_pci_msi_chip_list, list) {

•    if (its_msi_chip->chip == chip) {
  

•        list_del(&its_msi_chip->list);
  

•        kfree(its_msi_chip);
  

•        break;
  

•    }
  

• }
• mutex_unlock(&iort_pci_msi_chip_mutex);

+} +EXPORT_SYMBOL_GPL(iort_pci_msi_chip_remove);

+static struct msi_controller *iort_pci_find_msi_chip_by_its(u32 its_id) +{

• struct iort_its_msi_chip *its_msi_chip;
• mutex_lock(&iort_pci_msi_chip_mutex);
• list_for_each_entry(its_msi_chip, &iort_pci_msi_chip_list, list) {

•    if (its_msi_chip->id == its_id) {
  

•        mutex_unlock(&iort_pci_msi_chip_mutex);
  

•        return its_msi_chip->chip;
  

•    }
  

• }
• mutex_unlock(&iort_pci_msi_chip_mutex);
• return NULL;

+}

+/**

• • iort_find_root_its_node() - Get PCI root complex, device, or SMMU's
• • parent ITS node.
• • @node: node pointer to PCI root complex, device, or SMMU
• • Returns: parent ITS node pointer on success

• •     NULL on failure
    

• */

+static struct acpi_iort_node * +iort_find_parent_its_node(struct acpi_iort_node *node) +{

• struct acpi_iort_id_mapping *id_map;
• if (!node)

•    return NULL;
  

• /* Go upstream until find its parent ITS node */
• while (node->type != ACPI_IORT_NODE_ITS_GROUP) {

•    /* TODO: handle multi ID mapping entries */
  

•    id_map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node,
  

•                  node->mapping_offset);
  

•    /* Firmware bug! */
  

•    if (!id_map->output_reference) {
  

•        pr_err(FW_BUG "[node %p type %d] ID map has invalid
  

parent reference\n",

•               node, node->type);
  

•        return NULL;
  

•    }
  

•    /* TODO: Components that do not generate MSIs but are
  

connected to an SMMU */

•    node = ACPI_ADD_PTR(struct acpi_iort_node, iort_table,
  

•                id_map->output_reference);
  

• }
• return node;

+}

+/**

• • iort_scan_node() - scan the IORT and call the handler with specific
• • IORT node type
• • @type: IORT node type
• • @callback: callback with specific node type
• • @context: context pass to the callback
• • Returns: node pointer when the callback succeed

• •     NULL on failure
    

• */

+static struct acpi_iort_node * +iort_scan_node(enum acpi_iort_node_type type,

•       iort_find_node_callback callback, void *context)
  

+{

• struct acpi_iort_node *iort_node, *iort_end;
• struct acpi_table_iort *iort;
• int i;
• if (!iort_table)

•    return NULL;
  

• /*

• * iort_table and iort both point to the start of IORT table, but
  

• * have different struct types
  

• */
  

• iort = container_of(iort_table, struct acpi_table_iort, header);
• /* Get the first iort node */
• iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort,

•             iort->node_offset);
  

• /* pointer to the end of the table */
• iort_end = ACPI_ADD_PTR(struct acpi_iort_node, iort_table,

•            iort_table->length);
  

• for (i = 0; i < iort->node_count; i++) {

•    if (iort_node >= iort_end) {
  

•        pr_err("iort node pointer overflows, bad table\n");
  

•        return NULL;
  

•    }
  

•    if (iort_node->type == type) {
  

•        if (ACPI_SUCCESS(callback(iort_node, context)))
  

•            return iort_node;
  

•    }
  

•    iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node,
  

•                 iort_node->length);
  

• }
• return NULL;

+}

+static acpi_status +iort_find_pci_rc_callback(struct acpi_iort_node *node, void *context) +{

• struct acpi_iort_root_complex *pci_rc;
• int segment = *(int *)context;
• pci_rc = (struct acpi_iort_root_complex *)node->node_data;
• /*

• * It is assumed that PCI segment numbers have a one-to-one mapping
  

• * with root complexes. Each segment number can represent only one
  

• * root complex.
  

• */
  

• if (pci_rc->pci_segment_number == segment)

•    return AE_OK;
  

• return AE_NOT_FOUND;

+}

+/**

• • iort_find_pci_msi_chip() - find the msi controller with root

complex's

• • segment number
• • @segment: domain number of this pci root complex
• • @idx: index of the ITS in the ITS group
• • Returns: msi controller bind to the root complex with the segment

• •     NULL on failure
    

• */

+struct msi_controller *iort_find_pci_msi_chip(int segment, unsigned int idx) +{

• struct acpi_iort_its_group *its;
• struct acpi_iort_node *node;
• struct msi_controller *msi_chip;
• node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX,

•              iort_find_pci_rc_callback, &segment);
  

• if (!node) {

•    pr_err("can't find node related to PCI host bridge [segment
  

%d]\n",

•           segment);
  

•    return NULL;
  

• }
• node = iort_find_parent_its_node(node);
• if (!node) {

•    pr_err("can't find ITS parent node for PCI host bridge
  

[segment %d]\n",

•           segment);
  

•    return NULL;
  

• }
• /* Move to ITS specific data */
• its = (struct acpi_iort_its_group *)node->node_data;
• if (idx > its->its_count) {

•    pr_err("requested ITS ID index [%d] is greater than
  

available ITS count [%d]\n",

•           idx, its->its_count);
  

•    return NULL;
  

• }
• msi_chip = iort_pci_find_msi_chip_by_its(its->identifiers[idx]);
• if (!msi_chip)

•    pr_err("can not find ITS chip ID:%d, not registered\n",
  

•           its->identifiers[idx]);
  

• return msi_chip;

+} +EXPORT_SYMBOL_GPL(iort_find_pci_msi_chip);

+/* Get the remapped IORT table */ +static int __init iort_table_detect(void) +{

• acpi_status status;
• if (acpi_disabled)

•    return -ENODEV;
  

• status = acpi_get_table(ACPI_SIG_IORT, 0, &iort_table);
• if (ACPI_FAILURE(status)) {

•    const char *msg = acpi_format_exception(status);
  

•    pr_err("Failed to get table, %s\n", msg);
  

•    return -EINVAL;
  

• }
• return 0;

+} +arch_initcall(iort_table_detect); diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 22d0cb7..b1f6d04 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -34,6 +34,7 @@ #include <linux/pci-acpi.h> #include <linux/pci-aspm.h> #include <linux/dmar.h> +#include <linux/iort.h> #include <linux/acpi.h> #include <linux/slab.h> #include <linux/dmi.h> @@ -842,6 +843,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, bus = pci_create_root_bus(NULL, busnum, ops->pci_ops, &info->controller, &info->resources); if (bus) {

•    bus->msi = iort_find_pci_msi_chip(root->segment, 0);
      pci_scan_child_bus(bus);
      pci_set_host_bridge_release(to_pci_host_bridge(bus->bridge),
                      acpi_pci_root_release_info, info);
  

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 0dd64c5..7dddfee 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -26,6 +26,7 @@ config ARM_GIC_V3 config ARM_GIC_V3_ITS bool select PCI_MSI_IRQ_DOMAIN

• select IORT_TABLE if (ACPI && PCI_MSI)

The number of Kconfig options is mind boggling these days :/. Do we need to select on a GICv3 option, too?

Seems not, IORT is only connecting to ITS. but as you said, seems ARM_GIC_V3_ITS depends on GICv3 :)

Thanks Hanjun _______________________________________________ Linaro-acpi mailing list Linaro-acpi@lists.linaro.org https://lists.linaro.org/mailman/listinfo/linaro-acpi