<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:宋体;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:"\@宋体";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.m-918250190295239798hoenzb
{mso-style-name:m_-918250190295239798hoenzb;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
span.EmailStyle20
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">ok, I have sent the new patch for 2.0.14. Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Burton, Ross [mailto:ross.burton@intel.com]
<br>
<b>Sent:</b> 2017</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">年</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">1</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">月</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">6</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">日</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">
22:32<br>
<b>To:</b> Bai, Haiqing<br>
<b>Cc:</b> OE-core<br>
<b>Subject:</b> Re: [OE-core] [PATCH] kexec: ARM: fix align issue of add_buffer_phys_virt() for LPAE kernel.<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">Can you rebase and resent the patch please then?<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Cheers,<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 6 January 2017 at 02:40, Bai, Haiqing (Wind River) <<a href="mailto:haiqing.bai@windriver.com" target="_blank">haiqing.bai@windriver.com</a>> wrote:<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Hi, Ross:</span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"> I clone the branch (</span>poky-contrib:ross/mut<span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">)
and did’t find the fix in 2.0.14, so this fix is still required. Thanks</span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"> </span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">B,R</span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Haiqing Bai</span><o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Burton, Ross [mailto:<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>]
<br>
<b>Sent:</b> 2017</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">年</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">1</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">月</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">4</span><span lang="ZH-CN" style="font-size:10.0pt;font-family:宋体">日</span><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">
22:32<br>
<b>To:</b> Bai, Haiqing<br>
<b>Cc:</b> OE-core<br>
<b>Subject:</b> Re: [OE-core] [PATCH] kexec: ARM: fix align issue of add_buffer_phys_virt() for LPAE kernel.</span><o:p></o:p></p>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"> <o:p></o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">An upgrade to 2.0.14 was recently posted on the list (and is now in poky-contrib:ross/mut), can you verify that this patch is still required with that release and rebase?<o:p></o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"> <o:p></o:p></p>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"> <o:p></o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">On 3 January 2017 at 09:05, Haiqing Bai <<a href="mailto:Haiqing.Bai@windriver.com" target="_blank">Haiqing.Bai@windriver.com</a>> wrote:<o:p></o:p></p>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto">If LPAE is enabled, 3 level page table is used and the 'SECTION_SIZE'<br>
is (1<<21), so add_buffer_phys_virt() should align to (1 << 21).<br>
<br>
Signed-off-by: Haiqing Bai <<a href="mailto:Haiqing.Bai@windriver.com" target="_blank">Haiqing.Bai@windriver.com</a>><br>
---<br>
...-ARM-fix-add_buffer_phys_virt-align-issue.patch | 52 ++++++++++++++++++++++<br>
meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.12.bb" target="_blank">kexec-tools_2.0.12.bb</a> | 1 +<br>
2 files changed, 53 insertions(+)<br>
create mode 100644 meta/recipes-kernel/kexec/kexec-tools/kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch<br>
<br>
diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch<br>
new file mode 100644<br>
index 0000000..7d1f95e<br>
--- /dev/null<br>
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch<br>
@@ -0,0 +1,52 @@<br>
+From 380019f68e19ac863cf32dc7ff6784e8fe1d751f Mon Sep 17 00:00:00 2001<br>
+From: Haiqing Bai <<a href="mailto:Haiqing.Bai@windriver.com" target="_blank">Haiqing.Bai@windriver.com</a>><br>
+Date: Mon, 19 Dec 2016 14:52:02 +0800<br>
+Subject: [PATCH] kexec: ARM: Fix add_buffer_phys_virt() align issue.<br>
+<br>
+When "CONFIG_ARM_LPAE" is enabled,3 level page table<br>
+is used by MMU, the "SECTION_SIZE" is defined with<br>
+(1 << 21), but 'add_buffer_phys_virt()' hardcode this<br>
+to (1 << 20).<br>
+<br>
+Upstream-Status: Pending<br>
+<br>
+<a href="mailto:Suggested-By%3Afredrik.markstrom@gmail.com" target="_blank">Suggested-By:fredrik.markstrom@gmail.com</a><br>
+Signed-off-by: Haiqing Bai <<a href="mailto:Haiqing.Bai@windriver.com" target="_blank">Haiqing.Bai@windriver.com</a>><br>
+---<br>
+ kexec/arch/arm/crashdump-arm.c | 5 ++++-<br>
+ 1 file changed, 4 insertions(+), 1 deletion(-)<br>
+<br>
+diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c<br>
+index 38a1401..e41b7fb 100644<br>
+--- a/kexec/arch/arm/crashdump-arm.c<br>
++++ b/kexec/arch/arm/crashdump-arm.c<br>
+@@ -271,6 +271,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)<br>
+ void *buf;<br>
+ int err;<br>
+ int last_ranges;<br>
++ unsigned short align_bit_shift = 20;<br>
+<br>
+ /*<br>
+ * First fetch all the memory (RAM) ranges that we are going to pass to<br>
+@@ -295,6 +296,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)<br>
+<br>
+ /* for support LPAE enabled kernel*/<br>
+ elf_info.class = ELFCLASS64;<br>
++ align_bit_shift = 21;<br>
+<br>
+ err = crash_create_elf64_headers(info, &elf_info,<br>
+ usablemem_rgns.ranges,<br>
+@@ -315,8 +317,9 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline)<br>
+ * 1MB) so that available memory passed in kernel command line will be<br>
+ * aligned to 1MB. This is because kernel create_mapping() wants memory<br>
+ * regions to be aligned to SECTION_SIZE.<br>
++ * The SECTION_SIZE of LPAE kernel is '1UL << 21' defined in pgtable-3level.h<br>
+ */<br>
+- elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20,<br>
++ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << align_bit_shift,<br>
+ crash_reserved_mem.start,<br>
+ crash_reserved_mem.end, -1, 0);<br>
+<br>
+--<br>
+1.9.1<br>
+<br>
diff --git a/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.12.bb" target="_blank">kexec-tools_2.0.12.bb</a> b/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.12.bb" target="_blank">kexec-tools_2.0.12.bb</a><br>
index 59376c8..3e38923 100644<br>
--- a/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.12.bb" target="_blank">kexec-tools_2.0.12.bb</a><br>
+++ b/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.12.bb" target="_blank">kexec-tools_2.0.12.bb</a><br>
@@ -8,6 +8,7 @@ SRC_URI += " \<br>
<a href="file:///\\0002-powerpc-change-the-memory-size-limit.patch">file://0002-powerpc-change-the-memory-size-limit.patch</a> \<br>
<a href="file:///\\0001-purgatory-Pass-r-directly-to-linker.patch">file://0001-purgatory-Pass-r-directly-to-linker.patch</a> \<br>
<a href="file:///\\0001-vmcore-dmesg-Define-_GNU_SOURCE.patch">file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch</a> \<br>
+ <a href="file:///\\kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch">
file://kexec-ARM-fix-add_buffer_phys_virt-align-issue.patch</a> \<br>
"<br>
<br>
SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3"<br>
<span class="m-918250190295239798hoenzb"><span style="color:#888888">--</span></span><span style="color:#888888"><br>
<span class="m-918250190295239798hoenzb">1.9.1</span><br>
<br>
<span class="m-918250190295239798hoenzb">--</span><br>
<span class="m-918250190295239798hoenzb">_______________________________________________</span><br>
<span class="m-918250190295239798hoenzb">Openembedded-core mailing list</span><br>
<span class="m-918250190295239798hoenzb"><a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a></span><br>
<span class="m-918250190295239798hoenzb"><a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a></span></span><o:p></o:p></p>
</div>
<p class="MsoNormal" style="mso-margin-top-alt:auto;mso-margin-bottom-alt:auto"> <o:p></o:p></p>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>