diff for duplicates of <50F6A14C.6040206@codeaurora.org> diff --git a/a/1.1.hdr b/a/1.1.hdr deleted file mode 100644 index c64c2bc..0000000 --- a/a/1.1.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/plain; charset=ISO-8859-15; format=flowed -Content-Transfer-Encoding: 7bit diff --git a/a/1.2.bin b/a/1.2.bin deleted file mode 100644 index 3fb2641..0000000 --- a/a/1.2.bin +++ /dev/null @@ -1,112 +0,0 @@ -<html> - <head> - - <meta http-equiv="content-type" content="text/html; charset=ISO-8859-15"> - </head> - <body text="#000000" bgcolor="#FFFFFF"> - <br> - Hi Russell,<br> - <br> - Is it possible to pick up James patch below? Thread here: - <a class="moz-txt-link-freetext" href="http://comments.gmane.org/gmane.linux.kernel.mmc/18670">http://comments.gmane.org/gmane.linux.kernel.mmc/18670</a>, have the - details on the motivation behind this fix.<br> - <br> - Regards,<br> - Subhash<br> - <div class="moz-forward-container"><br> - -------- Original Message -------- - <table class="moz-email-headers-table" border="0" cellpadding="0" - cellspacing="0"> - <tbody> - <tr> - <th nowrap="nowrap" valign="BASELINE" align="RIGHT">Subject: - </th> - <td>Re: [PATCH v2 1/1] block: blk-merge: don't merge the - pages with non-contiguous descriptors</td> - </tr> - <tr> - <th nowrap="nowrap" valign="BASELINE" align="RIGHT">Date: </th> - <td>Wed, 16 Jan 2013 18:09:14 +0530</td> - </tr> - <tr> - <th nowrap="nowrap" valign="BASELINE" align="RIGHT">From: </th> - <td>Subhash Jadavani <a class="moz-txt-link-rfc2396E" href="mailto:subhashj@codeaurora.org"><subhashj@codeaurora.org></a></td> - </tr> - <tr> - <th nowrap="nowrap" valign="BASELINE" align="RIGHT">To: </th> - <td>James Bottomley - <a class="moz-txt-link-rfc2396E" href="mailto:James.Bottomley@HansenPartnership.com"><James.Bottomley@HansenPartnership.com></a></td> - </tr> - <tr> - <th nowrap="nowrap" valign="BASELINE" align="RIGHT">CC: </th> - <td><a class="moz-txt-link-abbreviated" href="mailto:linux-kernel@vger.kernel.org">linux-kernel@vger.kernel.org</a>, - <a class="moz-txt-link-abbreviated" href="mailto:linux-scsi@vger.kernel.org">linux-scsi@vger.kernel.org</a>, <a class="moz-txt-link-abbreviated" href="mailto:linux-mmc@vger.kernel.org">linux-mmc@vger.kernel.org</a>, - <a class="moz-txt-link-abbreviated" href="mailto:linux-arm-msm@vger.kernel.org">linux-arm-msm@vger.kernel.org</a>, <a class="moz-txt-link-abbreviated" href="mailto:martin.petersen@oracle.com">martin.petersen@oracle.com</a>, - <a class="moz-txt-link-abbreviated" href="mailto:asias@redhat.com">asias@redhat.com</a>, <a class="moz-txt-link-abbreviated" href="mailto:tj@kernel.org">tj@kernel.org</a>, - <a class="moz-txt-link-abbreviated" href="mailto:linux-arm-kernel@lists.infradead.org">linux-arm-kernel@lists.infradead.org</a>, Russell King - <a class="moz-txt-link-rfc2396E" href="mailto:linux@arm.linux.org.uk"><linux@arm.linux.org.uk></a></td> - </tr> - </tbody> - </table> - <br> - <br> - <pre>On 1/16/2013 4:02 PM, James Bottomley wrote: -> On Wed, 2013-01-16 at 12:07 +0530, Subhash Jadavani wrote: -> ->> Now consider this call stack from MMC block driver (this is on the ARmv7 ->> based board): ->> [ 98.918174] [<c001b50c>] (v7_dma_inv_range+0x30/0x48) from ->> [<c0017b8c>] (dma_cache_maint_page+0x1c4/0x24c) ->> [ 98.927819] [<c0017b8c>] (dma_cache_maint_page+0x1c4/0x24c) from ->> [<c0017c28>] (___dma_page_cpu_to_dev+0x14/0x1c) ->> [ 98.937982] [<c0017c28>] (___dma_page_cpu_to_dev+0x14/0x1c) from ->> [<c0017ff8>] (dma_map_sg+0x3c/0x114) -> OK, so this is showing that ARM itself is making the assumption that the -> pages are contiguous in the page offset map. -> -> Fix this by doing the increment via the pfn, which will do the right -> thing whatever the memory model. -> -> Signed-off-by: James Bottomley <a class="moz-txt-link-rfc2396E" href="mailto:JBottomley@Parallels.com"><JBottomley@Parallels.com></a> - -Thanks James. Yes, it make sense to fix the ARM code itself if it is the -only one giving this trouble. -I have tried your change below and it also fixes this issue (without -having my blk-merge patch). I will forward your change to Russel King to -see what he thinks about it. - -Regards, -Subhash -> -> --- -> -> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c -> index 6b2fb87..ab88c5b 100644 -> --- a/arch/arm/mm/dma-mapping.c -> +++ b/arch/arm/mm/dma-mapping.c -> @@ -809,7 +809,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, -> op(vaddr, len, dir); -> } -> offset = 0; -> - page++; -> + page = pfn_to_page(page_to_pfn(page) + 1); -> left -= len; -> } while (left); -> } -> -> -> -- -> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in -> the body of a message to <a class="moz-txt-link-abbreviated" href="mailto:majordomo@vger.kernel.org">majordomo@vger.kernel.org</a> -> More majordomo info at <a class="moz-txt-link-freetext" href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> - --- -To unsubscribe from this list: send the line "unsubscribe linux-scsi" in -the body of a message to <a class="moz-txt-link-abbreviated" href="mailto:majordomo@vger.kernel.org">majordomo@vger.kernel.org</a> -More majordomo info at <a class="moz-txt-link-freetext" href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> -</pre> - <br> - </div> - <br> - </body> -</html> diff --git a/a/1.2.hdr b/a/1.2.hdr deleted file mode 100644 index 103ccde..0000000 --- a/a/1.2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/html; charset=ISO-8859-15 -Content-Transfer-Encoding: 7bit diff --git a/a/1.1.txt b/N1/1.txt similarity index 80% rename from a/1.1.txt rename to N1/1.txt index 12c16e4..1715135 100644 --- a/a/1.1.txt +++ b/N1/1.txt @@ -14,10 +14,10 @@ with non-contiguous descriptors Date: Wed, 16 Jan 2013 18:09:14 +0530 From: Subhash Jadavani <subhashj@codeaurora.org> To: James Bottomley <James.Bottomley@HansenPartnership.com> -CC: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, -linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, -martin.petersen@oracle.com, asias@redhat.com, tj@kernel.org, -linux-arm-kernel@lists.infradead.org, Russell King <linux@arm.linux.org.uk> +CC: linux-kernel at vger.kernel.org, linux-scsi at vger.kernel.org, +linux-mmc at vger.kernel.org, linux-arm-msm at vger.kernel.org, +martin.petersen at oracle.com, asias at redhat.com, tj at kernel.org, +linux-arm-kernel at lists.infradead.org, Russell King <linux@arm.linux.org.uk> @@ -68,10 +68,16 @@ Subhash > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in -the body of a message to majordomo@vger.kernel.org +the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html + + + +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130116/bcc1625a/attachment-0001.html> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 4b86001..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,4 +0,0 @@ -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 8133cf0..0000000 --- a/a/2.txt +++ /dev/null @@ -1,4 +0,0 @@ -_______________________________________________ -linux-arm-kernel mailing list -linux-arm-kernel@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index 975fc0a..9eb9af1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,9 @@ "ref\050F69F72.4030807@codeaurora.org\0" - "From\0Subhash Jadavani <subhashj@codeaurora.org>\0" + "From\0subhashj@codeaurora.org (Subhash Jadavani)\0" "Subject\0ARM DMA: Fix in dma_cache_maint_page\0" "Date\0Wed, 16 Jan 2013 18:17:08 +0530\0" - "To\0Russell King <linux@arm.linux.org.uk>" - " linux-arm-kernel@lists.infradead.org\0" - "Cc\0james.bottomley@hansenpartnership.com" - " linux-arm-msm@vger.kernel.org <linux-arm-msm@vger.kernel.org>\0" - "\02:1.1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "\n" "Hi Russell,\n" @@ -24,10 +21,10 @@ "Date: \tWed, 16 Jan 2013 18:09:14 +0530\n" "From: \tSubhash Jadavani <subhashj@codeaurora.org>\n" "To: \tJames Bottomley <James.Bottomley@HansenPartnership.com>\n" - "CC: \tlinux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, \n" - "linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org, \n" - "martin.petersen@oracle.com, asias@redhat.com, tj@kernel.org, \n" - "linux-arm-kernel@lists.infradead.org, Russell King <linux@arm.linux.org.uk>\n" + "CC: \tlinux-kernel at vger.kernel.org, linux-scsi at vger.kernel.org, \n" + "linux-mmc at vger.kernel.org, linux-arm-msm at vger.kernel.org, \n" + "martin.petersen at oracle.com, asias at redhat.com, tj at kernel.org, \n" + "linux-arm-kernel at lists.infradead.org, Russell King <linux@arm.linux.org.uk>\n" "\n" "\n" "\n" @@ -78,132 +75,18 @@ ">\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-scsi\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "--\n" "To unsubscribe from this list: send the line \"unsubscribe linux-scsi\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html - "\02:1.2\0" - "b\0" - "<html>\n" - " <head>\n" + "the body of a message to majordomo at vger.kernel.org\n" + "More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" - " <meta http-equiv=\"content-type\" content=\"text/html; charset=ISO-8859-15\">\n" - " </head>\n" - " <body text=\"#000000\" bgcolor=\"#FFFFFF\">\n" - " <br>\n" - " Hi Russell,<br>\n" - " <br>\n" - " Is it possible to pick up James patch below? Thread here:\n" - " <a class=\"moz-txt-link-freetext\" href=\"http://comments.gmane.org/gmane.linux.kernel.mmc/18670\">http://comments.gmane.org/gmane.linux.kernel.mmc/18670</a>, have the\n" - " details on the motivation behind this fix.<br>\n" - " <br>\n" - " Regards,<br>\n" - " Subhash<br>\n" - " <div class=\"moz-forward-container\"><br>\n" - " -------- Original Message --------\n" - " <table class=\"moz-email-headers-table\" border=\"0\" cellpadding=\"0\"\n" - " cellspacing=\"0\">\n" - " <tbody>\n" - " <tr>\n" - " <th nowrap=\"nowrap\" valign=\"BASELINE\" align=\"RIGHT\">Subject:\n" - " </th>\n" - " <td>Re: [PATCH v2 1/1] block: blk-merge: don't merge the\n" - " pages with non-contiguous descriptors</td>\n" - " </tr>\n" - " <tr>\n" - " <th nowrap=\"nowrap\" valign=\"BASELINE\" align=\"RIGHT\">Date: </th>\n" - " <td>Wed, 16 Jan 2013 18:09:14 +0530</td>\n" - " </tr>\n" - " <tr>\n" - " <th nowrap=\"nowrap\" valign=\"BASELINE\" align=\"RIGHT\">From: </th>\n" - " <td>Subhash Jadavani <a class=\"moz-txt-link-rfc2396E\" href=\"mailto:subhashj@codeaurora.org\"><subhashj@codeaurora.org></a></td>\n" - " </tr>\n" - " <tr>\n" - " <th nowrap=\"nowrap\" valign=\"BASELINE\" align=\"RIGHT\">To: </th>\n" - " <td>James Bottomley\n" - " <a class=\"moz-txt-link-rfc2396E\" href=\"mailto:James.Bottomley@HansenPartnership.com\"><James.Bottomley@HansenPartnership.com></a></td>\n" - " </tr>\n" - " <tr>\n" - " <th nowrap=\"nowrap\" valign=\"BASELINE\" align=\"RIGHT\">CC: </th>\n" - " <td><a class=\"moz-txt-link-abbreviated\" href=\"mailto:linux-kernel@vger.kernel.org\">linux-kernel@vger.kernel.org</a>,\n" - " <a class=\"moz-txt-link-abbreviated\" href=\"mailto:linux-scsi@vger.kernel.org\">linux-scsi@vger.kernel.org</a>, <a class=\"moz-txt-link-abbreviated\" href=\"mailto:linux-mmc@vger.kernel.org\">linux-mmc@vger.kernel.org</a>,\n" - " <a class=\"moz-txt-link-abbreviated\" href=\"mailto:linux-arm-msm@vger.kernel.org\">linux-arm-msm@vger.kernel.org</a>, <a class=\"moz-txt-link-abbreviated\" href=\"mailto:martin.petersen@oracle.com\">martin.petersen@oracle.com</a>,\n" - " <a class=\"moz-txt-link-abbreviated\" href=\"mailto:asias@redhat.com\">asias@redhat.com</a>, <a class=\"moz-txt-link-abbreviated\" href=\"mailto:tj@kernel.org\">tj@kernel.org</a>,\n" - " <a class=\"moz-txt-link-abbreviated\" href=\"mailto:linux-arm-kernel@lists.infradead.org\">linux-arm-kernel@lists.infradead.org</a>, Russell King\n" - " <a class=\"moz-txt-link-rfc2396E\" href=\"mailto:linux@arm.linux.org.uk\"><linux@arm.linux.org.uk></a></td>\n" - " </tr>\n" - " </tbody>\n" - " </table>\n" - " <br>\n" - " <br>\n" - " <pre>On 1/16/2013 4:02 PM, James Bottomley wrote:\n" - "> On Wed, 2013-01-16 at 12:07 +0530, Subhash Jadavani wrote:\n" - ">\n" - ">> Now consider this call stack from MMC block driver (this is on the ARmv7\n" - ">> based board):\n" - ">> [ 98.918174] [<c001b50c>] (v7_dma_inv_range+0x30/0x48) from\n" - ">> [<c0017b8c>] (dma_cache_maint_page+0x1c4/0x24c)\n" - ">> [ 98.927819] [<c0017b8c>] (dma_cache_maint_page+0x1c4/0x24c) from\n" - ">> [<c0017c28>] (___dma_page_cpu_to_dev+0x14/0x1c)\n" - ">> [ 98.937982] [<c0017c28>] (___dma_page_cpu_to_dev+0x14/0x1c) from\n" - ">> [<c0017ff8>] (dma_map_sg+0x3c/0x114)\n" - "> OK, so this is showing that ARM itself is making the assumption that the\n" - "> pages are contiguous in the page offset map.\n" - ">\n" - "> Fix this by doing the increment via the pfn, which will do the right\n" - "> thing whatever the memory model.\n" - ">\n" - "> Signed-off-by: James Bottomley <a class=\"moz-txt-link-rfc2396E\" href=\"mailto:JBottomley@Parallels.com\"><JBottomley@Parallels.com></a>\n" "\n" - "Thanks James. Yes, it make sense to fix the ARM code itself if it is the \n" - "only one giving this trouble.\n" - "I have tried your change below and it also fixes this issue (without \n" - "having my blk-merge patch). I will forward your change to Russel King to \n" - "see what he thinks about it.\n" "\n" - "Regards,\n" - "Subhash\n" - ">\n" - "> ---\n" - ">\n" - "> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c\n" - "> index 6b2fb87..ab88c5b 100644\n" - "> --- a/arch/arm/mm/dma-mapping.c\n" - "> +++ b/arch/arm/mm/dma-mapping.c\n" - "> @@ -809,7 +809,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset,\n" - "> \t\t\top(vaddr, len, dir);\n" - "> \t\t}\n" - "> \t\toffset = 0;\n" - "> -\t\tpage++;\n" - "> +\t\tpage = pfn_to_page(page_to_pfn(page) + 1);\n" - "> \t\tleft -= len;\n" - "> \t} while (left);\n" - "> }\n" - ">\n" - ">\n" - "> --\n" - "> To unsubscribe from this list: send the line \"unsubscribe linux-scsi\" in\n" - "> the body of a message to <a class=\"moz-txt-link-abbreviated\" href=\"mailto:majordomo@vger.kernel.org\">majordomo@vger.kernel.org</a>\n" - "> More majordomo info at <a class=\"moz-txt-link-freetext\" href=\"http://vger.kernel.org/majordomo-info.html\">http://vger.kernel.org/majordomo-info.html</a>\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-scsi\" in\n" - "the body of a message to <a class=\"moz-txt-link-abbreviated\" href=\"mailto:majordomo@vger.kernel.org\">majordomo@vger.kernel.org</a>\n" - "More majordomo info at <a class=\"moz-txt-link-freetext\" href=\"http://vger.kernel.org/majordomo-info.html\">http://vger.kernel.org/majordomo-info.html</a>\n" - "</pre>\n" - " <br>\n" - " </div>\n" - " <br>\n" - " </body>\n" - "</html>\n" - "\01:2\0" - "b\0" - "_______________________________________________\n" - "linux-arm-kernel mailing list\n" - "linux-arm-kernel@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-arm-kernel + "-------------- next part --------------\n" + "An HTML attachment was scrubbed...\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130116/bcc1625a/attachment-0001.html> -de8171fc3852bf464909d7a61fb1248e6d4d5a362924c3bf1c9fd58821592997 +06e04eba9e5a874b7835723e882e7cc0bcf934653f6f969b0cbf26e01d5ea05b
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.