diff for duplicates of <570E6112.3040503@arm.com> diff --git a/a/1.txt b/N1/1.txt index 1b0acd6..62f5951 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,7 +32,7 @@ On 04/04/16 09:52, Tomasz Nowicki wrote: > order = MAX_ORDER - 1; > - pr_warn("%s: Device Table too large, reduce its page order to %u\n", > - node_name, order); -> + pr_warn("ITS@0x%lx: Device Table too large, reduce its page order to %u\n", +> + pr_warn("ITS at 0x%lx: Device Table too large, reduce its page order to %u\n", > + its->phys_base, order); Start by making the phys_base field in struct its_node a phys_addr_t (as @@ -47,7 +47,7 @@ it should have been from day-1), and use %pa in the format strings. > order = get_order(GITS_BASER_PAGES_MAX * psz); > - pr_warn("%s: Device Table too large, reduce its page order to %u (%u pages)\n", > - node_name, order, alloc_pages); -> + pr_warn("ITS@0x%lx: Device Table too large, reduce its page order to %u (%u pages)\n", +> + pr_warn("ITS at 0x%lx: Device Table too large, reduce its page order to %u (%u pages)\n", > + its->phys_base, order, alloc_pages); > } > @@ -58,7 +58,7 @@ it should have been from day-1), and use %pa in the format strings. > if (val != tmp) { > - pr_err("ITS: %s: GITS_BASER%d doesn't stick: %lx %lx\n", > - node_name, i, -> + pr_err("ITS@0x%lx: GITS_BASER%d doesn't stick: %lx %lx\n", +> + pr_err("ITS at 0x%lx: GITS_BASER%d doesn't stick: %lx %lx\n", > + its->phys_base, i, > (unsigned long) val, (unsigned long) tmp); > err = -ENXIO; @@ -116,7 +116,7 @@ your ACPI code and pass that around, just like we do here. > + its_base = ioremap(phys_base, size); > if (!its_base) { > - pr_warn("%s: unable to map registers\n", node->full_name); -> + pr_warn("ITS@0x%lx: Unable to map ITS registers\n", +> + pr_warn("ITS at 0x%lx: Unable to map ITS registers\n", > + (long)phys_base); Same here. Use the right format, and lose the case everywhere. @@ -127,7 +127,7 @@ Same here. Use the right format, and lose the case everywhere. > 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("ITS@0x%lx: No ITS detected, giving up\n", +> + pr_warn("ITS at 0x%lx: No ITS detected, giving up\n", > + (long)phys_base); > err = -ENODEV; > goto out_unmap; @@ -137,13 +137,13 @@ Same here. Use the right format, and lose the case everywhere. > if (err) { > - pr_warn("%s: failed to quiesce, giving up\n", > - node->full_name); -> + pr_warn("ITS@0x%lx: Failed to quiesce, giving up\n", +> + pr_warn("ITS at 0x%lx: Failed to quiesce, giving up\n", > + (long)phys_base); > goto out_unmap; > } > > - pr_info("ITS: %s\n", node->full_name); -> + pr_info("ITS@0x%lx\n", (long)phys_base); +> + pr_info("ITS at 0x%lx\n", (long)phys_base); > > its = kzalloc(sizeof(*its), GFP_KERNEL); > if (!its) { @@ -179,7 +179,7 @@ Same here. Use the right format, and lose the case everywhere. > out_unmap: > iounmap(its_base); > - pr_err("ITS: failed probing %s (%d)\n", node->full_name, err); -> + pr_err("ITS@0x%lx: failed probing (%d)\n", (long)phys_base, err); +> + pr_err("ITS at 0x%lx: failed probing (%d)\n", (long)phys_base, err); > return err; > } > diff --git a/a/content_digest b/N1/content_digest index 9f58597..4568809 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,9 @@ "ref\01459759975-24097-1-git-send-email-tn@semihalf.com\0" "ref\01459759975-24097-4-git-send-email-tn@semihalf.com\0" - "From\0Marc Zyngier <marc.zyngier@arm.com>\0" - "Subject\0Re: [PATCH V4 3/7] irqchip, GICv3, ITS: Refator ITS DT init code to prepare for ACPI.\0" + "From\0marc.zyngier@arm.com (Marc Zyngier)\0" + "Subject\0[PATCH V4 3/7] irqchip, GICv3, ITS: Refator ITS DT init code to prepare for ACPI.\0" "Date\0Wed, 13 Apr 2016 16:09:06 +0100\0" - "To\0Tomasz Nowicki <tn@semihalf.com>" - tglx@linutronix.de - jason@lakedaemon.net - rjw@rjwysocki.net - lorenzo.pieralisi@arm.com - robert.richter@caviumnetworks.com - shijie.huang@arm.com - Suravee.Suthikulpanit@amd.com - " hanjun.guo@linaro.org\0" - "Cc\0al.stone@linaro.org" - mw@semihalf.com - graeme.gregory@linaro.org - Catalin.Marinas@arm.com - will.deacon@arm.com - linux-kernel@vger.kernel.org - linux-acpi@vger.kernel.org - linux-arm-kernel@lists.infradead.org - ddaney.cavm@gmail.com - " okaya@codeaurora.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 04/04/16 09:52, Tomasz Nowicki wrote:\n" @@ -58,7 +40,7 @@ "> \t\t\t\torder = MAX_ORDER - 1;\n" "> -\t\t\t\tpr_warn(\"%s: Device Table too large, reduce its page order to %u\\n\",\n" "> -\t\t\t\t\tnode_name, order);\n" - "> +\t\t\t\tpr_warn(\"ITS@0x%lx: Device Table too large, reduce its page order to %u\\n\",\n" + "> +\t\t\t\tpr_warn(\"ITS at 0x%lx: Device Table too large, reduce its page order to %u\\n\",\n" "> +\t\t\t\t\tits->phys_base, order);\n" "\n" "Start by making the phys_base field in struct its_node a phys_addr_t (as\n" @@ -73,7 +55,7 @@ "> \t\t\torder = get_order(GITS_BASER_PAGES_MAX * psz);\n" "> -\t\t\tpr_warn(\"%s: Device Table too large, reduce its page order to %u (%u pages)\\n\",\n" "> -\t\t\t\tnode_name, order, alloc_pages);\n" - "> +\t\t\tpr_warn(\"ITS@0x%lx: Device Table too large, reduce its page order to %u (%u pages)\\n\",\n" + "> +\t\t\tpr_warn(\"ITS at 0x%lx: Device Table too large, reduce its page order to %u (%u pages)\\n\",\n" "> +\t\t\t\tits->phys_base, order, alloc_pages);\n" "> \t\t}\n" "> \n" @@ -84,7 +66,7 @@ "> \t\tif (val != tmp) {\n" "> -\t\t\tpr_err(\"ITS: %s: GITS_BASER%d doesn't stick: %lx %lx\\n\",\n" "> -\t\t\t node_name, i,\n" - "> +\t\t\tpr_err(\"ITS@0x%lx: GITS_BASER%d doesn't stick: %lx %lx\\n\",\n" + "> +\t\t\tpr_err(\"ITS at 0x%lx: GITS_BASER%d doesn't stick: %lx %lx\\n\",\n" "> +\t\t\t its->phys_base, i,\n" "> \t\t\t (unsigned long) val, (unsigned long) tmp);\n" "> \t\t\terr = -ENXIO;\n" @@ -142,7 +124,7 @@ "> +\tits_base = ioremap(phys_base, size);\n" "> \tif (!its_base) {\n" "> -\t\tpr_warn(\"%s: unable to map registers\\n\", node->full_name);\n" - "> +\t\tpr_warn(\"ITS@0x%lx: Unable to map ITS registers\\n\",\n" + "> +\t\tpr_warn(\"ITS at 0x%lx: Unable to map ITS registers\\n\",\n" "> +\t\t\t(long)phys_base);\n" "\n" "Same here. Use the right format, and lose the case everywhere.\n" @@ -153,7 +135,7 @@ "> \tval = readl_relaxed(its_base + GITS_PIDR2) & GIC_PIDR2_ARCH_MASK;\n" "> \tif (val != 0x30 && val != 0x40) {\n" "> -\t\tpr_warn(\"%s: no ITS detected, giving up\\n\", node->full_name);\n" - "> +\t\tpr_warn(\"ITS@0x%lx: No ITS detected, giving up\\n\",\n" + "> +\t\tpr_warn(\"ITS at 0x%lx: No ITS detected, giving up\\n\",\n" "> +\t\t\t(long)phys_base);\n" "> \t\terr = -ENODEV;\n" "> \t\tgoto out_unmap;\n" @@ -163,13 +145,13 @@ "> \tif (err) {\n" "> -\t\tpr_warn(\"%s: failed to quiesce, giving up\\n\",\n" "> -\t\t\tnode->full_name);\n" - "> +\t\tpr_warn(\"ITS@0x%lx: Failed to quiesce, giving up\\n\",\n" + "> +\t\tpr_warn(\"ITS at 0x%lx: Failed to quiesce, giving up\\n\",\n" "> +\t\t\t(long)phys_base);\n" "> \t\tgoto out_unmap;\n" "> \t}\n" "> \n" "> -\tpr_info(\"ITS: %s\\n\", node->full_name);\n" - "> +\tpr_info(\"ITS@0x%lx\\n\", (long)phys_base);\n" + "> +\tpr_info(\"ITS at 0x%lx\\n\", (long)phys_base);\n" "> \n" "> \tits = kzalloc(sizeof(*its), GFP_KERNEL);\n" "> \tif (!its) {\n" @@ -205,7 +187,7 @@ "> out_unmap:\n" "> \tiounmap(its_base);\n" "> -\tpr_err(\"ITS: failed probing %s (%d)\\n\", node->full_name, err);\n" - "> +\tpr_err(\"ITS@0x%lx: failed probing (%d)\\n\", (long)phys_base, err);\n" + "> +\tpr_err(\"ITS at 0x%lx: failed probing (%d)\\n\", (long)phys_base, err);\n" "> \treturn err;\n" "> }\n" "> \n" @@ -296,4 +278,4 @@ "-- \n" Jazz is not dead. It just smells funny... -397d104556d167514c37a87248df4fc5be247a97bb5cdb6b8663a1b92955e336 +5b8e328e3be52587492479e996a972cce453131eacf4d0e6749a969fac94f052
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.