greybus: svc: Read and clear module's boot status

As per the module's boot sequence diagram, the AP needs to read/clear
T_TstSrcIncrement attribute on hotplug (svc) events.

Implement that.

FIXME: This is module-hardware dependent and needs to be extended for
every type of module we want to support.

[ Based on work by Marti & Eli to clear the attribute with DME set]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Viresh Kumar 2015-09-24 14:40:29 -07:00 committed by Greg Kroah-Hartman
parent bbaca71151
commit 6bec5c78e5
2 changed files with 44 additions and 0 deletions

View File

@ -829,6 +829,10 @@ struct gb_svc_dme_peer_set_response {
__le16 result_code;
} __packed;
/* Attributes for peer get/set operations */
#define DME_ATTR_SELECTOR_INDEX 0
#define DME_ATTR_T_TST_SRC_INCREMENT 0x4083
struct gb_svc_route_create_request {
__u8 intf1_id;
__u8 dev1_id;

View File

@ -176,6 +176,42 @@ int gb_svc_dme_peer_set(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
}
EXPORT_SYMBOL_GPL(gb_svc_dme_peer_set);
/*
* T_TstSrcIncrement is written by the module on ES2 as a stand-in for boot
* status attribute. AP needs to read and clear it, after reading a non-zero
* value from it.
*
* FIXME: This is module-hardware dependent and needs to be extended for every
* type of module we want to support.
*/
static int gb_svc_read_and_clear_module_boot_status(struct gb_interface *intf)
{
struct greybus_host_device *hd = intf->hd;
int ret;
u32 value;
/* Read and clear boot status in T_TstSrcIncrement */
ret = gb_svc_dme_peer_get(hd->svc, intf->interface_id,
DME_ATTR_T_TST_SRC_INCREMENT,
DME_ATTR_SELECTOR_INDEX, &value);
if (ret)
return ret;
/*
* A nonzero boot status indicates the module has finished
* booting. Clear it.
*/
if (!value) {
dev_err(&intf->dev, "Module not ready yet\n");
return -ENODEV;
}
return gb_svc_dme_peer_set(hd->svc, intf->interface_id,
DME_ATTR_T_TST_SRC_INCREMENT,
DME_ATTR_SELECTOR_INDEX, 0);
}
int gb_svc_connection_create(struct gb_svc *svc,
u8 intf1_id, u16 cport1_id,
u8 intf2_id, u16 cport2_id)
@ -398,6 +434,10 @@ static void svc_process_hotplug(struct work_struct *work)
goto free_svc_hotplug;
}
ret = gb_svc_read_and_clear_module_boot_status(intf);
if (ret)
goto destroy_interface;
intf->unipro_mfg_id = le32_to_cpu(hotplug->data.unipro_mfg_id);
intf->unipro_prod_id = le32_to_cpu(hotplug->data.unipro_prod_id);
intf->ara_vend_id = le32_to_cpu(hotplug->data.ara_vend_id);