Pull VFIO updates from Alex Williamson: - Fix dma-valid return WAITED implementation (Anthony Yznaga) - SPDX license cleanups (Cai Huoqing) - Split vfio-pci-core from vfio-pci and enhance PCI driver matching to support future vendor provided vfio-pci variants (Yishai Hadas, Max Gurtovoy, Jason Gunthorpe) - Replace duplicated reflck with core support for managing first open, last close, and device sets (Jason Gunthorpe, Max Gurtovoy, Yishai Hadas) - Fix non-modular mdev support and don't nag about request callback support (Christoph Hellwig) - Add semaphore to protect instruction intercept handler and replace open-coded locks in vfio-ap driver (Tony Krowiak) - Convert vfio-ap to vfio_register_group_dev() API (Jason Gunthorpe) * tag 'vfio-v5.15-rc1' of git://github.com/awilliam/linux-vfio: (37 commits) vfio/pci: Introduce vfio_pci_core.ko vfio: Use kconfig if XX/endif blocks instead of repeating 'depends on' vfio: Use select for eventfd PCI / VFIO: Add 'override_only' support for VFIO PCI sub system PCI: Add 'override_only' field to struct pci_device_id vfio/pci: Move module parameters to vfio_pci.c vfio/pci: Move igd initialization to vfio_pci.c vfio/pci: Split the pci_driver code out of vfio_pci_core.c vfio/pci: Include vfio header in vfio_pci_core.h vfio/pci: Rename ops functions to fit core namings vfio/pci: Rename vfio_pci_device to vfio_pci_core_device vfio/pci: Rename vfio_pci_private.h to vfio_pci_core.h vfio/pci: Rename vfio_pci.c to vfio_pci_core.c vfio/ap_ops: Convert to use vfio_register_group_dev() s390/vfio-ap: replace open coded locks for VFIO_GROUP_NOTIFY_SET_KVM notification s390/vfio-ap: r/w lock for PQAP interception handler function pointer vfio/type1: Fix vfio_find_dma_valid return vfio-pci/zdev: Remove repeated verbose license text vfio: platform: reset: Convert to SPDX identifier vfio: Remove struct vfio_device_ops open/release ...
Showing the changes to scripts (2 of 45 files). Show all
Unified · Split
| @@ -42,6 +42,7 @@ int main(void) · 41 unmodified lines | ||
| 42 | 42 | DEVID_FIELD(pci_device_id, subdevice); |
| 43 | 43 | DEVID_FIELD(pci_device_id, class); |
| 44 | 44 | DEVID_FIELD(pci_device_id, class_mask); |
| 45 | + DEVID_FIELD(pci_device_id, override_only); | |
| 45 | 46 | |
| 46 | 47 | DEVID(ccw_device_id); |
| 47 | 48 | DEVID_FIELD(ccw_device_id, match_flags); |
| @@ -426,7 +426,7 @@ static int do_ieee1394_entry(const char *filename, · 425 unmodified lines | ||
| 426 | 426 | return 1; |
| 427 | 427 | } |
| 428 | 428 | |
| 429 | −/* Looks like: pci:vNdNsvNsdNbcNscNiN. */ | |
| 429 | +/* Looks like: pci:vNdNsvNsdNbcNscNiN or <prefix>_pci:vNdNsvNsdNbcNscNiN. */ | |
| 430 | 430 | static int do_pci_entry(const char *filename, |
| 431 | 431 | void *symval, char *alias) |
| 432 | 432 | { |
| @@ -440,8 +440,21 @@ static int do_pci_entry(const char *filename, · 7 unmodified lines | ||
| 440 | 440 | DEF_FIELD(symval, pci_device_id, subdevice); |
| 441 | 441 | DEF_FIELD(symval, pci_device_id, class); |
| 442 | 442 | DEF_FIELD(symval, pci_device_id, class_mask); |
| 443 | + DEF_FIELD(symval, pci_device_id, override_only); | |
| 444 | + | |
| 445 | + switch (override_only) { | |
| 446 | + case 0: | |
| 447 | + strcpy(alias, "pci:"); | |
| 448 | + break; | |
| 449 | + case PCI_ID_F_VFIO_DRIVER_OVERRIDE: | |
| 450 | + strcpy(alias, "vfio_pci:"); | |
| 451 | + break; | |
| 452 | + default: | |
| 453 | + warn("Unknown PCI driver_override alias %08X\n", | |
| 454 | + override_only); | |
| 455 | + return 0; | |
| 456 | + } | |
| 443 | 457 | |
| 444 | − strcpy(alias, "pci:"); | |
| 445 | 458 | ADD(alias, "v", vendor != PCI_ANY_ID, vendor); |
| 446 | 459 | ADD(alias, "d", device != PCI_ANY_ID, device); |
| 447 | 460 | ADD(alias, "sv", subvendor != PCI_ANY_ID, subvendor); |