Commit 21d0bafb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200703' into staging 



s390 update:
- various fixes
- cleanup in the s390x-ccw bios

# gpg: Signature made Fri 03 Jul 2020 11:04:08 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [marginal]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20200703:
  s390x/pci: fix set_ind_atomic
  virtio-ccw: fix virtio_set_ind_atomic
  target/s390x: Fix SQXBR
  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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7b751570 f196f6a8

hw/s390x/s390-pci-bus.c

+9 −7
Original line number Diff line number Diff line
@@ -637,22 +637,24 @@ static AddressSpace *s390_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn) 


static uint8_t set_ind_atomic(uint64_t ind_loc, uint8_t to_be_set)

{

    uint8_t ind_old, ind_new;

    uint8_t expected, actual;

    hwaddr len = 1;

    uint8_t *ind_addr;

    /* avoid  multiple fetches */

    uint8_t volatile *ind_addr;



    ind_addr = cpu_physical_memory_map(ind_loc, &len, true);

    if (!ind_addr) {

        s390_pci_generate_error_event(ERR_EVENT_AIRERR, 0, 0, 0, 0);

        return -1;

    }

    actual = *ind_addr;

    do {

        ind_old = *ind_addr;

        ind_new = ind_old | to_be_set;

    } while (atomic_cmpxchg(ind_addr, ind_old, ind_new) != ind_old);

    cpu_physical_memory_unmap(ind_addr, len, 1, len);

        expected = actual;

        actual = atomic_cmpxchg(ind_addr, expected, expected | to_be_set);

    } while (actual != expected);

    cpu_physical_memory_unmap((void *)ind_addr, len, 1, len);



    return ind_old;

    return actual;

}



static void s390_msi_ctrl_write(void *opaque, hwaddr addr, uint64_t data,

hw/s390x/virtio-ccw.c

+10 −8
Original line number Diff line number Diff line
@@ -786,9 +786,10 @@ static inline VirtioCcwDevice *to_virtio_ccw_dev_fast(DeviceState *d) 
static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc,

                                     uint8_t to_be_set)

{

    uint8_t ind_old, ind_new;

    uint8_t expected, actual;

    hwaddr len = 1;

    uint8_t *ind_addr;

    /* avoid  multiple fetches */

    uint8_t volatile *ind_addr;



    ind_addr = cpu_physical_memory_map(ind_loc, &len, true);

    if (!ind_addr) {
@@ -796,14 +797,15 @@ static uint8_t virtio_set_ind_atomic(SubchDev *sch, uint64_t ind_loc, 
                     __func__, sch->cssid, sch->ssid, sch->schid);

        return -1;

    }

    actual = *ind_addr;

    do {

        ind_old = *ind_addr;

        ind_new = ind_old | to_be_set;

    } while (atomic_cmpxchg(ind_addr, ind_old, ind_new) != ind_old);

    trace_virtio_ccw_set_ind(ind_loc, ind_old, ind_new);

    cpu_physical_memory_unmap(ind_addr, len, 1, len);

        expected = actual;

        actual = atomic_cmpxchg(ind_addr, expected, expected | to_be_set);

    } while (actual != expected);

    trace_virtio_ccw_set_ind(ind_loc, actual, actual | to_be_set);

    cpu_physical_memory_unmap((void *)ind_addr, len, 1, len);



    return ind_old;

    return actual;

}



static void virtio_ccw_notify(DeviceState *d, uint16_t vector)

pc-bios/s390-ccw.img

(41.6 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

pc-bios/s390-ccw/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -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

pc-bios/s390-ccw/bootmap.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

    }