dany/facetimehd
1
0
Fork 0
mirror of https://github.com/patjak/facetimehd.git synced 2026-04-09 11:02:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

bcwc_pcie: also request memory for s2 mem region

Browse Source 
and use our own root for the memory resource allocator to prevent
conflicts with system resource memory allocation.
This commit is contained in:
Sven Schnelle
2015-10-26 09:12:02 +01:00
parent 99b97043e7
commit 6e8bdbbaf5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bcwc_drv.c
View File

@@ -40,14 +40,18 @@ static int bcwc_pci_reserve_mem(struct bcwc_private *dev_priv)
return ret;
}
/* S2 MEM is reserved by the isp memory manager */
ret = pci_request_region(dev_priv->pdev, BCWC_PCI_ISP_IO, "ISP IO");
if (ret) {
dev_err(&dev_priv->pdev->dev, "Failed to request ISP IO\n");
return ret;
}
ret = pci_request_region(dev_priv->pdev, BCWC_PCI_S2_MEM, "S2 MEM");
if (ret) {
dev_err(&dev_priv->pdev->dev, "Failed to request S2 MEM\n");
return ret;
}
/* S2 IO */
start = pci_resource_start(dev_priv->pdev, BCWC_PCI_S2_IO);
len = pci_resource_len(dev_priv->pdev, BCWC_PCI_S2_IO);

15
isp.c
View File

@@ -28,15 +28,13 @@
int isp_mem_init(struct bcwc_private *dev_priv)
{
struct resource *root = &dev_priv->pdev->resource[BCWC_PCI_S2_MEM];
int ret;
ret = allocate_resource(root, dev_priv->mem, FTHD_MEM_SIZE, root->start,
root->end, PAGE_SIZE, NULL, NULL);
if (ret) {
dev_err(&dev_priv->pdev->dev,
"Failed to initialize ISP memory manager\n");
return -EIO;
}
dev_priv->mem = kzalloc(sizeof(struct resource), GFP_KERNEL);
if (!dev_priv->mem)
return -ENOMEM;
dev_priv->mem->start = root->start;
dev_priv->mem->end = root->end;
/* Preallocate 8mb for the firmware */
dev_priv->firmware = isp_mem_create(dev_priv, FTHD_MEM_FIRMWARE,
@@ -307,5 +305,6 @@ int isp_init(struct bcwc_private *dev_priv)
int isp_uninit(struct bcwc_private *dev_priv)
{
kfree(dev_priv->mem);
return 0;
}