On 2016/8/11 18:06, Tomasz Nowicki wrote:
In order to add ACPI support we need to isolate ACPI&DT common code and move DT logic to corresponding functions. To achieve this we are using firmware agnostic handle which can be unpacked to either DT or ACPI node.
No functional changes other than a very minor one:
- Terminate its_init call with -ENODEV for non-DT case which allows
to remove hack from its-gic-v3.c. 2. Fix ITS base register address type (from 'unsigned long' to 'phys_addr_t'), as a bonus we get nice string formatting. 3. Since there is only one of ITS parent domain convert it to static global variable and drop the parameter from its_probe_one. Users can refer to it in more convenient way then.
[...]
-static int __init its_probe(struct device_node *node,
struct irq_domain *parent)
+static int __init its_probe_one(struct resource *res,
struct fwnode_handle *handle, int numa_node)
{
- 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(res->start, resource_size(res)); if (!its_base) {
pr_warn("%s: unable to map registers\n", node->full_name);
return -ENOMEM; }pr_warn("ITS@%pa: Unable to map ITS registers\n", &res->start);
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);
err = -ENODEV; goto out_unmap; }pr_warn("ITS@%pa: No ITS detected, giving up\n", &res->start);
err = its_force_quiescent(its_base); if (err) {
pr_warn("%s: failed to quiesce, giving up\n",
node->full_name);
goto out_unmap; }pr_warn("ITS@%pa: Failed to quiesce, giving up\n", &res->start);
- pr_info("ITS: %s\n", node->full_name);
- pr_info("ITS@%pa\n", &res->start);
^^
When I was testing this patch set I found message printed as below:
[ 0.000000] ITS@0x00000000c6000000 [ 0.000000] ITS@0x00000000c6000000: allocated 524288 Devices @27dc400000 (flat, esz 8, psz 16K, shr 1) [ 0.000000] ITS@0x00000000c6000000: allocated 2048 Virtual CPUs @27dc820000 (flat, esz 8, psz 4K, shr 1) [ 0.000000] ITS@0x00000000c6000000: allocated 512 Interrupt Collections @27dc80f000 (flat, esz 8, psz 4K, shr 1)
Seems this print is redundant, can we remove it?
Thanks Hanjun