Commit a753bfcf authored by Alexander Shishkin's avatar Alexander Shishkin

intel_th: Make the switch allocate its subdevices

Instead of allocating devices for every possible output subdevice,
allow the switch to allocate only the ones that it knows about.
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
parent 8edc514b
...@@ -101,17 +101,53 @@ static int intel_th_probe(struct device *dev) ...@@ -101,17 +101,53 @@ static int intel_th_probe(struct device *dev)
return ret; return ret;
} }
static void intel_th_device_remove(struct intel_th_device *thdev);
static int intel_th_remove(struct device *dev) static int intel_th_remove(struct device *dev)
{ {
struct intel_th_driver *thdrv = to_intel_th_driver(dev->driver); struct intel_th_driver *thdrv = to_intel_th_driver(dev->driver);
struct intel_th_device *thdev = to_intel_th_device(dev); struct intel_th_device *thdev = to_intel_th_device(dev);
struct intel_th_device *hub = to_intel_th_device(dev->parent); struct intel_th_device *hub = to_intel_th_hub(thdev);
int err; int err;
if (thdev->type == INTEL_TH_SWITCH) { if (thdev->type == INTEL_TH_SWITCH) {
struct intel_th *th = to_intel_th(hub);
int i, lowest;
/* disconnect outputs */
err = device_for_each_child(dev, thdev, intel_th_child_remove); err = device_for_each_child(dev, thdev, intel_th_child_remove);
if (err) if (err)
return err; return err;
/*
* Remove outputs, that is, hub's children: they are created
* at hub's probe time by having the hub call
* intel_th_output_enable() for each of them.
*/
for (i = 0, lowest = -1; i < th->num_thdevs; i++) {
/*
* Move the non-output devices from higher up the
* th->thdev[] array to lower positions to maintain
* a contiguous array.
*/
if (th->thdev[i]->type != INTEL_TH_OUTPUT) {
if (lowest >= 0) {
th->thdev[lowest] = th->thdev[i];
th->thdev[i] = NULL;
++lowest;
}
continue;
}
if (lowest == -1)
lowest = i;
intel_th_device_remove(th->thdev[i]);
th->thdev[i] = NULL;
}
th->num_thdevs = lowest;
} }
if (thdrv->attr_group) if (thdrv->attr_group)
...@@ -377,7 +413,7 @@ static const struct intel_th_subdevice { ...@@ -377,7 +413,7 @@ static const struct intel_th_subdevice {
unsigned otype; unsigned otype;
unsigned scrpd; unsigned scrpd;
int id; int id;
} intel_th_subdevices[TH_SUBDEVICE_MAX] = { } intel_th_subdevices[] = {
{ {
.nres = 1, .nres = 1,
.res = { .res = {
...@@ -511,98 +547,181 @@ static inline void intel_th_request_hub_module_flush(struct intel_th *th) ...@@ -511,98 +547,181 @@ static inline void intel_th_request_hub_module_flush(struct intel_th *th)
} }
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
static int intel_th_populate(struct intel_th *th, struct resource *devres, static struct intel_th_device *
unsigned int ndevres, int irq) intel_th_subdevice_alloc(struct intel_th *th,
const struct intel_th_subdevice *subdev)
{ {
struct intel_th_device *thdev;
struct resource res[3]; struct resource res[3];
unsigned int req = 0; unsigned int req = 0;
int src, dst, err; int r, err;
/* create devices for each intel_th_subdevice */ thdev = intel_th_device_alloc(th, subdev->type, subdev->name,
for (src = 0, dst = 0; src < ARRAY_SIZE(intel_th_subdevices); src++) { subdev->id);
const struct intel_th_subdevice *subdev = if (!thdev)
&intel_th_subdevices[src]; return ERR_PTR(-ENOMEM);
struct intel_th_device *thdev;
int r;
/* only allow SOURCE and SWITCH devices in host mode */
if (host_mode && subdev->type == INTEL_TH_OUTPUT)
continue;
thdev = intel_th_device_alloc(th, subdev->type, subdev->name, memcpy(res, subdev->res,
subdev->id); sizeof(struct resource) * subdev->nres);
if (!thdev) {
err = -ENOMEM; for (r = 0; r < subdev->nres; r++) {
goto kill_subdevs; struct resource *devres = th->resource;
int bar = TH_MMIO_CONFIG;
/*
* Take .end == 0 to mean 'take the whole bar',
* .start then tells us which bar it is. Default to
* TH_MMIO_CONFIG.
*/
if (!res[r].end && res[r].flags == IORESOURCE_MEM) {
bar = res[r].start;
res[r].start = 0;
res[r].end = resource_size(&devres[bar]) - 1;
} }
memcpy(res, subdev->res, if (res[r].flags & IORESOURCE_MEM) {
sizeof(struct resource) * subdev->nres); res[r].start += devres[bar].start;
res[r].end += devres[bar].start;
for (r = 0; r < subdev->nres; r++) { dev_dbg(th->dev, "%s:%d @ %pR\n",
int bar = TH_MMIO_CONFIG; subdev->name, r, &res[r]);
} else if (res[r].flags & IORESOURCE_IRQ) {
res[r].start = th->irq;
}
}
/* err = intel_th_device_add_resources(thdev, res, subdev->nres);
* Take .end == 0 to mean 'take the whole bar', if (err) {
* .start then tells us which bar it is. Default to put_device(&thdev->dev);
* TH_MMIO_CONFIG. goto fail_put_device;
*/ }
if (!res[r].end && res[r].flags == IORESOURCE_MEM) {
bar = res[r].start;
res[r].start = 0;
res[r].end = resource_size(&devres[bar]) - 1;
}
if (res[r].flags & IORESOURCE_MEM) { if (subdev->type == INTEL_TH_OUTPUT) {
res[r].start += devres[bar].start; thdev->dev.devt = MKDEV(th->major, th->num_thdevs);
res[r].end += devres[bar].start; thdev->output.type = subdev->otype;
thdev->output.port = -1;
thdev->output.scratchpad = subdev->scrpd;
} else if (subdev->type == INTEL_TH_SWITCH) {
thdev->host_mode = host_mode;
th->hub = thdev;
}
dev_dbg(th->dev, "%s:%d @ %pR\n", err = device_add(&thdev->dev);
subdev->name, r, &res[r]); if (err) {
} else if (res[r].flags & IORESOURCE_IRQ) { put_device(&thdev->dev);
res[r].start = irq; goto fail_free_res;
} }
}
err = intel_th_device_add_resources(thdev, res, subdev->nres); /* need switch driver to be loaded to enumerate the rest */
if (err) { if (subdev->type == INTEL_TH_SWITCH && !req) {
put_device(&thdev->dev); err = intel_th_request_hub_module(th);
goto kill_subdevs; if (!err)
} req++;
}
if (subdev->type == INTEL_TH_OUTPUT) { return thdev;
thdev->dev.devt = MKDEV(th->major, dst);
thdev->output.type = subdev->otype; fail_free_res:
thdev->output.port = -1; kfree(thdev->resource);
thdev->output.scratchpad = subdev->scrpd;
} else if (subdev->type == INTEL_TH_SWITCH) { fail_put_device:
thdev->host_mode = host_mode; put_device(&thdev->dev);
}
return ERR_PTR(err);
}
err = device_add(&thdev->dev); /**
if (err) { * intel_th_output_enable() - find and enable a device for a given output type
put_device(&thdev->dev); * @th: Intel TH instance
goto kill_subdevs; * @otype: output type
*
* Go through the unallocated output devices, find the first one whos type
* matches @otype and instantiate it. These devices are removed when the hub
* device is removed, see intel_th_remove().
*/
int intel_th_output_enable(struct intel_th *th, unsigned int otype)
{
struct intel_th_device *thdev;
int src = 0, dst = 0;
for (src = 0, dst = 0; dst <= th->num_thdevs; src++, dst++) {
for (; src < ARRAY_SIZE(intel_th_subdevices); src++) {
if (intel_th_subdevices[src].type != INTEL_TH_OUTPUT)
continue;
if (intel_th_subdevices[src].otype != otype)
continue;
break;
} }
/* need switch driver to be loaded to enumerate the rest */ /* no unallocated matching subdevices */
if (subdev->type == INTEL_TH_SWITCH && !req) { if (src == ARRAY_SIZE(intel_th_subdevices))
th->hub = thdev; return -ENODEV;
err = intel_th_request_hub_module(th);
if (!err) for (; dst < th->num_thdevs; dst++) {
req++; if (th->thdev[dst]->type != INTEL_TH_OUTPUT)
continue;
if (th->thdev[dst]->output.type != otype)
continue;
break;
} }
th->thdev[dst++] = thdev; /*
* intel_th_subdevices[src] matches our requirements and is
* not matched in th::thdev[]
*/
if (dst == th->num_thdevs)
goto found;
} }
return -ENODEV;
found:
thdev = intel_th_subdevice_alloc(th, &intel_th_subdevices[src]);
if (IS_ERR(thdev))
return PTR_ERR(thdev);
th->thdev[th->num_thdevs++] = thdev;
return 0; return 0;
}
EXPORT_SYMBOL_GPL(intel_th_output_enable);
kill_subdevs: static int intel_th_populate(struct intel_th *th)
for (; dst >= 0; dst--) {
intel_th_device_remove(th->thdev[dst]); int src;
return err; /* create devices for each intel_th_subdevice */
for (src = 0; src < ARRAY_SIZE(intel_th_subdevices); src++) {
const struct intel_th_subdevice *subdev =
&intel_th_subdevices[src];
struct intel_th_device *thdev;
/* only allow SOURCE and SWITCH devices in host mode */
if (host_mode && subdev->type == INTEL_TH_OUTPUT)
continue;
/*
* don't enable port OUTPUTs in this path; SWITCH enables them
* via intel_th_output_enable()
*/
if (subdev->type == INTEL_TH_OUTPUT &&
subdev->otype != GTH_NONE)
continue;
thdev = intel_th_subdevice_alloc(th, subdev);
/* note: caller should free subdevices from th::thdev[] */
if (IS_ERR(thdev))
return PTR_ERR(thdev);
th->thdev[th->num_thdevs++] = thdev;
}
return 0;
} }
static int match_devt(struct device *dev, void *data) static int match_devt(struct device *dev, void *data)
...@@ -679,24 +798,25 @@ intel_th_alloc(struct device *dev, struct resource *devres, ...@@ -679,24 +798,25 @@ intel_th_alloc(struct device *dev, struct resource *devres,
} }
th->dev = dev; th->dev = dev;
th->resource = devres;
th->num_resources = ndevres;
th->irq = irq;
dev_set_drvdata(dev, th); dev_set_drvdata(dev, th);
pm_runtime_no_callbacks(dev); pm_runtime_no_callbacks(dev);
pm_runtime_put(dev); pm_runtime_put(dev);
pm_runtime_allow(dev); pm_runtime_allow(dev);
err = intel_th_populate(th, devres, ndevres, irq); err = intel_th_populate(th);
if (err) if (err) {
goto err_chrdev; /* free the subdevices and undo everything */
intel_th_free(th);
return ERR_PTR(err);
}
return th; return th;
err_chrdev:
pm_runtime_forbid(dev);
__unregister_chrdev(th->major, 0, TH_POSSIBLE_OUTPUTS,
"intel_th/output");
err_ida: err_ida:
ida_simple_remove(&intel_th_ida, th->id); ida_simple_remove(&intel_th_ida, th->id);
...@@ -712,11 +832,15 @@ void intel_th_free(struct intel_th *th) ...@@ -712,11 +832,15 @@ void intel_th_free(struct intel_th *th)
int i; int i;
intel_th_request_hub_module_flush(th); intel_th_request_hub_module_flush(th);
for (i = 0; i < TH_SUBDEVICE_MAX; i++)
if (th->thdev[i] && th->thdev[i] != th->hub)
intel_th_device_remove(th->thdev[i]);
intel_th_device_remove(th->hub); intel_th_device_remove(th->hub);
for (i = 0; i < th->num_thdevs; i++) {
if (th->thdev[i] != th->hub)
intel_th_device_remove(th->thdev[i]);
th->thdev[i] = NULL;
}
th->num_thdevs = 0;
pm_runtime_get_sync(th->dev); pm_runtime_get_sync(th->dev);
pm_runtime_forbid(th->dev); pm_runtime_forbid(th->dev);
......
...@@ -639,6 +639,7 @@ intel_th_gth_set_output(struct intel_th_device *thdev, unsigned int master) ...@@ -639,6 +639,7 @@ intel_th_gth_set_output(struct intel_th_device *thdev, unsigned int master)
static int intel_th_gth_probe(struct intel_th_device *thdev) static int intel_th_gth_probe(struct intel_th_device *thdev)
{ {
struct device *dev = &thdev->dev; struct device *dev = &thdev->dev;
struct intel_th *th = dev_get_drvdata(dev->parent);
struct gth_device *gth; struct gth_device *gth;
struct resource *res; struct resource *res;
void __iomem *base; void __iomem *base;
...@@ -660,6 +661,8 @@ static int intel_th_gth_probe(struct intel_th_device *thdev) ...@@ -660,6 +661,8 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
gth->base = base; gth->base = base;
spin_lock_init(&gth->gth_lock); spin_lock_init(&gth->gth_lock);
dev_set_drvdata(dev, gth);
/* /*
* Host mode can be signalled via SW means or via SCRPD_DEBUGGER_IN_USE * Host mode can be signalled via SW means or via SCRPD_DEBUGGER_IN_USE
* bit. Either way, don't reset HW in this case, and don't export any * bit. Either way, don't reset HW in this case, and don't export any
...@@ -667,7 +670,7 @@ static int intel_th_gth_probe(struct intel_th_device *thdev) ...@@ -667,7 +670,7 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
* drivers to ports, see intel_th_gth_assign(). * drivers to ports, see intel_th_gth_assign().
*/ */
if (thdev->host_mode) if (thdev->host_mode)
goto done; return 0;
ret = intel_th_gth_reset(gth); ret = intel_th_gth_reset(gth);
if (ret) { if (ret) {
...@@ -676,7 +679,7 @@ static int intel_th_gth_probe(struct intel_th_device *thdev) ...@@ -676,7 +679,7 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
thdev->host_mode = true; thdev->host_mode = true;
goto done; return 0;
} }
for (i = 0; i < TH_CONFIGURABLE_MASTERS + 1; i++) for (i = 0; i < TH_CONFIGURABLE_MASTERS + 1; i++)
...@@ -687,6 +690,13 @@ static int intel_th_gth_probe(struct intel_th_device *thdev) ...@@ -687,6 +690,13 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
gth->output[i].index = i; gth->output[i].index = i;
gth->output[i].port_type = gth->output[i].port_type =
gth_output_parm_get(gth, i, TH_OUTPUT_PARM(port)); gth_output_parm_get(gth, i, TH_OUTPUT_PARM(port));
if (gth->output[i].port_type == GTH_NONE)
continue;
ret = intel_th_output_enable(th, gth->output[i].port_type);
/* -ENODEV is ok, we just won't have that device enumerated */
if (ret && ret != -ENODEV)
return ret;
} }
if (intel_th_output_attributes(gth) || if (intel_th_output_attributes(gth) ||
...@@ -698,9 +708,6 @@ static int intel_th_gth_probe(struct intel_th_device *thdev) ...@@ -698,9 +708,6 @@ static int intel_th_gth_probe(struct intel_th_device *thdev)
return -ENOMEM; return -ENOMEM;
} }
done:
dev_set_drvdata(dev, gth);
return 0; return 0;
} }
......
...@@ -216,6 +216,7 @@ int intel_th_trace_enable(struct intel_th_device *thdev); ...@@ -216,6 +216,7 @@ int intel_th_trace_enable(struct intel_th_device *thdev);
int intel_th_trace_disable(struct intel_th_device *thdev); int intel_th_trace_disable(struct intel_th_device *thdev);
int intel_th_set_output(struct intel_th_device *thdev, int intel_th_set_output(struct intel_th_device *thdev,
unsigned int master); unsigned int master);
int intel_th_output_enable(struct intel_th *th, unsigned int otype);
enum { enum {
TH_MMIO_CONFIG = 0, TH_MMIO_CONFIG = 0,
...@@ -223,8 +224,9 @@ enum { ...@@ -223,8 +224,9 @@ enum {
TH_MMIO_END, TH_MMIO_END,
}; };
#define TH_SUBDEVICE_MAX 6
#define TH_POSSIBLE_OUTPUTS 8 #define TH_POSSIBLE_OUTPUTS 8
/* Total number of possible subdevices: outputs + GTH + STH */
#define TH_SUBDEVICE_MAX (TH_POSSIBLE_OUTPUTS + 2)
#define TH_CONFIGURABLE_MASTERS 256 #define TH_CONFIGURABLE_MASTERS 256
#define TH_MSC_MAX 2 #define TH_MSC_MAX 2
...@@ -233,6 +235,10 @@ enum { ...@@ -233,6 +235,10 @@ enum {
* @dev: driver core's device * @dev: driver core's device
* @thdev: subdevices * @thdev: subdevices
* @hub: "switch" subdevice (GTH) * @hub: "switch" subdevice (GTH)
* @resource: resources of the entire controller
* @num_thdevs: number of devices in the @thdev array
* @num_resources: number or resources in the @resource array
* @irq: irq number
* @id: this Intel TH controller's device ID in the system * @id: this Intel TH controller's device ID in the system
* @major: device node major for output devices * @major: device node major for output devices
*/ */
...@@ -242,6 +248,11 @@ struct intel_th { ...@@ -242,6 +248,11 @@ struct intel_th {
struct intel_th_device *thdev[TH_SUBDEVICE_MAX]; struct intel_th_device *thdev[TH_SUBDEVICE_MAX];
struct intel_th_device *hub; struct intel_th_device *hub;
struct resource *resource;
unsigned int num_thdevs;
unsigned int num_resources;
int irq;
int id; int id;
int major; int major;
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment