mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-16 11:56:46 +07:00
Merge branch 'topic/ti-xbar' into for-linus
This commit is contained in:
commit
76891cc8c4
@ -20,16 +20,19 @@
|
||||
#define TI_XBAR_OUTPUTS 127
|
||||
#define TI_XBAR_INPUTS 256
|
||||
|
||||
static DEFINE_IDR(map_idr);
|
||||
#define TI_XBAR_EDMA_OFFSET 0
|
||||
#define TI_XBAR_SDMA_OFFSET 1
|
||||
|
||||
struct ti_dma_xbar_data {
|
||||
void __iomem *iomem;
|
||||
|
||||
struct dma_router dmarouter;
|
||||
struct idr map_idr;
|
||||
|
||||
u16 safe_val; /* Value to rest the crossbar lines */
|
||||
u32 xbar_requests; /* number of DMA requests connected to XBAR */
|
||||
u32 dma_requests; /* number of DMA requests forwarded to DMA */
|
||||
u32 dma_offset;
|
||||
};
|
||||
|
||||
struct ti_dma_xbar_map {
|
||||
@ -51,7 +54,7 @@ static void ti_dma_xbar_free(struct device *dev, void *route_data)
|
||||
map->xbar_in, map->xbar_out);
|
||||
|
||||
ti_dma_xbar_write(xbar->iomem, map->xbar_out, xbar->safe_val);
|
||||
idr_remove(&map_idr, map->xbar_out);
|
||||
idr_remove(&xbar->map_idr, map->xbar_out);
|
||||
kfree(map);
|
||||
}
|
||||
|
||||
@ -81,12 +84,11 @@ static void *ti_dma_xbar_route_allocate(struct of_phandle_args *dma_spec,
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
map->xbar_out = idr_alloc(&map_idr, NULL, 0, xbar->dma_requests,
|
||||
map->xbar_out = idr_alloc(&xbar->map_idr, NULL, 0, xbar->dma_requests,
|
||||
GFP_KERNEL);
|
||||
map->xbar_in = (u16)dma_spec->args[0];
|
||||
|
||||
/* The DMA request is 1 based in sDMA */
|
||||
dma_spec->args[0] = map->xbar_out + 1;
|
||||
dma_spec->args[0] = map->xbar_out + xbar->dma_offset;
|
||||
|
||||
dev_dbg(&pdev->dev, "Mapping XBAR%u to DMA%d\n",
|
||||
map->xbar_in, map->xbar_out);
|
||||
@ -96,9 +98,22 @@ static void *ti_dma_xbar_route_allocate(struct of_phandle_args *dma_spec,
|
||||
return map;
|
||||
}
|
||||
|
||||
static const struct of_device_id ti_dma_master_match[] = {
|
||||
{
|
||||
.compatible = "ti,omap4430-sdma",
|
||||
.data = (void *)TI_XBAR_SDMA_OFFSET,
|
||||
},
|
||||
{
|
||||
.compatible = "ti,edma3",
|
||||
.data = (void *)TI_XBAR_EDMA_OFFSET,
|
||||
},
|
||||
{},
|
||||
};
|
||||
|
||||
static int ti_dma_xbar_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
const struct of_device_id *match;
|
||||
struct device_node *dma_node;
|
||||
struct ti_dma_xbar_data *xbar;
|
||||
struct resource *res;
|
||||
@ -113,12 +128,20 @@ static int ti_dma_xbar_probe(struct platform_device *pdev)
|
||||
if (!xbar)
|
||||
return -ENOMEM;
|
||||
|
||||
idr_init(&xbar->map_idr);
|
||||
|
||||
dma_node = of_parse_phandle(node, "dma-masters", 0);
|
||||
if (!dma_node) {
|
||||
dev_err(&pdev->dev, "Can't get DMA master node\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
match = of_match_node(ti_dma_master_match, dma_node);
|
||||
if (!match) {
|
||||
dev_err(&pdev->dev, "DMA master is not supported\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (of_property_read_u32(dma_node, "dma-requests",
|
||||
&xbar->dma_requests)) {
|
||||
dev_info(&pdev->dev,
|
||||
@ -139,17 +162,15 @@ static int ti_dma_xbar_probe(struct platform_device *pdev)
|
||||
xbar->safe_val = (u16)safe_val;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res)
|
||||
return -ENODEV;
|
||||
|
||||
iomem = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (!iomem)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(iomem))
|
||||
return PTR_ERR(iomem);
|
||||
|
||||
xbar->iomem = iomem;
|
||||
|
||||
xbar->dmarouter.dev = &pdev->dev;
|
||||
xbar->dmarouter.route_free = ti_dma_xbar_free;
|
||||
xbar->dma_offset = (u32)match->data;
|
||||
|
||||
platform_set_drvdata(pdev, xbar);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user