* [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
@ 2017-07-11 13:56 Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 01/11] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
` (12 more replies)
0 siblings, 13 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
It's already possible to do a network boot of an s390x guest with an
external netboot image based on a Linux installation, but it would
be much more convenient if the s390-ccw firmware supported network
booting right out of the box, without the need to assemble such an
external image first.
This patch series now introduces a s390-netboot.img that can be used
for network booting via DHCP and TFTP by re-using the networking stack
from the SLOF firmware (see https://github.com/aik/SLOF/ for details),
and adds a driver for virtio-net-ccw devices.
The code can only be built if the roms/SLOF submodule has been checked
out (there is a sanity check for this in the Makefile). Once it has
been built, you can download a combined kernel + initrd image via TFTP
by starting QEMU for example with:
qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
-netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img
Note that this version does not support downloading via config
files (i.e. pxelinux config files or .INS config files) yet. This
will be added later.
v4:
- Cosmetic clean-ups according to the review feedback from v3
- Fixed bug in the find_dev() function (spotted by Cornelia in v3)
- Added an additional patch to remove some unused structs from
virtio.h
v3:
- Adressed the review feedback from v2
- The last remaining SLOF patch has now been merged (big thanks to
Alexey!), so not sending this as RFC anymore - it is ready now for
integration, I think.
v2:
- Put the network boot loader into a separate s390-netboot.img
binary instead of linking it directly into the s390-ccw firmware.
- Use the SLOF sources from the roms/SLOF/ submodule instead of
copying them into the pc-bios/s390-ccw folder
- Removed the .INS config file loading code for now - only support
combined kernel + initrd images in this initial implementation.
Thomas Huth (11):
pc-bios/s390-ccw: Move libc functions to separate header
pc-bios/s390-ccw: Move ebc2asc to sclp.c
pc-bios/s390-ccw: Move virtio-block related functions into a separate
file
pc-bios/s390-ccw: Add a write() function for stdio
pc-bios/s390-ccw: Move byteswap functions to a separate header
pc-bios/s390-ccw: Remove unused structs from virtio.h
pc-bios/s390-ccw: Add code for virtio feature negotiation
roms/SLOF: Update submodule to latest status
pc-bios/s390-ccw: Add core files for the network bootloading program
pc-bios/s390-ccw: Add virtio-net driver code
pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP
load
pc-bios/s390-ccw/Makefile | 13 +-
pc-bios/s390-ccw/bootmap.c | 2 +
pc-bios/s390-ccw/bootmap.h | 26 ---
pc-bios/s390-ccw/bswap.h | 30 ++++
pc-bios/s390-ccw/libc.h | 45 +++++
pc-bios/s390-ccw/main.c | 14 +-
pc-bios/s390-ccw/netboot.mak | 51 ++++++
pc-bios/s390-ccw/netmain.c | 362 +++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/s390-ccw.h | 33 +---
pc-bios/s390-ccw/sclp.c | 37 ++--
pc-bios/s390-ccw/virtio-blkdev.c | 296 ++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio-net.c | 135 +++++++++++++++
pc-bios/s390-ccw/virtio-scsi.c | 1 +
pc-bios/s390-ccw/virtio.c | 306 ++++-----------------------------
pc-bios/s390-ccw/virtio.h | 46 ++---
roms/SLOF | 2 +-
16 files changed, 1011 insertions(+), 388 deletions(-)
create mode 100644 pc-bios/s390-ccw/bswap.h
create mode 100644 pc-bios/s390-ccw/libc.h
create mode 100644 pc-bios/s390-ccw/netboot.mak
create mode 100644 pc-bios/s390-ccw/netmain.c
create mode 100644 pc-bios/s390-ccw/virtio-blkdev.c
create mode 100644 pc-bios/s390-ccw/virtio-net.c
--
1.8.3.1
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 01/11] pc-bios/s390-ccw: Move libc functions to separate header
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 02/11] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
` (11 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
The upcoming netboot code will use the libc from SLOF. To be able
to still use s390-ccw.h there, the libc related functions in this
header have to be moved to a different location.
And while we're at it, remove the duplicate memcpy() function from
sclp.c.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/bootmap.c | 1 +
pc-bios/s390-ccw/libc.h | 45 ++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/main.c | 1 +
pc-bios/s390-ccw/s390-ccw.h | 29 ---------------------------
pc-bios/s390-ccw/sclp.c | 10 ++--------
pc-bios/s390-ccw/virtio-scsi.c | 1 +
pc-bios/s390-ccw/virtio.c | 1 +
7 files changed, 51 insertions(+), 37 deletions(-)
create mode 100644 pc-bios/s390-ccw/libc.h
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 523fa78..458d3da 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "bootmap.h"
#include "virtio.h"
diff --git a/pc-bios/s390-ccw/libc.h b/pc-bios/s390-ccw/libc.h
new file mode 100644
index 0000000..0142ea8
--- /dev/null
+++ b/pc-bios/s390-ccw/libc.h
@@ -0,0 +1,45 @@
+/*
+ * libc-style definitions and functions
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#ifndef S390_CCW_LIBC_H
+#define S390_CCW_LIBC_H
+
+typedef long size_t;
+typedef int bool;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+typedef unsigned long long uint64_t;
+
+static inline void *memset(void *s, int c, size_t n)
+{
+ int i;
+ unsigned char *p = s;
+
+ for (i = 0; i < n; i++) {
+ p[i] = c;
+ }
+
+ return s;
+}
+
+static inline void *memcpy(void *s1, const void *s2, size_t n)
+{
+ uint8_t *dest = s1;
+ const uint8_t *src = s2;
+ int i;
+
+ for (i = 0; i < n; i++) {
+ dest[i] = src[i];
+ }
+
+ return s1;
+}
+
+#endif
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 1cacc1b..40cba8d 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 2089274..43e2d42 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -18,12 +18,6 @@ typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
typedef unsigned long ulong;
-typedef long size_t;
-typedef int bool;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
typedef unsigned char __u8;
typedef unsigned short __u16;
typedef unsigned int __u32;
@@ -88,18 +82,6 @@ ulong get_second(void);
/* bootmap.c */
void zipl_load(void);
-static inline void *memset(void *s, int c, size_t n)
-{
- int i;
- unsigned char *p = s;
-
- for (i = 0; i < n; i++) {
- p[i] = c;
- }
-
- return s;
-}
-
static inline void fill_hex(char *out, unsigned char val)
{
const char hex[] = "0123456789abcdef";
@@ -169,17 +151,6 @@ static inline void sleep(unsigned int seconds)
}
}
-static inline void *memcpy(void *s1, const void *s2, size_t n)
-{
- uint8_t *p1 = s1;
- const uint8_t *p2 = s2;
-
- while (n--) {
- p1[n] = p2[n];
- }
- return s1;
-}
-
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index a1639ba..aa1c862 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "sclp.h"
@@ -59,13 +60,6 @@ static int _strlen(const char *str)
return i;
}
-static void _memcpy(char *dest, const char *src, int len)
-{
- int i;
- for (i = 0; i < len; i++)
- dest[i] = src[i];
-}
-
void sclp_print(const char *str)
{
int len = _strlen(str);
@@ -76,7 +70,7 @@ void sclp_print(const char *str)
sccb->ebh.length = sizeof(EventBufferHeader) + len;
sccb->ebh.type = SCLP_EVENT_ASCII_CONSOLE_DATA;
sccb->ebh.flags = 0;
- _memcpy(sccb->data, str, len);
+ memcpy(sccb->data, str, len);
sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
}
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index f61ecf0..c92f5d3 100644
--- a/pc-bios/s390-ccw/virtio-scsi.c
+++ b/pc-bios/s390-ccw/virtio-scsi.c
@@ -9,6 +9,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
#include "scsi.h"
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 6ee93d5..8768331 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -8,6 +8,7 @@
* directory.
*/
+#include "libc.h"
#include "s390-ccw.h"
#include "virtio.h"
#include "virtio-scsi.h"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 02/11] pc-bios/s390-ccw: Move ebc2asc to sclp.c
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 01/11] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 03/11] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
` (10 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
We will later need this array in a file that we will link to the
netboot code, too. Since there is some ebcdic conversion done
in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
candidate.
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/main.c | 11 -----------
pc-bios/s390-ccw/sclp.c | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 40cba8d..0580eac 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-const unsigned char ebc2asc[256] =
- /* 0123456789abcdef0123456789abcdef */
- "................................" /* 1F */
- "................................" /* 3F */
- " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
- "-/.........,%_>?.........`:#@'=\""/* 7F */
- ".abcdefghi.......jklmnopqr......" /* 9F */
- "..stuvwxyz......................" /* BF */
- ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
- "..STUVWXYZ......0123456789......";/* FF */
-
/*
* Priniciples of Operations (SA22-7832-09) chapter 17 requires that
* a subsystem-identification is at 184-187 and bytes 188-191 are zero
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index aa1c862..2ee204a 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -14,6 +14,17 @@
static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
+const unsigned char ebc2asc[256] =
+ /* 0123456789abcdef0123456789abcdef */
+ "................................" /* 1F */
+ "................................" /* 3F */
+ " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space */
+ "-/.........,%_>?.........`:#@'=\""/* 7F */
+ ".abcdefghi.......jklmnopqr......" /* 9F */
+ "..stuvwxyz......................" /* BF */
+ ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
+ "..STUVWXYZ......0123456789......";/* FF */
+
/* Perform service call. Return 0 on success, non-zero otherwise. */
static int sclp_service_call(unsigned int command, void *sccb)
{
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 03/11] pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 01/11] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 02/11] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 04/11] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
` (9 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
The netboot code is going to link against the code from virtio.c, too, so
we've got to move the virtio-block and -scsi related code out of the way.
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 2 +-
pc-bios/s390-ccw/main.c | 2 +-
pc-bios/s390-ccw/s390-ccw.h | 2 +-
pc-bios/s390-ccw/virtio-blkdev.c | 296 +++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio.c | 277 +-----------------------------------
pc-bios/s390-ccw/virtio.h | 6 +
6 files changed, 311 insertions(+), 274 deletions(-)
create mode 100644 pc-bios/s390-ccw/virtio-blkdev.c
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index fb88c13..82b41ef 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -9,7 +9,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
.PHONY : all clean build-all
-OBJECTS = start.o main.o bootmap.o sclp.o virtio.o virtio-scsi.o
+OBJECTS = start.o main.o bootmap.o sclp.o virtio.o virtio-scsi.o virtio-blkdev.o
QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))
QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 0580eac..401e9db 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -144,7 +144,7 @@ static void virtio_setup(void)
sclp_print("Network boot device detected\n");
vdev->netboot_start_addr = iplb.ccw.netboot_start_addr;
} else {
- virtio_setup_device(blk_schid);
+ virtio_blk_setup_device(blk_schid);
IPL_assert(virtio_ipl_disk_is_valid(), "No valid IPL device detected");
}
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 43e2d42..6fdc858 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -74,7 +74,7 @@ void sclp_get_loadparm_ascii(char *loadparm);
unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
ulong subchan_id, void *load_addr);
bool virtio_is_supported(SubChannelId schid);
-void virtio_setup_device(SubChannelId schid);
+void virtio_blk_setup_device(SubChannelId schid);
int virtio_read(ulong sector, void *load_addr);
int enable_mss_facility(void);
ulong get_second(void);
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
new file mode 100644
index 0000000..11c5626
--- /dev/null
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -0,0 +1,296 @@
+/*
+ * Virtio driver bits
+ *
+ * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include "libc.h"
+#include "s390-ccw.h"
+#include "virtio.h"
+#include "virtio-scsi.h"
+
+static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr,
+ int sec_num)
+{
+ VirtioBlkOuthdr out_hdr;
+ u8 status;
+ VRing *vr = &vdev->vrings[vdev->cmd_vr_idx];
+
+ /* Tell the host we want to read */
+ out_hdr.type = VIRTIO_BLK_T_IN;
+ out_hdr.ioprio = 99;
+ out_hdr.sector = virtio_sector_adjust(sector);
+
+ vring_send_buf(vr, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
+
+ /* This is where we want to receive data */
+ vring_send_buf(vr, load_addr, virtio_get_block_size() * sec_num,
+ VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
+ VRING_DESC_F_NEXT);
+
+ /* status field */
+ vring_send_buf(vr, &status, sizeof(u8),
+ VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN);
+
+ /* Now we can tell the host to read */
+ vring_wait_reply();
+
+ if (drain_irqs(vr->schid)) {
+ /* Well, whatever status is supposed to contain... */
+ status = 1;
+ }
+ return status;
+}
+
+int virtio_read_many(ulong sector, void *load_addr, int sec_num)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return virtio_blk_read_many(vdev, sector, load_addr, sec_num);
+ case VIRTIO_ID_SCSI:
+ return virtio_scsi_read_many(vdev, sector, load_addr, sec_num);
+ }
+ panic("\n! No readable IPL device !\n");
+ return -1;
+}
+
+unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
+ ulong subchan_id, void *load_addr)
+{
+ u8 status;
+ int sec = rec_list1;
+ int sec_num = ((rec_list2 >> 32) & 0xffff) + 1;
+ int sec_len = rec_list2 >> 48;
+ ulong addr = (ulong)load_addr;
+
+ if (sec_len != virtio_get_block_size()) {
+ return -1;
+ }
+
+ sclp_print(".");
+ status = virtio_read_many(sec, (void *)addr, sec_num);
+ if (status) {
+ panic("I/O Error");
+ }
+ addr += sec_num * virtio_get_block_size();
+
+ return addr;
+}
+
+int virtio_read(ulong sector, void *load_addr)
+{
+ return virtio_read_many(sector, load_addr, 1);
+}
+
+/*
+ * Other supported value pairs, if any, would need to be added here.
+ * Note: head count is always 15.
+ */
+static inline u8 virtio_eckd_sectors_for_block_size(int size)
+{
+ switch (size) {
+ case 512:
+ return 49;
+ case 1024:
+ return 33;
+ case 2048:
+ return 21;
+ case 4096:
+ return 12;
+ }
+ return 0;
+}
+
+VirtioGDN virtio_guessed_disk_nature(void)
+{
+ return virtio_get_device()->guessed_disk_nature;
+}
+
+void virtio_assume_scsi(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
+ vdev->config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
+ vdev->config.blk.physical_block_exp = 0;
+ vdev->blk_factor = 1;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
+ break;
+ }
+}
+
+void virtio_assume_iso9660(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->guessed_disk_nature = VIRTIO_GDN_SCSI;
+ vdev->config.blk.blk_size = VIRTIO_ISO_BLOCK_SIZE;
+ vdev->config.blk.physical_block_exp = 0;
+ vdev->blk_factor = VIRTIO_ISO_BLOCK_SIZE / VIRTIO_SECTOR_SIZE;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
+ break;
+ }
+}
+
+void virtio_assume_eckd(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ vdev->guessed_disk_nature = VIRTIO_GDN_DASD;
+ vdev->blk_factor = 1;
+ vdev->config.blk.physical_block_exp = 0;
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ vdev->config.blk.blk_size = 4096;
+ break;
+ case VIRTIO_ID_SCSI:
+ vdev->config.blk.blk_size = vdev->scsi_block_size;
+ break;
+ }
+ vdev->config.blk.geometry.heads = 15;
+ vdev->config.blk.geometry.sectors =
+ virtio_eckd_sectors_for_block_size(vdev->config.blk.blk_size);
+}
+
+bool virtio_disk_is_scsi(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ if (vdev->guessed_disk_nature == VIRTIO_GDN_SCSI) {
+ return true;
+ }
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return (vdev->config.blk.geometry.heads == 255)
+ && (vdev->config.blk.geometry.sectors == 63)
+ && (virtio_get_block_size() == VIRTIO_SCSI_BLOCK_SIZE);
+ case VIRTIO_ID_SCSI:
+ return true;
+ }
+ return false;
+}
+
+bool virtio_disk_is_eckd(void)
+{
+ VDev *vdev = virtio_get_device();
+ const int block_size = virtio_get_block_size();
+
+ if (vdev->guessed_disk_nature == VIRTIO_GDN_DASD) {
+ return true;
+ }
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return (vdev->config.blk.geometry.heads == 15)
+ && (vdev->config.blk.geometry.sectors ==
+ virtio_eckd_sectors_for_block_size(block_size));
+ case VIRTIO_ID_SCSI:
+ return false;
+ }
+ return false;
+}
+
+bool virtio_ipl_disk_is_valid(void)
+{
+ return virtio_disk_is_scsi() || virtio_disk_is_eckd();
+}
+
+int virtio_get_block_size(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.blk_size << vdev->config.blk.physical_block_exp;
+ case VIRTIO_ID_SCSI:
+ return vdev->scsi_block_size;
+ }
+ return 0;
+}
+
+uint8_t virtio_get_heads(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.geometry.heads;
+ case VIRTIO_ID_SCSI:
+ return vdev->guessed_disk_nature == VIRTIO_GDN_DASD
+ ? vdev->config.blk.geometry.heads : 255;
+ }
+ return 0;
+}
+
+uint8_t virtio_get_sectors(void)
+{
+ VDev *vdev = virtio_get_device();
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.geometry.sectors;
+ case VIRTIO_ID_SCSI:
+ return vdev->guessed_disk_nature == VIRTIO_GDN_DASD
+ ? vdev->config.blk.geometry.sectors : 63;
+ }
+ return 0;
+}
+
+uint64_t virtio_get_blocks(void)
+{
+ VDev *vdev = virtio_get_device();
+ const uint64_t factor = virtio_get_block_size() / VIRTIO_SECTOR_SIZE;
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ return vdev->config.blk.capacity / factor;
+ case VIRTIO_ID_SCSI:
+ return vdev->scsi_last_block / factor;
+ }
+ return 0;
+}
+
+void virtio_blk_setup_device(SubChannelId schid)
+{
+ VDev *vdev = virtio_get_device();
+
+ vdev->schid = schid;
+ virtio_setup_ccw(vdev);
+
+ switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_BLOCK:
+ sclp_print("Using virtio-blk.\n");
+ if (!virtio_ipl_disk_is_valid()) {
+ /* make sure all getters but blocksize return 0 for
+ * invalid IPL disk
+ */
+ memset(&vdev->config.blk, 0, sizeof(vdev->config.blk));
+ virtio_assume_scsi();
+ }
+ break;
+ case VIRTIO_ID_SCSI:
+ IPL_assert(vdev->config.scsi.sense_size == VIRTIO_SCSI_SENSE_SIZE,
+ "Config: sense size mismatch");
+ IPL_assert(vdev->config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
+ "Config: CDB size mismatch");
+
+ sclp_print("Using virtio-scsi.\n");
+ virtio_scsi_setup(vdev);
+ break;
+ default:
+ panic("\n! No IPL device available !\n");
+ }
+}
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 8768331..9d9e61f 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -70,7 +70,7 @@ static long virtio_notify(SubChannelId schid, int vq_idx, long cookie)
* Virtio functions *
***********************************************/
-static int drain_irqs(SubChannelId schid)
+int drain_irqs(SubChannelId schid)
{
Irb irb = {};
int r = 0;
@@ -149,13 +149,13 @@ static void vring_init(VRing *vr, VqInfo *info)
debug_print_addr("init vr", vr);
}
-static bool vring_notify(VRing *vr)
+bool vring_notify(VRing *vr)
{
vr->cookie = virtio_notify(vr->schid, vr->id, vr->cookie);
return vr->cookie >= 0;
}
-static void vring_send_buf(VRing *vr, void *p, int len, int flags)
+void vring_send_buf(VRing *vr, void *p, int len, int flags)
{
/* For follow-up chains we need to keep the first entry point */
if (!(flags & VRING_HIDDEN_IS_CHAIN)) {
@@ -188,7 +188,7 @@ ulong get_second(void)
return (get_clock() >> 12) / 1000000;
}
-static int vr_poll(VRing *vr)
+int vr_poll(VRing *vr)
{
if (vr->used->idx == vr->used_idx) {
vring_notify(vr);
@@ -210,7 +210,7 @@ static int vr_poll(VRing *vr)
*
* Returns 0 on success, 1 on timeout.
*/
-static int vring_wait_reply(void)
+int vring_wait_reply(void)
{
ulong target_second = get_second() + vdev.wait_reply_timeout;
@@ -247,242 +247,7 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd)
return 0;
}
-/***********************************************
- * Virtio block *
- ***********************************************/
-
-static int virtio_blk_read_many(VDev *vdev,
- ulong sector, void *load_addr, int sec_num)
-{
- VirtioBlkOuthdr out_hdr;
- u8 status;
- VRing *vr = &vdev->vrings[vdev->cmd_vr_idx];
-
- /* Tell the host we want to read */
- out_hdr.type = VIRTIO_BLK_T_IN;
- out_hdr.ioprio = 99;
- out_hdr.sector = virtio_sector_adjust(sector);
-
- vring_send_buf(vr, &out_hdr, sizeof(out_hdr), VRING_DESC_F_NEXT);
-
- /* This is where we want to receive data */
- vring_send_buf(vr, load_addr, virtio_get_block_size() * sec_num,
- VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN |
- VRING_DESC_F_NEXT);
-
- /* status field */
- vring_send_buf(vr, &status, sizeof(u8),
- VRING_DESC_F_WRITE | VRING_HIDDEN_IS_CHAIN);
-
- /* Now we can tell the host to read */
- vring_wait_reply();
-
- if (drain_irqs(vr->schid)) {
- /* Well, whatever status is supposed to contain... */
- status = 1;
- }
- return status;
-}
-
-int virtio_read_many(ulong sector, void *load_addr, int sec_num)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return virtio_blk_read_many(&vdev, sector, load_addr, sec_num);
- case VIRTIO_ID_SCSI:
- return virtio_scsi_read_many(&vdev, sector, load_addr, sec_num);
- }
- panic("\n! No readable IPL device !\n");
- return -1;
-}
-
-unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
- ulong subchan_id, void *load_addr)
-{
- u8 status;
- int sec = rec_list1;
- int sec_num = ((rec_list2 >> 32) & 0xffff) + 1;
- int sec_len = rec_list2 >> 48;
- ulong addr = (ulong)load_addr;
-
- if (sec_len != virtio_get_block_size()) {
- return -1;
- }
-
- sclp_print(".");
- status = virtio_read_many(sec, (void *)addr, sec_num);
- if (status) {
- panic("I/O Error");
- }
- addr += sec_num * virtio_get_block_size();
-
- return addr;
-}
-
-int virtio_read(ulong sector, void *load_addr)
-{
- return virtio_read_many(sector, load_addr, 1);
-}
-
-/*
- * Other supported value pairs, if any, would need to be added here.
- * Note: head count is always 15.
- */
-static inline u8 virtio_eckd_sectors_for_block_size(int size)
-{
- switch (size) {
- case 512:
- return 49;
- case 1024:
- return 33;
- case 2048:
- return 21;
- case 4096:
- return 12;
- }
- return 0;
-}
-
-VirtioGDN virtio_guessed_disk_nature(void)
-{
- return vdev.guessed_disk_nature;
-}
-
-void virtio_assume_scsi(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.guessed_disk_nature = VIRTIO_GDN_SCSI;
- vdev.config.blk.blk_size = VIRTIO_SCSI_BLOCK_SIZE;
- vdev.config.blk.physical_block_exp = 0;
- vdev.blk_factor = 1;
- break;
- case VIRTIO_ID_SCSI:
- vdev.scsi_block_size = VIRTIO_SCSI_BLOCK_SIZE;
- break;
- }
-}
-
-void virtio_assume_iso9660(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.guessed_disk_nature = VIRTIO_GDN_SCSI;
- vdev.config.blk.blk_size = VIRTIO_ISO_BLOCK_SIZE;
- vdev.config.blk.physical_block_exp = 0;
- vdev.blk_factor = VIRTIO_ISO_BLOCK_SIZE / VIRTIO_SECTOR_SIZE;
- break;
- case VIRTIO_ID_SCSI:
- vdev.scsi_block_size = VIRTIO_ISO_BLOCK_SIZE;
- break;
- }
-}
-
-void virtio_assume_eckd(void)
-{
- vdev.guessed_disk_nature = VIRTIO_GDN_DASD;
- vdev.blk_factor = 1;
- vdev.config.blk.physical_block_exp = 0;
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- vdev.config.blk.blk_size = 4096;
- break;
- case VIRTIO_ID_SCSI:
- vdev.config.blk.blk_size = vdev.scsi_block_size;
- break;
- }
- vdev.config.blk.geometry.heads = 15;
- vdev.config.blk.geometry.sectors =
- virtio_eckd_sectors_for_block_size(vdev.config.blk.blk_size);
-}
-
-bool virtio_disk_is_scsi(void)
-{
- if (vdev.guessed_disk_nature == VIRTIO_GDN_SCSI) {
- return true;
- }
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return (vdev.config.blk.geometry.heads == 255)
- && (vdev.config.blk.geometry.sectors == 63)
- && (virtio_get_block_size() == VIRTIO_SCSI_BLOCK_SIZE);
- case VIRTIO_ID_SCSI:
- return true;
- }
- return false;
-}
-
-bool virtio_disk_is_eckd(void)
-{
- const int block_size = virtio_get_block_size();
-
- if (vdev.guessed_disk_nature == VIRTIO_GDN_DASD) {
- return true;
- }
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return (vdev.config.blk.geometry.heads == 15)
- && (vdev.config.blk.geometry.sectors ==
- virtio_eckd_sectors_for_block_size(block_size));
- case VIRTIO_ID_SCSI:
- return false;
- }
- return false;
-}
-
-bool virtio_ipl_disk_is_valid(void)
-{
- return virtio_disk_is_scsi() || virtio_disk_is_eckd();
-}
-
-int virtio_get_block_size(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.blk_size << vdev.config.blk.physical_block_exp;
- case VIRTIO_ID_SCSI:
- return vdev.scsi_block_size;
- }
- return 0;
-}
-
-uint8_t virtio_get_heads(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.geometry.heads;
- case VIRTIO_ID_SCSI:
- return vdev.guessed_disk_nature == VIRTIO_GDN_DASD
- ? vdev.config.blk.geometry.heads : 255;
- }
- return 0;
-}
-
-uint8_t virtio_get_sectors(void)
-{
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.geometry.sectors;
- case VIRTIO_ID_SCSI:
- return vdev.guessed_disk_nature == VIRTIO_GDN_DASD
- ? vdev.config.blk.geometry.sectors : 63;
- }
- return 0;
-}
-
-uint64_t virtio_get_blocks(void)
-{
- const uint64_t factor = virtio_get_block_size() / VIRTIO_SECTOR_SIZE;
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- return vdev.config.blk.capacity / factor;
- case VIRTIO_ID_SCSI:
- return vdev.scsi_last_block / factor;
- }
- return 0;
-}
-
-static void virtio_setup_ccw(VDev *vdev)
+void virtio_setup_ccw(VDev *vdev)
{
int i, cfg_size = 0;
unsigned char status = VIRTIO_CONFIG_S_DRIVER_OK;
@@ -544,36 +309,6 @@ static void virtio_setup_ccw(VDev *vdev)
"Could not write status to host");
}
-void virtio_setup_device(SubChannelId schid)
-{
- vdev.schid = schid;
- virtio_setup_ccw(&vdev);
-
- switch (vdev.senseid.cu_model) {
- case VIRTIO_ID_BLOCK:
- sclp_print("Using virtio-blk.\n");
- if (!virtio_ipl_disk_is_valid()) {
- /* make sure all getters but blocksize return 0 for
- * invalid IPL disk
- */
- memset(&vdev.config.blk, 0, sizeof(vdev.config.blk));
- virtio_assume_scsi();
- }
- break;
- case VIRTIO_ID_SCSI:
- IPL_assert(vdev.config.scsi.sense_size == VIRTIO_SCSI_SENSE_SIZE,
- "Config: sense size mismatch");
- IPL_assert(vdev.config.scsi.cdb_size == VIRTIO_SCSI_CDB_SIZE,
- "Config: CDB size mismatch");
-
- sclp_print("Using virtio-scsi.\n");
- virtio_scsi_setup(&vdev);
- break;
- default:
- panic("\n! No IPL device available !\n");
- }
-}
-
bool virtio_is_supported(SubChannelId schid)
{
vdev.schid = schid;
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index 1eaf865..024e9a6 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -291,6 +291,12 @@ struct VirtioCmd {
};
typedef struct VirtioCmd VirtioCmd;
+bool vring_notify(VRing *vr);
+int drain_irqs(SubChannelId schid);
+void vring_send_buf(VRing *vr, void *p, int len, int flags);
+int vr_poll(VRing *vr);
+int vring_wait_reply(void);
int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
+void virtio_setup_ccw(VDev *vdev);
#endif /* VIRTIO_H */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 04/11] pc-bios/s390-ccw: Add a write() function for stdio
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (2 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 03/11] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 05/11] pc-bios/s390-ccw: Move byteswap functions to a separate header Thomas Huth
` (8 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
The stdio functions from the SLOF libc need a write() function for
printing text to stdout/stderr. Let's implement this function by
refactoring the code from sclp_print().
Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/sclp.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index 2ee204a..b1fc8ff 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -12,6 +12,8 @@
#include "s390-ccw.h"
#include "sclp.h"
+long write(int fd, const void *str, size_t len);
+
static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
const unsigned char ebc2asc[256] =
@@ -71,11 +73,14 @@ static int _strlen(const char *str)
return i;
}
-void sclp_print(const char *str)
+long write(int fd, const void *str, size_t len)
{
- int len = _strlen(str);
WriteEventData *sccb = (void *)_sccb;
+ if (fd != 1 && fd != 2) {
+ return -EIO;
+ }
+
sccb->h.length = sizeof(WriteEventData) + len;
sccb->h.function_code = SCLP_FC_NORMAL_WRITE;
sccb->ebh.length = sizeof(EventBufferHeader) + len;
@@ -84,6 +89,13 @@ void sclp_print(const char *str)
memcpy(sccb->data, str, len);
sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
+
+ return len;
+}
+
+void sclp_print(const char *str)
+{
+ write(1, str, _strlen(str));
}
void sclp_get_loadparm_ascii(char *loadparm)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 05/11] pc-bios/s390-ccw: Move byteswap functions to a separate header
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (3 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 04/11] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h Thomas Huth
` (7 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
We'll need them in code that is not related to bootmap.h, so
they should reside in an independent header.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/bootmap.c | 1 +
pc-bios/s390-ccw/bootmap.h | 26 --------------------------
pc-bios/s390-ccw/bswap.h | 30 ++++++++++++++++++++++++++++++
3 files changed, 31 insertions(+), 26 deletions(-)
create mode 100644 pc-bios/s390-ccw/bswap.h
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 458d3da..67a6123 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -12,6 +12,7 @@
#include "s390-ccw.h"
#include "bootmap.h"
#include "virtio.h"
+#include "bswap.h"
#ifdef DEBUG
/* #define DEBUG_FALLBACK */
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index 7f36782..cf99a4c 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -324,32 +324,6 @@ static inline int _memcmp(const void *s1, const void *s2, size_t n)
return 0;
}
-/* from include/qemu/bswap.h */
-
-/* El Torito is always little-endian */
-static inline uint16_t bswap16(uint16_t x)
-{
- return ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8);
-}
-
-static inline uint32_t bswap32(uint32_t x)
-{
- return ((x & 0x000000ffU) << 24) | ((x & 0x0000ff00U) << 8) |
- ((x & 0x00ff0000U) >> 8) | ((x & 0xff000000U) >> 24);
-}
-
-static inline uint64_t bswap64(uint64_t x)
-{
- return ((x & 0x00000000000000ffULL) << 56) |
- ((x & 0x000000000000ff00ULL) << 40) |
- ((x & 0x0000000000ff0000ULL) << 24) |
- ((x & 0x00000000ff000000ULL) << 8) |
- ((x & 0x000000ff00000000ULL) >> 8) |
- ((x & 0x0000ff0000000000ULL) >> 24) |
- ((x & 0x00ff000000000000ULL) >> 40) |
- ((x & 0xff00000000000000ULL) >> 56);
-}
-
static inline uint32_t iso_733_to_u32(uint64_t x)
{
return (uint32_t)x;
diff --git a/pc-bios/s390-ccw/bswap.h b/pc-bios/s390-ccw/bswap.h
new file mode 100644
index 0000000..a422604
--- /dev/null
+++ b/pc-bios/s390-ccw/bswap.h
@@ -0,0 +1,30 @@
+/*
+ * Byte swap functions - taken from include/qemu/bswap.h
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+static inline uint16_t bswap16(uint16_t x)
+{
+ return ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8);
+}
+
+static inline uint32_t bswap32(uint32_t x)
+{
+ return ((x & 0x000000ffU) << 24) | ((x & 0x0000ff00U) << 8) |
+ ((x & 0x00ff0000U) >> 8) | ((x & 0xff000000U) >> 24);
+}
+
+static inline uint64_t bswap64(uint64_t x)
+{
+ return ((x & 0x00000000000000ffULL) << 56) |
+ ((x & 0x000000000000ff00ULL) << 40) |
+ ((x & 0x0000000000ff0000ULL) << 24) |
+ ((x & 0x00000000ff000000ULL) << 8) |
+ ((x & 0x000000ff00000000ULL) >> 8) |
+ ((x & 0x0000ff0000000000ULL) >> 24) |
+ ((x & 0x00ff000000000000ULL) >> 40) |
+ ((x & 0xff00000000000000ULL) >> 56);
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (4 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 05/11] pc-bios/s390-ccw: Move byteswap functions to a separate header Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 14:16 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation Thomas Huth
` (6 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
Looks like they have never beend used, so let's simply remove them.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/virtio.h | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index 024e9a6..d733780 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -32,24 +32,6 @@ enum VirtioDevType {
};
typedef enum VirtioDevType VirtioDevType;
-struct VirtioDevHeader {
- VirtioDevType type:8;
- uint8_t num_vq;
- uint8_t feature_len;
- uint8_t config_len;
- uint8_t status;
- uint8_t vqconfig[];
-} __attribute__((packed));
-typedef struct VirtioDevHeader VirtioDevHeader;
-
-struct VirtioVqConfig {
- uint64_t token;
- uint64_t address;
- uint16_t num;
- uint8_t pad[6];
-} __attribute__((packed));
-typedef struct VirtioVqConfig VirtioVqConfig;
-
struct VqInfo {
uint64_t queue;
uint32_t align;
@@ -64,15 +46,6 @@ struct VqConfig {
} __attribute__((packed));
typedef struct VqConfig VqConfig;
-struct VirtioDev {
- VirtioDevHeader *header;
- VirtioVqConfig *vqconfig;
- char *host_features;
- char *guest_features;
- char *config;
-};
-typedef struct VirtioDev VirtioDev;
-
#define VIRTIO_RING_SIZE (PAGE_SIZE * 8)
#define VIRTIO_MAX_VQS 3
#define KVM_S390_VIRTIO_RING_ALIGN 4096
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (5 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 14:23 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 08/11] roms/SLOF: Update submodule to latest status Thomas Huth
` (5 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
The upcoming virtio-net driver needs to negotiate some features,
so we need the possibility to do this in the core virtio code.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/s390-ccw.h | 2 ++
pc-bios/s390-ccw/virtio.c | 23 +++++++++++++++++------
pc-bios/s390-ccw/virtio.h | 1 +
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 6fdc858..25d4d21 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -44,6 +44,8 @@ typedef unsigned long long __u64;
((b) == 0 ? (a) : (MIN(a, b))))
#endif
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
#include "cio.h"
#include "iplb.h"
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 9d9e61f..18fc5d1 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -12,6 +12,7 @@
#include "s390-ccw.h"
#include "virtio.h"
#include "virtio-scsi.h"
+#include "bswap.h"
#define VRING_WAIT_REPLY_TIMEOUT 3
@@ -249,8 +250,12 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd)
void virtio_setup_ccw(VDev *vdev)
{
- int i, cfg_size = 0;
+ int i, rc, cfg_size = 0;
unsigned char status = VIRTIO_CONFIG_S_DRIVER_OK;
+ struct VirtioFeatureDesc {
+ uint32_t features;
+ uint8_t index;
+ } __attribute__((packed)) feats;
IPL_assert(virtio_is_supported(vdev->schid), "PE");
/* device ID has been established now */
@@ -277,11 +282,17 @@ void virtio_setup_ccw(VDev *vdev)
IPL_assert(run_ccw(vdev, CCW_CMD_READ_CONF, &vdev->config, cfg_size) == 0,
"Could not get block device configuration");
- /*
- * Skipping CCW_CMD_READ_FEAT. We're not doing anything fancy, and
- * we'll just stop dead anyway if anything does not work like we
- * expect it.
- */
+ /* Feature negotiation */
+ for (i = 0; i < ARRAY_SIZE(vdev->guest_features); i++) {
+ feats.features = 0;
+ feats.index = i;
+ rc = run_ccw(vdev, CCW_CMD_READ_FEAT, &feats, sizeof(feats));
+ IPL_assert(rc == 0, "Could not get features bits");
+ vdev->guest_features[i] &= bswap32(feats.features);
+ feats.features = bswap32(vdev->guest_features[i]);
+ rc = run_ccw(vdev, CCW_CMD_WRITE_FEAT, &feats, sizeof(feats));
+ IPL_assert(rc == 0, "Could not set features bits");
+ }
for (i = 0; i < vdev->nr_vqs; i++) {
VqInfo info = {
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index d733780..a00a320 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -251,6 +251,7 @@ struct VDev {
ScsiDevice selected_scsi_device;
uint64_t netboot_start_addr;
uint32_t max_transfer;
+ uint32_t guest_features[2];
};
typedef struct VDev VDev;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 08/11] roms/SLOF: Update submodule to latest status
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (6 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
` (4 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
We need the latest fixes for building the libc and libnet
of SLOF for the s390-ccw network bootloader firmware.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
roms/SLOF | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/SLOF b/roms/SLOF
index 66d250e..834113a 160000
--- a/roms/SLOF
+++ b/roms/SLOF
@@ -1 +1 @@
-Subproject commit 66d250ef0fd06bb88b7399b9563b5008201f2d63
+Subproject commit 834113a1c67d6fb53dea153c3313d182238f2d36
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (7 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 08/11] roms/SLOF: Update submodule to latest status Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 14:30 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
` (3 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
This is just a preparation for the next steps: Add a makefile and a
stripped down copy of pc-bios/s390-ccw/main.c as a basis for the network
bootloader program, linked against the libc from SLOF already (which we
will need for SLOF's libnet). The networking code is not included yet.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 11 +++-
pc-bios/s390-ccw/netboot.mak | 41 +++++++++++++
pc-bios/s390-ccw/netmain.c | 137 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 187 insertions(+), 2 deletions(-)
create mode 100644 pc-bios/s390-ccw/netboot.mak
create mode 100644 pc-bios/s390-ccw/netmain.c
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 82b41ef..cbae745 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -16,7 +16,7 @@ QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
LDFLAGS += -Wl,-pie -nostdlib
-build-all: s390-ccw.img
+build-all: s390-ccw.img s390-netboot.img
s390-ccw.elf: $(OBJECTS)
$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
@@ -28,5 +28,12 @@ s390-ccw.img: s390-ccw.elf
$(OBJECTS): Makefile
+ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),)
+include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak
+else
+s390-netboot.img:
+ @echo "s390-netboot.img not built since roms/SLOF/ is not available."
+endif
+
clean:
- rm -f *.o *.d *.img *.elf *~
+ $(RM) *.o *.d *.img *.elf *~ *.a
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
new file mode 100644
index 0000000..1eaa0d8
--- /dev/null
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -0,0 +1,41 @@
+
+SLOF_DIR := $(SRC_PATH)/roms/SLOF
+
+NETOBJS := start.o sclp.o virtio.o netmain.o sbrk.o libc.a
+
+LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
+LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
+
+NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
+
+$(NETOBJS): CFLAGS += $(LIBC_INC) $(LIBNET_INC)
+
+s390-netboot.elf: $(NETOBJS)
+ $(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $(NETOBJS),"BUILD","$(TARGET_DIR)$@")
+
+s390-netboot.img: s390-netboot.elf
+ $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
+
+
+LIBCCMNDIR = $(SLOF_DIR)/lib/libc
+STRINGCMNDIR = $(LIBCCMNDIR)/string
+CTYPECMNDIR = $(LIBCCMNDIR)/ctype
+STDLIBCMNDIR = $(LIBCCMNDIR)/stdlib
+STDIOCMNDIR = $(LIBCCMNDIR)/stdio
+
+include $(STRINGCMNDIR)/Makefile.inc
+include $(CTYPECMNDIR)/Makefile.inc
+include $(STDLIBCMNDIR)/Makefile.inc
+include $(STDIOCMNDIR)/Makefile.inc
+
+STDIO_OBJS = sprintf.o vfprintf.o vsnprintf.o vsprintf.o fprintf.o \
+ printf.o putc.o puts.o putchar.o stdchnls.o fileno.o
+
+LIBCOBJS := $(STRING_OBJS) $(CTYPE_OBJS) $(STDLIB_OBJS) $(STDIO_OBJS)
+$(LIBCOBJS): CFLAGS += $(LIBC_INC) $(QEMU_CFLAGS)
+
+libc.a: $(LIBCOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
+
+sbrk.o: $(SLOF_DIR)/slof/sbrk.c
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(LIBC_INC) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
new file mode 100644
index 0000000..d604623
--- /dev/null
+++ b/pc-bios/s390-ccw/netmain.c
@@ -0,0 +1,137 @@
+/*
+ * S390 virtio-ccw network boot loading program
+ *
+ * Copyright 2017 Thomas Huth, Red Hat Inc.
+ *
+ * Based on the S390 virtio-ccw loading program (main.c)
+ * Copyright (c) 2013 Alexander Graf <agraf@suse.de>
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "s390-ccw.h"
+#include "virtio.h"
+
+extern char _start[];
+
+char stack[PAGE_SIZE * 8] __attribute__((aligned(PAGE_SIZE)));
+IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
+
+static SubChannelId net_schid = { .one = 1 };
+static uint64_t dest_timer;
+
+static uint64_t get_timer_ms(void)
+{
+ uint64_t clk;
+
+ asm volatile(" stck %0 " : : "Q"(clk) : "memory");
+
+ /* Bit 51 is incrememented each microsecond */
+ return (clk >> (63 - 51)) / 1000;
+}
+
+void set_timer(int val)
+{
+ dest_timer = get_timer_ms() + val;
+}
+
+int get_timer(void)
+{
+ return dest_timer - get_timer_ms();
+}
+
+int get_sec_ticks(void)
+{
+ return 1000; /* number of ticks in 1 second */
+}
+
+void panic(const char *string)
+{
+ sclp_print(string);
+ for (;;) {
+ disabled_wait();
+ }
+}
+
+static bool find_net_dev(Schib *schib, int dev_no)
+{
+ int i, r;
+
+ for (i = 0; i < 0x10000; i++) {
+ net_schid.sch_no = i;
+ r = stsch_err(net_schid, schib);
+ if (r == 3 || r == -EIO) {
+ break;
+ }
+ if (!schib->pmcw.dnv) {
+ continue;
+ }
+ if (!virtio_is_supported(net_schid)) {
+ continue;
+ }
+ if (virtio_get_device_type() != VIRTIO_ID_NET) {
+ continue;
+ }
+ if (dev_no < 0 || schib->pmcw.dev == dev_no) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static void virtio_setup(void)
+{
+ Schib schib;
+ int ssid;
+ bool found = false;
+ uint16_t dev_no;
+
+ /*
+ * We unconditionally enable mss support. In every sane configuration,
+ * this will succeed; and even if it doesn't, stsch_err() can deal
+ * with the consequences.
+ */
+ enable_mss_facility();
+
+ if (store_iplb(&iplb)) {
+ IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected");
+ dev_no = iplb.ccw.devno;
+ debug_print_int("device no. ", dev_no);
+ net_schid.ssid = iplb.ccw.ssid & 0x3;
+ debug_print_int("ssid ", net_schid.ssid);
+ found = find_net_dev(&schib, dev_no);
+ } else {
+ for (ssid = 0; ssid < 0x3; ssid++) {
+ net_schid.ssid = ssid;
+ found = find_net_dev(&schib, -1);
+ if (found) {
+ break;
+ }
+ }
+ }
+
+ IPL_assert(found && virtio_get_device_type() == VIRTIO_ID_NET,
+ "No virtio net device found");
+}
+
+void main(void)
+{
+ sclp_setup();
+ sclp_print("Network boot starting...\n");
+
+ virtio_setup();
+
+ panic("Failed to load OS from network\n");
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (8 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 14:32 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
` (2 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
The driver provides the recv() and send() functions which will
be required by SLOF's libnet code for receiving and sending
packets.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/netboot.mak | 2 +-
pc-bios/s390-ccw/virtio-net.c | 135 ++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/virtio.c | 5 ++
pc-bios/s390-ccw/virtio.h | 12 +++-
4 files changed, 151 insertions(+), 3 deletions(-)
create mode 100644 pc-bios/s390-ccw/virtio-net.c
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index 1eaa0d8..dd9119a 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,7 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
-NETOBJS := start.o sclp.o virtio.o netmain.o sbrk.o libc.a
+NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libc.a
LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
new file mode 100644
index 0000000..ff7f4da
--- /dev/null
+++ b/pc-bios/s390-ccw/virtio-net.c
@@ -0,0 +1,135 @@
+/*
+ * Virtio-net driver for the s390-ccw firmware
+ *
+ * Copyright 2017 Thomas Huth, Red Hat Inc.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <ethernet.h>
+#include "s390-ccw.h"
+#include "virtio.h"
+
+#ifndef DEBUG_VIRTIO_NET
+#define DEBUG_VIRTIO_NET 0
+#endif
+
+#define VIRTIO_NET_F_MAC_BIT (1 << 5)
+
+#define VQ_RX 0 /* Receive queue */
+#define VQ_TX 1 /* Transmit queue */
+
+struct VirtioNetHdr {
+ uint8_t flags;
+ uint8_t gso_type;
+ uint16_t hdr_len;
+ uint16_t gso_size;
+ uint16_t csum_start;
+ uint16_t csum_offset;
+ /*uint16_t num_buffers;*/ /* Only with VIRTIO_NET_F_MRG_RXBUF or VIRTIO1 */
+};
+typedef struct VirtioNetHdr VirtioNetHdr;
+
+static uint16_t rx_last_idx; /* Last index in receive queue "used" ring */
+
+int virtio_net_init(void *mac_addr)
+{
+ VDev *vdev = virtio_get_device();
+ VRing *rxvq = &vdev->vrings[VQ_RX];
+ void *buf;
+ int i;
+
+ 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");
+ memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
+
+ for (i = 0; i < 64; i++) {
+ buf = malloc(ETH_MTU_SIZE + sizeof(VirtioNetHdr));
+ IPL_assert(buf != NULL, "Can not allocate memory for receive buffers");
+ vring_send_buf(rxvq, buf, ETH_MTU_SIZE + sizeof(VirtioNetHdr),
+ VRING_DESC_F_WRITE);
+ }
+ vring_notify(rxvq);
+
+ return 0;
+}
+
+int send(int fd, const void *buf, int len, int flags)
+{
+ VirtioNetHdr tx_hdr;
+ VDev *vdev = virtio_get_device();
+ VRing *txvq = &vdev->vrings[VQ_TX];
+
+ /* Set up header - we do not use anything special, so simply clear it */
+ memset(&tx_hdr, 0, sizeof(tx_hdr));
+
+ vring_send_buf(txvq, &tx_hdr, sizeof(tx_hdr), VRING_DESC_F_NEXT);
+ vring_send_buf(txvq, (void *)buf, len, VRING_HIDDEN_IS_CHAIN);
+ while (!vr_poll(txvq)) {
+ yield();
+ }
+ if (drain_irqs(txvq->schid)) {
+ puts("send: drain irqs failed");
+ return -1;
+ }
+
+ return len;
+}
+
+int recv(int fd, void *buf, int maxlen, int flags)
+{
+ VDev *vdev = virtio_get_device();
+ VRing *rxvq = &vdev->vrings[VQ_RX];
+ int len, id;
+ uint8_t *pkt;
+
+ if (rx_last_idx == rxvq->used->idx) {
+ return 0;
+ }
+
+ len = rxvq->used->ring[rx_last_idx % rxvq->num].len - sizeof(VirtioNetHdr);
+ if (len > maxlen) {
+ puts("virtio-net: Receive buffer too small");
+ len = maxlen;
+ }
+ id = rxvq->used->ring[rx_last_idx % rxvq->num].id % rxvq->num;
+ pkt = (uint8_t *)(rxvq->desc[id].addr + sizeof(VirtioNetHdr));
+
+#if DEBUG_VIRTIO_NET /* Dump packet */
+ int i;
+ printf("\nbuf %p: len=%i\n", (void *)rxvq->desc[id].addr, len);
+ for (i = 0; i < 64; i++) {
+ printf(" %02x", pkt[i]);
+ if ((i % 16) == 15) {
+ printf("\n");
+ }
+ }
+ printf("\n");
+#endif
+
+ /* Copy data to destination buffer */
+ memcpy(buf, pkt, len);
+
+ /* Mark buffer as available to the host again */
+ rxvq->avail->ring[rxvq->avail->idx % rxvq->num] = id;
+ rxvq->avail->idx = rxvq->avail->idx + 1;
+ vring_notify(rxvq);
+
+ /* Move index to next entry */
+ rx_last_idx = rx_last_idx + 1;
+
+ return len;
+}
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 18fc5d1..c890a03 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -266,6 +266,11 @@ void virtio_setup_ccw(VDev *vdev)
run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0);
switch (vdev->senseid.cu_model) {
+ case VIRTIO_ID_NET:
+ vdev->nr_vqs = 2;
+ vdev->cmd_vr_idx = 0;
+ cfg_size = sizeof(vdev->config.net);
+ break;
case VIRTIO_ID_BLOCK:
vdev->nr_vqs = 1;
vdev->cmd_vr_idx = 0;
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index a00a320..19fceb6 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -11,8 +11,6 @@
#ifndef VIRTIO_H
#define VIRTIO_H
-#include "s390-ccw.h"
-
/* Status byte for guest to report progress, and synchronize features. */
/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
#define VIRTIO_CONFIG_S_ACKNOWLEDGE 1
@@ -227,6 +225,13 @@ struct ScsiDevice {
};
typedef struct ScsiDevice ScsiDevice;
+struct VirtioNetConfig {
+ uint8_t mac[6];
+ /* uint16_t status; */ /* Only with VIRTIO_NET_F_STATUS */
+ /* uint16_t max_virtqueue_pairs; */ /* Only with VIRTIO_NET_F_MQ */
+};
+typedef struct VirtioNetConfig VirtioNetConfig;
+
struct VDev {
int nr_vqs;
VRing *vrings;
@@ -239,6 +244,7 @@ struct VDev {
union {
VirtioBlkConfig blk;
VirtioScsiConfig scsi;
+ VirtioNetConfig net;
} config;
ScsiDevice *scsi_device;
bool is_cdrom;
@@ -273,4 +279,6 @@ int vring_wait_reply(void);
int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
void virtio_setup_ccw(VDev *vdev);
+int virtio_net_init(void *mac_addr);
+
#endif /* VIRTIO_H */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (9 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
@ 2017-07-11 13:56 ` Thomas Huth
2017-07-11 14:33 ` Cornelia Huck
2017-07-11 14:59 ` [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS no-reply
2017-07-12 8:33 ` Christian Borntraeger
12 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-11 13:56 UTC (permalink / raw)
To: qemu-devel, Christian Borntraeger, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
Most of the code has been taken from SLOF's netload.c file. Now we
can finally load an image via TFTP and execute the downloaded kernel.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/netboot.mak | 12 ++-
pc-bios/s390-ccw/netmain.c | 225 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 236 insertions(+), 1 deletion(-)
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index dd9119a..8c54b05 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,7 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
-NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libc.a
+NETOBJS := start.o sclp.o virtio.o virtio-net.o netmain.o sbrk.o libnet.a libc.a
LIBC_INC := -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
@@ -39,3 +39,13 @@ libc.a: $(LIBCOBJS)
sbrk.o: $(SLOF_DIR)/slof/sbrk.c
$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(LIBC_INC) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+LIBNETOBJS := args.o dhcp.o dns.o icmpv6.o ipv6.o tcp.o udp.o bootp.o \
+ dhcpv6.o ethernet.o ipv4.o ndp.o tftp.o
+LIBNETCFLAGS := $(QEMU_CFLAGS) $(LIBC_INC) $(LIBNET_INC)
+
+%.o : $(SLOF_DIR)/lib/libnet/%.c
+ $(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")
+
+libnet.a: $(LIBNETOBJS)
+ $(call quiet-command,$(AR) -rc $@ $^,"AR","$(TARGET_DIR)$@")
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
index d604623..3c785ac 100644
--- a/pc-bios/s390-ccw/netmain.c
+++ b/pc-bios/s390-ccw/netmain.c
@@ -6,6 +6,9 @@
* Based on the S390 virtio-ccw loading program (main.c)
* Copyright (c) 2013 Alexander Graf <agraf@suse.de>
*
+ * And based on the network loading code from SLOF (netload.c)
+ * Copyright (c) 2004, 2008 IBM Corporation
+ *
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
@@ -18,17 +21,29 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
+#include <tftp.h>
+#include <ethernet.h>
+#include <dhcp.h>
+#include <dhcpv6.h>
+#include <ipv4.h>
+#include <ipv6.h>
+#include <dns.h>
#include <time.h>
#include "s390-ccw.h"
#include "virtio.h"
+#define DEFAULT_BOOT_RETRIES 10
+#define DEFAULT_TFTP_RETRIES 20
+
extern char _start[];
char stack[PAGE_SIZE * 8] __attribute__((aligned(PAGE_SIZE)));
IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
static SubChannelId net_schid = { .one = 1 };
+static int ip_version = 4;
static uint64_t dest_timer;
static uint64_t get_timer_ms(void)
@@ -56,6 +71,208 @@ int get_sec_ticks(void)
return 1000; /* number of ticks in 1 second */
}
+/**
+ * Obtain IP and configuration info from DHCP server (either IPv4 or IPv6).
+ * @param fn_ip contains the following configuration information:
+ * client MAC, client IP, TFTP-server MAC, TFTP-server IP,
+ * boot file name
+ * @param retries Number of DHCP attempts
+ * @return 0 : IP and configuration info obtained;
+ * non-0 : error condition occurred.
+ */
+static int dhcp(struct filename_ip *fn_ip, int retries)
+{
+ int i = retries + 1;
+ int rc = -1;
+
+ printf(" Requesting information via DHCP: ");
+
+ dhcpv4_generate_transaction_id();
+ dhcpv6_generate_transaction_id();
+
+ do {
+ printf("\b\b\b%03d", i - 1);
+ if (!--i) {
+ printf("\nGiving up after %d DHCP requests\n", retries);
+ return -1;
+ }
+ ip_version = 4;
+ rc = dhcpv4(NULL, fn_ip);
+ if (rc == -1) {
+ ip_version = 6;
+ set_ipv6_address(fn_ip->fd, 0);
+ rc = dhcpv6(NULL, fn_ip);
+ if (rc == 0) {
+ memcpy(&fn_ip->own_ip6, get_ipv6_address(), 16);
+ break;
+ }
+ }
+ if (rc != -1) { /* either success or non-dhcp failure */
+ break;
+ }
+ } while (1);
+ printf("\b\b\b\bdone\n");
+
+ return rc;
+}
+
+/**
+ * Seed the random number generator with our mac and current timestamp
+ */
+static void seed_rng(uint8_t mac[])
+{
+ uint64_t seed;
+
+ asm volatile(" stck %0 " : : "Q"(seed) : "memory");
+ seed ^= (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5];
+ srand(seed);
+}
+
+static int tftp_load(filename_ip_t *fnip, void *buffer, int len,
+ unsigned int retries, int ip_vers)
+{
+ tftp_err_t tftp_err;
+ int rc;
+
+ rc = tftp(fnip, buffer, len, retries, &tftp_err, 1, 1428, ip_vers);
+
+ if (rc > 0) {
+ printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename,
+ rc / 1024);
+ } else if (rc == -1) {
+ puts("unknown TFTP error");
+ } else if (rc == -2) {
+ printf("TFTP buffer of %d bytes is too small for %s\n",
+ len, fnip->filename);
+ } else if (rc == -3) {
+ printf("file not found: %s\n", fnip->filename);
+ } else if (rc == -4) {
+ puts("TFTP access violation");
+ } else if (rc == -5) {
+ puts("illegal TFTP operation");
+ } else if (rc == -6) {
+ puts("unknown TFTP transfer ID");
+ } else if (rc == -7) {
+ puts("no such TFTP user");
+ } else if (rc == -8) {
+ puts("TFTP blocksize negotiation failed");
+ } else if (rc == -9) {
+ puts("file exceeds maximum TFTP transfer size");
+ } else if (rc <= -10 && rc >= -15) {
+ const char *icmp_err_str;
+ switch (rc) {
+ case -ICMP_NET_UNREACHABLE - 10:
+ icmp_err_str = "net unreachable";
+ break;
+ case -ICMP_HOST_UNREACHABLE - 10:
+ icmp_err_str = "host unreachable";
+ break;
+ case -ICMP_PROTOCOL_UNREACHABLE - 10:
+ icmp_err_str = "protocol unreachable";
+ break;
+ case -ICMP_PORT_UNREACHABLE - 10:
+ icmp_err_str = "port unreachable";
+ break;
+ case -ICMP_FRAGMENTATION_NEEDED - 10:
+ icmp_err_str = "fragmentation needed and DF set";
+ break;
+ case -ICMP_SOURCE_ROUTE_FAILED - 10:
+ icmp_err_str = "source route failed";
+ break;
+ default:
+ icmp_err_str = " UNKNOWN";
+ break;
+ }
+ printf("ICMP ERROR \"%s\"\n", icmp_err_str);
+ } else if (rc == -40) {
+ printf("TFTP error occurred after %d bad packets received",
+ tftp_err.bad_tftp_packets);
+ } else if (rc == -41) {
+ printf("TFTP error occurred after missing %d responses",
+ tftp_err.no_packets);
+ } else if (rc == -42) {
+ printf("TFTP error missing block %d, expected block was %d",
+ tftp_err.blocks_missed,
+ tftp_err.blocks_received);
+ }
+
+ return rc;
+}
+
+static int net_load(char *buffer, int len)
+{
+ filename_ip_t fn_ip;
+ uint8_t mac[6];
+ int rc;
+
+ memset(&fn_ip, 0, sizeof(filename_ip_t));
+
+ rc = virtio_net_init(mac);
+ if (rc < 0) {
+ puts("Could not initialize network device");
+ return -101;
+ }
+ fn_ip.fd = rc;
+
+ printf(" Using MAC address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+ set_mac_address(mac); /* init ethernet layer */
+ seed_rng(mac);
+
+ rc = dhcp(&fn_ip, DEFAULT_BOOT_RETRIES);
+ if (rc >= 0) {
+ if (ip_version == 4) {
+ set_ipv4_address(fn_ip.own_ip);
+ }
+ } else {
+ puts("Could not get IP address");
+ return -101;
+ }
+
+ if (ip_version == 4) {
+ printf(" Using IPv4 address: %d.%d.%d.%d\n",
+ (fn_ip.own_ip >> 24) & 0xFF, (fn_ip.own_ip >> 16) & 0xFF,
+ (fn_ip.own_ip >> 8) & 0xFF, fn_ip.own_ip & 0xFF);
+ } else if (ip_version == 6) {
+ char ip6_str[40];
+ ipv6_to_str(fn_ip.own_ip6.addr, ip6_str);
+ printf(" Using IPv6 address: %s\n", ip6_str);
+ }
+
+ if (rc == -2) {
+ printf("ARP request to TFTP server (%d.%d.%d.%d) failed\n",
+ (fn_ip.server_ip >> 24) & 0xFF, (fn_ip.server_ip >> 16) & 0xFF,
+ (fn_ip.server_ip >> 8) & 0xFF, fn_ip.server_ip & 0xFF);
+ return -102;
+ }
+ if (rc == -4 || rc == -3) {
+ puts("Can't obtain TFTP server IP address");
+ return -107;
+ }
+
+ if (ip_version == 4) {
+ printf(" Requesting file \"%s\" via TFTP from %d.%d.%d.%d\n",
+ fn_ip.filename,
+ (fn_ip.server_ip >> 24) & 0xFF, (fn_ip.server_ip >> 16) & 0xFF,
+ (fn_ip.server_ip >> 8) & 0xFF, fn_ip.server_ip & 0xFF);
+ } else if (ip_version == 6) {
+ char ip6_str[40];
+ printf(" Requesting file \"%s\" via TFTP from ", fn_ip.filename);
+ ipv6_to_str(fn_ip.server_ip6.addr, ip6_str);
+ printf("%s\n", ip6_str);
+ }
+
+ /* Do the TFTP load and print error message if necessary */
+ rc = tftp_load(&fn_ip, buffer, len, DEFAULT_TFTP_RETRIES, ip_version);
+
+ if (ip_version == 4) {
+ dhcp_send_release(fn_ip.fd);
+ }
+
+ return rc;
+}
+
void panic(const char *string)
{
sclp_print(string);
@@ -128,10 +345,18 @@ static void virtio_setup(void)
void main(void)
{
+ int rc;
+
sclp_setup();
sclp_print("Network boot starting...\n");
virtio_setup();
+ rc = net_load(NULL, (long)_start);
+ if (rc > 0) {
+ sclp_print("Network loading done, starting kernel...\n");
+ asm volatile (" lpsw 0(%0) " : : "r"(0) : "memory");
+ }
+
panic("Failed to load OS from network\n");
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h Thomas Huth
@ 2017-07-11 14:16 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-11 14:16 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On Tue, 11 Jul 2017 15:56:32 +0200
Thomas Huth <thuth@redhat.com> wrote:
> Looks like they have never beend used, so let's simply remove them.
s/beend/been/
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/virtio.h | 27 ---------------------------
> 1 file changed, 27 deletions(-)
Huh. At least their style had been fixed in the past ;)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation Thomas Huth
@ 2017-07-11 14:23 ` Cornelia Huck
2017-07-12 6:56 ` Thomas Huth
0 siblings, 1 reply; 22+ messages in thread
From: Cornelia Huck @ 2017-07-11 14:23 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On Tue, 11 Jul 2017 15:56:33 +0200
Thomas Huth <thuth@redhat.com> wrote:
> The upcoming virtio-net driver needs to negotiate some features,
> so we need the possibility to do this in the core virtio code.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/s390-ccw.h | 2 ++
> pc-bios/s390-ccw/virtio.c | 23 +++++++++++++++++------
> pc-bios/s390-ccw/virtio.h | 1 +
> 3 files changed, 20 insertions(+), 6 deletions(-)
> diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
> index d733780..a00a320 100644
> --- a/pc-bios/s390-ccw/virtio.h
> +++ b/pc-bios/s390-ccw/virtio.h
> @@ -251,6 +251,7 @@ struct VDev {
> ScsiDevice selected_scsi_device;
> uint64_t netboot_start_addr;
> uint32_t max_transfer;
> + uint32_t guest_features[2];
Just 'features' might have been a better name, but:
> };
> typedef struct VDev VDev;
>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
@ 2017-07-11 14:30 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-11 14:30 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On Tue, 11 Jul 2017 15:56:35 +0200
Thomas Huth <thuth@redhat.com> wrote:
> This is just a preparation for the next steps: Add a makefile and a
> stripped down copy of pc-bios/s390-ccw/main.c as a basis for the network
> bootloader program, linked against the libc from SLOF already (which we
> will need for SLOF's libnet). The networking code is not included yet.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/Makefile | 11 +++-
> pc-bios/s390-ccw/netboot.mak | 41 +++++++++++++
> pc-bios/s390-ccw/netmain.c | 137 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 187 insertions(+), 2 deletions(-)
> create mode 100644 pc-bios/s390-ccw/netboot.mak
> create mode 100644 pc-bios/s390-ccw/netmain.c
>
> diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
> new file mode 100644
> index 0000000..d604623
> --- /dev/null
> +++ b/pc-bios/s390-ccw/netmain.c
> @@ -0,0 +1,137 @@
(...)
> +static uint64_t get_timer_ms(void)
> +{
> + uint64_t clk;
> +
> + asm volatile(" stck %0 " : : "Q"(clk) : "memory");
> +
> + /* Bit 51 is incrememented each microsecond */
s/incrememented/incremented/
> + return (clk >> (63 - 51)) / 1000;
> +}
(...)
> +static bool find_net_dev(Schib *schib, int dev_no)
> +{
> + int i, r;
> +
> + for (i = 0; i < 0x10000; i++) {
> + net_schid.sch_no = i;
> + r = stsch_err(net_schid, schib);
> + if (r == 3 || r == -EIO) {
> + break;
> + }
> + if (!schib->pmcw.dnv) {
> + continue;
> + }
> + if (!virtio_is_supported(net_schid)) {
> + continue;
> + }
> + if (virtio_get_device_type() != VIRTIO_ID_NET) {
> + continue;
> + }
> + if (dev_no < 0 || schib->pmcw.dev == dev_no) {
> + return true;
> + }
> + }
> +
> + return false;
> +}
> +
> +static void virtio_setup(void)
> +{
> + Schib schib;
> + int ssid;
> + bool found = false;
> + uint16_t dev_no;
> +
> + /*
> + * We unconditionally enable mss support. In every sane configuration,
> + * this will succeed; and even if it doesn't, stsch_err() can deal
> + * with the consequences.
> + */
> + enable_mss_facility();
> +
> + if (store_iplb(&iplb)) {
> + IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, "IPL_TYPE_CCW expected");
> + dev_no = iplb.ccw.devno;
> + debug_print_int("device no. ", dev_no);
> + net_schid.ssid = iplb.ccw.ssid & 0x3;
> + debug_print_int("ssid ", net_schid.ssid);
> + found = find_net_dev(&schib, dev_no);
> + } else {
> + for (ssid = 0; ssid < 0x3; ssid++) {
> + net_schid.ssid = ssid;
> + found = find_net_dev(&schib, -1);
> + if (found) {
> + break;
> + }
> + }
> + }
> +
> + IPL_assert(found && virtio_get_device_type() == VIRTIO_ID_NET,
Is found && virtio_get_device_type() != VIRTIO_ID_NET even possible?
> + "No virtio net device found");
> +}
Anyway, otherwise
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
@ 2017-07-11 14:32 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-11 14:32 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On Tue, 11 Jul 2017 15:56:36 +0200
Thomas Huth <thuth@redhat.com> wrote:
> The driver provides the recv() and send() functions which will
> be required by SLOF's libnet code for receiving and sending
> packets.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/netboot.mak | 2 +-
> pc-bios/s390-ccw/virtio-net.c | 135 ++++++++++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/virtio.c | 5 ++
> pc-bios/s390-ccw/virtio.h | 12 +++-
> 4 files changed, 151 insertions(+), 3 deletions(-)
> create mode 100644 pc-bios/s390-ccw/virtio-net.c
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
@ 2017-07-11 14:33 ` Cornelia Huck
0 siblings, 0 replies; 22+ messages in thread
From: Cornelia Huck @ 2017-07-11 14:33 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On Tue, 11 Jul 2017 15:56:37 +0200
Thomas Huth <thuth@redhat.com> wrote:
> Most of the code has been taken from SLOF's netload.c file. Now we
> can finally load an image via TFTP and execute the downloaded kernel.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/netboot.mak | 12 ++-
> pc-bios/s390-ccw/netmain.c | 225 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 236 insertions(+), 1 deletion(-)
Still
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (10 preceding siblings ...)
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
@ 2017-07-11 14:59 ` no-reply
2017-07-12 8:33 ` Christian Borntraeger
12 siblings, 0 replies; 22+ messages in thread
From: no-reply @ 2017-07-11 14:59 UTC (permalink / raw)
To: thuth
Cc: famz, qemu-devel, borntraeger, cohuck, aik, mihajlov, alifm,
agraf, david
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 1499781397-19749-1-git-send-email-thuth@redhat.com
Type: series
Subject: [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))
done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
- [tag update] patchew/1499781397-19749-1-git-send-email-thuth@redhat.com -> patchew/1499781397-19749-1-git-send-email-thuth@redhat.com
* [new tag] patchew/1499783493-15911-1-git-send-email-stefanb@linux.vnet.ibm.com -> patchew/1499783493-15911-1-git-send-email-stefanb@linux.vnet.ibm.com
Switched to a new branch 'test'
dfcbff7 pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load
3d23b53 pc-bios/s390-ccw: Add virtio-net driver code
e902e4d pc-bios/s390-ccw: Add core files for the network bootloading program
ef33c9b roms/SLOF: Update submodule to latest status
a50b775 pc-bios/s390-ccw: Add code for virtio feature negotiation
3661080 pc-bios/s390-ccw: Remove unused structs from virtio.h
66831e3 pc-bios/s390-ccw: Move byteswap functions to a separate header
74c52d9 pc-bios/s390-ccw: Add a write() function for stdio
bf18612 pc-bios/s390-ccw: Move virtio-block related functions into a separate file
2e9282c pc-bios/s390-ccw: Move ebc2asc to sclp.c
842b66f pc-bios/s390-ccw: Move libc functions to separate header
=== OUTPUT BEGIN ===
Checking PATCH 1/11: pc-bios/s390-ccw: Move libc functions to separate header...
Checking PATCH 2/11: pc-bios/s390-ccw: Move ebc2asc to sclp.c...
Checking PATCH 3/11: pc-bios/s390-ccw: Move virtio-block related functions into a separate file...
Checking PATCH 4/11: pc-bios/s390-ccw: Add a write() function for stdio...
ERROR: externs should be avoided in .c files
#23: FILE: pc-bios/s390-ccw/sclp.c:15:
+long write(int fd, const void *str, size_t len);
total: 1 errors, 0 warnings, 37 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 5/11: pc-bios/s390-ccw: Move byteswap functions to a separate header...
Checking PATCH 6/11: pc-bios/s390-ccw: Remove unused structs from virtio.h...
Checking PATCH 7/11: pc-bios/s390-ccw: Add code for virtio feature negotiation...
Checking PATCH 8/11: roms/SLOF: Update submodule to latest status...
Checking PATCH 9/11: pc-bios/s390-ccw: Add core files for the network bootloading program...
ERROR: externs should be avoided in .c files
#121: FILE: pc-bios/s390-ccw/netmain.c:26:
+extern char _start[];
ERROR: externs should be avoided in .c files
#124: FILE: pc-bios/s390-ccw/netmain.c:29:
+IplParameterBlock iplb __attribute__((aligned(PAGE_SIZE)));
total: 2 errors, 0 warnings, 199 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 10/11: pc-bios/s390-ccw: Add virtio-net driver code...
Checking PATCH 11/11: pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load...
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation
2017-07-11 14:23 ` Cornelia Huck
@ 2017-07-12 6:56 ` Thomas Huth
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Huth @ 2017-07-12 6:56 UTC (permalink / raw)
To: Cornelia Huck
Cc: qemu-devel, Christian Borntraeger, Alexander Graf, Farhan Ali,
David Hildenbrand, Viktor Mihajlovski, Alexey Kardashevskiy
On 11.07.2017 16:23, Cornelia Huck wrote:
> On Tue, 11 Jul 2017 15:56:33 +0200
> Thomas Huth <thuth@redhat.com> wrote:
>
>> The upcoming virtio-net driver needs to negotiate some features,
>> so we need the possibility to do this in the core virtio code.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> pc-bios/s390-ccw/s390-ccw.h | 2 ++
>> pc-bios/s390-ccw/virtio.c | 23 +++++++++++++++++------
>> pc-bios/s390-ccw/virtio.h | 1 +
>> 3 files changed, 20 insertions(+), 6 deletions(-)
>
>
>> diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
>> index d733780..a00a320 100644
>> --- a/pc-bios/s390-ccw/virtio.h
>> +++ b/pc-bios/s390-ccw/virtio.h
>> @@ -251,6 +251,7 @@ struct VDev {
>> ScsiDevice selected_scsi_device;
>> uint64_t netboot_start_addr;
>> uint32_t max_transfer;
>> + uint32_t guest_features[2];
>
> Just 'features' might have been a better name, but:
I think it's clearer to call it guest_features ... in case we ever want
to store the host features, too.
>> };
>> typedef struct VDev VDev;
>>
>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Thanks!
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
` (11 preceding siblings ...)
2017-07-11 14:59 ` [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS no-reply
@ 2017-07-12 8:33 ` Christian Borntraeger
2017-07-12 10:53 ` Thomas Huth
12 siblings, 1 reply; 22+ messages in thread
From: Christian Borntraeger @ 2017-07-12 8:33 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
On 07/11/2017 03:56 PM, Thomas Huth wrote:
> It's already possible to do a network boot of an s390x guest with an
> external netboot image based on a Linux installation, but it would
> be much more convenient if the s390-ccw firmware supported network
> booting right out of the box, without the need to assemble such an
> external image first.
>
> This patch series now introduces a s390-netboot.img that can be used
> for network booting via DHCP and TFTP by re-using the networking stack
> from the SLOF firmware (see https://github.com/aik/SLOF/ for details),
> and adds a driver for virtio-net-ccw devices.
>
> The code can only be built if the roms/SLOF submodule has been checked
> out (there is a sanity check for this in the Makefile). Once it has
> been built, you can download a combined kernel + initrd image via TFTP
> by starting QEMU for example with:
>
> qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
> -netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img
>
> Note that this version does not support downloading via config
> files (i.e. pxelinux config files or .INS config files) yet. This
> will be added later.
>
> v4:
> - Cosmetic clean-ups according to the review feedback from v3
> - Fixed bug in the find_dev() function (spotted by Cornelia in v3)
> - Added an additional patch to remove some unused structs from
> virtio.h
>
> v3:
> - Adressed the review feedback from v2
> - The last remaining SLOF patch has now been merged (big thanks to
> Alexey!), so not sending this as RFC anymore - it is ready now for
> integration, I think.
>
> v2:
> - Put the network boot loader into a separate s390-netboot.img
> binary instead of linking it directly into the s390-ccw firmware.
> - Use the SLOF sources from the roms/SLOF/ submodule instead of
> copying them into the pc-bios/s390-ccw folder
> - Removed the .INS config file loading code for now - only support
> combined kernel + initrd images in this initial implementation.
>
> Thomas Huth (11):
> pc-bios/s390-ccw: Move libc functions to separate header
> pc-bios/s390-ccw: Move ebc2asc to sclp.c
> pc-bios/s390-ccw: Move virtio-block related functions into a separate
> file
> pc-bios/s390-ccw: Add a write() function for stdio
> pc-bios/s390-ccw: Move byteswap functions to a separate header
> pc-bios/s390-ccw: Remove unused structs from virtio.h
> pc-bios/s390-ccw: Add code for virtio feature negotiation
> roms/SLOF: Update submodule to latest status
> pc-bios/s390-ccw: Add core files for the network bootloading program
> pc-bios/s390-ccw: Add virtio-net driver code
> pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP
> load
>
> pc-bios/s390-ccw/Makefile | 13 +-
> pc-bios/s390-ccw/bootmap.c | 2 +
> pc-bios/s390-ccw/bootmap.h | 26 ---
> pc-bios/s390-ccw/bswap.h | 30 ++++
> pc-bios/s390-ccw/libc.h | 45 +++++
> pc-bios/s390-ccw/main.c | 14 +-
> pc-bios/s390-ccw/netboot.mak | 51 ++++++
> pc-bios/s390-ccw/netmain.c | 362 +++++++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/s390-ccw.h | 33 +---
> pc-bios/s390-ccw/sclp.c | 37 ++--
> pc-bios/s390-ccw/virtio-blkdev.c | 296 ++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/virtio-net.c | 135 +++++++++++++++
> pc-bios/s390-ccw/virtio-scsi.c | 1 +
> pc-bios/s390-ccw/virtio.c | 306 ++++-----------------------------
> pc-bios/s390-ccw/virtio.h | 46 ++---
> roms/SLOF | 2 +-
> 16 files changed, 1011 insertions(+), 388 deletions(-)
> create mode 100644 pc-bios/s390-ccw/bswap.h
> create mode 100644 pc-bios/s390-ccw/libc.h
> create mode 100644 pc-bios/s390-ccw/netboot.mak
> create mode 100644 pc-bios/s390-ccw/netmain.c
> create mode 100644 pc-bios/s390-ccw/virtio-blkdev.c
> create mode 100644 pc-bios/s390-ccw/virtio-net.c
>
Was going to apply but then I updated the slof thing but building fails. Not sure yet why.
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:13:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:15:17: error: expected ‘)’ before ‘ch’
int isdigit(int ch)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:15:5: error: expected expression before ‘)’ token
int isdigit(int ch)
^
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isprint.c:13:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isprint.c:15:17: error: expected ‘)’ before ‘ch’
int isprint(int ch)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isprint.c:15:5: error: expected expression before ‘)’ token
int isprint(int ch)
^
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isxdigit.c:13:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isxdigit.c:15:18: error: expected ‘)’ before ‘ch’
int isxdigit(int ch)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isxdigit.c:15:5: error: expected expression before ‘)’ token
int isxdigit(int ch)
^
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/tolower.c:13:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/tolower.c:15:5: error: expected identifier or ‘(’ before ‘__extension__’
int tolower(int c)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'isdigit.o' failed
make[1]: *** [isdigit.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'isprint.o' failed
make[1]: *** [isprint.o] Error 1
In file included from /usr/include/string.h:630:0,
from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strncmp.c:13:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strncmp.c:17:1: error: expected identifier or ‘(’ before ‘__extension__’
strncmp(const char *s1, const char *s2, size_t n)
^
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isspace.c:13:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isspace.c:15:17: error: expected ‘)’ before ‘ch’
int isspace(int ch)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isspace.c:15:5: error: expected expression before ‘)’ token
int isspace(int ch)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'isxdigit.o' failed
make[1]: *** [isxdigit.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'tolower.o' failed
make[1]: *** [tolower.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/Makefile.inc:22: recipe for target 'strncmp.o' failed
make[1]: *** [strncmp.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'isspace.o' failed
make[1]: *** [isspace.o] Error 1
In file included from /usr/include/string.h:630:0,
from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strcmp.c:13:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strcmp.c:17:1: error: expected identifier or ‘(’ before ‘__extension__’
strcmp(const char *s1, const char *s2)
^
In file included from /usr/include/string.h:630:0,
from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strchr.c:13:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strchr.c:16:1: error: expected identifier or ‘(’ before ‘__extension__’
strchr(const char *s, int c)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/strcmp.c:17:1: error: expected identifier or ‘(’ before ‘)’ token
strcmp(const char *s1, const char *s2)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/Makefile.inc:22: recipe for target 'strchr.o' failed
make[1]: *** [strchr.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/string/Makefile.inc:22: recipe for target 'strcmp.o' failed
make[1]: *** [strcmp.o] Error 1
In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/toupper.c:14:0:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/toupper.c:16:5: error: expected identifier or ‘(’ before ‘__extension__’
int toupper (int cha)
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/Makefile.inc:20: recipe for target 'toupper.o' failed
make[1]: *** [toupper.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/fileno.c: In function ‘fileno’:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/fileno.c:18:15: error: ‘FILE {aka struct _IO_FILE}’ has no member named ‘fd’
return stream->fd;
^~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/Makefile.inc:23: recipe for target 'fileno.o' failed
make[1]: *** [fileno.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/putc.c: In function ‘_IO_putc’:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/putc.c:21:18: error: ‘FILE {aka struct _IO_FILE}’ has no member named ‘fd’
if (write(stream->fd, &outchar, 1) == 1)
^~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/vfprintf.c: In function ‘vfprintf’:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/vfprintf.c:23:14: error: ‘FILE {aka struct _IO_FILE}’ has no member named ‘fd’
write(stream->fd, buffer, count);
^~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/Makefile.inc:23: recipe for target 'putc.o' failed
make[1]: *** [putc.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/Makefile.inc:23: recipe for target 'vfprintf.o' failed
make[1]: *** [vfprintf.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/puts.c: In function ‘puts’:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/puts.c:24:20: error: ‘struct _IO_FILE’ has no member named ‘fd’
ret = write(stdout->fd, str, strlen(str));
^~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/puts.c:25:14: error: ‘struct _IO_FILE’ has no member named ‘fd’
write(stdout->fd, "\r\n", 2);
^~
/home/cborntra/REPOS/qemu/pc-bios/s390-ccw/netmain.c:25:18: fatal error: tftp.h: No such file or directory
#include <tftp.h>
^
compilation terminated.
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/vsnprintf.c: In function ‘vsnprintf’:
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/vsnprintf.c:283:15: warning: implicit declaration of function ‘va_arg’ [-Wimplicit-function-declaration]
formstr, va_arg(arg, void *));
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/vsnprintf.c:283:27: error: expected expression before ‘void’
formstr, va_arg(arg, void *));
^~~~
/home/cborntra/REPOS/qemu/rules.mak:66: recipe for target 'netmain.o' failed
make[1]: *** [netmain.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/Makefile.inc:23: recipe for target 'puts.o' failed
make[1]: *** [puts.o] Error 1
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/Makefile.inc:23: recipe for target 'vsnprintf.o' failed
make[1]: *** [vsnprintf.o] Error 1
/home/cborntra/REPOS/qemu/pc-bios/s390-ccw/virtio-net.c:19:22: fatal error: ethernet.h: No such file or directory
#include <ethernet.h>
^
compilation terminated.
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:18:21: error: unknown field ‘fd’ specified in initializer
FILE stdin_data = { .fd = 0, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:18:30: error: unknown field ‘mode’ specified in initializer
FILE stdin_data = { .fd = 0, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:18:38: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
FILE stdin_data = { .fd = 0, .mode = _IOLBF, .pos = 0,
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:18:38: note: (near initialization for ‘stdin_data._IO_read_ptr’)
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:18:46: error: unknown field ‘pos’ specified in initializer
FILE stdin_data = { .fd = 0, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:19:7: error: unknown field ‘buf’ specified in initializer
.buf = stdin_buffer, .bufsiz = BUFSIZ };
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:19:28: error: unknown field ‘bufsiz’ specified in initializer
.buf = stdin_buffer, .bufsiz = BUFSIZ };
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:19:38: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.buf = stdin_buffer, .bufsiz = BUFSIZ };
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:19:38: note: (near initialization for ‘stdin_data._IO_write_base’)
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:20:22: error: unknown field ‘fd’ specified in initializer
FILE stdout_data = { .fd = 1, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:20:31: error: unknown field ‘mode’ specified in initializer
FILE stdout_data = { .fd = 1, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:20:39: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
FILE stdout_data = { .fd = 1, .mode = _IOLBF, .pos = 0,
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:20:39: note: (near initialization for ‘stdout_data._IO_read_ptr’)
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:20:47: error: unknown field ‘pos’ specified in initializer
FILE stdout_data = { .fd = 1, .mode = _IOLBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:21:8: error: unknown field ‘buf’ specified in initializer
.buf = stdout_buffer, .bufsiz = BUFSIZ };
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:21:30: error: unknown field ‘bufsiz’ specified in initializer
.buf = stdout_buffer, .bufsiz = BUFSIZ };
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:21:40: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
.buf = stdout_buffer, .bufsiz = BUFSIZ };
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:21:40: note: (near initialization for ‘stdout_data._IO_write_base’)
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:22:22: error: unknown field ‘fd’ specified in initializer
FILE stderr_data = { .fd = 2, .mode = _IONBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:22:31: error: unknown field ‘mode’ specified in initializer
FILE stderr_data = { .fd = 2, .mode = _IONBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:22:39: warning: initialization makes pointer from integer without a cast [-Wint-conversion]
FILE stderr_data = { .fd = 2, .mode = _IONBF, .pos = 0,
^~~~~~
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:22:39: note: (near initialization for ‘stderr_data._IO_read_ptr’)
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:22:47: error: unknown field ‘pos’ specified in initializer
FILE stderr_data = { .fd = 2, .mode = _IONBF, .pos = 0,
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:23:8: error: unknown field ‘buf’ specified in initializer
.buf = NULL, .bufsiz = 0 };
^
/home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/stdio/stdchnls.c:23:21: error: unknown field ‘bufsiz’ specified in initializer
.buf = NULL, .bufsiz = 0 };
^
/home/cborntra/REPOS/qemu/rules.mak:66: recipe for target 'virtio-net.o' failed
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
2017-07-12 8:33 ` Christian Borntraeger
@ 2017-07-12 10:53 ` Thomas Huth
2017-07-12 11:08 ` Viktor Mihajlovski
0 siblings, 1 reply; 22+ messages in thread
From: Thomas Huth @ 2017-07-12 10:53 UTC (permalink / raw)
To: Christian Borntraeger, qemu-devel, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand,
Viktor Mihajlovski, Alexey Kardashevskiy
On 12.07.2017 10:33, Christian Borntraeger wrote:
> On 07/11/2017 03:56 PM, Thomas Huth wrote:
>> It's already possible to do a network boot of an s390x guest with an
>> external netboot image based on a Linux installation, but it would
>> be much more convenient if the s390-ccw firmware supported network
>> booting right out of the box, without the need to assemble such an
>> external image first.
>>
>> This patch series now introduces a s390-netboot.img that can be used
>> for network booting via DHCP and TFTP by re-using the networking stack
>> from the SLOF firmware (see https://github.com/aik/SLOF/ for details),
>> and adds a driver for virtio-net-ccw devices.
>>
>> The code can only be built if the roms/SLOF submodule has been checked
>> out (there is a sanity check for this in the Makefile). Once it has
>> been built, you can download a combined kernel + initrd image via TFTP
>> by starting QEMU for example with:
>>
>> qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
>> -netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img
>>
>> Note that this version does not support downloading via config
>> files (i.e. pxelinux config files or .INS config files) yet. This
>> will be added later.
>>
>> v4:
>> - Cosmetic clean-ups according to the review feedback from v3
>> - Fixed bug in the find_dev() function (spotted by Cornelia in v3)
>> - Added an additional patch to remove some unused structs from
>> virtio.h
>>
>> v3:
>> - Adressed the review feedback from v2
>> - The last remaining SLOF patch has now been merged (big thanks to
>> Alexey!), so not sending this as RFC anymore - it is ready now for
>> integration, I think.
>>
>> v2:
>> - Put the network boot loader into a separate s390-netboot.img
>> binary instead of linking it directly into the s390-ccw firmware.
>> - Use the SLOF sources from the roms/SLOF/ submodule instead of
>> copying them into the pc-bios/s390-ccw folder
>> - Removed the .INS config file loading code for now - only support
>> combined kernel + initrd images in this initial implementation.
>>
>> Thomas Huth (11):
>> pc-bios/s390-ccw: Move libc functions to separate header
>> pc-bios/s390-ccw: Move ebc2asc to sclp.c
>> pc-bios/s390-ccw: Move virtio-block related functions into a separate
>> file
>> pc-bios/s390-ccw: Add a write() function for stdio
>> pc-bios/s390-ccw: Move byteswap functions to a separate header
>> pc-bios/s390-ccw: Remove unused structs from virtio.h
>> pc-bios/s390-ccw: Add code for virtio feature negotiation
>> roms/SLOF: Update submodule to latest status
>> pc-bios/s390-ccw: Add core files for the network bootloading program
>> pc-bios/s390-ccw: Add virtio-net driver code
>> pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP
>> load
>>
>> pc-bios/s390-ccw/Makefile | 13 +-
>> pc-bios/s390-ccw/bootmap.c | 2 +
>> pc-bios/s390-ccw/bootmap.h | 26 ---
>> pc-bios/s390-ccw/bswap.h | 30 ++++
>> pc-bios/s390-ccw/libc.h | 45 +++++
>> pc-bios/s390-ccw/main.c | 14 +-
>> pc-bios/s390-ccw/netboot.mak | 51 ++++++
>> pc-bios/s390-ccw/netmain.c | 362 +++++++++++++++++++++++++++++++++++++++
>> pc-bios/s390-ccw/s390-ccw.h | 33 +---
>> pc-bios/s390-ccw/sclp.c | 37 ++--
>> pc-bios/s390-ccw/virtio-blkdev.c | 296 ++++++++++++++++++++++++++++++++
>> pc-bios/s390-ccw/virtio-net.c | 135 +++++++++++++++
>> pc-bios/s390-ccw/virtio-scsi.c | 1 +
>> pc-bios/s390-ccw/virtio.c | 306 ++++-----------------------------
>> pc-bios/s390-ccw/virtio.h | 46 ++---
>> roms/SLOF | 2 +-
>> 16 files changed, 1011 insertions(+), 388 deletions(-)
>> create mode 100644 pc-bios/s390-ccw/bswap.h
>> create mode 100644 pc-bios/s390-ccw/libc.h
>> create mode 100644 pc-bios/s390-ccw/netboot.mak
>> create mode 100644 pc-bios/s390-ccw/netmain.c
>> create mode 100644 pc-bios/s390-ccw/virtio-blkdev.c
>> create mode 100644 pc-bios/s390-ccw/virtio-net.c
>>
>
> Was going to apply but then I updated the slof thing but building fails. Not sure yet why.
>
> In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:13:0:
> /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:15:17: error: expected ‘)’ before ‘ch’
> int isdigit(int ch)
What a bummer! Sorry, I've only cross-compiled the s390-ccw BIOS so far,
and that worked fine (since s390x machines are a little bit hard to get
here), but seems like there is still something ugly going on when you
build the code natively ... likely somethings wrong in the Makefile ...
I'll try to figure it out ...
Thomas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS
2017-07-12 10:53 ` Thomas Huth
@ 2017-07-12 11:08 ` Viktor Mihajlovski
0 siblings, 0 replies; 22+ messages in thread
From: Viktor Mihajlovski @ 2017-07-12 11:08 UTC (permalink / raw)
To: Thomas Huth, Christian Borntraeger, qemu-devel, Cornelia Huck
Cc: Alexander Graf, Farhan Ali, David Hildenbrand, Alexey Kardashevskiy
On 12.07.2017 12:53, Thomas Huth wrote:
> On 12.07.2017 10:33, Christian Borntraeger wrote:
>> On 07/11/2017 03:56 PM, Thomas Huth wrote:
>>> It's already possible to do a network boot of an s390x guest with an
>>> external netboot image based on a Linux installation, but it would
>>> be much more convenient if the s390-ccw firmware supported network
>>> booting right out of the box, without the need to assemble such an
>>> external image first.
>>>
>>> This patch series now introduces a s390-netboot.img that can be used
>>> for network booting via DHCP and TFTP by re-using the networking stack
>>> from the SLOF firmware (see https://github.com/aik/SLOF/ for details),
>>> and adds a driver for virtio-net-ccw devices.
>>>
>>> The code can only be built if the roms/SLOF submodule has been checked
>>> out (there is a sanity check for this in the Makefile). Once it has
>>> been built, you can download a combined kernel + initrd image via TFTP
>>> by starting QEMU for example with:
>>>
>>> qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
>>> -netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img
>>>
>>> Note that this version does not support downloading via config
>>> files (i.e. pxelinux config files or .INS config files) yet. This
>>> will be added later.
>>>
>>> v4:
>>> - Cosmetic clean-ups according to the review feedback from v3
>>> - Fixed bug in the find_dev() function (spotted by Cornelia in v3)
>>> - Added an additional patch to remove some unused structs from
>>> virtio.h
>>>
>>> v3:
>>> - Adressed the review feedback from v2
>>> - The last remaining SLOF patch has now been merged (big thanks to
>>> Alexey!), so not sending this as RFC anymore - it is ready now for
>>> integration, I think.
>>>
>>> v2:
>>> - Put the network boot loader into a separate s390-netboot.img
>>> binary instead of linking it directly into the s390-ccw firmware.
>>> - Use the SLOF sources from the roms/SLOF/ submodule instead of
>>> copying them into the pc-bios/s390-ccw folder
>>> - Removed the .INS config file loading code for now - only support
>>> combined kernel + initrd images in this initial implementation.
>>>
>>> Thomas Huth (11):
>>> pc-bios/s390-ccw: Move libc functions to separate header
>>> pc-bios/s390-ccw: Move ebc2asc to sclp.c
>>> pc-bios/s390-ccw: Move virtio-block related functions into a separate
>>> file
>>> pc-bios/s390-ccw: Add a write() function for stdio
>>> pc-bios/s390-ccw: Move byteswap functions to a separate header
>>> pc-bios/s390-ccw: Remove unused structs from virtio.h
>>> pc-bios/s390-ccw: Add code for virtio feature negotiation
>>> roms/SLOF: Update submodule to latest status
>>> pc-bios/s390-ccw: Add core files for the network bootloading program
>>> pc-bios/s390-ccw: Add virtio-net driver code
>>> pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP
>>> load
>>>
>>> pc-bios/s390-ccw/Makefile | 13 +-
>>> pc-bios/s390-ccw/bootmap.c | 2 +
>>> pc-bios/s390-ccw/bootmap.h | 26 ---
>>> pc-bios/s390-ccw/bswap.h | 30 ++++
>>> pc-bios/s390-ccw/libc.h | 45 +++++
>>> pc-bios/s390-ccw/main.c | 14 +-
>>> pc-bios/s390-ccw/netboot.mak | 51 ++++++
>>> pc-bios/s390-ccw/netmain.c | 362 +++++++++++++++++++++++++++++++++++++++
>>> pc-bios/s390-ccw/s390-ccw.h | 33 +---
>>> pc-bios/s390-ccw/sclp.c | 37 ++--
>>> pc-bios/s390-ccw/virtio-blkdev.c | 296 ++++++++++++++++++++++++++++++++
>>> pc-bios/s390-ccw/virtio-net.c | 135 +++++++++++++++
>>> pc-bios/s390-ccw/virtio-scsi.c | 1 +
>>> pc-bios/s390-ccw/virtio.c | 306 ++++-----------------------------
>>> pc-bios/s390-ccw/virtio.h | 46 ++---
>>> roms/SLOF | 2 +-
>>> 16 files changed, 1011 insertions(+), 388 deletions(-)
>>> create mode 100644 pc-bios/s390-ccw/bswap.h
>>> create mode 100644 pc-bios/s390-ccw/libc.h
>>> create mode 100644 pc-bios/s390-ccw/netboot.mak
>>> create mode 100644 pc-bios/s390-ccw/netmain.c
>>> create mode 100644 pc-bios/s390-ccw/virtio-blkdev.c
>>> create mode 100644 pc-bios/s390-ccw/virtio-net.c
>>>
>>
>> Was going to apply but then I updated the slof thing but building fails. Not sure yet why.
>>
>> In file included from /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:13:0:
>> /home/cborntra/REPOS/qemu/roms/SLOF/lib/libc/ctype/isdigit.c:15:17: error: expected ‘)’ before ‘ch’
>> int isdigit(int ch)
>
> What a bummer! Sorry, I've only cross-compiled the s390-ccw BIOS so far,
> and that worked fine (since s390x machines are a little bit hard to get
> here), but seems like there is still something ugly going on when you
> build the code natively ... likely somethings wrong in the Makefile ...
> I'll try to figure it out ...
>
> Thomas
>
I haven't tried recently, but you could consider using one of these here
https://developer.ibm.com/linuxone/
--
Mit freundlichen Grüßen/Kind Regards
Viktor Mihajlovski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martina Köderitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2017-07-12 11:08 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-11 13:56 [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 01/11] pc-bios/s390-ccw: Move libc functions to separate header Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 02/11] pc-bios/s390-ccw: Move ebc2asc to sclp.c Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 03/11] pc-bios/s390-ccw: Move virtio-block related functions into a separate file Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 04/11] pc-bios/s390-ccw: Add a write() function for stdio Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 05/11] pc-bios/s390-ccw: Move byteswap functions to a separate header Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 06/11] pc-bios/s390-ccw: Remove unused structs from virtio.h Thomas Huth
2017-07-11 14:16 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 07/11] pc-bios/s390-ccw: Add code for virtio feature negotiation Thomas Huth
2017-07-11 14:23 ` Cornelia Huck
2017-07-12 6:56 ` Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 08/11] roms/SLOF: Update submodule to latest status Thomas Huth
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 09/11] pc-bios/s390-ccw: Add core files for the network bootloading program Thomas Huth
2017-07-11 14:30 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 10/11] pc-bios/s390-ccw: Add virtio-net driver code Thomas Huth
2017-07-11 14:32 ` Cornelia Huck
2017-07-11 13:56 ` [Qemu-devel] [PATCH v4 11/11] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load Thomas Huth
2017-07-11 14:33 ` Cornelia Huck
2017-07-11 14:59 ` [Qemu-devel] [PATCH v4 00/11] Implement network booting in the s390-ccw BIOS no-reply
2017-07-12 8:33 ` Christian Borntraeger
2017-07-12 10:53 ` Thomas Huth
2017-07-12 11:08 ` Viktor Mihajlovski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.