Page MenuHomeFreeBSD
Files F115913179

D45904.diff
No OneTemporary
Actions

D45904.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
@@ -362,6 +362,8 @@
int linuxkpi_pcim_enable_device(struct pci_dev *pdev);
void __iomem **linuxkpi_pcim_iomap_table(struct pci_dev *pdev);
+void *linuxkpi_pci_iomap_range(struct pci_dev *pdev, int mmio_bar,
+ unsigned long mmio_off, unsigned long mmio_size);
void *linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size);
void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res);
int linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask,
@@ -774,6 +776,8 @@
{
}
+#define pci_iomap_range(pdev, mmio_bar, mmio_off, mmio_size) \
+ linuxkpi_pci_iomap_range(pdev, mmio_bar, mmio_off, mmio_size)
#define pci_iomap(pdev, mmio_bar, mmio_size) \
linuxkpi_pci_iomap(pdev, mmio_bar, mmio_size)
#define pci_iounmap(pdev, res) linuxkpi_pci_iounmap(pdev, res)
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
@@ -755,7 +755,8 @@
}
void *
-linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size)
+linuxkpi_pci_iomap_range(struct pci_dev *pdev, int mmio_bar,
+ unsigned long mmio_off, unsigned long mmio_size)
{
struct resource *res;
@@ -765,7 +766,14 @@
/* This is a FreeBSD extension so we can use bus_*(). */
if (pdev->want_iomap_res)
return (res);
- return ((void *)rman_get_bushandle(res));
+ MPASS(mmio_off < rman_get_size(res));
+ return ((void *)(rman_get_bushandle(res) + mmio_off));
+}
+
+void *
+linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size)
+{
+ return (linuxkpi_pci_iomap_range(pdev, mmio_bar, 0, mmio_size));
}
void
@@ -774,7 +782,9 @@
struct pci_mmio_region *mmio, *p;
TAILQ_FOREACH_SAFE(mmio, &pdev->mmio, next, p) {
- if (res != (void *)rman_get_bushandle(mmio->res))
+ if ((bus_space_handle_t)res < rman_get_bushandle(mmio->res) ||
+ (bus_space_handle_t)res >= rman_get_bushandle(mmio->res) +
+ rman_get_size(mmio->res))
continue;
bus_release_resource(pdev->dev.bsddev,
mmio->type, mmio->rid, mmio->res);

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 8:18 AM (13 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17877486
Default Alt Text
D45904.diff (2 KB)

Event Timeline