powerpc: increase MIN RMA size for CAS negotiation
PATCH 1/1 powerpc: increase MIN RMA size for CAS negotiation
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM, Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.
Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1 kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0 kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/file.c:215: Closing `/ppc/ppc64/initrd.img' ... kern/disk.c:297: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000'...kern/disk.c:311: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000' succeeded.kern/file.c:225: Closing /ppc/ppc64/initrd.img' failed with 3. kern/file.c:148: Opening /ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.
--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)
grub-core/kern/ieee1275/init.c +29 -4
@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */
@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);
@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */ + ibm_ca_support_reboot =0 ; +if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot" , + &ibm_ca_support_reboot, +sizeof (ibm_ca_support_reboot), + &actual) >=0 ) +grub_dprintf ("ieee1275" ,"ibm,client-architecture-support-reboot: %u\n" , + ibm_ca_support_reboot); +if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY )) { -/* if we have an error, don't call CAS, just hope for the best */ -if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas (); +/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will +* be set to 768 MB via CAS Vector2. This condition is required to avoid the +* issue where the older Linux kernels are still using rmo_top as 512 MB. +* Calling CAS when rmo_top is less then 768 MB will result in a issue +* where we won't be able to boot to a newer kernel and continue to +* boot with older kernel having rmo_top as 512 MB. +*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 )) +grub_ieee1275_ibm_cas (); }#endif
Signature · 7 lines
2.39.3 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 8 lines · Avnish Chouhan
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM, Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.
How often does the CAS reboot to claim additional RMA memory? Does this occur only once, or during every cold boot/reboot?
I hope it happens only once, because doing it repeatedly could complicate the configuration of the TPM PCR policy.
Thanks,
Michael
Quoted 93 lines
Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/file.c:215: Closing `/ppc/ppc64/initrd.img' ...kern/disk.c:297: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000'...kern/disk.c:311: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000' succeeded.kern/file.c:225: Closing/ppc/ppc64/initrd.img' failed with 3. kern/file.c:148: Opening/ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.Signed-off-by Avnish Chouhan <[email protected]>--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)grub-core/kern/ieee1275/init.c +29
-4@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */ + ibm_ca_support_reboot =0 ; +if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot" , + &ibm_ca_support_reboot, +sizeof (ibm_ca_support_reboot), + &actual) >=0 ) +grub_dprintf ("ieee1275" ,"ibm,client-architecture-support-reboot: %u\n" , + ibm_ca_support_reboot); +if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY )) { -/* if we have an error, don't call CAS, just hope for the best */ -if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas (); +/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will +* be set to 768 MB via CAS Vector2. This condition is required to avoid the +* issue where the older Linux kernels are still using rmo_top as 512 MB. +* Calling CAS when rmo_top is less then 768 MB will result in a issue +* where we won't be able to boot to a newer kernel and continue to +* boot with older kernel having rmo_top as 512 MB. +*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 )) +grub_ieee1275_ibm_cas (); }#endif Signature · 7 lines
2.39.3 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 10 lines · Michael Chang
Quoted 8 lines · Avnish Chouhan
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM, Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.
Quoted 9 lines
How often does the CAS reboot to claim additional RMA memory? Does this occur only once, or during every cold boot/reboot?
I hope it happens only once, because doing it repeatedly could complicate the configuration of the TPM PCR policy.
Thanks,
Michael
Hi Michael,
The CAS call to claim additional RMA memory will happen only once. Thank you!
Regards,
Avnish Chouhan
Quoted 97 lines
Quoted 97 lines
Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/file.c:215: Closing `/ppc/ppc64/initrd.img' ...kern/disk.c:297: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000'...kern/disk.c:311: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000' succeeded.kern/file.c:225: Closing/ppc/ppc64/initrd.img' failed with 3. kern/file.c:148: Opening/ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.Signed-off-by Avnish Chouhan <[email protected]>--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)grub-core/kern/ieee1275/init.c +1
-1@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt ifunsatisfied */
grub-core/kern/ieee1275/init.c +5
-0@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */
grub-core/kern/ieee1275/init.c +3
-0+ ibm_ca_support_reboot =0 ; + if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot",
grub-core/kern/ieee1275/init.c +2
-0+ &ibm_ca_support_reboot, + sizeof(
ibm_ca_support_reboot),grub-core/kern/ieee1275/init.c +2
-0+ &actual) >= 0) + grub_dprintf ("ieee1275","ibm,client-architecture-support-reboot: %u\n",
grub-core/kern/ieee1275/init.c +2
-0+ ibm_ca_support_reboot); + if (grub_ieee1275_test_flag(
GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY)){- /* if we have an error, don't call CAS, just hope for the best
*/grub-core/kern/ieee1275/init.c +5
-2-if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas (); +/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will
+ * be set to 768 MB via CAS Vector2. This condition is required
to avoid the
+ * issue where the older Linux kernels are still usingrmo_top
as 512 MB.
+ * Calling CAS whenrmo_topis less then 768 MB will result in
a issue
+ * where we won't be able to boot to a newer kernel and
continue togrub-core/kern/ieee1275/init.c +5
-0+* boot with older kernel having rmo_top as 512 MB. +*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 )) + grub_ieee1275_ibm_cas (); }#endif
Quoted 8 lines
Quoted 8 lines
--
2.39.3_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 97 lines · Avnish Chouhan
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM, Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime spacekern/file.c:215: Closing `/ppc/ppc64/initrd.img' ...kern/disk.c:297: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000'...kern/disk.c:311: Closing
`ieee1275//vdevice/v-scsi
@30000067/disk@8300000000000000' succeeded.kern/file.c:225: Closing/ppc/ppc64/initrd.img' failed with 3. kern/file.c:148: Opening/ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.Signed-off-by Avnish Chouhan <[email protected]>--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)grub-core/kern/ieee1275/init.c +29
-4@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */ + ibm_ca_support_reboot =0 ; +if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot" , + &ibm_ca_support_reboot, +sizeof (ibm_ca_support_reboot), + &actual) >=0 ) +grub_dprintf ("ieee1275" ,"ibm,client-architecture-support-reboot: %u\n" , + ibm_ca_support_reboot); +if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY )) { -/* if we have an error, don't call CAS, just hope for the best */ -if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas (); +/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will +* be set to 768 MB via CAS Vector2. This condition is required to avoid the +* issue where the older Linux kernels are still using rmo_top as 512 MB. +* Calling CAS when rmo_top is less then 768 MB will result in a issue +* where we won't be able to boot to a newer kernel and continue to +* boot with older kernel having rmo_top as 512 MB. +*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 )) +grub_ieee1275_ibm_cas (); }#endif Signature · 1 line
2.39.3
LGTM
Quoted 4 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Leo Sandoval
Reviewed-byLGTM
Quoted 118 lines · Mukesh Kumar Chaurasiya
Quoted 9 lines · Avnish Chouhan
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM, Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.Quoted 4 lines
Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimumruntime
Quoted 3 lines
space
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimumruntime
Quoted 12 lines
space
kern/file.c:215: Closing `/ppc/ppc64/initrd.img' ...kern/disk.c:297: Closing
`ieee1275//vdevice/v-scsi @30000067/disk@8300000000000000'...kern/disk.c:311: Closingieee1275//vdevice/v-scsi @30000067/disk@8300000000000000' succeeded. kern/file.c:225: Closing/ppc/ppc64/initrd.img' failed with 3.kern/file.c:148: Opening `/ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.Review
Quoted 6 lines
Signed-off-by Avnish Chouhan <[email protected]>--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/grub-core/kern/ieee1275/init.cgrub-core/kern/ieee1275/init.c grub_ieee1275_ibm_cas (void) · line 858
Quoted 12 lines
index dfbd0b8..502ebf1 100644
grub-core/kern/ieee1275/init.c +1
-1@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt ifunsatisfied */
Quoted 12 lines
grub-core/kern/ieee1275/init.c +4
-0@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 908
Quoted 4 lines
grub-core/kern/ieee1275/init.c +1
-0@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 917
Quoted 3 lines
grub-core/kern/ieee1275/init.c +3
-0+ ibm_ca_support_reboot =0 ; + if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot",
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 913
Quoted 2 lines
grub-core/kern/ieee1275/init.c +2
-0+ &ibm_ca_support_reboot, + sizeof(
ibm_ca_support_reboot),grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 915
Quoted 2 lines
grub-core/kern/ieee1275/init.c +2
-0+ &actual) >= 0) + grub_dprintf ("ieee1275", "ibm,client-architecture-support-reboot:%u\n",
grub-core/kern/ieee1275/init.c grub_claim_heap (void)
Quoted 3 lines
grub-core/kern/ieee1275/init.c +2
-0+ ibm_ca_support_reboot); + if (grub_ieee1275_test_flag(
GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY))grub-core/kern/ieee1275/init.c grub_claim_heap (void)
Quoted 10 lines
grub-core/kern/ieee1275/init.c +6
-3{ -/* if we have an error, don't call CAS, just hope for the best */ -if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas (); +/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will +* be set to 768 MB via CAS Vector2. This condition is required to avoid the
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 926
Quoted 1 line
grub-core/kern/ieee1275/init.c +1
-0+* issue where the older Linux kernels are still using rmo_top as 512 MB.
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 927
Quoted 1 line
grub-core/kern/ieee1275/init.c +1
-0+* Calling CAS when rmo_top is less then 768 MB will result in a issue
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 928
Quoted 1 line
grub-core/kern/ieee1275/init.c +1
-0+* where we won't be able to boot to a newer kernel and continue to
Quoted 9 lines
grub-core/kern/ieee1275/init.c +5
-1+* boot with older kernel having rmo_top as 512 MB. +*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 )) + grub_ieee1275_ibm_cas (); }#endif --Quoted 3 lines
2.39.3
LGTM
Reviewed-by Mukesh Kumar Chaurasiya <[email protected]>Quoted 4 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 5 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 2 lines · Avnish Chouhan
Change RMA size from 512 MB to 768 MB which will result
in more memory at boot time for PowerPC. When PowerPC LPAR use/uses vTPM,
s#use/uses#uses#?
Quoted 3 lines
Secure Boot or FADump, the 512 MB RMA memory is not sufficient for booting. With this 512 MB RMA, GRUB2 run out of memory and unable to load the necessary. Sometimes even usage of CDROM which requires more
"necessary" what?
Quoted 9 lines
memory for installation along with the options mentioned above troubles the boot memory and result in boot failures. Increasing the RMA size will resolves multiple out of memory issues observed in PowerPC.
Failure details (GRUB2 debugs):
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 1kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime space
Could you fix line wraps in this console dump, i.e., full message in one line should be in one line? And I suggest to add two space indention to this dump to make commit message more readable...
Quoted 3 lines
kern/ieee1275/init.c:550: mm requested region of size 8513000, flags 0kern/ieee1275/init.c:563: Cannot satisfy allocation and retain minimum runtime space
Ditto...
Quoted 7 lines
kern/file.c:215: Closing/ppc/ppc64/initrd.img' ... kern/disk.c:297: Closingieee1275//vdevice/v-scsi @30000067/disk@8300000000000000'...kern/disk.c:311: Closing `ieee1275//vdevice/v-scsi @30000067/disk@8300000000000000' succeeded.
And probably here...
Quoted 34 lines
kern/file.c:225: Closing/ppc/ppc64/initrd.img' failed with 3. kern/file.c:148: Opening/ppc/ppc64/initrd.img' succeeded.
error: ../../grub-core/kern/mm.c:552:out of memory.Signed-off-by Avnish Chouhan <[email protected]>--- grub-core/kern/ieee1275/init.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)grub-core/kern/ieee1275/init.c +5
-1@@ -852,7 +852,7 @@ grub_ieee1275_ibm_cas (void) .vec1 = 0x80, /* ignore */ .vec2_size = 1 + sizeof (struct option_vector2) - 2, .vec2 = { -0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,512 ,-1 ,0 ,48 +0 ,0 ,-1 ,-1 ,-1 ,-1 ,-1 ,768 ,-1 ,0 ,48 }, .vec3_size = 2 - 1, .vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */@@ -889,6 +889,10 @@ grub_claim_heap (void) {grub_err_t err;grub_uint32_t total =HEAP_MAX_SIZE ; +#if defined(__powerpc__) +grub_uint32_t ibm_ca_support_reboot; +grub_ssize_t actual; +#endif err =grub_ieee1275_total_mem (&rmo_top);
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 908
Quoted 4 lines
grub-core/kern/ieee1275/init.c +1
-0@@ -901,11 +905,32 @@ grub_claim_heap (void) grub_mm_add_region_fn = grub_ieee1275_mm_add_region;#if defined(__powerpc__) +/* Check if it's a CAS reboot with below property. If so, we will skip CAS call */
I suppose this comment should be before the "if" below...
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 909
Quoted 1 line
grub-core/kern/ieee1275/init.c +1
-0+ ibm_ca_support_reboot =0 ;
Initialize this at definition.
Quoted 13 lines
grub-core/kern/ieee1275/init.c +8
-3+if (grub_ieee1275_get_integer_property (grub_ieee1275_chosen, +"ibm,client-architecture-support-reboot" , + &ibm_ca_support_reboot, +sizeof (ibm_ca_support_reboot), + &actual) >=0 ) +grub_dprintf ("ieee1275" ,"ibm,client-architecture-support-reboot: %u\n" , + ibm_ca_support_reboot); +if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CAN_TRY_CAS_FOR_MORE_MEMORY )) { -/* if we have an error, don't call CAS, just hope for the best */ -if (err ==GRUB_ERR_NONE && rmo_top < (512 *1024 *1024 )) -grub_ieee1275_ibm_cas ();
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 929
Quoted 10 lines
grub-core/kern/ieee1275/init.c +10
-0+/* +* If we have an error or the reboot is detected as CAS reboot, +* don't call CAS, just hope for the best. +* Along with the above, if the rmo_top is 512 MB or above. We +* will skip the CAS call. Though if we call CAS, the rmo_top will +* be set to 768 MB via CAS Vector2. This condition is required to avoid the +* issue where the older Linux kernels are still using rmo_top as 512 MB. +* Calling CAS when rmo_top is less then 768 MB will result in a issue +* where we won't be able to boot to a newer kernel and continue to +* boot with older kernel having rmo_top as 512 MB.
The last sentence does not parse. Could you rephrase it?
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 932
Quoted 3 lines
grub-core/kern/ieee1275/init.c +3
-0+*/ +if (!ibm_ca_support_reboot && err ==GRUB_ERR_NONE + && rmo_top < (512 *1024 *1024 ))
Please do not wrap this line.
grub-core/kern/ieee1275/init.c grub_claim_heap (void) · line 933
Quoted 1 line
grub-core/kern/ieee1275/init.c +1
-0+grub_ieee1275_ibm_cas ();
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel