OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: mei: fix firmware reset race. 

The FW reset is currently detected from two points upon
a read failure from native read and from the reset
handler.
The fix removes the detection from the mevent rx callback,
leaving a single detection point.
To prevent reset hiccup, hw_ready is not set if a full rescan is
performed, it will be set only when virtio FW will request the FW reset.

Tracked-On: #1632
Signed-off-by: Aviad Nissel <aviad.nissel@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
This commit is contained in:
Aviad Nissel 2018-10-29 00:49:08 +02:00 committed by lijinxia
parent 5f41d4a8d3
commit 9ba75c55a7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devicemodel/hw/pci/virtio/virtio_mei.c
View File

@ -1708,12 +1708,6 @@ vmei_rx_callback(int fd, enum ev_type type, void *param)
out:
pthread_mutex_unlock(&vmei->rx_mutex);
vmei_host_client_put(hclient);
if (vmei->status == VMEI_STS_PENDING_RESET) {
vmei_virtual_fw_reset(vmei);
/* Let's wait 100ms for HBM enumeration done */
usleep(100000);
virtio_config_changed(&vmei->base);
}
}
/*
@ -1939,7 +1933,9 @@ vmei_start(struct virtio_mei *vmei, bool do_rescan)
vmei_fixed_clients_connect(vmei);
vmei->config->hw_ready = 1;
if (!do_rescan)
vmei->config->hw_ready = 1;
vmei_set_status(vmei, VMEI_STS_READY);
return 0;
@ -2001,6 +1997,7 @@ vmei_reset_callback(int fd, enum ev_type type, void *param)
DPRINTF("Reset state callback\n");
vmei_virtual_fw_reset(vmei);
virtio_config_changed(&vmei->base);
vmei_free_me_clients(vmei);
vmei_start(vmei, true);
}