Commit 120d0410 authored by Jason J. Herne's avatar Jason J. Herne Committed by Thomas Huth
Browse files

s390-bios: Decouple channel i/o logic from virtio 



Create a separate library for channel i/o related code. This decouples
channel i/o operations from virtio and allows us to make use of them for
the real dasd boot path.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1554388475-18329-6-git-send-email-jjherne@linux.ibm.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent d96c5db7

pc-bios/s390-ccw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) 
.PHONY : all clean build-all



OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \

	  virtio.o virtio-scsi.o virtio-blkdev.o libc.o

	  virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o



QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))

QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float

pc-bios/s390-ccw/cio.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * S390 Channel I/O

 *

 * Copyright (c) 2013 Alexander Graf <agraf@suse.de>

 * Copyright (c) 2019 IBM Corp.

 *

 * Author(s): Jason J. Herne <jjherne@us.ibm.com>

 *

 * 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 "cio.h"



static char chsc_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE)));



int enable_mss_facility(void)

{

    int ret;

    ChscAreaSda *sda_area = (ChscAreaSda *) chsc_page;



    memset(sda_area, 0, PAGE_SIZE);

    sda_area->request.length = 0x0400;

    sda_area->request.code = 0x0031;

    sda_area->operation_code = 0x2;



    ret = chsc(sda_area);

    if ((ret == 0) && (sda_area->response.code == 0x0001)) {

        return 0;

    }

    return -EIO;

}



void enable_subchannel(SubChannelId schid)

{

    Schib schib;



    stsch_err(schid, &schib);

    schib.pmcw.ena = 1;

    msch(schid, &schib);

}

pc-bios/s390-ccw/cio.h

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ typedef struct irb { 
    __u32 emw[8];

}  __attribute__ ((packed, aligned(4))) Irb;



int enable_mss_facility(void);

void enable_subchannel(SubChannelId schid);



/*

 * Some S390 specific IO instructions as inline

 */

pc-bios/s390-ccw/main.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include "libc.h"

#include "s390-ccw.h"

#include "cio.h"

#include "virtio.h"



char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));

pc-bios/s390-ccw/netboot.mak

+1 −1
Original line number Diff line number Diff line 


SLOF_DIR := $(SRC_PATH)/roms/SLOF



NETOBJS := start.o sclp.o virtio.o virtio-net.o jump2ipl.o netmain.o \

NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o \

	   libnet.a libc.a



LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include