github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 23:13:26 +00:00
Code Issues Projects Releases Wiki Activity

dm: passthru: remove the use of assert()

Browse Source 
Remove the use of assert() in passthrough driver.

Tracked-On: #3252
Signed-off-by: Binbin Wu <binbin.wu@intel.com>
Reviewed-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Binbin Wu 2019-06-14 15:10:52 +08:00 committed by wenlingz
parent efccdd22a0
commit 0ea788b48e
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
devicemodel/hw/pci/passthrough.c
View File

@ -71,9 +71,6 @@
extern uint64_t audio_nhlt_len; extern uint64_t audio_nhlt_len;
/* TODO: Add support for IO BAR of PTDev */
static int iofd = -1;
/* reference count for libpciaccess init/deinit */ /* reference count for libpciaccess init/deinit */
static int pciaccess_ref_cnt; static int pciaccess_ref_cnt;
static pthread_mutex_t ref_cnt_mtx = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t ref_cnt_mtx = PTHREAD_MUTEX_INITIALIZER;
@ -404,8 +401,6 @@ init_msix_table(struct vmctx *ctx, struct passthru_dev *ptdev, uint64_t base)
uint16_t virt_bdf = PCI_BDF(dev->bus, dev->slot, dev->func); uint16_t virt_bdf = PCI_BDF(dev->bus, dev->slot, dev->func);
struct ic_ptdev_irq ptirq; struct ic_ptdev_irq ptirq;
assert(ptdev_msix_table_bar(ptdev) >= 0 && ptdev_msix_pba_bar(ptdev) >= 0);
b = ptdev->sel.bus; b = ptdev->sel.bus;
s = ptdev->sel.dev; s = ptdev->sel.dev;
f = ptdev->sel.func; f = ptdev->sel.func;
@ -626,7 +621,11 @@ cfginitbar(struct vmctx *ctx, struct passthru_dev *ptdev)
*/ */
if (bartype == PCIBAR_MEM64) { if (bartype == PCIBAR_MEM64) {
i++; i++;
assert(i <= PCI_BARMAX); if (i > PCI_BARMAX) {
warnx("BAR count out of range\n");
return -1;
}
ptdev->bar[i].type = PCIBAR_MEMHI64; ptdev->bar[i].type = PCIBAR_MEMHI64;
} }
} }
@ -1073,21 +1072,14 @@ passthru_write(struct vmctx *ctx, int vcpu, struct pci_vdev *dev, int baridx,
uint64_t offset, int size, uint64_t value) uint64_t offset, int size, uint64_t value)
{ {
struct passthru_dev *ptdev; struct passthru_dev *ptdev;
struct iodev_pio_req pio;
ptdev = dev->arg; ptdev = dev->arg;
if (baridx == ptdev_msix_table_bar(ptdev)) { if (baridx == ptdev_msix_table_bar(ptdev)) {
msix_table_write(ptdev, offset, size, value); msix_table_write(ptdev, offset, size, value);
} else { } else {
assert(dev->bar[baridx].type == PCIBAR_IO); /* TODO: Add support for IO BAR of PTDev */
bzero(&pio, sizeof(struct iodev_pio_req)); warnx("Passthru: PIO write not supported, ignored\n");
pio.access = IODEV_PIO_WRITE;
pio.port = ptdev->bar[baridx].addr + offset;
pio.width = size;
pio.val = value;
(void)ioctl(iofd, IODEV_PIO, &pio);
} }
} }
@ -1096,7 +1088,6 @@ passthru_read(struct vmctx *ctx, int vcpu, struct pci_vdev *dev, int baridx,
uint64_t offset, int size) uint64_t offset, int size)
{ {
struct passthru_dev *ptdev; struct passthru_dev *ptdev;
struct iodev_pio_req pio;
uint64_t val; uint64_t val;
ptdev = dev->arg; ptdev = dev->arg;
@ -1104,16 +1095,9 @@ passthru_read(struct vmctx *ctx, int vcpu, struct pci_vdev *dev, int baridx,
if (baridx == ptdev_msix_table_bar(ptdev)) { if (baridx == ptdev_msix_table_bar(ptdev)) {
val = msix_table_read(ptdev, offset, size); val = msix_table_read(ptdev, offset, size);
} else { } else {
assert(dev->bar[baridx].type == PCIBAR_IO); /* TODO: Add support for IO BAR of PTDev */
bzero(&pio, sizeof(struct iodev_pio_req)); warnx("Passthru: PIO read not supported\n");
pio.access = IODEV_PIO_READ; val = (uint64_t)(-1);
pio.port = ptdev->bar[baridx].addr + offset;
pio.width = size;
pio.val = 0;
(void)ioctl(iofd, IODEV_PIO, &pio);
val = pio.val;
} }
return val; return val;