[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [kvm-unit-tests PATCH v8 10/14] pci: provide pci_enable_def
From: |
Peter Xu |
Subject: |
[Qemu-devel] [kvm-unit-tests PATCH v8 10/14] pci: provide pci_enable_defaults() |
Date: |
Mon, 12 Dec 2016 11:08:16 +0800 |
One helper function to set/clear specific bit in PCI_COMMAND register is
introduced. Then, provide a function to do most of the common PCI init
work.
Suggested-by: Andrew Jones <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
lib/pci.c | 19 +++++++++++++++++++
lib/pci.h | 2 ++
2 files changed, 21 insertions(+)
diff --git a/lib/pci.c b/lib/pci.c
index d4521be..bf2a3df 100644
--- a/lib/pci.c
+++ b/lib/pci.c
@@ -7,6 +7,18 @@
#include "pci.h"
#include "asm/pci.h"
+void pci_cmd_set_clr(struct pci_dev *dev, uint16_t set, uint16_t clr)
+{
+ uint16_t val = pci_config_readw(dev->bdf, PCI_COMMAND);
+
+ /* No overlap is allowed */
+ assert((set & clr) == 0);
+ val |= set;
+ val &= ~clr;
+
+ pci_config_writew(dev->bdf, PCI_COMMAND, val);
+}
+
bool pci_dev_exists(pcidevaddr_t dev)
{
return (pci_config_readw(dev, PCI_VENDOR_ID) != 0xffff &&
@@ -242,3 +254,10 @@ void pci_scan_bars(struct pci_dev *dev)
}
}
}
+
+void pci_enable_defaults(struct pci_dev *dev)
+{
+ pci_scan_bars(dev);
+ /* Enable device DMA operations */
+ pci_cmd_set_clr(dev, PCI_COMMAND_MASTER, 0);
+}
diff --git a/lib/pci.h b/lib/pci.h
index 8215c9d..d3052ef 100644
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -25,6 +25,8 @@ struct pci_dev {
extern void pci_dev_init(struct pci_dev *dev, pcidevaddr_t bdf);
extern void pci_scan_bars(struct pci_dev *dev);
+extern void pci_cmd_set_clr(struct pci_dev *dev, uint16_t set, uint16_t clr);
+extern void pci_enable_defaults(struct pci_dev *dev);
extern bool pci_probe(void);
extern void pci_print(void);
--
2.7.4
- [Qemu-devel] [kvm-unit-tests PATCH v8 00/14] VT-d unit test, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 01/14] pci: fix missing extern for pci_testdev(), Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 02/14] x86/asm: add cpu_relax(), Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 03/14] libcflat: introduce is_power_of_2(), Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 04/14] x86: intel-iommu: add vt-d init test, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 05/14] libcflat: add IS_ALIGNED() macro, and page sizes, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 06/14] libcflat: moving MIN/MAX here, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 07/14] vm/page: provide PGDIR_OFFSET() macro, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 08/14] pci: introduce struct pci_dev, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 09/14] pci: provide pci_scan_bars(), Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 10/14] pci: provide pci_enable_defaults(),
Peter Xu <=
- [Qemu-devel] [kvm-unit-tests PATCH v8 11/14] pci: edu: introduce pci-edu helpers, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 12/14] x86: intel-iommu: add dmar test, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 13/14] pci: add msi support for 32/64bit address, Peter Xu, 2016/12/11
- [Qemu-devel] [kvm-unit-tests PATCH v8 14/14] x86: intel-iommu: add IR MSI test, Peter Xu, 2016/12/11
- Re: [Qemu-devel] [kvm-unit-tests PATCH v8 00/14] VT-d unit test, Andrew Jones, 2016/12/22