Commit 8d72db68 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Paolo Bonzini
Browse files

megasas: Clear unit attention on initial reset 



The EFI firmware doesn't handle unit attentions properly,
so we need to clear the Power On/Reset unit attention upon
initial reset.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 77bb6b17

hw/scsi/megasas.c

+17 −1
Original line number Diff line number Diff line
@@ -2202,11 +2202,26 @@ static void megasas_soft_reset(MegasasState *s) 
    int i;

    MegasasCmd *cmd;



    trace_megasas_reset();

    trace_megasas_reset(s->fw_state);

    for (i = 0; i < s->fw_cmds; i++) {

        cmd = &s->frames[i];

        megasas_abort_command(cmd);

    }

    if (s->fw_state == MFI_FWSTATE_READY) {

        BusChild *kid;



        /*

         * The EFI firmware doesn't handle UA,

         * so we need to clear the Power On/Reset UA

         * after the initial reset.

         */

        QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {

            SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);



            sdev->unit_attention = SENSE_CODE(NO_SENSE);

            scsi_device_unit_attention_reported(sdev);

        }

    }

    megasas_reset_frames(s);

    s->reply_queue_len = s->fw_cmds;

    s->reply_queue_pa = 0;
@@ -2334,6 +2349,7 @@ static int megasas_scsi_init(PCIDevice *dev) 
        msix_vector_use(dev, 0);

    }



    s->fw_state = MFI_FWSTATE_READY;

    if (!s->sas_addr) {

        s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) |

                       IEEE_COMPANY_LOCALLY_ASSIGNED) << 36;

hw/scsi/scsi-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static SCSIRequest *scsi_device_alloc_req(SCSIDevice *s, uint32_t tag, uint32_t 
    return NULL;

}



static void scsi_device_unit_attention_reported(SCSIDevice *s)

void scsi_device_unit_attention_reported(SCSIDevice *s)

{

    SCSIDeviceClass *sc = SCSI_DEVICE_GET_CLASS(s);

    if (sc->unit_attention_reported) {

include/hw/scsi/scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ void scsi_req_retry(SCSIRequest *req); 
void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense);

void scsi_device_set_ua(SCSIDevice *sdev, SCSISense sense);

void scsi_device_report_change(SCSIDevice *dev, SCSISense sense);

void scsi_device_unit_attention_reported(SCSIDevice *dev);

int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed);

SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lun);

trace-events

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ megasas_dcmd_unsupported(int cmd, unsigned long size) "scmd %d: set properties l 
megasas_abort_frame(int cmd, int abort_cmd) "scmd %d: frame %x"

megasas_abort_no_cmd(int cmd, uint64_t context) "scmd %d: no active command for frame context %" PRIx64 ""

megasas_abort_invalid_context(int cmd, uint64_t context, int abort_cmd) "scmd %d: invalid frame context %" PRIx64 " for abort frame %x"

megasas_reset(void) "Reset"

megasas_reset(int fw_state) "firmware state %x"

megasas_init(int sges, int cmds, const char *mode) "Using %d sges, %d cmds, %s mode"

megasas_msix_raise(int vector) "vector %d"

megasas_msi_raise(int vector) "vector %d"