OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: fsl-mc: add function to return pointer to root dprc 

To support multiple root dprcs, instead of relying on the
dev_root field of the bus type struct, instead create a
function to traverse to the root dprc and return a pointer
to the device struct

Signed-off-by: Itai Katz <itai.katz@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Itai Katz 2015-10-04 10:09:52 +03:00 committed by Greg Kroah-Hartman
parent b55f00c6ed
commit e4ea40f98d
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/fsl-mc/bus/mc-bus.c
View File

@ -217,12 +217,35 @@ bool fsl_mc_bus_exists(void)
}
EXPORT_SYMBOL_GPL(fsl_mc_bus_exists);
/**
* fsl_mc_get_root_dprc - function to traverse to the root dprc
*/
static void fsl_mc_get_root_dprc(struct device *dev,
struct device **root_dprc_dev)
{
if (WARN_ON(!dev)) {
*root_dprc_dev = NULL;
} else if (WARN_ON(dev->bus != &fsl_mc_bus_type)) {
*root_dprc_dev = NULL;
} else {
*root_dprc_dev = dev;
while ((*root_dprc_dev)->parent->bus == &fsl_mc_bus_type)
*root_dprc_dev = (*root_dprc_dev)->parent;
}
}
/**
* fsl_mc_is_root_dprc - function to check if a given device is a root dprc
*/
static bool fsl_mc_is_root_dprc(struct device *dev)
{
return dev == fsl_mc_bus_type.dev_root;
struct device *root_dprc_dev;
fsl_mc_get_root_dprc(dev, &root_dprc_dev);
if (!root_dprc_dev)
return false;
else
return dev == root_dprc_dev;
}
static int get_dprc_icid(struct fsl_mc_io *mc_io,
@ -253,11 +276,18 @@ common_cleanup:
return error;
}
static int translate_mc_addr(enum dprc_region_type mc_region_type,
static int translate_mc_addr(struct fsl_mc_device *mc_dev,
enum dprc_region_type mc_region_type,
u64 mc_offset, phys_addr_t *phys_addr)
{
int i;
struct fsl_mc *mc = dev_get_drvdata(fsl_mc_bus_type.dev_root->parent);
struct device *root_dprc_dev;
struct fsl_mc *mc;
fsl_mc_get_root_dprc(&mc_dev->dev, &root_dprc_dev);
if (WARN_ON(!root_dprc_dev))
return -EINVAL;
mc = dev_get_drvdata(root_dprc_dev->parent);
if (mc->num_translation_ranges == 0) {
/*
@ -328,7 +358,7 @@ static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev,
}
WARN_ON(region_desc.size == 0);
error = translate_mc_addr(mc_region_type,
error = translate_mc_addr(mc_dev, mc_region_type,
region_desc.base_offset,
&regions[i].start);
if (error < 0) {