OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

* Source code clean-ups from Janosch

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAl79rzERHHRodXRoQHJl
 ZGhhdC5jb20ACgkQLtnXdP5wLbXSFhAAqQ03oBsvD3vBG+m9vvyGlmCCRuv1OTLl
 07DWNHV6X91Lhi5L7mCsTK8wImfx2nPSkRyXNIjjaHI66zCzhcG3cCPXO0OZphKO
 IFIlc2IlHQc+pO65pmeAW86xUeKSQVpeK5G9oV9Yr0UJc5jaCH7YWlhZXZ6LgWfC
 zAvGBOQM3pxyq2GMZOGVhDmSfaZq277/coesyUwbt/RmpOsT1allmShbyJ/5YCxj
 1ZUDCyGXmy0Q74bCMGjk5TsqrtANWXHi+r87fGr6Bg0kYZcTwcxO763xRVuRoTj0
 IjiFPLYq8ku/C/8GNCIPHKdbG1Ll3mlVdKJwgoniEXwg2ReCemIw6DbGk+x6HGKn
 Tb8p4yN1Tb9/wx8D85axij2NFTAoMVW4cdh04jkUscGM+u0E2xpbb7pxgnFVmZnt
 l95ZxRT1mGjcUD40Dvf3pHema9wzwLwP9Z8FPWcGdHVclyzn4r2SgTAL8CV6G480
 qJ8y4eRKTtqo/+LDsxYYvePO5tczVRlzGKHDXbX4z8/9XDi5Z+oN1FrOXalTrtrx
 7m0BrgTsjSedkSrg9TtyHwTjU3NwgxLsd0aUNadVMdcekrNRYOka0zr18u5j25n3
 hlwn2jHIshWtsKIBRmq+R+6nWUeTkBYhzjUcA1w04CL7ZvMkZ0TmLTFctwRUqUe3
 Vjya+yQNzEk=
 =hV+t
 -----END PGP SIGNATURE-----

Merge tag 's390-ccw-bios-2020-07-02' into s390-next-staging

* Source code clean-ups from Janosch

# gpg: Signature made Thu 02 Jul 2020 11:56:01 AM CEST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]

* tag 's390-ccw-bios-2020-07-02':
  pc-bios/s390: Update s390-ccw bios binaries with the latest changes
  pc-bios/s390-ccw: Generate and include dependency files in the Makefile
  pc-bios: s390x: Make u32 ptr check explicit
  pc-bios: s390x: Use ebcdic2ascii table
  pc-bios: s390x: Move panic() into header and add infinite loop
  pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR
  pc-bios: s390x: Rename PSW_MASK_ZMODE to PSW_MASK_64
  pc-bios: s390x: Get rid of magic offsets into the lowcore
  pc-bios: s390x: Move sleep and yield to helper.h
  pc-bios: s390x: Consolidate timing functions into time.h
  pc-bios: s390x: cio.c cleanup and compile fix

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2020-07-03 11:16:46 +02:00
commit f196f6a8c7
19 changed files with 116 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pc-bios/s390-ccw.img
View File

Binary file not shown.

3
pc-bios/s390-ccw/Makefile
View File

@ -38,5 +38,8 @@ s390-netboot.img:
@echo "s390-netboot.img not built since roms/SLOF/ is not available."
endif
ALL_OBJS = $(sort $(OBJECTS) $(NETOBJS) $(LIBCOBJS) $(LIBNETOBJS))
-include $(ALL_OBJS:%.o=%.d)
clean:
rm -f *.o *.d *.img *.elf *~ *.a

4
pc-bios/s390-ccw/bootmap.c
View File

@ -328,9 +328,7 @@ static void print_eckd_ldl_msg(ECKD_IPL_mode_t mode)
msg[0] = '2';
break;
default:
msg[0] = vlbl->LDL_version;
msg[0] &= 0x0f; /* convert EBCDIC */
msg[0] |= 0x30; /* to ASCII (digit) */
msg[0] = ebc2asc[vlbl->LDL_version];
msg[1] = '?';
break;
}

40
pc-bios/s390-ccw/cio.c
View File

@ -49,13 +49,13 @@ void enable_subchannel(SubChannelId schid)
uint16_t cu_type(SubChannelId schid)
{
Ccw1 sense_id_ccw;
SenseId sense_data;
sense_id_ccw.cmd_code = CCW_CMD_SENSE_ID;
sense_id_ccw.cda = ptr2u32(&sense_data);
sense_id_ccw.count = sizeof(sense_data);
sense_id_ccw.flags |= CCW_FLAG_SLI;
Ccw1 sense_id_ccw = {
.cmd_code = CCW_CMD_SENSE_ID,
.flags = CCW_FLAG_SLI,
.count = sizeof(sense_data),
.cda = ptr2u32(&sense_data),
};
if (do_cio(schid, CU_TYPE_UNKNOWN, ptr2u32(&sense_id_ccw), CCW_FMT1)) {
panic("Failed to run SenseID CCw\n");
@ -67,13 +67,13 @@ uint16_t cu_type(SubChannelId schid)
int basic_sense(SubChannelId schid, uint16_t cutype, void *sense_data,
uint16_t data_size)
{
Ccw1 senseCcw;
Ccw1 senseCcw = {
.cmd_code = CCW_CMD_BASIC_SENSE,
.count = data_size,
.cda = ptr2u32(sense_data),
};
Irb irb;
senseCcw.cmd_code = CCW_CMD_BASIC_SENSE;
senseCcw.cda = ptr2u32(sense_data);
senseCcw.count = data_size;
return __do_cio(schid, ptr2u32(&senseCcw), CCW_FMT1, &irb);
}
@ -314,7 +314,17 @@ static void print_irb_err(Irb *irb)
*/
static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
{
CmdOrb orb = {};
/*
* QEMU's CIO implementation requires prefetch and 64-bit idaws. We
* allow all paths.
*/
CmdOrb orb = {
.fmt = fmt,
.pfch = 1,
.c64 = 1,
.lpm = 0xFF,
.cpa = ccw_addr,
};
int rc;
IPL_assert(fmt == 0 || fmt == 1, "Invalid ccw format");
@ -324,12 +334,6 @@ static int __do_cio(SubChannelId schid, uint32_t ccw_addr, int fmt, Irb *irb)
IPL_assert(ccw_addr <= 0xFFFFFF - 8, "Invalid ccw address");
}
orb.fmt = fmt;
orb.pfch = 1; /* QEMU's cio implementation requires prefetch */
orb.c64 = 1; /* QEMU's cio implementation requires 64-bit idaws */
orb.lpm = 0xFF; /* All paths allowed */
orb.cpa = ccw_addr;
rc = ssch(schid, &orb);
if (rc == 1 || rc == 2) {
/* Subchannel status pending or busy. Eat status and ask for retry. */

17
pc-bios/s390-ccw/cio.h
View File

@ -122,12 +122,17 @@ typedef struct schib {
} __attribute__ ((packed, aligned(4))) Schib;
typedef struct subchannel_id {
__u32 cssid:8;
__u32:4;
__u32 m:1;
__u32 ssid:2;
__u32 one:1;
__u32 sch_no:16;
union {
struct {
__u16 cssid:8;
__u16 reserved:4;
__u16 m:1;
__u16 ssid:2;
__u16 one:1;
};
__u16 sch_id;
};
__u16 sch_no;
} __attribute__ ((packed, aligned(4))) SubChannelId;
struct chsc_header {

19
pc-bios/s390-ccw/helper.h
View File

@ -14,11 +14,12 @@
#define S390_CCW_HELPER_H
#include "s390-ccw.h"
#include "s390-time.h"
/* Avoids compiler warnings when casting a pointer to a u32 */
static inline uint32_t ptr2u32(void *ptr)
{
IPL_assert((uint64_t)ptr <= 0xffffffff, "ptr2u32: ptr too large");
IPL_assert((uint64_t)ptr <= 0xffffffffull, "ptr2u32: ptr too large");
return (uint32_t)(uint64_t)ptr;
}
@ -28,4 +29,20 @@ static inline void *u32toptr(uint32_t n)
return (void *)(uint64_t)n;
}
static inline void yield(void)
{
asm volatile ("diag 0,0,0x44"
: :
: "memory", "cc");
}
static inline void sleep(unsigned int seconds)
{
ulong target = get_time_seconds() + seconds;
while (get_time_seconds() < target) {
yield();
}
}
#endif

10
pc-bios/s390-ccw/jump2ipl.c
View File

@ -8,12 +8,10 @@
#include "libc.h"
#include "s390-ccw.h"
#include "s390-arch.h"
#define KERN_IMAGE_START 0x010000UL
#define PSW_MASK_64 0x0000000100000000ULL
#define PSW_MASK_32 0x0000000080000000ULL
#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_32 | PSW_MASK_64)
#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_64)
typedef struct ResetInfo {
uint64_t ipl_psw;
@ -54,7 +52,7 @@ void jump_to_IPL_code(uint64_t address)
current->ipl_psw = (uint64_t) &jump_to_IPL_2;
current->ipl_psw |= RESET_PSW_MASK;
current->ipl_continue = address & 0x7fffffff;
current->ipl_continue = address & PSW_MASK_SHORT_ADDR;
debug_print_int("set IPL addr to", current->ipl_continue);
@ -86,7 +84,7 @@ void jump_to_low_kernel(void)
/* Trying to get PSW at zero address */
if (*((uint64_t *)0) & RESET_PSW_MASK) {
jump_to_IPL_code((*((uint64_t *)0)) & 0x7fffffff);
jump_to_IPL_code((*((uint64_t *)0)) & PSW_MASK_SHORT_ADDR);
}
/* No other option left, so use the Linux kernel start address */

15
pc-bios/s390-ccw/main.c
View File

@ -36,11 +36,9 @@ LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */
*/
void write_subsystem_identification(void)
{
SubChannelId *schid = (SubChannelId *) 184;
uint32_t *zeroes = (uint32_t *) 188;
*schid = blk_schid;
*zeroes = 0;
lowcore->subchannel_id = blk_schid.sch_id;
lowcore->subchannel_nr = blk_schid.sch_no;
lowcore->io_int_parm = 0;
}
void write_iplb_location(void)
@ -48,13 +46,6 @@ void write_iplb_location(void)
lowcore->ptr_iplb = ptr2u32(&iplb);
}
void panic(const char *string)
{
sclp_print(string);
disabled_wait();
while (1) { }
}
unsigned int get_loadparm_index(void)
{
return atoui(loadparm_str);

1
pc-bios/s390-ccw/menu.c
View File

@ -12,6 +12,7 @@
#include "libc.h"
#include "s390-ccw.h"
#include "sclp.h"
#include "s390-time.h"
#define KEYCODE_NO_INP '\0'
#define KEYCODE_ESCAPE '\033'

13
pc-bios/s390-ccw/netboot.mak
View File

@ -1,8 +1,7 @@
SLOF_DIR := $(SRC_PATH)/roms/SLOF
NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \
libnet.a libc.a
NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
@ -11,15 +10,16 @@ NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
s390-netboot.elf: $(NETOBJS)
$(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $(NETOBJS),"BUILD","$(TARGET_DIR)$@")
s390-netboot.elf: $(NETOBJS) libnet.a libc.a
$(call quiet-command,$(CC) $(NETLDFLAGS) -o $@ $^,"BUILD","$(TARGET_DIR)$@")
s390-netboot.img: s390-netboot.elf
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
# libc files:
LIBC_CFLAGS := $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC)
LIBC_CFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
-MMD -MP -MT $@ -MF $(@:%.o=%.d)
CTYPE_OBJS = isdigit.o isxdigit.o toupper.o
%.o : $(SLOF_DIR)/lib/libc/ctype/%.c
@ -52,7 +52,8 @@ libc.a: $(LIBCOBJS)
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 pxelinux.o
LIBNETCFLAGS := $(QEMU_CFLAGS) $(CFLAGS) -DDHCPARCH=0x1F $(LIBC_INC) $(LIBNET_INC)
LIBNETCFLAGS = $(QEMU_CFLAGS) $(CFLAGS) $(LIBC_INC) $(LIBNET_INC) \
-DDHCPARCH=0x1F -MMD -MP -MT $@ -MF $(@:%.o=%.d)
%.o : $(SLOF_DIR)/lib/libnet/%.c
$(call quiet-command,$(CC) $(LIBNETCFLAGS) -c -o $@ $<,"CC","$(TARGET_DIR)$@")

23
pc-bios/s390-ccw/netmain.c
View File

@ -35,6 +35,7 @@
#include "s390-ccw.h"
#include "cio.h"
#include "virtio.h"
#include "s390-time.h"
#define DEFAULT_BOOT_RETRIES 10
#define DEFAULT_TFTP_RETRIES 20
@ -57,24 +58,14 @@ static SubChannelId net_schid = { .one = 1 };
static uint8_t mac[6];
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 incremented each microsecond */
return (clk >> (63 - 51)) / 1000;
}
void set_timer(int val)
{
dest_timer = get_timer_ms() + val;
dest_timer = get_time_ms() + val;
}
int get_timer(void)
{
return dest_timer - get_timer_ms();
return dest_timer - get_time_ms();
}
int get_sec_ticks(void)
@ -448,14 +439,6 @@ static int net_try_direct_tftp_load(filename_ip_t *fn_ip)
return rc;
}
void panic(const char *string)
{
sclp_print(string);
for (;;) {
disabled_wait();
}
}
void write_subsystem_identification(void)
{
SubChannelId *schid = (SubChannelId *) 184;

4
pc-bios/s390-ccw/s390-arch.h
View File

@ -26,10 +26,12 @@ _Static_assert(sizeof(struct PSWLegacy) == 8, "PSWLegacy size incorrect");
/* s390 psw bit masks */
#define PSW_MASK_IOINT 0x0200000000000000ULL
#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
#define PSW_MASK_WAIT 0x0002000000000000ULL
#define PSW_MASK_EAMODE 0x0000000100000000ULL
#define PSW_MASK_BAMODE 0x0000000080000000ULL
#define PSW_MASK_ZMODE (PSW_MASK_EAMODE | PSW_MASK_BAMODE)
#define PSW_MASK_SHORT_ADDR 0x000000007fffffffULL
#define PSW_MASK_64 (PSW_MASK_EAMODE | PSW_MASK_BAMODE)
/* Low core mapping */
typedef struct LowCore {

27
pc-bios/s390-ccw/s390-ccw.h
View File

@ -50,12 +50,11 @@ typedef unsigned long long __u64;
#include "iplb.h"
/* start.s */
void disabled_wait(void);
void disabled_wait(void) __attribute__ ((__noreturn__));
void consume_sclp_int(void);
void consume_io_int(void);
/* main.c */
void panic(const char *string);
void write_subsystem_identification(void);
void write_iplb_location(void);
extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
@ -74,8 +73,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
bool virtio_is_supported(SubChannelId schid);
void virtio_blk_setup_device(SubChannelId schid);
int virtio_read(ulong sector, void *load_addr);
u64 get_clock(void);
ulong get_second(void);
/* bootmap.c */
void zipl_load(void);
@ -93,6 +90,12 @@ bool menu_is_enabled_enum(void);
#define MAX_BOOT_ENTRIES 31
static inline void panic(const char *string)
{
sclp_print(string);
disabled_wait();
}
static inline void fill_hex(char *out, unsigned char val)
{
const char hex[] = "0123456789abcdef";
@ -144,24 +147,8 @@ static inline void debug_print_addr(const char *desc, void *p)
#define KVM_S390_VIRTIO_SET_STATUS 2
#define KVM_S390_VIRTIO_CCW_NOTIFY 3
static inline void yield(void)
{
asm volatile ("diag 0,0,0x44"
: :
: "memory", "cc");
}
#define MAX_SECTOR_SIZE 4096
static inline void sleep(unsigned int seconds)
{
ulong target = get_second() + seconds;
while (get_second() < target) {
yield();
}
}
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {

23
pc-bios/s390-ccw/s390-time.h Normal file
View File

@ -0,0 +1,23 @@
#ifndef TIME_H
#define TIME_H
static inline u64 get_clock(void)
{
u64 r;
asm volatile("stck %0" : "=Q" (r) : : "cc");
return r;
}
static inline u64 get_time_ms(void)
{
/* Bit 51 is incremented each microsecond */
return (get_clock() >> 12) / 1000;
}
static inline u64 get_time_seconds(void)
{
return get_time_ms() / 1000;
}
#endif

5
pc-bios/s390-ccw/start.S
View File

@ -47,8 +47,9 @@ memsetxc:
*/
.globl disabled_wait
disabled_wait:
larl %r1,disabled_wait_psw
lpswe 0(%r1)
larl %r1,disabled_wait_psw
lpswe 0(%r1)
1: j 1b
/*

2
pc-bios/s390-ccw/virtio-net.c
View File

@ -19,6 +19,8 @@
#include <ethernet.h>
#include "s390-ccw.h"
#include "virtio.h"
#include "s390-time.h"
#include "helper.h"
#ifndef DEBUG_VIRTIO_NET
#define DEBUG_VIRTIO_NET 0

2
pc-bios/s390-ccw/virtio-scsi.c
View File

@ -14,6 +14,8 @@
#include "virtio.h"
#include "scsi.h"
#include "virtio-scsi.h"
#include "s390-time.h"
#include "helper.h"
static ScsiDevice default_scsi_device;
static VirtioScsiCmdReq req;

18
pc-bios/s390-ccw/virtio.c
View File

@ -15,6 +15,7 @@
#include "virtio-scsi.h"
#include "bswap.h"
#include "helper.h"
#include "s390-time.h"
#define VRING_WAIT_REPLY_TIMEOUT 30
@ -157,19 +158,6 @@ void vring_send_buf(VRing *vr, void *p, int len, int flags)
}
}
u64 get_clock(void)
{
u64 r;
asm volatile("stck %0" : "=Q" (r) : : "cc");
return r;
}
ulong get_second(void)
{
return (get_clock() >> 12) / 1000000;
}
int vr_poll(VRing *vr)
{
if (vr->used->idx == vr->used_idx) {
@ -194,7 +182,7 @@ int vr_poll(VRing *vr)
*/
int vring_wait_reply(void)
{
ulong target_second = get_second() + vdev.wait_reply_timeout;
ulong target_second = get_time_seconds() + vdev.wait_reply_timeout;
/* Wait for any queue to be updated by the host */
do {
@ -207,7 +195,7 @@ int vring_wait_reply(void)
if (r) {
return 0;
}
} while (!vdev.wait_reply_timeout || (get_second() < target_second));
} while (!vdev.wait_reply_timeout || (get_time_seconds() < target_second));
return 1;
}

BIN
pc-bios/s390-netboot.img
View File

Binary file not shown.