github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-15 16:12:58 +00:00
Code Issues Projects Releases Wiki Activity

ACRN: DM: Fix the MSI mask and pending bit bugs

Browse Source 
The patch fix the Pci Msi capability mask and pending set and clear
bugs.

Tracked-On: #7697
Signed-off-by: Liu Long <long.liu@linux.intel.com>
This commit is contained in:
Liu Long 2022-06-08 16:15:16 +08:00 committed by acrnsi-robot
parent 337312da01
commit 0d4b05eeba
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devicemodel/hw/pci/core.c
View File

@ -961,7 +961,7 @@ pci_emul_add_capability(struct pci_vdev *dev, u_char *capdata, int caplen)
int int
pci_emul_find_capability(struct pci_vdev *dev, uint8_t capid, int *p_capoff) pci_emul_find_capability(struct pci_vdev *dev, uint8_t capid, int *p_capoff)
{ {
int coff; int coff = 0;
uint16_t sts; uint16_t sts;
sts = pci_get_cfgdata16(dev, PCIR_STATUS); sts = pci_get_cfgdata16(dev, PCIR_STATUS);
@ -1079,7 +1079,7 @@ pci_access_msi(struct pci_vdev *dev, int msi_cap, uint32_t *val, bool is_write)
if (rc) if (rc)
return -1; return -1;
msgctrl = pci_get_cfgdata16(dev, offset); msgctrl = pci_get_cfgdata16(dev, offset + 2);
if (msgctrl & PCIM_MSICTRL_64BIT) if (msgctrl & PCIM_MSICTRL_64BIT)
offset = offset + msi_cap; offset = offset + msi_cap;
else else
@ -1088,7 +1088,7 @@ pci_access_msi(struct pci_vdev *dev, int msi_cap, uint32_t *val, bool is_write)
if (is_write) if (is_write)
pci_set_cfgdata32(dev, offset, *val); pci_set_cfgdata32(dev, offset, *val);
else else
*val = pci_get_cfgdata16(dev, offset); *val = pci_get_cfgdata32(dev, offset);
return 0; return 0;
} }
@ -1160,7 +1160,7 @@ pci_populate_msicap(struct msicap *msicap, int msgnum, int nextptr)
int int
pci_emul_add_msicap(struct pci_vdev *dev, int msgnum) pci_emul_add_msicap(struct pci_vdev *dev, int msgnum)
{ {
struct msicap msicap; struct msicap msicap = {0};
return pci_populate_msicap(&msicap, msgnum, 0) || return pci_populate_msicap(&msicap, msgnum, 0) ||
pci_emul_add_capability(dev, (u_char *)&msicap, sizeof(msicap)); pci_emul_add_capability(dev, (u_char *)&msicap, sizeof(msicap));

5
devicemodel/include/pci_core.h
View File

@ -200,8 +200,11 @@ struct msicap {
uint32_t addrlo; uint32_t addrlo;
uint32_t addrhi; uint32_t addrhi;
uint16_t msgdata; uint16_t msgdata;
uint16_t reserve;
uint32_t maskbit;
uint32_t pendbit;
} __attribute__((packed)); } __attribute__((packed));
static_assert(sizeof(struct msicap) == 14, "compile-time assertion failed"); static_assert(sizeof(struct msicap) == 24, "compile-time assertion failed");
struct msixcap { struct msixcap {
uint8_t capid; uint8_t capid;