github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 01:54:44 +00:00
Code Issues Projects Releases Wiki Activity

HV: extract common code blocks to has_msi_cap and has_msix_cap functions

Browse Source 
Define has_msi_cap and has_msix_cap inline functions to do sanity checking for
msi and msix ops, the corresponding code block in existing code is replaced with
a call to these new functions.

A few minor coding style fix.

Tracked-On: #2534
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen
2019-03-05 17:31:57 -08:00
committed by wenlingz
parent 79cfb1cf58
commit 5767d1e141
3 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hypervisor/dm/vpci/msi.c
View File

@@ -35,13 +35,22 @@
#include "pci_priv.h"
/**
* @pre vdev != NULL
*/
static inline bool has_msi_cap(const struct pci_vdev *vdev)
{
return (vdev->msi.capoff != 0U);
}
/**
* @pre vdev != NULL
*/
static inline bool msicap_access(const struct pci_vdev *vdev, uint32_t offset)
{
bool ret;
bool ret = false;
if (vdev->msi.capoff == 0U) {
ret = 0;
} else {
if (has_msi_cap(vdev)) {
ret = in_range(offset, vdev->msi.capoff, vdev->msi.caplen);
}
@@ -160,7 +169,7 @@ int32_t vmsi_cfgwrite(struct pci_vdev *vdev, uint32_t offset, uint32_t bytes, ui
int32_t vmsi_deinit(struct pci_vdev *vdev)
{
if (vdev->msi.capoff != 0U) {
if (has_msi_cap(vdev)) {
ptirq_remove_msix_remapping(vdev->vpci->vm, vdev->vbdf.value, 1U);
}
@@ -194,11 +203,10 @@ int32_t vmsi_init(struct pci_vdev *vdev)
struct pci_pdev *pdev = vdev->pdev;
uint32_t val;
/* Copy MSI/MSI-X capability struct into virtual device */
if (pdev->msi.capoff != 0U) {
vdev->msi.capoff = pdev->msi.capoff;
vdev->msi.caplen = pdev->msi.caplen;
vdev->msi.capoff = pdev->msi.capoff;
vdev->msi.caplen = pdev->msi.caplen;
if (has_msi_cap(vdev)) {
(void)memcpy_s((void *)&vdev->cfgdata.data_8[pdev->msi.capoff], pdev->msi.caplen,
(void *)&pdev->msi.cap[0U], pdev->msi.caplen);