mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
thunderbolt: Enable plug events
Thunderbolt switches have a plug events capability. This patch adds the tb_plug_events_active method and uses it to activate plug events during switch allocation. Signed-off-by: Andreas Noever <andreas.noever@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e2b8785ed3
commit
ca389f716f
2 changed files with 53 additions and 0 deletions
|
@ -98,6 +98,45 @@ static void tb_dump_switch(struct tb *tb, struct tb_regs_switch_header *sw)
|
|||
sw->__unknown1, sw->__unknown4);
|
||||
}
|
||||
|
||||
/**
|
||||
* tb_plug_events_active() - enable/disable plug events on a switch
|
||||
*
|
||||
* Also configures a sane plug_events_delay of 255ms.
|
||||
*
|
||||
* Return: Returns 0 on success or an error code on failure.
|
||||
*/
|
||||
static int tb_plug_events_active(struct tb_switch *sw, bool active)
|
||||
{
|
||||
u32 data;
|
||||
int res;
|
||||
|
||||
sw->config.plug_events_delay = 0xff;
|
||||
res = tb_sw_write(sw, ((u32 *) &sw->config) + 4, TB_CFG_SWITCH, 4, 1);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
res = tb_sw_read(sw, &data, TB_CFG_SWITCH, sw->cap_plug_events + 1, 1);
|
||||
if (res)
|
||||
return res;
|
||||
|
||||
if (active) {
|
||||
data = data & 0xFFFFFF83;
|
||||
switch (sw->config.device_id) {
|
||||
case 0x1513:
|
||||
case 0x151a:
|
||||
case 0x1549:
|
||||
break;
|
||||
default:
|
||||
data |= 4;
|
||||
}
|
||||
} else {
|
||||
data = data | 0x7c;
|
||||
}
|
||||
return tb_sw_write(sw, &data, TB_CFG_SWITCH,
|
||||
sw->cap_plug_events + 1, 1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* tb_switch_free() - free a tb_switch and all downstream switches
|
||||
*/
|
||||
|
@ -113,6 +152,8 @@ void tb_switch_free(struct tb_switch *sw)
|
|||
sw->ports[i].remote = NULL;
|
||||
}
|
||||
|
||||
tb_plug_events_active(sw, false);
|
||||
|
||||
kfree(sw->ports);
|
||||
kfree(sw);
|
||||
}
|
||||
|
@ -125,6 +166,7 @@ void tb_switch_free(struct tb_switch *sw)
|
|||
struct tb_switch *tb_switch_alloc(struct tb *tb, u64 route)
|
||||
{
|
||||
int i;
|
||||
int cap;
|
||||
struct tb_switch *sw;
|
||||
int upstream_port = tb_cfg_get_upstream_port(tb->ctl, route);
|
||||
if (upstream_port < 0)
|
||||
|
@ -177,6 +219,16 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, u64 route)
|
|||
|
||||
/* TODO: I2C, IECS, EEPROM, link controller */
|
||||
|
||||
cap = tb_find_cap(&sw->ports[0], TB_CFG_SWITCH, TB_CAP_PLUG_EVENTS);
|
||||
if (cap < 0) {
|
||||
tb_sw_warn(sw, "cannot find TB_CAP_PLUG_EVENTS aborting\n");
|
||||
goto err;
|
||||
}
|
||||
sw->cap_plug_events = cap;
|
||||
|
||||
if (tb_plug_events_active(sw, true))
|
||||
goto err;
|
||||
|
||||
return sw;
|
||||
err:
|
||||
kfree(sw->ports);
|
||||
|
|
|
@ -19,6 +19,7 @@ struct tb_switch {
|
|||
struct tb_regs_switch_header config;
|
||||
struct tb_port *ports;
|
||||
struct tb *tb;
|
||||
int cap_plug_events; /* offset, zero if not found */
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue