Page MenuHomeFreeBSD
Files F109813546

D42821.diff
No OneTemporary
Actions

D42821.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -347,6 +347,7 @@
size_t romlen;
struct msi_desc **msi_desc;
char *path_name;
+ spinlock_t pcie_cap_lock;
TAILQ_HEAD(, pci_mmio_region) mmio;
};
@@ -1012,35 +1013,38 @@
}
static inline int
-pcie_capability_set_word(struct pci_dev *dev, int pos, uint16_t val)
+pcie_capability_clear_and_set_word(struct pci_dev *dev, int pos,
+ uint16_t clear, uint16_t set)
{
int error;
uint16_t v;
+ if (pos == PCI_EXP_LNKCTL || pos == PCI_EXP_RTCTL)
+ spin_lock(&dev->pcie_cap_lock);
+
error = pcie_capability_read_word(dev, pos, &v);
- if (error != 0)
- return (error);
+ if (error == 0) {
+ v &= ~clear;
+ v |= set;
+ error = pcie_capability_write_word(dev, pos, v);
+ }
- v |= val;
+ if (pos == PCI_EXP_LNKCTL || pos == PCI_EXP_RTCTL)
+ spin_unlock(&dev->pcie_cap_lock);
- error = pcie_capability_write_word(dev, pos, v);
return (error);
}
static inline int
-pcie_capability_clear_word(struct pci_dev *dev, int pos, uint16_t val)
+pcie_capability_set_word(struct pci_dev *dev, int pos, uint16_t val)
{
- int error;
- uint16_t v;
-
- error = pcie_capability_read_word(dev, pos, &v);
- if (error != 0)
- return (error);
-
- v &= ~val;
+ return (pcie_capability_clear_and_set_word(dev, pos, 0, val));
+}
- error = pcie_capability_write_word(dev, pos, v);
- return (error);
+static inline int
+pcie_capability_clear_word(struct pci_dev *dev, int pos, uint16_t val)
+{
+ return (pcie_capability_clear_and_set_word(dev, pos, val, 0));
}
static inline int pcie_get_minimum_link(struct pci_dev *dev,
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -525,6 +525,7 @@
goto out_dma_init;
TAILQ_INIT(&pdev->mmio);
+ spin_lock_init(&pdev->pcie_cap_lock);
spin_lock(&pci_lock);
list_add(&pdev->links, &pci_devices);
@@ -539,6 +540,7 @@
out_probe:
free(pdev->bus, M_DEVBUF);
+ spin_lock_destroy(&pdev->pcie_cap_lock);
linux_pdev_dma_uninit(pdev);
out_dma_init:
spin_lock(&pci_lock);
@@ -579,6 +581,7 @@
spin_lock(&pci_lock);
list_del(&pdev->links);
spin_unlock(&pci_lock);
+ spin_lock_destroy(&pdev->pcie_cap_lock);
put_device(&pdev->dev);
return (0);

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 10, 9:10 PM (8 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16583767
Default Alt Text
D42821.diff (2 KB)

Event Timeline