From: Jan Kiszka <[email protected]> As this function both enables and disables the suppression, add a "set" to its name. Also align the parameter name.
No functional changes. Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm-common/pci.c | 6 +++--- hypervisor/arch/x86/pci.c | 8 ++++---- hypervisor/include/jailhouse/pci.h | 8 ++++---- hypervisor/pci.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hypervisor/arch/arm-common/pci.c b/hypervisor/arch/arm-common/pci.c index 4f35175f..8daccee5 100644 --- a/hypervisor/arch/arm-common/pci.c +++ b/hypervisor/arch/arm-common/pci.c @@ -31,9 +31,9 @@ void arch_pci_remove_physical_device(struct pci_device *device) { } -void arch_pci_suppress_msi(struct pci_device *device, - const struct jailhouse_pci_capability *cap, - bool suppressed) +void arch_pci_set_suppress_msi(struct pci_device *device, + const struct jailhouse_pci_capability *cap, + bool suppress) { } diff --git a/hypervisor/arch/x86/pci.c b/hypervisor/arch/x86/pci.c index 0cbb2f3d..fdd27d19 100644 --- a/hypervisor/arch/x86/pci.c +++ b/hypervisor/arch/x86/pci.c @@ -282,9 +282,9 @@ x86_pci_translate_msi(struct pci_device *device, unsigned int vector, return irq_msg; } -void arch_pci_suppress_msi(struct pci_device *device, - const struct jailhouse_pci_capability *cap, - bool suppressed) +void arch_pci_set_suppress_msi(struct pci_device *device, + const struct jailhouse_pci_capability *cap, + bool suppress) { unsigned int n, vectors = pci_enabled_msi_vectors(device); const struct jailhouse_pci_device *info = device->info; @@ -299,7 +299,7 @@ void arch_pci_suppress_msi(struct pci_device *device, if (!(pci_read_config(info->bdf, PCI_CFG_COMMAND, 2) & PCI_CMD_MASTER)) return; - if (suppressed) { + if (suppress) { /* * Disable delivery by setting no destination CPU bit in logical * addressing mode. diff --git a/hypervisor/include/jailhouse/pci.h b/hypervisor/include/jailhouse/pci.h index ea8c1a0b..8f14ec7b 100644 --- a/hypervisor/include/jailhouse/pci.h +++ b/hypervisor/include/jailhouse/pci.h @@ -210,14 +210,14 @@ void arch_pci_remove_physical_device(struct pci_device *device); * Avoid MSI vector delivery of a given device or re-enable it. * @param device Device to be silenced. * @param cap MSI capability of the device. - * @param suppressed True to disable delivery, false to allow it again. + * @param suppress True to disable delivery, false to allow it again. * * @note As events may be lost while a MSI vector is suppressed, re-enabling it * may require injecting one event unconditionally. */ -void arch_pci_suppress_msi(struct pci_device *device, - const struct jailhouse_pci_capability *cap, - bool suppressed); +void arch_pci_set_suppress_msi(struct pci_device *device, + const struct jailhouse_pci_capability *cap, + bool suppress); /** * Update MSI vector mapping for a given device. diff --git a/hypervisor/pci.c b/hypervisor/pci.c index 4ab5fea3..b1a9613d 100644 --- a/hypervisor/pci.c +++ b/hypervisor/pci.c @@ -528,7 +528,7 @@ void pci_prepare_handover(void) continue; for_each_pci_cap(cap, device, n) { if (cap->id == PCI_CAP_ID_MSI) - arch_pci_suppress_msi(device, cap, true); + arch_pci_set_suppress_msi(device, cap, true); else if (cap->id == PCI_CAP_ID_MSIX) pci_suppress_msix(device, cap, true); } @@ -808,8 +808,8 @@ void pci_config_commit(struct cell *cell_added_removed) if (cap->id == PCI_CAP_ID_MSI) { err = arch_pci_update_msi(device, cap); if (device->cell == &root_cell) - arch_pci_suppress_msi(device, cap, - false); + arch_pci_set_suppress_msi(device, cap, + false); } else if (cap->id == PCI_CAP_ID_MSIX) { err = pci_update_msix(device, cap); if (device->cell == &root_cell) -- 2.16.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/0ecdd03e1fbff6388ea6ad6ad2f29f06f2fc29db.1561357723.git.jan.kiszka%40siemens.com. For more options, visit https://groups.google.com/d/optout.
