[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] pcie: Rename the pcie_cap_ari_* functions to p
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/11] pcie: Rename the pcie_cap_ari_* functions to pcie_cap_arifwd_* |
Date: |
Mon, 25 Aug 2014 00:18:41 +0200 |
From: Knut Omang <address@hidden>
Rename helper functions to make a clearer distinction between
the PCIe capability/control register feature ARI forwarding and a
device that supports the ARI feature via an ARI extended PCIe capability.
Signed-off-by: Knut Omang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/pci/pcie.h | 7 ++++---
hw/pci-bridge/ioh3420.c | 1 +
hw/pci-bridge/xio3130_downstream.c | 4 ++--
hw/pci/pcie.c | 11 ++++++-----
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 7fe81f3..d139d58 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -103,9 +103,10 @@ void pcie_cap_flr_init(PCIDevice *dev);
void pcie_cap_flr_write_config(PCIDevice *dev,
uint32_t addr, uint32_t val, int len);
-void pcie_cap_ari_init(PCIDevice *dev);
-void pcie_cap_ari_reset(PCIDevice *dev);
-bool pcie_cap_is_ari_enabled(const PCIDevice *dev);
+/* ARI forwarding capability and control */
+void pcie_cap_arifwd_init(PCIDevice *dev);
+void pcie_cap_arifwd_reset(PCIDevice *dev);
+bool pcie_cap_is_arifwd_enabled(const PCIDevice *dev);
/* PCI express extended capability helper functions */
uint16_t pcie_find_capability(PCIDevice *dev, uint16_t cap_id);
diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index 7cd87fc..aed2bf1 100644
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -118,6 +118,7 @@ static int ioh3420_initfn(PCIDevice *d)
if (rc < 0) {
goto err_msi;
}
+
pcie_cap_deverr_init(d);
pcie_cap_slot_init(d, s->slot);
pcie_chassis_create(s->chassis);
diff --git a/hw/pci-bridge/xio3130_downstream.c
b/hw/pci-bridge/xio3130_downstream.c
index 51f20d7..b3a6479 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -50,7 +50,7 @@ static void xio3130_downstream_reset(DeviceState *qdev)
pcie_cap_deverr_reset(d);
pcie_cap_slot_reset(d);
- pcie_cap_ari_reset(d);
+ pcie_cap_arifwd_reset(d);
pci_bridge_reset(qdev);
}
@@ -91,7 +91,7 @@ static int xio3130_downstream_initfn(PCIDevice *d)
if (rc < 0) {
goto err_pcie_cap;
}
- pcie_cap_ari_init(d);
+ pcie_cap_arifwd_init(d);
rc = pcie_aer_init(d, XIO3130_AER_OFFSET);
if (rc < 0) {
goto err;
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index de0e967..6cb6e0c 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -497,9 +497,10 @@ void pcie_cap_flr_write_config(PCIDevice *dev,
}
}
-/* Alternative Routing-ID Interpretation (ARI) */
-/* ari forwarding support for down stream port */
-void pcie_cap_ari_init(PCIDevice *dev)
+/* Alternative Routing-ID Interpretation (ARI)
+ * forwarding support for root and downstream ports
+ */
+void pcie_cap_arifwd_init(PCIDevice *dev)
{
uint32_t pos = dev->exp.exp_cap;
pci_long_test_and_set_mask(dev->config + pos + PCI_EXP_DEVCAP2,
@@ -508,13 +509,13 @@ void pcie_cap_ari_init(PCIDevice *dev)
PCI_EXP_DEVCTL2_ARI);
}
-void pcie_cap_ari_reset(PCIDevice *dev)
+void pcie_cap_arifwd_reset(PCIDevice *dev)
{
uint8_t *devctl2 = dev->config + dev->exp.exp_cap + PCI_EXP_DEVCTL2;
pci_long_test_and_clear_mask(devctl2, PCI_EXP_DEVCTL2_ARI);
}
-bool pcie_cap_is_ari_enabled(const PCIDevice *dev)
+bool pcie_cap_is_arifwd_enabled(const PCIDevice *dev)
{
if (!pci_is_express(dev)) {
return false;
--
MST
- [Qemu-devel] [PULL 00/11] pci, pc fixes, features, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 01/11] hostmem: set MPOL_MF_MOVE, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 02/11] pci_bridge: manually destroy memory regions within PCIBridgeWindows, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 03/11] pcihp: fix possible array out of bounds, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 05/11] Add ACPI tables for TPM, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 04/11] pc: reserve more memory for ACPI for new machine types, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 07/11] pcie: Fix incorrect write to the ari capability next function field, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 06/11] ssdt-tpm: add generated hex file to git, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 08/11] pcie: Rename the pcie_cap_ari_* functions to pcie_cap_arifwd_*,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/11] ioh3420: Remove obsoleted, unused ioh3420_init function, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 10/11] ioh3420: Enable ARI forwarding, Michael S. Tsirkin, 2014/08/24
- [Qemu-devel] [PULL 11/11] pcie: fix trailing whitespace, Michael S. Tsirkin, 2014/08/24
- Re: [Qemu-devel] [PULL 00/11] pci, pc fixes, features, Peter Maydell, 2014/08/25