From 28815d3928b6cddb5a62f9e781aa95101f629d5e Mon Sep 17 00:00:00 2001 From: Vasily Gorbik Date: Mon, 9 Feb 2026 00:35:35 +0100 Subject: [PATCH] ipl_tools/chreipl: Rename BOOTPARMS_FCP_MAX to BOOTPARMS_SCPDATA_MAX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chreipl passes additional boot parameters via the firmware scp_data sysfs attribute. This mechanism is shared by multiple re-IPL types (FCP, NVMe, and ECKD) and they all have the same scp_data size limit. The BOOTPARMS_FCP_MAX name is therefore misleading. Rename BOOTPARMS_FCP_MAX to BOOTPARMS_SCPDATA_MAX and update all callers to make the intent clear and avoid implying this limit is FCP-only. Reviewed-by: Jan Polensky Signed-off-by: Vasily Gorbik Signed-off-by: Jan Höppner --- ipl_tools/cmd_chreipl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ipl_tools/cmd_chreipl.c b/ipl_tools/cmd_chreipl.c index e05c2ab3..473a3101 100644 --- a/ipl_tools/cmd_chreipl.c +++ b/ipl_tools/cmd_chreipl.c @@ -26,7 +26,7 @@ #define BOOTPARMS_NSS_MAX 56 #define BOOTPARMS_CCW_MAX 64 -#define BOOTPARMS_FCP_MAX 3452 +#define BOOTPARMS_SCPDATA_MAX 3452 #define OPT_BRCHR 0x80 @@ -836,9 +836,9 @@ static void chreipl_eckd(void) } check_exists("reipl/eckd/device", "\"eckd\" re-IPL target"); - if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) { + if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) { ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)", - strlen(l.bootparms), BOOTPARMS_FCP_MAX); + strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX); } if (l.reipl_clear >= 0) { @@ -870,9 +870,9 @@ static void chreipl_fcp(void) ERR_EXIT("Could not find FCP device \"%s\"", l.busid); } check_exists("reipl/fcp/device", "\"fcp\" re-IPL target"); - if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) { + if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) { ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)", - strlen(l.bootparms), BOOTPARMS_FCP_MAX); + strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX); } if (l.reipl_clear >= 0) { @@ -913,9 +913,9 @@ static void chreipl_nvme(void) } check_exists("reipl/nvme/fid", "\"nvme\" re-IPL target"); - if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) { + if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) { ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)", - strlen(l.bootparms), BOOTPARMS_FCP_MAX); + strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX); } if (l.reipl_clear >= 0) {