Commit 5c8d6f00 authored by Dong Jia Shi's avatar Dong Jia Shi Committed by Cornelia Huck
Browse files

s390x/css: generate solicited crw for rchp completion signaling 



A successful completion of rchp should signal a solicited channel path
initialized CRW (channel report word), while the current implementation
always generates an un-solicited one. Let's fix this.

Reported-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: default avatarDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Reviewed-by: default avatarHalil Pasic <pasic@linux.vnet.ibm.com>
Message-Id: <20170803003527.86979-3-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 808e668b

hw/s390x/css.c

+10 −6
Original line number Diff line number Diff line
@@ -1750,10 +1750,10 @@ int css_do_rchp(uint8_t cssid, uint8_t chpid) 
    }



    /* We don't really use a channel path, so we're done here. */

    css_queue_crw(CRW_RSC_CHP, CRW_ERC_INIT,

    css_queue_crw(CRW_RSC_CHP, CRW_ERC_INIT, 1,

                  channel_subsys.max_cssid > 0 ? 1 : 0, chpid);

    if (channel_subsys.max_cssid > 0) {

        css_queue_crw(CRW_RSC_CHP, CRW_ERC_INIT, 0, real_cssid << 8);

        css_queue_crw(CRW_RSC_CHP, CRW_ERC_INIT, 1, 0, real_cssid << 8);

    }

    return 0;

}
@@ -2033,7 +2033,8 @@ void css_subch_assign(uint8_t cssid, uint8_t ssid, uint16_t schid, 
    }

}



void css_queue_crw(uint8_t rsc, uint8_t erc, int chain, uint16_t rsid)

void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,

                   int chain, uint16_t rsid)

{

    CrwContainer *crw_cont;
@@ -2045,6 +2046,9 @@ void css_queue_crw(uint8_t rsc, uint8_t erc, int chain, uint16_t rsid) 
        return;

    }

    crw_cont->crw.flags = (rsc << 8) | erc;

    if (solicited) {

        crw_cont->crw.flags |= CRW_FLAGS_MASK_S;

    }

    if (chain) {

        crw_cont->crw.flags |= CRW_FLAGS_MASK_C;

    }
@@ -2091,9 +2095,9 @@ void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid, 
    }

    chain_crw = (channel_subsys.max_ssid > 0) ||

            (channel_subsys.max_cssid > 0);

    css_queue_crw(CRW_RSC_SUBCH, CRW_ERC_IPI, chain_crw ? 1 : 0, schid);

    css_queue_crw(CRW_RSC_SUBCH, CRW_ERC_IPI, 0, chain_crw ? 1 : 0, schid);

    if (chain_crw) {

        css_queue_crw(CRW_RSC_SUBCH, CRW_ERC_IPI, 0,

        css_queue_crw(CRW_RSC_SUBCH, CRW_ERC_IPI, 0, 0,

                      (guest_cssid << 8) | (ssid << 4));

    }

    /* RW_ERC_IPI --> clear pending interrupts */
@@ -2108,7 +2112,7 @@ void css_generate_chp_crws(uint8_t cssid, uint8_t chpid) 
void css_generate_css_crws(uint8_t cssid)

{

    if (!channel_subsys.sei_pending) {

        css_queue_crw(CRW_RSC_CSS, CRW_ERC_EVENT, 0, cssid);

        css_queue_crw(CRW_RSC_CSS, CRW_ERC_EVENT, 0, 0, cssid);

    }

    channel_subsys.sei_pending = true;

}

include/hw/s390x/css.h

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ void copy_scsw_to_guest(SCSW *dest, const SCSW *src); 
void css_inject_io_interrupt(SubchDev *sch);

void css_reset(void);

void css_reset_sch(SubchDev *sch);

void css_queue_crw(uint8_t rsc, uint8_t erc, int chain, uint16_t rsid);

void css_queue_crw(uint8_t rsc, uint8_t erc, int solicited,

                   int chain, uint16_t rsid);

void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,

                           int hotplugged, int add);

void css_generate_chp_crws(uint8_t cssid, uint8_t chpid);