greybus: host controller additions
Also some gbuf functions starting to get fleshed out.
diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/es1-ap-usb.c
index e7042d5..a08e4dd 100644
--- a/drivers/staging/greybus/es1-ap-usb.c
+++ b/drivers/staging/greybus/es1-ap-usb.c
@@ -13,7 +13,7 @@
#include "greybus.h"
static const struct usb_device_id id_table[] = {
- { USB_DEVICE(0x0000, 0x0000) }, // FIXME
+ { USB_DEVICE(0xffff, 0x0001) }, // FIXME
{ },
};
MODULE_DEVICE_TABLE(usb, id_table);
@@ -21,18 +21,73 @@
struct es1_ap_dev {
struct usb_device *usb_dev;
struct usb_interface *usb_intf;
+ struct greybus_host_device *hd;
- __u8 ap_in_endpoint;
- __u8 ap_out_endpoint;
+ __u8 ap_comm_endpoint; /* endpoint to talk to the AP */
+ __u8 ap_in_endpoint; /* bulk in for CPort data */
+ __u8 ap_out_endpoint; /* bulk out for CPort data */
u8 *ap_buffer;
};
+static inline struct es1_ap_dev *hd_to_es1(struct greybus_host_device *hd)
+{
+ return (struct es1_ap_dev *)(hd->hd_priv);
+}
+
/*
- * Hack, we "know" we will only have one of these at any one time, so only
- * create one static structure pointer.
+ * Allocate the actual buffer for this gbuf and device and cport
+ *
+ * We are responsible for setting the following fields in a struct gbuf:
+ * void *hcpriv;
+ * void *transfer_buffer;
+ * u32 transfer_buffer_length;
*/
-static struct es1_ap_dev *es1_ap_dev;
+static int alloc_gbuf(struct gbuf *gbuf, unsigned int size, gfp_t gfp_mask)
+{
+ struct es1_ap_dev *es1 = hd_to_es1(gbuf->gdev->hd);
+ u8 *buffer;
+
+ /* For ES2 we need to figure out what cport is going to what endpoint,
+ * but for ES1, it's so dirt simple, we don't have a choice...
+ *
+ * Also, do a "slow" allocation now, if we need speed, use a cache
+ */
+ buffer = kmalloc(size + 1, gfp_mask);
+ if (!buffer)
+ return -ENOMEM;
+
+ /*
+ * we will encode the cport number in the first byte of the buffer, so
+ * set the second byte to be the "transfer buffer"
+ */
+ buffer[0] = gbuf->cport->number;
+ gbuf->transfer_buffer = &buffer[1];
+ gbuf->transfer_buffer_length = size;
+
+ gbuf->hdpriv = es1; /* really, we could do something else here... */
+
+ return 0;
+}
+
+/* Free the memory we allocated with a gbuf */
+static void free_gbuf(struct gbuf *gbuf)
+{
+ u8 *transfer_buffer;
+ u8 *buffer;
+
+ transfer_buffer = gbuf->transfer_buffer;
+ buffer = &transfer_buffer[-1]; /* yes, we mean -1 */
+ kfree(buffer);
+}
+
+
+static struct greybus_host_driver es1_driver = {
+ .hd_priv_size = sizeof(struct es1_ap_dev),
+ .alloc_gbuf = alloc_gbuf,
+ .free_gbuf = free_gbuf,
+};
+
void ap_in_callback(struct urb *urb)
{
@@ -100,19 +155,26 @@
static int ap_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
+ struct es1_ap_dev *es1;
+ struct greybus_host_device *hd;
+ struct usb_device *udev;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint;
- size_t buffer_size;
int i;
- if (es1_ap_dev) {
- dev_err(&interface->dev, "Already have a es1_ap_dev???\n");
- return -ENODEV;
- }
- es1_ap_dev = kzalloc(sizeof(*es1_ap_dev), GFP_KERNEL);
- if (!es1_ap_dev)
+ udev = usb_get_dev(interface_to_usbdev(interface));
+
+ hd = greybus_create_hd(&es1_driver, &udev->dev);
+ if (!hd)
return -ENOMEM;
+ es1 = hd_to_es1(hd);
+ es1->hd = hd;
+
+ /* Control endpoint is the pipe to talk to this AP, so save it off */
+ endpoint = &udev->ep0.desc;
+ es1->ap_comm_endpoint = endpoint->bEndpointAddress;
+
// FIXME
// figure out endpoint for talking to the AP.
iface_desc = interface->cur_altsetting;
@@ -120,13 +182,10 @@
endpoint = &iface_desc->endpoint[i].desc;
if (usb_endpoint_is_bulk_in(endpoint)) {
- buffer_size = usb_endpoint_maxp(endpoint);
- // FIXME - Save buffer_size?
- es1_ap_dev->ap_in_endpoint = endpoint->bEndpointAddress;
+ es1->ap_in_endpoint = endpoint->bEndpointAddress;
}
if (usb_endpoint_is_bulk_out(endpoint)) {
- // FIXME - anything else about this we need?
- es1_ap_dev->ap_out_endpoint = endpoint->bEndpointAddress;
+ es1->ap_out_endpoint = endpoint->bEndpointAddress;
}
// FIXME - properly exit once found the AP endpoint
// FIXME - set up cport endpoints
@@ -135,23 +194,25 @@
// FIXME - allocate buffer
// FIXME = start up talking, then create the gb "devices" based on what the AP tells us.
- es1_ap_dev->usb_intf = interface;
- es1_ap_dev->usb_dev = usb_get_dev(interface_to_usbdev(interface));
- usb_set_intfdata(interface, es1_ap_dev);
+ es1->usb_intf = interface;
+ es1->usb_dev = udev;
+ usb_set_intfdata(interface, es1);
return 0;
}
static void ap_disconnect(struct usb_interface *interface)
{
- es1_ap_dev = usb_get_intfdata(interface);
+ struct es1_ap_dev *es1;
+
+ es1 = usb_get_intfdata(interface);
/* Tear down everything! */
- usb_put_dev(es1_ap_dev->usb_dev);
- kfree(es1_ap_dev->ap_buffer);
- kfree(es1_ap_dev);
- es1_ap_dev = NULL;
+ usb_put_dev(es1->usb_dev);
+ kfree(es1->ap_buffer);
+ // FIXME
+ //greybus_destroy_hd(es1->hd);
}
static struct usb_driver es1_ap_driver = {