You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
131 lines
3.9 KiB
131 lines
3.9 KiB
From d5e0f77bd63bc767856e1922b24556ef1b123b55 Mon Sep 17 00:00:00 2001
|
|
From: Jared Rossi <jrossi@linux.ibm.com>
|
|
Date: Sat, 19 Oct 2024 21:29:45 -0400
|
|
Subject: [PATCH 13/38] pc-bios/s390-ccw: Remove panics from Netboot IPL path
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
RH-MergeRequest: 278: Full boot order support for s390x [Centos 10]
|
|
RH-Jira: RHEL-58153
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [12/23] 26920462eca8a2e6d443c811efa69023fbe4f31f (thuth/qemu-kvm-cs9)
|
|
|
|
Remove panic-on-error from Netboot specific functions so that error recovery
|
|
may be possible in the future.
|
|
|
|
Functions that would previously panic now provide a return code.
|
|
|
|
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Message-ID: <20241020012953.1380075-12-jrossi@linux.ibm.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit f1a2a6e41ef76e02ddc5ede3dd042ef96b4fb8d2)
|
|
---
|
|
pc-bios/s390-ccw/bootmap.c | 1 +
|
|
pc-bios/s390-ccw/netmain.c | 17 +++++++++++------
|
|
pc-bios/s390-ccw/s390-ccw.h | 2 +-
|
|
pc-bios/s390-ccw/virtio-net.c | 7 +++++--
|
|
4 files changed, 18 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
|
|
index 652807a16a..95ef9104d0 100644
|
|
--- a/pc-bios/s390-ccw/bootmap.c
|
|
+++ b/pc-bios/s390-ccw/bootmap.c
|
|
@@ -1072,6 +1072,7 @@ void zipl_load(void)
|
|
|
|
if (virtio_get_device_type() == VIRTIO_ID_NET) {
|
|
netmain();
|
|
+ panic("\n! Cannot IPL from this network !\n");
|
|
}
|
|
|
|
if (ipl_scsi()) {
|
|
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
|
|
index bc6ad8695f..d1a6c9a91c 100644
|
|
--- a/pc-bios/s390-ccw/netmain.c
|
|
+++ b/pc-bios/s390-ccw/netmain.c
|
|
@@ -464,7 +464,7 @@ static bool find_net_dev(Schib *schib, int dev_no)
|
|
return false;
|
|
}
|
|
|
|
-static void virtio_setup(void)
|
|
+static bool virtio_setup(void)
|
|
{
|
|
Schib schib;
|
|
int ssid;
|
|
@@ -495,10 +495,10 @@ static void virtio_setup(void)
|
|
}
|
|
}
|
|
|
|
- IPL_assert(found, "No virtio net device found");
|
|
+ return found;
|
|
}
|
|
|
|
-void netmain(void)
|
|
+int netmain(void)
|
|
{
|
|
filename_ip_t fn_ip;
|
|
int rc, fnlen;
|
|
@@ -506,11 +506,15 @@ void netmain(void)
|
|
sclp_setup();
|
|
puts("Network boot starting...");
|
|
|
|
- virtio_setup();
|
|
+ if (!virtio_setup()) {
|
|
+ puts("No virtio net device found.");
|
|
+ return -1;
|
|
+ }
|
|
|
|
rc = net_init(&fn_ip);
|
|
if (rc) {
|
|
- panic("Network initialization failed. Halting.");
|
|
+ puts("Network initialization failed.");
|
|
+ return -1;
|
|
}
|
|
|
|
fnlen = strlen(fn_ip.filename);
|
|
@@ -528,5 +532,6 @@ void netmain(void)
|
|
jump_to_low_kernel();
|
|
}
|
|
|
|
- panic("Failed to load OS from network.");
|
|
+ puts("Failed to load OS from network.");
|
|
+ return -1;
|
|
}
|
|
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
|
|
index 3e844abd71..344ad15655 100644
|
|
--- a/pc-bios/s390-ccw/s390-ccw.h
|
|
+++ b/pc-bios/s390-ccw/s390-ccw.h
|
|
@@ -57,7 +57,7 @@ unsigned int get_loadparm_index(void);
|
|
void main(void);
|
|
|
|
/* netmain.c */
|
|
-void netmain(void);
|
|
+int netmain(void);
|
|
|
|
/* sclp.c */
|
|
void sclp_print(const char *string);
|
|
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
|
|
index 2fcb0a58c5..f9854a22c3 100644
|
|
--- a/pc-bios/s390-ccw/virtio-net.c
|
|
+++ b/pc-bios/s390-ccw/virtio-net.c
|
|
@@ -54,8 +54,11 @@ int virtio_net_init(void *mac_addr)
|
|
vdev->guest_features[0] = VIRTIO_NET_F_MAC_BIT;
|
|
virtio_setup_ccw(vdev);
|
|
|
|
- IPL_assert(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT,
|
|
- "virtio-net device does not support the MAC address feature");
|
|
+ if (!(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT)) {
|
|
+ puts("virtio-net device does not support the MAC address feature");
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
|
|
|
|
for (i = 0; i < 64; i++) {
|
|
--
|
|
2.39.3
|
|
|