diff for duplicates of <1366674609.10399.12@snotra> diff --git a/a/1.txt b/N1/1.txt index aaa05f9..5ca6704 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,8 +5,8 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > 2. Added an attribute for enabling/disabling DMA to a particular > memory window. > 3. Added domain attribute to check for PAMUV1 specific constraints. -> -> Signed-off-by: Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org> +>=20 +> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> > --- > v13 changes: > - created a new file include/linux/fsl_pamu_stash.h for stash @@ -15,13 +15,13 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > - Moved PAMU specifc stash ids and structures to PAMU header file. > - no change in v11. > - no change in v10. -> include/linux/fsl_pamu_stash.h | 39 +> include/linux/fsl_pamu_stash.h | 39 =20 > +++++++++++++++++++++++++++++++++++++++ > include/linux/iommu.h | 16 ++++++++++++++++ > 2 files changed, 55 insertions(+), 0 deletions(-) > create mode 100644 include/linux/fsl_pamu_stash.h -> -> diff --git a/include/linux/fsl_pamu_stash.h +>=20 +> diff --git a/include/linux/fsl_pamu_stash.h =20 > b/include/linux/fsl_pamu_stash.h > new file mode 100644 > index 0000000..caa1b21 @@ -29,9 +29,9 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > +++ b/include/linux/fsl_pamu_stash.h > @@ -0,0 +1,39 @@ > +/* -> + * This program is free software; you can redistribute it and/or +> + * This program is free software; you can redistribute it and/or =20 > modify -> + * it under the terms of the GNU General Public License, version 2, +> + * it under the terms of the GNU General Public License, version 2, =20 > as > + * published by the Free Software Foundation. > + * @@ -42,7 +42,7 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software -> + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +> + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA =20 > 02110-1301, USA. > + * > + * Copyright (C) 2013 Freescale Semiconductor, Inc. @@ -54,7 +54,7 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > + > +/* cache stash targets */ > +enum pamu_stash_target { -> + PAMU_ATTR_CACHE_L1 = 1, +> + PAMU_ATTR_CACHE_L1 =3D 1, > + PAMU_ATTR_CACHE_L2, > + PAMU_ATTR_CACHE_L3, > +}; @@ -76,9 +76,9 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > +++ b/include/linux/iommu.h > @@ -57,10 +57,26 @@ struct iommu_domain { > #define IOMMU_CAP_CACHE_COHERENCY 0x1 -> #define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device +> #define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device =20 > intrs */ -> +>=20 > +/* > + * Following constraints are specifc to PAMUV1: @@ -90,9 +90,9 @@ FSL_PAMUV1 > + * -the actual size of the mapped region of a window must be power > + * of 2 starting with 4KB and physical address must be naturally > + * aligned. -> + * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned +> + * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned =20 > contraints. -> + * The caller can invoke iommu_domain_get_attr to check if the +> + * The caller can invoke iommu_domain_get_attr to check if the =20 > underlying > + * iommu implementation supports these constraints. > + */ @@ -106,7 +106,7 @@ FSL_PAMUV1 > + DOMAIN_ATTR_FSL_PAMUV1, > DOMAIN_ATTR_MAX, -Please be consistent on whether "PAMU" gets an "FSL_" namespace prefix +Please be consistent on whether "PAMU" gets an "FSL_" namespace prefix =20 (I'd prefer that it does). --Scott +-Scott= diff --git a/a/content_digest b/N1/content_digest index df06bd4..4b6a1ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,14 @@ "ref\01366608716-1704-2-git-send-email-Varun.Sethi@freescale.com\0" - "ref\01366608716-1704-2-git-send-email-Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" - "From\0Scott Wood <scottwood-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" + "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH 2/3 v13] iommu/fsl: Add additional iommu attributes required by the PAMU driver.\0" "Date\0Mon, 22 Apr 2013 18:50:09 -0500\0" - "Cc\0stuart.yoder-KZfg59tc24xl57MIdRCFDg@public.gmane.org" - benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org - galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org> - " linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "To\0Varun Sethi <Varun.Sethi@freescale.com>\0" + "Cc\0stuart.yoder@freescale.com" + joro@8bytes.org + linux-kernel@vger.kernel.org + iommu@lists.linux-foundation.org + Varun Sethi <Varun.Sethi@freescale.com> + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "On 04/22/2013 12:31:55 AM, Varun Sethi wrote:\n" @@ -19,8 +18,8 @@ "> 2. Added an attribute for enabling/disabling DMA to a particular\n" "> memory window.\n" "> 3. Added domain attribute to check for PAMUV1 specific constraints.\n" - "> \n" - "> Signed-off-by: Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" + ">=20\n" + "> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>\n" "> ---\n" "> v13 changes:\n" "> - created a new file include/linux/fsl_pamu_stash.h for stash\n" @@ -29,13 +28,13 @@ "> - Moved PAMU specifc stash ids and structures to PAMU header file.\n" "> - no change in v11.\n" "> - no change in v10.\n" - "> include/linux/fsl_pamu_stash.h | 39 \n" + "> include/linux/fsl_pamu_stash.h | 39 =20\n" "> +++++++++++++++++++++++++++++++++++++++\n" "> include/linux/iommu.h | 16 ++++++++++++++++\n" "> 2 files changed, 55 insertions(+), 0 deletions(-)\n" "> create mode 100644 include/linux/fsl_pamu_stash.h\n" - "> \n" - "> diff --git a/include/linux/fsl_pamu_stash.h \n" + ">=20\n" + "> diff --git a/include/linux/fsl_pamu_stash.h =20\n" "> b/include/linux/fsl_pamu_stash.h\n" "> new file mode 100644\n" "> index 0000000..caa1b21\n" @@ -43,9 +42,9 @@ "> +++ b/include/linux/fsl_pamu_stash.h\n" "> @@ -0,0 +1,39 @@\n" "> +/*\n" - "> + * This program is free software; you can redistribute it and/or \n" + "> + * This program is free software; you can redistribute it and/or =20\n" "> modify\n" - "> + * it under the terms of the GNU General Public License, version 2, \n" + "> + * it under the terms of the GNU General Public License, version 2, =20\n" "> as\n" "> + * published by the Free Software Foundation.\n" "> + *\n" @@ -56,7 +55,7 @@ "> + *\n" "> + * You should have received a copy of the GNU General Public License\n" "> + * along with this program; if not, write to the Free Software\n" - "> + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA \n" + "> + * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA =20\n" "> 02110-1301, USA.\n" "> + *\n" "> + * Copyright (C) 2013 Freescale Semiconductor, Inc.\n" @@ -68,7 +67,7 @@ "> +\n" "> +/* cache stash targets */\n" "> +enum pamu_stash_target {\n" - "> +\tPAMU_ATTR_CACHE_L1 = 1,\n" + "> +\tPAMU_ATTR_CACHE_L1 =3D 1,\n" "> +\tPAMU_ATTR_CACHE_L2,\n" "> +\tPAMU_ATTR_CACHE_L3,\n" "> +};\n" @@ -90,9 +89,9 @@ "> +++ b/include/linux/iommu.h\n" "> @@ -57,10 +57,26 @@ struct iommu_domain {\n" "> #define IOMMU_CAP_CACHE_COHERENCY\t0x1\n" - "> #define IOMMU_CAP_INTR_REMAP\t\t0x2\t/* isolates device \n" + "> #define IOMMU_CAP_INTR_REMAP\t\t0x2\t/* isolates device =20\n" "> intrs */\n" - "> \n" + ">=20\n" "> +/*\n" "> + * Following constraints are specifc to PAMUV1:\n" "\n" @@ -104,9 +103,9 @@ "> + * -the actual size of the mapped region of a window must be power\n" "> + * of 2 starting with 4KB and physical address must be naturally\n" "> + * aligned.\n" - "> + * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned \n" + "> + * DOMAIN_ATTR_FSL_PAMUV1 corresponds to the above mentioned =20\n" "> contraints.\n" - "> + * The caller can invoke iommu_domain_get_attr to check if the \n" + "> + * The caller can invoke iommu_domain_get_attr to check if the =20\n" "> underlying\n" "> + * iommu implementation supports these constraints.\n" "> + */\n" @@ -120,9 +119,9 @@ "> +\tDOMAIN_ATTR_FSL_PAMUV1,\n" "> \tDOMAIN_ATTR_MAX,\n" "\n" - "Please be consistent on whether \"PAMU\" gets an \"FSL_\" namespace prefix \n" + "Please be consistent on whether \"PAMU\" gets an \"FSL_\" namespace prefix =20\n" "(I'd prefer that it does).\n" "\n" - -Scott + -Scott= -dd43b15f9ac3df01a05740ef2d9bc4cdd8063fad5912c0760109709f2524c3e1 +3e0e4dde791a8ec7849663e4f0d6f309d920a0f387e331f3160c9b7283045687
diff --git a/a/1.txt b/N2/1.txt index aaa05f9..ba60643 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,7 @@ On 04/22/2013 12:31:55 AM, Varun Sethi wrote: > memory window. > 3. Added domain attribute to check for PAMUV1 specific constraints. > -> Signed-off-by: Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org> +> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> > --- > v13 changes: > - created a new file include/linux/fsl_pamu_stash.h for stash diff --git a/a/content_digest b/N2/content_digest index df06bd4..3df69d3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,16 @@ "ref\01366608716-1704-2-git-send-email-Varun.Sethi@freescale.com\0" - "ref\01366608716-1704-2-git-send-email-Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org\0" - "From\0Scott Wood <scottwood-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\0" + "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH 2/3 v13] iommu/fsl: Add additional iommu attributes required by the PAMU driver.\0" "Date\0Mon, 22 Apr 2013 18:50:09 -0500\0" - "Cc\0stuart.yoder-KZfg59tc24xl57MIdRCFDg@public.gmane.org" - benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org - galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org - Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org> - " linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\0" + "To\0Varun Sethi <Varun.Sethi@freescale.com>\0" + "Cc\0<joro@8bytes.org>" + <iommu@lists.linux-foundation.org> + <linuxppc-dev@lists.ozlabs.org> + <linux-kernel@vger.kernel.org> + <galak@kernel.crashing.org> + <benh@kernel.crashing.org> + <stuart.yoder@freescale.com> + " Varun Sethi <Varun.Sethi@freescale.com>\0" "\00:1\0" "b\0" "On 04/22/2013 12:31:55 AM, Varun Sethi wrote:\n" @@ -20,7 +21,7 @@ "> memory window.\n" "> 3. Added domain attribute to check for PAMUV1 specific constraints.\n" "> \n" - "> Signed-off-by: Varun Sethi <Varun.Sethi-KZfg59tc24xl57MIdRCFDg@public.gmane.org>\n" + "> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>\n" "> ---\n" "> v13 changes:\n" "> - created a new file include/linux/fsl_pamu_stash.h for stash\n" @@ -125,4 +126,4 @@ "\n" -Scott -dd43b15f9ac3df01a05740ef2d9bc4cdd8063fad5912c0760109709f2524c3e1 +ad6bbfbf69d419e192a667a316630b59af20606bc1a3fd8783d2320651232e18
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.