evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: most: fix buffer synchronization request

Browse source 
Revision D of OS81118 network interface controller have the internal
buffer synchronization mechanism changed. This patch adapts the driver
to this.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2015-09-28 17:18:38 +02:00 • committed by Greg Kroah-Hartman
parent a2cfae06ac
commit d747e8ec1c
1 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/staging/most/hdm-usb/hdm_usb.c
View file

@ -59,6 +59,8 @@
#define DRCI_REG_HW_ADDR_HI 0x0145 #define DRCI_REG_HW_ADDR_HI 0x0145
#define DRCI_REG_HW_ADDR_MI 0x0146 #define DRCI_REG_HW_ADDR_MI 0x0146
#define DRCI_REG_HW_ADDR_LO 0x0147 #define DRCI_REG_HW_ADDR_LO 0x0147
#define DRCI_REG_BASE 0x1100
#define DRCI_COMMAND 0x02
#define DRCI_READ_REQ 0xA0 #define DRCI_READ_REQ 0xA0
#define DRCI_WRITE_REQ 0xA1 #define DRCI_WRITE_REQ 0xA1
@ -136,36 +138,6 @@ static struct workqueue_struct *schedule_usb_work;
static void wq_clear_halt(struct work_struct *wq_obj); static void wq_clear_halt(struct work_struct *wq_obj);
static void wq_netinfo(struct work_struct *wq_obj); static void wq_netinfo(struct work_struct *wq_obj);
/**
* trigger_resync_vr - Vendor request to trigger HW re-sync mechanism
* @dev: usb device
*
*/
static void trigger_resync_vr(struct usb_device *dev)
{
int retval;
u8 request_type = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT;
int *data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
goto error;
*data = HW_RESYNC;
retval = usb_control_msg(dev,
usb_sndctrlpipe(dev, 0),
0,
request_type,
0,
0,
data,
0,
5 * HZ);
kfree(data);
if (retval >= 0)
return;
error:
dev_err(&dev->dev, "Vendor request \"stall\" failed\n");
}
/** /**
* drci_rd_reg - read a DCI register * drci_rd_reg - read a DCI register
* @dev: usb device * @dev: usb device
@ -1239,6 +1211,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
struct usb_host_interface *usb_iface_desc; struct usb_host_interface *usb_iface_desc;
struct usb_endpoint_descriptor *ep_desc; struct usb_endpoint_descriptor *ep_desc;
int ret = 0; int ret = 0;
int err;
usb_iface_desc = interface->cur_altsetting; usb_iface_desc = interface->cur_altsetting;
usb_dev = interface_to_usbdev(interface); usb_dev = interface_to_usbdev(interface);
@ -1319,6 +1292,13 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
tmp_cap++; tmp_cap++;
INIT_LIST_HEAD(&mdev->anchor_list[i]); INIT_LIST_HEAD(&mdev->anchor_list[i]);
spin_lock_init(&mdev->anchor_list_lock[i]); spin_lock_init(&mdev->anchor_list_lock[i]);
err = drci_wr_reg(usb_dev,
DRCI_REG_BASE + DRCI_COMMAND +
ep_desc->bEndpointAddress * 16,
cpu_to_le16(1));
if (err < 0)
pr_warn("DCI Sync for EP %02x failed",
ep_desc->bEndpointAddress);
} }
dev_notice(dev, "claimed gadget: Vendor=%4.4x ProdID=%4.4x Bus=%02x Device=%02x\n", dev_notice(dev, "claimed gadget: Vendor=%4.4x ProdID=%4.4x Bus=%02x Device=%02x\n",
le16_to_cpu(usb_dev->descriptor.idVendor), le16_to_cpu(usb_dev->descriptor.idVendor),
@ -1353,7 +1333,6 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
kobject_uevent(&mdev->dci->kobj, KOBJ_ADD); kobject_uevent(&mdev->dci->kobj, KOBJ_ADD);
mdev->dci->usb_device = mdev->usb_device; mdev->dci->usb_device = mdev->usb_device;
trigger_resync_vr(usb_dev);
} }
mutex_unlock(&mdev->io_mutex); mutex_unlock(&mdev->io_mutex);
return 0; return 0;