UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ccree: handle limiting of DMA masks 

Properly handle limiting of DMA masks based on device and bus
capabilities.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gilad Ben-Yossef 2017-11-02 08:10:22 +00:00 committed by Greg Kroah-Hartman
parent e7cdcba451
commit 414a48e88d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/ccree/ssi_driver.c
View File

@ -208,6 +208,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
struct device *dev = &plat_dev->dev; struct device *dev = &plat_dev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
u32 signature_val; u32 signature_val;
dma_addr_t dma_mask;
int rc = 0; int rc = 0;
new_drvdata = devm_kzalloc(dev, sizeof(*new_drvdata), GFP_KERNEL); new_drvdata = devm_kzalloc(dev, sizeof(*new_drvdata), GFP_KERNEL);
@ -256,15 +257,29 @@ static int init_cc_resources(struct platform_device *plat_dev)
} }
dev_dbg(dev, "Registered to IRQ: %d\n", new_drvdata->irq); dev_dbg(dev, "Registered to IRQ: %d\n", new_drvdata->irq);
if (!plat_dev->dev.dma_mask)
plat_dev->dev.dma_mask = &plat_dev->dev.coherent_dma_mask;
dma_mask = (dma_addr_t)(DMA_BIT_MASK(DMA_BIT_MASK_LEN));
while (dma_mask > 0x7fffffffUL) {
if (dma_supported(&plat_dev->dev, dma_mask)) {
rc = dma_set_coherent_mask(&plat_dev->dev, dma_mask);
if (!rc)
break;
}
dma_mask >>= 1;
}
if (rc) {
dev_err(dev, "Error: failed in dma_set_mask, mask=%par\n",
&dma_mask);
goto post_drvdata_err;
}
rc = cc_clk_on(new_drvdata); rc = cc_clk_on(new_drvdata);
if (rc) if (rc)
goto post_drvdata_err; goto post_drvdata_err;
if (!dev->dma_mask)
dev->dma_mask = &dev->coherent_dma_mask;
if (!dev->coherent_dma_mask)
dev->coherent_dma_mask = DMA_BIT_MASK(DMA_BIT_MASK_LEN);
/* Verify correct mapping */ /* Verify correct mapping */
signature_val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE)); signature_val = CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_SIGNATURE));