github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

dm: mei: fix double fw_reset on uos reboot

Browse Source 
Edge triggered mevent on sysfs file is triggered
immediately after mevent_add(), hence this has to be ignored.
The issue that is resolved that the 'first' flag was
global and wasn't reset on each mevent_add().

Tracked-On: #1846
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Tomas Winkler 2018-11-19 20:06:05 +02:00 committed by lijinxia
parent 844553ef23
commit 87fbb7003d
1 changed files with 8 additions and 3 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

@ -318,6 +318,7 @@ struct virtio_mei {
pthread_mutex_t mutex; pthread_mutex_t mutex;
struct mevent *reset_mevp; struct mevent *reset_mevp;
bool dev_state_first;
struct mei_virtio_cfg *config; struct mei_virtio_cfg *config;
@ -1979,7 +1980,6 @@ vmei_stop(struct virtio_mei *vmei)
static void static void
vmei_reset_callback(int fd, enum ev_type type, void *param) vmei_reset_callback(int fd, enum ev_type type, void *param)
{ {
static bool first_time = true;
struct virtio_mei *vmei = param; struct virtio_mei *vmei = param;
char buf[MEI_DEV_STATE_LEN] = {0}; char buf[MEI_DEV_STATE_LEN] = {0};
int sz; int sz;
@ -1989,8 +1989,12 @@ vmei_reset_callback(int fd, enum ev_type type, void *param)
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
sz = read(fd, buf, 12); sz = read(fd, buf, 12);
if (first_time) { /*
first_time = false; * edge mevent is hit immediately after add
* as the file is not empty, this has to be ignored
*/
if (vmei->dev_state_first) {
vmei->dev_state_first = false;
return; return;
} }
@ -2017,6 +2021,7 @@ static int vmei_add_reset_event(struct virtio_mei *vmei)
if (dev_state_fd < 0) if (dev_state_fd < 0)
return -errno; return -errno;
vmei->dev_state_first = true;
vmei->reset_mevp = mevent_add(dev_state_fd, EVF_READ_ET, vmei->reset_mevp = mevent_add(dev_state_fd, EVF_READ_ET,
vmei_reset_callback, vmei); vmei_reset_callback, vmei);
if (!vmei->reset_mevp) { if (!vmei->reset_mevp) {