*/
#include <linux/debugfs.h>
-#include <linux/input.h>
#include <linux/workqueue.h>
#include "greybus.h"
-#define SVC_KEY_ARA_BUTTON KEY_A
-
-#define SVC_INTF_EJECT_TIMEOUT 9000
+#define SVC_INTF_EJECT_TIMEOUT 9000
+#define SVC_INTF_ACTIVATE_TIMEOUT 6000
+#define SVC_INTF_RESUME_TIMEOUT 3000
struct gb_svc_deferred_request {
struct work_struct work;
};
+static int gb_svc_queue_deferred_request(struct gb_operation *operation);
+
static ssize_t endo_id_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
}
static DEVICE_ATTR_RO(ap_intf_id);
-
// FIXME
// This is a hack, we need to do this "right" and clean the interface up
// properly, not just forcibly yank the thing out of the system and hope for the
}
static DEVICE_ATTR_RW(watchdog);
+static ssize_t watchdog_action_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct gb_svc *svc = to_gb_svc(dev);
+
+ if (svc->action == GB_SVC_WATCHDOG_BITE_PANIC_KERNEL)
+ return sprintf(buf, "panic\n");
+ else if (svc->action == GB_SVC_WATCHDOG_BITE_RESET_UNIPRO)
+ return sprintf(buf, "reset\n");
+
+ return -EINVAL;
+}
+
+static ssize_t watchdog_action_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct gb_svc *svc = to_gb_svc(dev);
+
+ if (sysfs_streq(buf, "panic"))
+ svc->action = GB_SVC_WATCHDOG_BITE_PANIC_KERNEL;
+ else if (sysfs_streq(buf, "reset"))
+ svc->action = GB_SVC_WATCHDOG_BITE_RESET_UNIPRO;
+ else
+ return -EINVAL;
+
+ return len;
+}
+static DEVICE_ATTR_RW(watchdog_action);
+
static int gb_svc_pwrmon_rail_count_get(struct gb_svc *svc, u8 *value)
{
struct gb_svc_pwrmon_rail_count_get_response response;
return ret;
}
+ if (response->status != GB_SVC_OP_SUCCESS) {
+ dev_err(&svc->dev,
+ "SVC error while getting rail names: %u\n",
+ response->status);
+ return -EREMOTEIO;
+ }
+
return 0;
}
case GB_SVC_PWRMON_GET_SAMPLE_NOSUPP:
return -ENOMSG;
default:
- return -EIO;
+ return -EREMOTEIO;
}
}
case GB_SVC_PWRMON_GET_SAMPLE_INVAL:
return -EINVAL;
case GB_SVC_PWRMON_GET_SAMPLE_NOSUPP:
- return -ENOSYS;
+ return -ENOMSG;
default:
- return -EIO;
+ return -EREMOTEIO;
}
}
&dev_attr_ap_intf_id.attr,
&dev_attr_intf_eject.attr,
&dev_attr_watchdog.attr,
+ &dev_attr_watchdog_action.attr,
NULL,
};
ATTRIBUTE_GROUPS(svc);
return 0;
}
+int gb_svc_intf_vsys_set(struct gb_svc *svc, u8 intf_id, bool enable)
+{
+ struct gb_svc_intf_vsys_request request;
+ struct gb_svc_intf_vsys_response response;
+ int type, ret;
+
+ request.intf_id = intf_id;
+
+ if (enable)
+ type = GB_SVC_TYPE_INTF_VSYS_ENABLE;
+ else
+ type = GB_SVC_TYPE_INTF_VSYS_DISABLE;
+
+ ret = gb_operation_sync(svc->connection, type,
+ &request, sizeof(request),
+ &response, sizeof(response));
+ if (ret < 0)
+ return ret;
+ if (response.result_code != GB_SVC_INTF_VSYS_OK)
+ return -EREMOTEIO;
+ return 0;
+}
+
+int gb_svc_intf_refclk_set(struct gb_svc *svc, u8 intf_id, bool enable)
+{
+ struct gb_svc_intf_refclk_request request;
+ struct gb_svc_intf_refclk_response response;
+ int type, ret;
+
+ request.intf_id = intf_id;
+
+ if (enable)
+ type = GB_SVC_TYPE_INTF_REFCLK_ENABLE;
+ else
+ type = GB_SVC_TYPE_INTF_REFCLK_DISABLE;
+
+ ret = gb_operation_sync(svc->connection, type,
+ &request, sizeof(request),
+ &response, sizeof(response));
+ if (ret < 0)
+ return ret;
+ if (response.result_code != GB_SVC_INTF_REFCLK_OK)
+ return -EREMOTEIO;
+ return 0;
+}
+
+int gb_svc_intf_unipro_set(struct gb_svc *svc, u8 intf_id, bool enable)
+{
+ struct gb_svc_intf_unipro_request request;
+ struct gb_svc_intf_unipro_response response;
+ int type, ret;
+
+ request.intf_id = intf_id;
+
+ if (enable)
+ type = GB_SVC_TYPE_INTF_UNIPRO_ENABLE;
+ else
+ type = GB_SVC_TYPE_INTF_UNIPRO_DISABLE;
+
+ ret = gb_operation_sync(svc->connection, type,
+ &request, sizeof(request),
+ &response, sizeof(response));
+ if (ret < 0)
+ return ret;
+ if (response.result_code != GB_SVC_INTF_UNIPRO_OK)
+ return -EREMOTEIO;
+ return 0;
+}
+
+int gb_svc_intf_activate(struct gb_svc *svc, u8 intf_id, u8 *intf_type)
+{
+ struct gb_svc_intf_activate_request request;
+ struct gb_svc_intf_activate_response response;
+ int ret;
+
+ request.intf_id = intf_id;
+
+ ret = gb_operation_sync_timeout(svc->connection,
+ GB_SVC_TYPE_INTF_ACTIVATE,
+ &request, sizeof(request),
+ &response, sizeof(response),
+ SVC_INTF_ACTIVATE_TIMEOUT);
+ if (ret < 0)
+ return ret;
+ if (response.status != GB_SVC_OP_SUCCESS) {
+ dev_err(&svc->dev, "failed to activate interface %u: %u\n",
+ intf_id, response.status);
+ return -EREMOTEIO;
+ }
+
+ *intf_type = response.intf_type;
+
+ return 0;
+}
+
+int gb_svc_intf_resume(struct gb_svc *svc, u8 intf_id)
+{
+ struct gb_svc_intf_resume_request request;
+ struct gb_svc_intf_resume_response response;
+ int ret;
+
+ request.intf_id = intf_id;
+
+ ret = gb_operation_sync_timeout(svc->connection,
+ GB_SVC_TYPE_INTF_RESUME,
+ &request, sizeof(request),
+ &response, sizeof(response),
+ SVC_INTF_RESUME_TIMEOUT);
+ if (ret < 0) {
+ dev_err(&svc->dev, "failed to send interface resume %u: %d\n",
+ intf_id, ret);
+ return ret;
+ }
+
+ if (response.status != GB_SVC_OP_SUCCESS) {
+ dev_err(&svc->dev, "failed to resume interface %u: %u\n",
+ intf_id, response.status);
+ return -EREMOTEIO;
+ }
+
+ return 0;
+}
+
int gb_svc_dme_peer_get(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
u32 *value)
{
if (result) {
dev_err(&svc->dev, "UniPro error while getting DME attribute (%u 0x%04x %u): %u\n",
intf_id, attr, selector, result);
- return -EIO;
+ return -EREMOTEIO;
}
if (value)
return 0;
}
-EXPORT_SYMBOL_GPL(gb_svc_dme_peer_get);
int gb_svc_dme_peer_set(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
u32 value)
if (result) {
dev_err(&svc->dev, "UniPro error while setting DME attribute (%u 0x%04x %u %u): %u\n",
intf_id, attr, selector, value, result);
- return -EIO;
+ return -EREMOTEIO;
}
return 0;
}
-EXPORT_SYMBOL_GPL(gb_svc_dme_peer_set);
int gb_svc_connection_create(struct gb_svc *svc,
u8 intf1_id, u16 cport1_id,
return gb_operation_sync(svc->connection, GB_SVC_TYPE_CONN_CREATE,
&request, sizeof(request), NULL, 0);
}
-EXPORT_SYMBOL_GPL(gb_svc_connection_create);
void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
u8 intf2_id, u16 cport2_id)
intf1_id, cport1_id, intf2_id, cport2_id, ret);
}
}
-EXPORT_SYMBOL_GPL(gb_svc_connection_destroy);
+
+int gb_svc_timesync_enable(struct gb_svc *svc, u8 count, u64 frame_time,
+ u32 strobe_delay, u32 refclk)
+{
+ struct gb_connection *connection = svc->connection;
+ struct gb_svc_timesync_enable_request request;
+
+ request.count = count;
+ request.frame_time = cpu_to_le64(frame_time);
+ request.strobe_delay = cpu_to_le32(strobe_delay);
+ request.refclk = cpu_to_le32(refclk);
+ return gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_ENABLE,
+ &request, sizeof(request), NULL, 0);
+}
+
+int gb_svc_timesync_disable(struct gb_svc *svc)
+{
+ struct gb_connection *connection = svc->connection;
+
+ return gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_DISABLE,
+ NULL, 0, NULL, 0);
+}
+
+int gb_svc_timesync_authoritative(struct gb_svc *svc, u64 *frame_time)
+{
+ struct gb_connection *connection = svc->connection;
+ struct gb_svc_timesync_authoritative_response response;
+ int ret, i;
+
+ ret = gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_AUTHORITATIVE, NULL, 0,
+ &response, sizeof(response));
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < GB_TIMESYNC_MAX_STROBES; i++)
+ frame_time[i] = le64_to_cpu(response.frame_time[i]);
+ return 0;
+}
+
+int gb_svc_timesync_ping(struct gb_svc *svc, u64 *frame_time)
+{
+ struct gb_connection *connection = svc->connection;
+ struct gb_svc_timesync_ping_response response;
+ int ret;
+
+ ret = gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_PING,
+ NULL, 0,
+ &response, sizeof(response));
+ if (ret < 0)
+ return ret;
+
+ *frame_time = le64_to_cpu(response.frame_time);
+ return 0;
+}
+
+int gb_svc_timesync_wake_pins_acquire(struct gb_svc *svc, u32 strobe_mask)
+{
+ struct gb_connection *connection = svc->connection;
+ struct gb_svc_timesync_wake_pins_acquire_request request;
+
+ request.strobe_mask = cpu_to_le32(strobe_mask);
+ return gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_WAKE_PINS_ACQUIRE,
+ &request, sizeof(request),
+ NULL, 0);
+}
+
+int gb_svc_timesync_wake_pins_release(struct gb_svc *svc)
+{
+ struct gb_connection *connection = svc->connection;
+
+ return gb_operation_sync(connection,
+ GB_SVC_TYPE_TIMESYNC_WAKE_PINS_RELEASE,
+ NULL, 0, NULL, 0);
+}
/* Creates bi-directional routes between the devices */
int gb_svc_route_create(struct gb_svc *svc, u8 intf1_id, u8 dev1_id,
int gb_svc_intf_set_power_mode(struct gb_svc *svc, u8 intf_id, u8 hs_series,
u8 tx_mode, u8 tx_gear, u8 tx_nlanes,
+ u8 tx_amplitude, u8 tx_hs_equalizer,
u8 rx_mode, u8 rx_gear, u8 rx_nlanes,
- u8 flags, u32 quirks)
+ u8 flags, u32 quirks,
+ struct gb_svc_l2_timer_cfg *local,
+ struct gb_svc_l2_timer_cfg *remote)
{
struct gb_svc_intf_set_pwrm_request request;
struct gb_svc_intf_set_pwrm_response response;
int ret;
+ u16 result_code;
+
+ memset(&request, 0, sizeof(request));
request.intf_id = intf_id;
request.hs_series = hs_series;
request.tx_mode = tx_mode;
request.tx_gear = tx_gear;
request.tx_nlanes = tx_nlanes;
+ request.tx_amplitude = tx_amplitude;
+ request.tx_hs_equalizer = tx_hs_equalizer;
request.rx_mode = rx_mode;
request.rx_gear = rx_gear;
request.rx_nlanes = rx_nlanes;
request.flags = flags;
request.quirks = cpu_to_le32(quirks);
+ if (local)
+ request.local_l2timerdata = *local;
+ if (remote)
+ request.remote_l2timerdata = *remote;
ret = gb_operation_sync(svc->connection, GB_SVC_TYPE_INTF_SET_PWRM,
&request, sizeof(request),
if (ret < 0)
return ret;
- return le16_to_cpu(response.result_code);
+ result_code = response.result_code;
+ if (result_code != GB_SVC_SETPWRM_PWR_LOCAL) {
+ dev_err(&svc->dev, "set power mode = %d\n", result_code);
+ return -EIO;
+ }
+
+ return 0;
}
EXPORT_SYMBOL_GPL(gb_svc_intf_set_power_mode);
+int gb_svc_intf_set_power_mode_hibernate(struct gb_svc *svc, u8 intf_id)
+{
+ struct gb_svc_intf_set_pwrm_request request;
+ struct gb_svc_intf_set_pwrm_response response;
+ int ret;
+ u16 result_code;
+
+ memset(&request, 0, sizeof(request));
+
+ request.intf_id = intf_id;
+ request.hs_series = GB_SVC_UNIPRO_HS_SERIES_A;
+ request.tx_mode = GB_SVC_UNIPRO_HIBERNATE_MODE;
+ request.rx_mode = GB_SVC_UNIPRO_HIBERNATE_MODE;
+
+ ret = gb_operation_sync(svc->connection, GB_SVC_TYPE_INTF_SET_PWRM,
+ &request, sizeof(request),
+ &response, sizeof(response));
+ if (ret < 0) {
+ dev_err(&svc->dev,
+ "failed to send set power mode operation to interface %u: %d\n",
+ intf_id, ret);
+ return ret;
+ }
+
+ result_code = response.result_code;
+ if (result_code != GB_SVC_SETPWRM_PWR_OK) {
+ dev_err(&svc->dev,
+ "failed to hibernate the link for interface %u: %u\n",
+ intf_id, result_code);
+ return -EIO;
+ }
+
+ return 0;
+}
+
int gb_svc_ping(struct gb_svc *svc)
{
return gb_operation_sync_timeout(svc->connection, GB_SVC_TYPE_PING,
NULL, 0, NULL, 0,
GB_OPERATION_TIMEOUT_DEFAULT * 2);
}
-EXPORT_SYMBOL_GPL(gb_svc_ping);
static int gb_svc_version_request(struct gb_operation *op)
{
struct gb_connection *connection = op->connection;
struct gb_svc *svc = gb_connection_get_data(connection);
- struct gb_protocol_version_request *request;
- struct gb_protocol_version_response *response;
+ struct gb_svc_version_request *request;
+ struct gb_svc_version_response *response;
if (op->request->payload_size < sizeof(*request)) {
dev_err(&svc->dev, "short version request (%zu < %zu)\n",
int i;
size_t bufsize;
struct dentry *dent;
+ struct gb_svc_pwrmon_rail_names_get_response *rail_names;
+ u8 rail_count;
dent = debugfs_create_dir("pwrmon", svc->debugfs_dentry);
if (IS_ERR_OR_NULL(dent))
return;
- if (gb_svc_pwrmon_rail_count_get(svc, &svc->rail_count))
+ if (gb_svc_pwrmon_rail_count_get(svc, &rail_count))
goto err_pwrmon_debugfs;
- if (!svc->rail_count || svc->rail_count > GB_SVC_PWRMON_MAX_RAIL_COUNT)
+ if (!rail_count || rail_count > GB_SVC_PWRMON_MAX_RAIL_COUNT)
goto err_pwrmon_debugfs;
- bufsize = GB_SVC_PWRMON_RAIL_NAME_BUFSIZE * svc->rail_count;
+ bufsize = sizeof(*rail_names) +
+ GB_SVC_PWRMON_RAIL_NAME_BUFSIZE * rail_count;
- svc->rail_names = kzalloc(bufsize, GFP_KERNEL);
- if (!svc->rail_names)
+ rail_names = kzalloc(bufsize, GFP_KERNEL);
+ if (!rail_names)
goto err_pwrmon_debugfs;
- svc->pwrmon_rails = kcalloc(svc->rail_count, sizeof(*svc->pwrmon_rails),
+ svc->pwrmon_rails = kcalloc(rail_count, sizeof(*svc->pwrmon_rails),
GFP_KERNEL);
if (!svc->pwrmon_rails)
goto err_pwrmon_debugfs_free;
- if (gb_svc_pwrmon_rail_names_get(svc, svc->rail_names, bufsize))
+ if (gb_svc_pwrmon_rail_names_get(svc, rail_names, bufsize))
goto err_pwrmon_debugfs_free;
- for (i = 0; i < svc->rail_count; i++) {
+ for (i = 0; i < rail_count; i++) {
struct dentry *dir;
struct svc_debugfs_pwrmon_rail *rail = &svc->pwrmon_rails[i];
char fname[GB_SVC_PWRMON_RAIL_NAME_BUFSIZE];
snprintf(fname, sizeof(fname), "%s",
- (char *)&svc->rail_names->name[i]);
+ (char *)&rail_names->name[i]);
rail->id = i;
rail->svc = svc;
&pwrmon_debugfs_current_fops);
debugfs_create_file("power_now", S_IRUGO, dir, rail,
&pwrmon_debugfs_power_fops);
- };
+ }
+
+ kfree(rail_names);
return;
err_pwrmon_debugfs_free:
- kfree(svc->rail_names);
- svc->rail_names = NULL;
-
+ kfree(rail_names);
kfree(svc->pwrmon_rails);
svc->pwrmon_rails = NULL;
static void gb_svc_debugfs_exit(struct gb_svc *svc)
{
debugfs_remove_recursive(svc->debugfs_dentry);
- kfree(svc->rail_names);
+ kfree(svc->pwrmon_rails);
+ svc->pwrmon_rails = NULL;
}
static int gb_svc_hello(struct gb_operation *op)
return ret;
}
- ret = input_register_device(svc->input);
- if (ret) {
- dev_err(&svc->dev, "failed to register input: %d\n", ret);
- device_del(&svc->dev);
- return ret;
- }
-
ret = gb_svc_watchdog_create(svc);
if (ret) {
dev_err(&svc->dev, "failed to create watchdog: %d\n", ret);
- input_unregister_device(svc->input);
- device_del(&svc->dev);
- return ret;
+ goto err_unregister_device;
}
gb_svc_debugfs_init(svc);
- return 0;
+ ret = gb_timesync_svc_add(svc);
+ if (ret) {
+ dev_err(&svc->dev, "failed to add SVC to timesync: %d\n", ret);
+ gb_svc_debugfs_exit(svc);
+ goto err_unregister_device;
+ }
+
+ return gb_svc_queue_deferred_request(op);
+
+err_unregister_device:
+ gb_svc_watchdog_destroy(svc);
+ device_del(&svc->dev);
+ return ret;
+}
+
+static struct gb_interface *gb_svc_interface_lookup(struct gb_svc *svc,
+ u8 intf_id)
+{
+ struct gb_host_device *hd = svc->hd;
+ struct gb_module *module;
+ size_t num_interfaces;
+ u8 module_id;
+
+ list_for_each_entry(module, &hd->modules, hd_node) {
+ module_id = module->module_id;
+ num_interfaces = module->num_interfaces;
+
+ if (intf_id >= module_id &&
+ intf_id < module_id + num_interfaces) {
+ return module->interfaces[intf_id - module_id];
+ }
+ }
+
+ return NULL;
+}
+
+static struct gb_module *gb_svc_module_lookup(struct gb_svc *svc, u8 module_id)
+{
+ struct gb_host_device *hd = svc->hd;
+ struct gb_module *module;
+
+ list_for_each_entry(module, &hd->modules, hd_node) {
+ if (module->module_id == module_id)
+ return module;
+ }
+
+ return NULL;
}
-static void gb_svc_process_intf_hotplug(struct gb_operation *operation)
+static void gb_svc_process_hello_deferred(struct gb_operation *operation)
{
- struct gb_svc_intf_hotplug_request *request;
struct gb_connection *connection = operation->connection;
struct gb_svc *svc = gb_connection_get_data(connection);
- struct gb_host_device *hd = connection->hd;
- struct gb_interface *intf;
- u8 intf_id;
+ int ret;
+
+ /*
+ * XXX This is a hack/work-around to reconfigure the APBridgeA-Switch
+ * link to PWM G2, 1 Lane, Slow Auto, so that it has sufficient
+ * bandwidth for 3 audio streams plus boot-over-UniPro of a hot-plugged
+ * module.
+ *
+ * The code should be removed once SW-2217, Heuristic for UniPro
+ * Power Mode Changes is resolved.
+ */
+ ret = gb_svc_intf_set_power_mode(svc, svc->ap_intf_id,
+ GB_SVC_UNIPRO_HS_SERIES_A,
+ GB_SVC_UNIPRO_SLOW_AUTO_MODE,
+ 2, 1,
+ GB_SVC_SMALL_AMPLITUDE, GB_SVC_NO_DE_EMPHASIS,
+ GB_SVC_UNIPRO_SLOW_AUTO_MODE,
+ 2, 1,
+ 0, 0,
+ NULL, NULL);
+
+ if (ret)
+ dev_warn(&svc->dev,
+ "power mode change failed on AP to switch link: %d\n",
+ ret);
+}
+
+static void gb_svc_process_module_inserted(struct gb_operation *operation)
+{
+ struct gb_svc_module_inserted_request *request;
+ struct gb_connection *connection = operation->connection;
+ struct gb_svc *svc = gb_connection_get_data(connection);
+ struct gb_host_device *hd = svc->hd;
+ struct gb_module *module;
+ size_t num_interfaces;
+ u8 module_id;
+ u16 flags;
int ret;
/* The request message size has already been verified. */
request = operation->request->payload;
- intf_id = request->intf_id;
-
- dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id);
+ module_id = request->primary_intf_id;
+ num_interfaces = request->intf_count;
+ flags = le16_to_cpu(request->flags);
- intf = gb_interface_find(hd, intf_id);
- if (intf) {
- dev_info(&svc->dev, "mode switch detected on interface %u\n",
- intf_id);
+ dev_dbg(&svc->dev, "%s - id = %u, num_interfaces = %zu, flags = 0x%04x\n",
+ __func__, module_id, num_interfaces, flags);
- /* Mark as disconnected to prevent I/O during disable. */
- intf->disconnected = true;
- gb_interface_disable(intf);
- intf->disconnected = false;
+ if (flags & GB_SVC_MODULE_INSERTED_FLAG_NO_PRIMARY) {
+ dev_warn(&svc->dev, "no primary interface detected on module %u\n",
+ module_id);
+ }
- goto enable_interface;
+ module = gb_svc_module_lookup(svc, module_id);
+ if (module) {
+ dev_warn(&svc->dev, "unexpected module-inserted event %u\n",
+ module_id);
+ return;
}
- intf = gb_interface_create(hd, intf_id);
- if (!intf) {
- dev_err(&svc->dev, "failed to create interface %u\n",
- intf_id);
+ module = gb_module_create(hd, module_id, num_interfaces);
+ if (!module) {
+ dev_err(&svc->dev, "failed to create module\n");
return;
}
- ret = gb_interface_activate(intf);
+ ret = gb_module_add(module);
if (ret) {
- dev_err(&svc->dev, "failed to activate interface %u: %d\n",
- intf_id, ret);
- gb_interface_add(intf);
+ gb_module_put(module);
return;
}
- ret = gb_interface_add(intf);
- if (ret)
- goto err_interface_deactivate;
+ list_add(&module->hd_node, &hd->modules);
+}
-enable_interface:
- ret = gb_interface_enable(intf);
- if (ret) {
- dev_err(&svc->dev, "failed to enable interface %u: %d\n",
- intf_id, ret);
- goto err_interface_deactivate;
+static void gb_svc_process_module_removed(struct gb_operation *operation)
+{
+ struct gb_svc_module_removed_request *request;
+ struct gb_connection *connection = operation->connection;
+ struct gb_svc *svc = gb_connection_get_data(connection);
+ struct gb_module *module;
+ u8 module_id;
+
+ /* The request message size has already been verified. */
+ request = operation->request->payload;
+ module_id = request->primary_intf_id;
+
+ dev_dbg(&svc->dev, "%s - id = %u\n", __func__, module_id);
+
+ module = gb_svc_module_lookup(svc, module_id);
+ if (!module) {
+ dev_warn(&svc->dev, "unexpected module-removed event %u\n",
+ module_id);
+ return;
}
- return;
+ module->disconnected = true;
-err_interface_deactivate:
- gb_interface_deactivate(intf);
+ gb_module_del(module);
+ list_del(&module->hd_node);
+ gb_module_put(module);
}
-static void gb_svc_process_intf_hot_unplug(struct gb_operation *operation)
+static void gb_svc_process_intf_oops(struct gb_operation *operation)
{
- struct gb_svc *svc = gb_connection_get_data(operation->connection);
- struct gb_svc_intf_hot_unplug_request *request;
- struct gb_host_device *hd = operation->connection->hd;
+ struct gb_svc_intf_oops_request *request;
+ struct gb_connection *connection = operation->connection;
+ struct gb_svc *svc = gb_connection_get_data(connection);
struct gb_interface *intf;
u8 intf_id;
+ u8 reason;
/* The request message size has already been verified. */
request = operation->request->payload;
intf_id = request->intf_id;
+ reason = request->reason;
- dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id);
-
- intf = gb_interface_find(hd, intf_id);
+ intf = gb_svc_interface_lookup(svc, intf_id);
if (!intf) {
- dev_warn(&svc->dev, "could not find hot-unplug interface %u\n",
- intf_id);
+ dev_warn(&svc->dev, "unexpected interface-oops event %u\n",
+ intf_id);
return;
}
- /* Mark as disconnected to prevent I/O during disable. */
- intf->disconnected = true;
+ dev_info(&svc->dev, "Deactivating interface %u, interface oops reason = %u\n",
+ intf_id, reason);
+ mutex_lock(&intf->mutex);
+ intf->disconnected = true;
gb_interface_disable(intf);
gb_interface_deactivate(intf);
- gb_interface_remove(intf);
+ mutex_unlock(&intf->mutex);
+}
+
+static void gb_svc_process_intf_mailbox_event(struct gb_operation *operation)
+{
+ struct gb_svc_intf_mailbox_event_request *request;
+ struct gb_connection *connection = operation->connection;
+ struct gb_svc *svc = gb_connection_get_data(connection);
+ struct gb_interface *intf;
+ u8 intf_id;
+ u16 result_code;
+ u32 mailbox;
+
+ /* The request message size has already been verified. */
+ request = operation->request->payload;
+ intf_id = request->intf_id;
+ result_code = le16_to_cpu(request->result_code);
+ mailbox = le32_to_cpu(request->mailbox);
+
+ dev_dbg(&svc->dev, "%s - id = %u, result = 0x%04x, mailbox = 0x%08x\n",
+ __func__, intf_id, result_code, mailbox);
+
+ intf = gb_svc_interface_lookup(svc, intf_id);
+ if (!intf) {
+ dev_warn(&svc->dev, "unexpected mailbox event %u\n", intf_id);
+ return;
+ }
+
+ gb_interface_mailbox_event(intf, result_code, mailbox);
}
static void gb_svc_process_deferred_request(struct work_struct *work)
type = operation->request->header->type;
switch (type) {
- case GB_SVC_TYPE_INTF_HOTPLUG:
- gb_svc_process_intf_hotplug(operation);
+ case GB_SVC_TYPE_SVC_HELLO:
+ gb_svc_process_hello_deferred(operation);
+ break;
+ case GB_SVC_TYPE_MODULE_INSERTED:
+ gb_svc_process_module_inserted(operation);
+ break;
+ case GB_SVC_TYPE_MODULE_REMOVED:
+ gb_svc_process_module_removed(operation);
break;
- case GB_SVC_TYPE_INTF_HOT_UNPLUG:
- gb_svc_process_intf_hot_unplug(operation);
+ case GB_SVC_TYPE_INTF_MAILBOX_EVENT:
+ gb_svc_process_intf_mailbox_event(operation);
+ break;
+ case GB_SVC_TYPE_INTF_OOPS:
+ gb_svc_process_intf_oops(operation);
break;
default:
dev_err(&svc->dev, "bad deferred request type: 0x%02x\n", type);
return 0;
}
-/*
- * Bringing up a module can be time consuming, as that may require lots of
- * initialization on the module side. Over that, we may also need to download
- * the firmware first and flash that on the module.
- *
- * In order not to make other svc events wait for all this to finish,
- * handle most of module hotplug stuff outside of the hotplug callback, with
- * help of a workqueue.
- */
-static int gb_svc_intf_hotplug_recv(struct gb_operation *op)
+static int gb_svc_intf_reset_recv(struct gb_operation *op)
{
struct gb_svc *svc = gb_connection_get_data(op->connection);
- struct gb_svc_intf_hotplug_request *request;
+ struct gb_message *request = op->request;
+ struct gb_svc_intf_reset_request *reset;
+ u8 intf_id;
- if (op->request->payload_size < sizeof(*request)) {
- dev_warn(&svc->dev, "short hotplug request received (%zu < %zu)\n",
- op->request->payload_size, sizeof(*request));
+ if (request->payload_size < sizeof(*reset)) {
+ dev_warn(&svc->dev, "short reset request received (%zu < %zu)\n",
+ request->payload_size, sizeof(*reset));
return -EINVAL;
}
+ reset = request->payload;
- request = op->request->payload;
+ intf_id = reset->intf_id;
- dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);
+ /* FIXME Reset the interface here */
- return gb_svc_queue_deferred_request(op);
+ return 0;
}
-static int gb_svc_intf_hot_unplug_recv(struct gb_operation *op)
+static int gb_svc_module_inserted_recv(struct gb_operation *op)
{
struct gb_svc *svc = gb_connection_get_data(op->connection);
- struct gb_svc_intf_hot_unplug_request *request;
+ struct gb_svc_module_inserted_request *request;
if (op->request->payload_size < sizeof(*request)) {
- dev_warn(&svc->dev, "short hot unplug request received (%zu < %zu)\n",
+ dev_warn(&svc->dev, "short module-inserted request received (%zu < %zu)\n",
op->request->payload_size, sizeof(*request));
return -EINVAL;
}
request = op->request->payload;
- dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);
+ dev_dbg(&svc->dev, "%s - id = %u\n", __func__,
+ request->primary_intf_id);
return gb_svc_queue_deferred_request(op);
}
-static int gb_svc_intf_reset_recv(struct gb_operation *op)
+static int gb_svc_module_removed_recv(struct gb_operation *op)
{
struct gb_svc *svc = gb_connection_get_data(op->connection);
- struct gb_message *request = op->request;
- struct gb_svc_intf_reset_request *reset;
- u8 intf_id;
+ struct gb_svc_module_removed_request *request;
- if (request->payload_size < sizeof(*reset)) {
- dev_warn(&svc->dev, "short reset request received (%zu < %zu)\n",
- request->payload_size, sizeof(*reset));
+ if (op->request->payload_size < sizeof(*request)) {
+ dev_warn(&svc->dev, "short module-removed request received (%zu < %zu)\n",
+ op->request->payload_size, sizeof(*request));
return -EINVAL;
}
- reset = request->payload;
- intf_id = reset->intf_id;
+ request = op->request->payload;
- /* FIXME Reset the interface here */
+ dev_dbg(&svc->dev, "%s - id = %u\n", __func__,
+ request->primary_intf_id);
- return 0;
+ return gb_svc_queue_deferred_request(op);
}
-static int gb_svc_key_code_map(struct gb_svc *svc, u16 key_code, u16 *code)
+static int gb_svc_intf_oops_recv(struct gb_operation *op)
{
- switch (key_code) {
- case GB_KEYCODE_ARA:
- *code = SVC_KEY_ARA_BUTTON;
- break;
- default:
- dev_warn(&svc->dev, "unknown keycode received: %u\n", key_code);
+ struct gb_svc *svc = gb_connection_get_data(op->connection);
+ struct gb_svc_intf_oops_request *request;
+
+ if (op->request->payload_size < sizeof(*request)) {
+ dev_warn(&svc->dev, "short intf-oops request received (%zu < %zu)\n",
+ op->request->payload_size, sizeof(*request));
return -EINVAL;
}
- return 0;
+ return gb_svc_queue_deferred_request(op);
}
-static int gb_svc_key_event_recv(struct gb_operation *op)
+static int gb_svc_intf_mailbox_event_recv(struct gb_operation *op)
{
struct gb_svc *svc = gb_connection_get_data(op->connection);
- struct gb_message *request = op->request;
- struct gb_svc_key_event_request *key;
- u16 code;
- u8 event;
- int ret;
+ struct gb_svc_intf_mailbox_event_request *request;
- if (request->payload_size < sizeof(*key)) {
- dev_warn(&svc->dev, "short key request received (%zu < %zu)\n",
- request->payload_size, sizeof(*key));
+ if (op->request->payload_size < sizeof(*request)) {
+ dev_warn(&svc->dev, "short mailbox request received (%zu < %zu)\n",
+ op->request->payload_size, sizeof(*request));
return -EINVAL;
}
- key = request->payload;
-
- ret = gb_svc_key_code_map(svc, le16_to_cpu(key->key_code), &code);
- if (ret < 0)
- return ret;
-
- event = key->key_event;
- if ((event != GB_SVC_KEY_PRESSED) && (event != GB_SVC_KEY_RELEASED)) {
- dev_warn(&svc->dev, "unknown key event received: %u\n", event);
- return -EINVAL;
- }
+ request = op->request->payload;
- input_report_key(svc->input, code, (event == GB_SVC_KEY_PRESSED));
- input_sync(svc->input);
+ dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);
- return 0;
+ return gb_svc_queue_deferred_request(op);
}
static int gb_svc_request_handler(struct gb_operation *op)
* need to protect 'state' for any races.
*/
switch (type) {
- case GB_REQUEST_TYPE_PROTOCOL_VERSION:
+ case GB_SVC_TYPE_PROTOCOL_VERSION:
if (svc->state != GB_SVC_STATE_RESET)
ret = -EINVAL;
break;
}
switch (type) {
- case GB_REQUEST_TYPE_PROTOCOL_VERSION:
+ case GB_SVC_TYPE_PROTOCOL_VERSION:
ret = gb_svc_version_request(op);
if (!ret)
svc->state = GB_SVC_STATE_PROTOCOL_VERSION;
if (!ret)
svc->state = GB_SVC_STATE_SVC_HELLO;
return ret;
- case GB_SVC_TYPE_INTF_HOTPLUG:
- return gb_svc_intf_hotplug_recv(op);
- case GB_SVC_TYPE_INTF_HOT_UNPLUG:
- return gb_svc_intf_hot_unplug_recv(op);
case GB_SVC_TYPE_INTF_RESET:
return gb_svc_intf_reset_recv(op);
- case GB_SVC_TYPE_KEY_EVENT:
- return gb_svc_key_event_recv(op);
+ case GB_SVC_TYPE_MODULE_INSERTED:
+ return gb_svc_module_inserted_recv(op);
+ case GB_SVC_TYPE_MODULE_REMOVED:
+ return gb_svc_module_removed_recv(op);
+ case GB_SVC_TYPE_INTF_MAILBOX_EVENT:
+ return gb_svc_intf_mailbox_event_recv(op);
+ case GB_SVC_TYPE_INTF_OOPS:
+ return gb_svc_intf_oops_recv(op);
default:
dev_warn(&svc->dev, "unsupported request 0x%02x\n", type);
return -EINVAL;
}
}
-static struct input_dev *gb_svc_input_create(struct gb_svc *svc)
-{
- struct input_dev *input_dev;
-
- input_dev = input_allocate_device();
- if (!input_dev)
- return ERR_PTR(-ENOMEM);
-
- input_dev->name = dev_name(&svc->dev);
- svc->input_phys = kasprintf(GFP_KERNEL, "greybus-%s/input0",
- input_dev->name);
- if (!svc->input_phys)
- goto err_free_input;
-
- input_dev->phys = svc->input_phys;
- input_dev->dev.parent = &svc->dev;
-
- input_set_drvdata(input_dev, svc);
-
- input_set_capability(input_dev, EV_KEY, SVC_KEY_ARA_BUTTON);
-
- return input_dev;
-
-err_free_input:
- input_free_device(svc->input);
- return ERR_PTR(-ENOMEM);
-}
-
static void gb_svc_release(struct device *dev)
{
struct gb_svc *svc = to_gb_svc(dev);
gb_connection_destroy(svc->connection);
ida_destroy(&svc->device_id_map);
destroy_workqueue(svc->wq);
- kfree(svc->input_phys);
kfree(svc);
}
svc->state = GB_SVC_STATE_RESET;
svc->hd = hd;
- svc->input = gb_svc_input_create(svc);
- if (IS_ERR(svc->input)) {
- dev_err(&svc->dev, "failed to create input device: %ld\n",
- PTR_ERR(svc->input));
- goto err_put_device;
- }
-
svc->connection = gb_connection_create_static(hd, GB_SVC_CPORT_ID,
gb_svc_request_handler);
if (IS_ERR(svc->connection)) {
dev_err(&svc->dev, "failed to create connection: %ld\n",
PTR_ERR(svc->connection));
- goto err_free_input;
+ goto err_put_device;
}
gb_connection_set_data(svc->connection, svc);
return svc;
-err_free_input:
- input_free_device(svc->input);
err_put_device:
put_device(&svc->dev);
return NULL;
return 0;
}
-static void gb_svc_remove_interfaces(struct gb_svc *svc)
+static void gb_svc_remove_modules(struct gb_svc *svc)
{
- struct gb_interface *intf, *tmp;
+ struct gb_host_device *hd = svc->hd;
+ struct gb_module *module, *tmp;
- list_for_each_entry_safe(intf, tmp, &svc->hd->interfaces, links) {
- gb_interface_disable(intf);
- gb_interface_deactivate(intf);
- gb_interface_remove(intf);
+ list_for_each_entry_safe(module, tmp, &hd->modules, hd_node) {
+ gb_module_del(module);
+ list_del(&module->hd_node);
+ gb_module_put(module);
}
}
void gb_svc_del(struct gb_svc *svc)
{
- gb_connection_disable(svc->connection);
+ gb_connection_disable_rx(svc->connection);
/*
- * The SVC device and input device may have been registered
- * from the request handler.
+ * The SVC device may have been registered from the request handler.
*/
if (device_is_registered(&svc->dev)) {
+ gb_timesync_svc_remove(svc);
gb_svc_debugfs_exit(svc);
gb_svc_watchdog_destroy(svc);
- input_unregister_device(svc->input);
device_del(&svc->dev);
}
flush_workqueue(svc->wq);
- gb_svc_remove_interfaces(svc);
+ gb_svc_remove_modules(svc);
+
+ gb_connection_disable(svc->connection);
}
void gb_svc_put(struct gb_svc *svc)
projects / cascardo / linux.git / blobdiff