From 0c0a18b7a1a6b44963da4469d21428e76f9c2b30 Mon Sep 17 00:00:00 2001 From: Mike Wolf Date: Tue, 15 Jan 2008 14:33:51 -0600 Subject: [PATCH 1/1] use public interface to detect CAS reboots (take 2) This is the second pass of this patch. The fw variable name is changed to use ibm,client-architecture-support-reboot field which is already present in the firmware. Please disregard the previous patch. The firmware field used to detect CAS reboots (ibm,fw-nbr-reboots) is really a private field that could change without warning. A new field ibm,#reconfig-reboots will be added as a public interface intended to be used for this detection. The patch will first check for ibm,client-architecture-support-reboot if that is not found it will see if ibm,fw-nbr-reboots is present and will use that instead. ------- --- second/yaboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/second/yaboot.c b/second/yaboot.c index 5fc1213..3d93275 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -1702,7 +1702,8 @@ yaboot_main(void) DEBUG_F("/chosen/bootargs = %s\n", bootargs); prom_get_chosen("bootpath", bootdevice, BOOTDEVSZ); DEBUG_F("/chosen/bootpath = %s\n", bootdevice); - prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ); + if (prom_get_options("ibm,client-architecture-support-reboot",fw_nbr_reboots, FW_NBR_REBOOTSZ) == -1 ) + prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ); fw_reboot_cnt = simple_strtol(fw_nbr_reboots,&endp,10); if (fw_reboot_cnt > 0L) prom_get_options("boot-last-label", bootlastlabel, BOOTLASTSZ); -- 2.39.2