diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 19:44:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-06 19:44:27 -0700 |
| commit | f605ba97fb80522656c7dce9825a908f1e765b57 (patch) | |
| tree | cd7d7e1ebd2d59562a61ee45c350392ab00c7ed6 /samples | |
| parent | 016c6f25d11af187f93324d5c591f5d6f63dfb75 (diff) | |
| parent | da9147140fe3de5a3a3fe5fe7f69739d4f39bea1 (diff) | |
| download | linux-rpi3-f605ba97fb80522656c7dce9825a908f1e765b57.tar.gz linux-rpi3-f605ba97fb80522656c7dce9825a908f1e765b57.tar.bz2 linux-rpi3-f605ba97fb80522656c7dce9825a908f1e765b57.zip | |
Merge tag 'vfio-v4.17-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Adopt iommu_unmap_fast() interface to type1 backend
(Suravee Suthikulpanit)
- mdev sample driver fixup (Shunyong Yang)
- More efficient PFN mapping handling in type1 backend
(Jason Cai)
- VFIO device ioeventfd interface (Alex Williamson)
- Tag new vfio-platform sub-maintainer (Alex Williamson)
* tag 'vfio-v4.17-rc1' of git://github.com/awilliam/linux-vfio:
MAINTAINERS: vfio/platform: Update sub-maintainer
vfio/pci: Add ioeventfd support
vfio/pci: Use endian neutral helpers
vfio/pci: Pull BAR mapping setup from read-write path
vfio/type1: Improve memory pinning process for raw PFN mapping
vfio-mdev/samples: change RDI interrupt condition
vfio/type1: Adopt fast IOTLB flush interface when unmap IOVAs
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/vfio-mdev/mtty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c index 09f255bdf3ac..7abb79d8313d 100644 --- a/samples/vfio-mdev/mtty.c +++ b/samples/vfio-mdev/mtty.c @@ -534,7 +534,7 @@ static void handle_bar_read(unsigned int index, struct mdev_state *mdev_state, /* Interrupt priority 2: Fifo trigger level reached */ if ((ier & UART_IER_RDI) && - (mdev_state->s[index].rxtx.count == + (mdev_state->s[index].rxtx.count >= mdev_state->s[index].intr_trigger_level)) *buf |= UART_IIR_RDI; |