diff for duplicates of <1492998461.25397.16.camel@buserror.net> diff --git a/a/1.txt b/N1/1.txt index 7c762c1..5fd83dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,9 +5,9 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > > Signed-off-by: Roy Pledge <roy.pledge@nxp.com> > --- -> drivers/soc/fsl/qbman/bman_portal.c | 16 +++++++++++++--- -> drivers/soc/fsl/qbman/qman_portal.c | 16 +++++++++++++--- -> 2 files changed, 26 insertions(+), 6 deletions(-) +> ?drivers/soc/fsl/qbman/bman_portal.c | 16 +++++++++++++--- +> ?drivers/soc/fsl/qbman/qman_portal.c | 16 +++++++++++++--- +> ?2 files changed, 26 insertions(+), 6 deletions(-) > > diff --git a/drivers/soc/fsl/qbman/bman_portal.c > b/drivers/soc/fsl/qbman/bman_portal.c @@ -16,22 +16,22 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > +++ b/drivers/soc/fsl/qbman/bman_portal.c > @@ -125,7 +125,18 @@ static int bman_portal_probe(struct platform_device > *pdev) -> } -> pcfg->irq = irq; -> +> ? } +> ? pcfg->irq = irq; +> ? > - va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), > 0); > +#ifdef CONFIG_PPC > + /* PPC requires a cacheable/non-coherent mapping of the portal */ > + va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), -> + (pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT)); +> + ??(pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT)); > +#else > + /* -> + * For ARM we can use write combine mapping. A cacheable/non +> + ?* For ARM we can use write combine mapping.??A cacheable/non > shareable -> + * mapping will perform better but equires additional platform -> + * support which is not currently available -> + */ +> + ?* mapping will perform better but equires additional platform +> + ?* support which is not currently available +> + ?*/ s/equires/requires/ diff --git a/a/content_digest b/N1/content_digest index 3df3a80..1271607 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,9 @@ "ref\01492634930-10765-1-git-send-email-roy.pledge@nxp.com\0" "ref\01492634930-10765-8-git-send-email-roy.pledge@nxp.com\0" - "From\0Scott Wood <oss@buserror.net>\0" - "Subject\0Re: [PATCH v2 07/11] soc/fsl/qbman: Rework ioremap() calls for ARM/PPC\0" + "From\0oss@buserror.net (Scott Wood)\0" + "Subject\0[PATCH v2 07/11] soc/fsl/qbman: Rework ioremap() calls for ARM/PPC\0" "Date\0Sun, 23 Apr 2017 20:47:41 -0500\0" - "To\0roy.pledge@nxp.com" - linuxppc-dev@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - " robin.murphy@arm.com\0" - "Cc\0madalin.bucur@nxp.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote:\n" @@ -18,9 +13,9 @@ "> \n" "> Signed-off-by: Roy Pledge <roy.pledge@nxp.com>\n" "> ---\n" - "> \302\240drivers/soc/fsl/qbman/bman_portal.c | 16 +++++++++++++---\n" - "> \302\240drivers/soc/fsl/qbman/qman_portal.c | 16 +++++++++++++---\n" - "> \302\2402 files changed, 26 insertions(+), 6 deletions(-)\n" + "> ?drivers/soc/fsl/qbman/bman_portal.c | 16 +++++++++++++---\n" + "> ?drivers/soc/fsl/qbman/qman_portal.c | 16 +++++++++++++---\n" + "> ?2 files changed, 26 insertions(+), 6 deletions(-)\n" "> \n" "> diff --git a/drivers/soc/fsl/qbman/bman_portal.c\n" "> b/drivers/soc/fsl/qbman/bman_portal.c\n" @@ -29,22 +24,22 @@ "> +++ b/drivers/soc/fsl/qbman/bman_portal.c\n" "> @@ -125,7 +125,18 @@ static int bman_portal_probe(struct platform_device\n" "> *pdev)\n" - "> \302\240\t}\n" - "> \302\240\tpcfg->irq = irq;\n" - "> \302\240\n" + "> ?\t}\n" + "> ?\tpcfg->irq = irq;\n" + "> ?\n" "> -\tva = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]),\n" "> 0);\n" "> +#ifdef CONFIG_PPC\n" "> +\t/* PPC requires a cacheable/non-coherent mapping of the portal */\n" "> +\tva = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]),\n" - "> +\t\t\t\302\240\302\240(pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT));\n" + "> +\t\t\t??(pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT));\n" "> +#else\n" "> +\t/*\n" - "> +\t\302\240* For ARM we can use write combine mapping.\302\240\302\240A cacheable/non\n" + "> +\t?* For ARM we can use write combine mapping.??A cacheable/non\n" "> shareable\n" - "> +\t\302\240* mapping will perform better but equires additional platform\n" - "> +\t\302\240* support which is not currently available\n" - "> +\t\302\240*/\n" + "> +\t?* mapping will perform better but equires additional platform\n" + "> +\t?* support which is not currently available\n" + "> +\t?*/\n" "\n" "s/equires/requires/\n" "\n" @@ -52,4 +47,4 @@ "\n" -Scott -b49240b289b9e42ece686f96d598a36540f3b3e048c718cda3080f8aa6e86670 +8abdf6d8f117f9c8f3a130b6c4d628cee352b2a6eb7b6be390983114978794da
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.