diff for duplicates of <1492998299.25397.14.camel@buserror.net> diff --git a/a/1.txt b/N1/1.txt index 6630174..fd9f304 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,9 +1,9 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > @@ -727,10 +730,81 @@ static int fsl_qman_probe(struct platform_device > *pdev) -> qm_channel_caam = QMAN_CHANNEL_CAAM_REV3; -> } -> +> ? qm_channel_caam = QMAN_CHANNEL_CAAM_REV3; +> ? } +> ? > - ret = zero_priv_mem(dev, node, fqd_a, fqd_sz); > - WARN_ON(ret); > - if (ret) @@ -11,9 +11,9 @@ On Wed, 2017-04-19 at 16:48 -0400, Roy Pledge wrote: > + if (fqd_a) { > +#ifdef CONFIG_PPC > + /* -> + * For PPC backward DT compatibility -> + * FQD memory MUST be zero'd by software -> + */ +> + ?* For PPC backward DT compatibility +> + ?* FQD memory MUST be zero'd by software +> + ?*/ > + zero_priv_mem(fqd_a, fqd_sz); > +#endif @@ -22,12 +22,12 @@ it. > + } else { > + /* -> + * Order of memory regions is assumed as FQD followed by +> + ?* Order of memory regions is assumed as FQD followed by > PFDR -> + * in order to ensure allocations from the correct regions +> + ?* in order to ensure allocations from the correct regions > the -> + * driver initializes then allocates each piece in order -> + */ +> + ?* driver initializes then allocates each piece in order +> + ?*/ This should be explicitly specified in the binding rather than here. @@ -63,13 +63,13 @@ This should be explicitly specified in the binding rather than here. > + } > + > + /* -> + * Disassociate the FQD reseverd memory area from the +> + ?* Disassociate the FQD reseverd memory area from the > device -> + * because a device can only have one DMA memory area. This -> + * should be fine since the memory is allocated and +> + ?* because a device can only have one DMA memory area. This +> + ?* should be fine since the memory is allocated and > initialized -> + * and only ever accessed by the QMan device from now on -> + */ +> + ?* and only ever accessed by the QMan device from now on +> + ?*/ > + of_reserved_mem_device_release(dev); s/reseverd/reserved/ diff --git a/a/content_digest b/N1/content_digest index 2dcc337..1826e0b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,17 @@ "ref\01492634930-10765-1-git-send-email-roy.pledge@nxp.com\0" "ref\01492634930-10765-3-git-send-email-roy.pledge@nxp.com\0" - "From\0Scott Wood <oss@buserror.net>\0" - "Subject\0Re: [PATCH v2 02/11] soc/fsl/qbman: Use shared-dma-pool for QMan private memory allocations\0" + "From\0oss@buserror.net (Scott Wood)\0" + "Subject\0[PATCH v2 02/11] soc/fsl/qbman: Use shared-dma-pool for QMan private memory allocations\0" "Date\0Sun, 23 Apr 2017 20:44:59 -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" "> @@ -727,10 +730,81 @@ static int fsl_qman_probe(struct platform_device\n" "> *pdev)\n" - "> \302\240\t\tqm_channel_caam = QMAN_CHANNEL_CAAM_REV3;\n" - "> \302\240\t}\n" - "> \302\240\n" + "> ?\t\tqm_channel_caam = QMAN_CHANNEL_CAAM_REV3;\n" + "> ?\t}\n" + "> ?\n" "> -\tret = zero_priv_mem(dev, node, fqd_a, fqd_sz);\n" "> -\tWARN_ON(ret);\n" "> -\tif (ret)\n" @@ -24,9 +19,9 @@ "> +\tif (fqd_a) {\n" "> +#ifdef CONFIG_PPC\n" "> +\t\t/*\n" - "> +\t\t\302\240* For PPC backward DT compatibility\n" - "> +\t\t\302\240* FQD memory MUST be zero'd by software\n" - "> +\t\t\302\240*/\n" + "> +\t\t?* For PPC backward DT compatibility\n" + "> +\t\t?* FQD memory MUST be zero'd by software\n" + "> +\t\t?*/\n" "> +\t\tzero_priv_mem(fqd_a, fqd_sz);\n" "> +#endif\n" "\n" @@ -35,12 +30,12 @@ "\n" "> +\t} else {\n" "> +\t\t/*\n" - "> +\t\t\302\240* Order of memory regions is assumed as FQD followed by\n" + "> +\t\t?* Order of memory regions is assumed as FQD followed by\n" "> PFDR\n" - "> +\t\t\302\240* in order to ensure allocations from the correct regions\n" + "> +\t\t?* in order to ensure allocations from the correct regions\n" "> the\n" - "> +\t\t\302\240* driver initializes then allocates each piece in order\n" - "> +\t\t\302\240*/\n" + "> +\t\t?* driver initializes then allocates each piece in order\n" + "> +\t\t?*/\n" "\n" "This should be explicitly specified in the binding rather than here.\n" "\n" @@ -76,13 +71,13 @@ "> +\t\t}\n" "> +\n" "> +\t\t/*\n" - "> +\t\t\302\240* Disassociate the FQD reseverd memory area from the\n" + "> +\t\t?* Disassociate the FQD reseverd memory area from the\n" "> device\n" - "> +\t\t\302\240* because a device can only have one DMA memory area. This\n" - "> +\t\t\302\240* should be fine since the memory is allocated and\n" + "> +\t\t?* because a device can only have one DMA memory area. This\n" + "> +\t\t?* should be fine since the memory is allocated and\n" "> initialized\n" - "> +\t\t\302\240* and only ever accessed by the QMan device from now on\n" - "> +\t\t\302\240*/\n" + "> +\t\t?* and only ever accessed by the QMan device from now on\n" + "> +\t\t?*/\n" "> +\t\tof_reserved_mem_device_release(dev);\n" "\n" "s/reseverd/reserved/\n" @@ -95,4 +90,4 @@ "\n" -Scott -9474520605d5ffa3b284f2a658e6543780b3997387d053b97e4f0e804034707f +93a45fa4b5c9578bb20ff9bec2a9055c1c0cf2eff155b64f58ea32599b1b9f49
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.