mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
3d71769014
Here are the changes for v3.4 merge window. It includes a new glue layer for Samsung's Exynos platform, a simplification of memory management on DWC3 driver by using dev_xxx functions, a few optimizations to IRQ handling by dropping memcpy() and using bitshifts, a fix for TI's OMAP5430 TX Fifo Allocation, two fixes on USB2 test mode implementation (one on debugfs and one on ep0), and several minor changes such as whitespace cleanups, simplification of a few parts of the code, decreasing a long delay to something a bit saner, dropping a header which was included twice and so on. The highlight on this merge is the support for Samsung's Exynos platform, increasing the number of different users for this driver to three. Note that Samsung Exynos glue layer will only compile on platforms which provide implementation for the clk API for now. Once Samsung supports pm_runtime, that limitation can be dropped from the Makefile. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPUJ2bAAoJEIaOsuA1yqREwOgP/2bG6rvPBMlGmXvvR40HNUXJ jXzkXcrTBrO172Fxl2P+mAgNFggMURrOdiyXwl7+2Ib0NM7sS9jwikuxos8DwuQv Ci0GgJtQySORIl5Sw29uB1W65aV2ieNBh/fN/52LwVOQYITt89GYK1DsRUWRN2V/ 0bw3OepckiAFN5gWRykIYIUXZs8DQa+L1qYc6fexZk7zZ+XrjdNba8RzGzsyUelD BB0eOj4E2Mda6Yp7kyiBRuTXVAUChNa5J0iCvXSnR8l2wppfXlmD2UD4Sfo/yxd5 q25/rm1e1A4iKcPjSkhzTayQKrLWEgCxZK69sZXlEPG9qhA3iMjWDNBvEy6cV4bc bFFjwXAObX+bm+QDYqcD66iUZTPzEW149W/e5B7+XGk09NcCs/wqoA1jEgCLEHnv 3rsG0RvsgtMdwmBYpO8zrhJPTFa6NAq9Qc4nLj3WefXP9Vkl5gpfneIcgYKB6x0q LHRQsLHBWl/hXClWAPflDJaGQqEt6hjkA3IqV03yTlMNuYxDNJy931J6Cz9a9Lu5 Gr2By/bHVcADmt8WzituQsnLvQIzLLGl0U0lKpdl24I52roqMkZVj7XaWDojLVSq HZnbk+c3PdEXVIDNCz1QnCY/QojEhKkeR23LP3YD8L9KxcOu8DNyL1RKdYqx3Cnv vrqerutPusT6kGvaRQIk =4Z2+ -----END PGP SIGNATURE----- Merge tag 'dwc3-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next usb: dwc3: changes for v3.4 merge window Here are the changes for v3.4 merge window. It includes a new glue layer for Samsung's Exynos platform, a simplification of memory management on DWC3 driver by using dev_xxx functions, a few optimizations to IRQ handling by dropping memcpy() and using bitshifts, a fix for TI's OMAP5430 TX Fifo Allocation, two fixes on USB2 test mode implementation (one on debugfs and one on ep0), and several minor changes such as whitespace cleanups, simplification of a few parts of the code, decreasing a long delay to something a bit saner, dropping a header which was included twice and so on. The highlight on this merge is the support for Samsung's Exynos platform, increasing the number of different users for this driver to three. Note that Samsung Exynos glue layer will only compile on platforms which provide implementation for the clk API for now. Once Samsung supports pm_runtime, that limitation can be dropped from the Makefile. Conflicts: drivers/usb/dwc3/gadget.c
188 lines
6.0 KiB
C
188 lines
6.0 KiB
C
/**
|
|
* gadget.h - DesignWare USB3 DRD Gadget Header
|
|
*
|
|
* Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
|
|
*
|
|
* Authors: Felipe Balbi <balbi@ti.com>,
|
|
* Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions, and the following disclaimer,
|
|
* without modification.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The names of the above-listed copyright holders may not be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* ALTERNATIVELY, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2, as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
|
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
|
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef __DRIVERS_USB_DWC3_GADGET_H
|
|
#define __DRIVERS_USB_DWC3_GADGET_H
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/usb/gadget.h>
|
|
#include "io.h"
|
|
|
|
struct dwc3;
|
|
#define to_dwc3_ep(ep) (container_of(ep, struct dwc3_ep, endpoint))
|
|
#define gadget_to_dwc(g) (container_of(g, struct dwc3, gadget))
|
|
|
|
/* DEPCFG parameter 1 */
|
|
#define DWC3_DEPCFG_INT_NUM(n) ((n) << 0)
|
|
#define DWC3_DEPCFG_XFER_COMPLETE_EN (1 << 8)
|
|
#define DWC3_DEPCFG_XFER_IN_PROGRESS_EN (1 << 9)
|
|
#define DWC3_DEPCFG_XFER_NOT_READY_EN (1 << 10)
|
|
#define DWC3_DEPCFG_FIFO_ERROR_EN (1 << 11)
|
|
#define DWC3_DEPCFG_STREAM_EVENT_EN (1 << 13)
|
|
#define DWC3_DEPCFG_BINTERVAL_M1(n) ((n) << 16)
|
|
#define DWC3_DEPCFG_STREAM_CAPABLE (1 << 24)
|
|
#define DWC3_DEPCFG_EP_NUMBER(n) ((n) << 25)
|
|
#define DWC3_DEPCFG_BULK_BASED (1 << 30)
|
|
#define DWC3_DEPCFG_FIFO_BASED (1 << 31)
|
|
|
|
/* DEPCFG parameter 0 */
|
|
#define DWC3_DEPCFG_EP_TYPE(n) ((n) << 1)
|
|
#define DWC3_DEPCFG_MAX_PACKET_SIZE(n) ((n) << 3)
|
|
#define DWC3_DEPCFG_FIFO_NUMBER(n) ((n) << 17)
|
|
#define DWC3_DEPCFG_BURST_SIZE(n) ((n) << 22)
|
|
#define DWC3_DEPCFG_DATA_SEQ_NUM(n) ((n) << 26)
|
|
#define DWC3_DEPCFG_IGN_SEQ_NUM (1 << 31)
|
|
|
|
/* DEPXFERCFG parameter 0 */
|
|
#define DWC3_DEPXFERCFG_NUM_XFER_RES(n) ((n) & 0xffff)
|
|
|
|
struct dwc3_gadget_ep_cmd_params {
|
|
u32 param2;
|
|
u32 param1;
|
|
u32 param0;
|
|
};
|
|
|
|
/* -------------------------------------------------------------------------- */
|
|
|
|
#define to_dwc3_request(r) (container_of(r, struct dwc3_request, request))
|
|
|
|
static inline struct dwc3_request *next_request(struct list_head *list)
|
|
{
|
|
if (list_empty(list))
|
|
return NULL;
|
|
|
|
return list_first_entry(list, struct dwc3_request, list);
|
|
}
|
|
|
|
static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req)
|
|
{
|
|
struct dwc3_ep *dep = req->dep;
|
|
|
|
req->queued = true;
|
|
list_move_tail(&req->list, &dep->req_queued);
|
|
}
|
|
|
|
void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
|
|
int status);
|
|
|
|
int dwc3_gadget_set_test_mode(struct dwc3 *dwc, int mode);
|
|
int dwc3_gadget_set_link_state(struct dwc3 *dwc, enum dwc3_link_state state);
|
|
|
|
void dwc3_ep0_interrupt(struct dwc3 *dwc,
|
|
const struct dwc3_event_depevt *event);
|
|
void dwc3_ep0_out_start(struct dwc3 *dwc);
|
|
int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
|
|
gfp_t gfp_flags);
|
|
int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value);
|
|
int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
|
|
unsigned cmd, struct dwc3_gadget_ep_cmd_params *params);
|
|
|
|
/**
|
|
* dwc3_gadget_ep_get_transfer_index - Gets transfer index from HW
|
|
* @dwc: DesignWare USB3 Pointer
|
|
* @number: DWC endpoint number
|
|
*
|
|
* Caller should take care of locking
|
|
*/
|
|
static inline u32 dwc3_gadget_ep_get_transfer_index(struct dwc3 *dwc, u8 number)
|
|
{
|
|
u32 res_id;
|
|
|
|
res_id = dwc3_readl(dwc->regs, DWC3_DEPCMD(number));
|
|
|
|
return DWC3_DEPCMD_GET_RSC_IDX(res_id);
|
|
}
|
|
|
|
/**
|
|
* dwc3_gadget_event_string - returns event name
|
|
* @event: the event code
|
|
*/
|
|
static inline const char *dwc3_gadget_event_string(u8 event)
|
|
{
|
|
switch (event) {
|
|
case DWC3_DEVICE_EVENT_DISCONNECT:
|
|
return "Disconnect";
|
|
case DWC3_DEVICE_EVENT_RESET:
|
|
return "Reset";
|
|
case DWC3_DEVICE_EVENT_CONNECT_DONE:
|
|
return "Connection Done";
|
|
case DWC3_DEVICE_EVENT_LINK_STATUS_CHANGE:
|
|
return "Link Status Change";
|
|
case DWC3_DEVICE_EVENT_WAKEUP:
|
|
return "WakeUp";
|
|
case DWC3_DEVICE_EVENT_EOPF:
|
|
return "End-Of-Frame";
|
|
case DWC3_DEVICE_EVENT_SOF:
|
|
return "Start-Of-Frame";
|
|
case DWC3_DEVICE_EVENT_ERRATIC_ERROR:
|
|
return "Erratic Error";
|
|
case DWC3_DEVICE_EVENT_CMD_CMPL:
|
|
return "Command Complete";
|
|
case DWC3_DEVICE_EVENT_OVERFLOW:
|
|
return "Overflow";
|
|
}
|
|
|
|
return "UNKNOWN";
|
|
}
|
|
|
|
/**
|
|
* dwc3_ep_event_string - returns event name
|
|
* @event: then event code
|
|
*/
|
|
static inline const char *dwc3_ep_event_string(u8 event)
|
|
{
|
|
switch (event) {
|
|
case DWC3_DEPEVT_XFERCOMPLETE:
|
|
return "Transfer Complete";
|
|
case DWC3_DEPEVT_XFERINPROGRESS:
|
|
return "Transfer In-Progress";
|
|
case DWC3_DEPEVT_XFERNOTREADY:
|
|
return "Transfer Not Ready";
|
|
case DWC3_DEPEVT_RXTXFIFOEVT:
|
|
return "FIFO";
|
|
case DWC3_DEPEVT_STREAMEVT:
|
|
return "Stream";
|
|
case DWC3_DEPEVT_EPCMDCMPLT:
|
|
return "Endpoint Command Complete";
|
|
}
|
|
|
|
return "UNKNOWN";
|
|
}
|
|
|
|
#endif /* __DRIVERS_USB_DWC3_GADGET_H */
|