Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eb88016 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: dwc3: gadget: add a pointer to endpoint registers 



By adding a pointer to endpoint registers' base
address, we can avoid using our controller-wide
struct dwc3 pointer for everything. At some point
this will allow us to have per-endpoint locks which
will, in turn, let us queue requests to separate
endpoints in parallel.

Because of this change our debugfs interface and io
accessors need to be changed accordingly.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 2cd4718d

drivers/usb/dwc3/core.h

+9 −4
Original line number Diff line number Diff line
@@ -138,10 +138,12 @@ 
#define DWC3_DGCMDPAR		0xc710

#define DWC3_DGCMD		0xc714

#define DWC3_DALEPENA		0xc720

#define DWC3_DEPCMDPAR2(n)	(0xc800 + (n * 0x10))

#define DWC3_DEPCMDPAR1(n)	(0xc804 + (n * 0x10))

#define DWC3_DEPCMDPAR0(n)	(0xc808 + (n * 0x10))

#define DWC3_DEPCMD(n)		(0xc80c + (n * 0x10))



#define DWC3_DEP_BASE(n)	(0xc800 + (n * 0x10))

#define DWC3_DEPCMDPAR2		0x00

#define DWC3_DEPCMDPAR1		0x04

#define DWC3_DEPCMDPAR0		0x08

#define DWC3_DEPCMD		0x0c



/* OTG Registers */

#define DWC3_OCFG		0xcc00
@@ -480,6 +482,7 @@ struct dwc3_event_buffer { 
 * @endpoint: usb endpoint

 * @pending_list: list of pending requests for this endpoint

 * @started_list: list of started requests on this endpoint

 * @regs: pointer to first endpoint register

 * @trb_pool: array of transaction buffers

 * @trb_pool_dma: dma address of @trb_pool

 * @trb_enqueue: enqueue 'pointer' into TRB array
@@ -501,6 +504,8 @@ struct dwc3_ep { 
	struct list_head	pending_list;

	struct list_head	started_list;



	void __iomem		*regs;



	struct dwc3_trb		*trb_pool;

	dma_addr_t		trb_pool_dma;

	const struct usb_ss_ep_comp_descriptor *comp_desc;

drivers/usb/dwc3/debugfs.c

+57 −133
Original line number Diff line number Diff line
@@ -36,9 +36,32 @@ 
#define dump_register(nm)				\

{							\

	.name	= __stringify(nm),			\

	.offset	= DWC3_ ##nm - DWC3_GLOBALS_REGS_START,	\

	.offset	= DWC3_ ##nm,				\

}



#define dump_ep_register_set(n)			\

	{					\

		.name = "DEPCMDPAR2("__stringify(n)")",	\

		.offset = DWC3_DEP_BASE(n) +	\

			DWC3_DEPCMDPAR2,	\

	},					\

	{					\

		.name = "DEPCMDPAR1("__stringify(n)")",	\

		.offset = DWC3_DEP_BASE(n) +	\

			DWC3_DEPCMDPAR1,	\

	},					\

	{					\

		.name = "DEPCMDPAR0("__stringify(n)")",	\

		.offset = DWC3_DEP_BASE(n) +	\

			DWC3_DEPCMDPAR0,	\

	},					\

	{					\

		.name = "DEPCMD("__stringify(n)")",	\

		.offset = DWC3_DEP_BASE(n) +	\

			DWC3_DEPCMD,		\

	}





static const struct debugfs_reg32 dwc3_regs[] = {

	dump_register(GSBUSCFG0),

	dump_register(GSBUSCFG1),
@@ -218,137 +241,38 @@ static const struct debugfs_reg32 dwc3_regs[] = { 
	dump_register(DGCMD),

	dump_register(DALEPENA),



	dump_register(DEPCMDPAR2(0)),

	dump_register(DEPCMDPAR2(1)),

	dump_register(DEPCMDPAR2(2)),

	dump_register(DEPCMDPAR2(3)),

	dump_register(DEPCMDPAR2(4)),

	dump_register(DEPCMDPAR2(5)),

	dump_register(DEPCMDPAR2(6)),

	dump_register(DEPCMDPAR2(7)),

	dump_register(DEPCMDPAR2(8)),

	dump_register(DEPCMDPAR2(9)),

	dump_register(DEPCMDPAR2(10)),

	dump_register(DEPCMDPAR2(11)),

	dump_register(DEPCMDPAR2(12)),

	dump_register(DEPCMDPAR2(13)),

	dump_register(DEPCMDPAR2(14)),

	dump_register(DEPCMDPAR2(15)),

	dump_register(DEPCMDPAR2(16)),

	dump_register(DEPCMDPAR2(17)),

	dump_register(DEPCMDPAR2(18)),

	dump_register(DEPCMDPAR2(19)),

	dump_register(DEPCMDPAR2(20)),

	dump_register(DEPCMDPAR2(21)),

	dump_register(DEPCMDPAR2(22)),

	dump_register(DEPCMDPAR2(23)),

	dump_register(DEPCMDPAR2(24)),

	dump_register(DEPCMDPAR2(25)),

	dump_register(DEPCMDPAR2(26)),

	dump_register(DEPCMDPAR2(27)),

	dump_register(DEPCMDPAR2(28)),

	dump_register(DEPCMDPAR2(29)),

	dump_register(DEPCMDPAR2(30)),

	dump_register(DEPCMDPAR2(31)),



	dump_register(DEPCMDPAR1(0)),

	dump_register(DEPCMDPAR1(1)),

	dump_register(DEPCMDPAR1(2)),

	dump_register(DEPCMDPAR1(3)),

	dump_register(DEPCMDPAR1(4)),

	dump_register(DEPCMDPAR1(5)),

	dump_register(DEPCMDPAR1(6)),

	dump_register(DEPCMDPAR1(7)),

	dump_register(DEPCMDPAR1(8)),

	dump_register(DEPCMDPAR1(9)),

	dump_register(DEPCMDPAR1(10)),

	dump_register(DEPCMDPAR1(11)),

	dump_register(DEPCMDPAR1(12)),

	dump_register(DEPCMDPAR1(13)),

	dump_register(DEPCMDPAR1(14)),

	dump_register(DEPCMDPAR1(15)),

	dump_register(DEPCMDPAR1(16)),

	dump_register(DEPCMDPAR1(17)),

	dump_register(DEPCMDPAR1(18)),

	dump_register(DEPCMDPAR1(19)),

	dump_register(DEPCMDPAR1(20)),

	dump_register(DEPCMDPAR1(21)),

	dump_register(DEPCMDPAR1(22)),

	dump_register(DEPCMDPAR1(23)),

	dump_register(DEPCMDPAR1(24)),

	dump_register(DEPCMDPAR1(25)),

	dump_register(DEPCMDPAR1(26)),

	dump_register(DEPCMDPAR1(27)),

	dump_register(DEPCMDPAR1(28)),

	dump_register(DEPCMDPAR1(29)),

	dump_register(DEPCMDPAR1(30)),

	dump_register(DEPCMDPAR1(31)),



	dump_register(DEPCMDPAR0(0)),

	dump_register(DEPCMDPAR0(1)),

	dump_register(DEPCMDPAR0(2)),

	dump_register(DEPCMDPAR0(3)),

	dump_register(DEPCMDPAR0(4)),

	dump_register(DEPCMDPAR0(5)),

	dump_register(DEPCMDPAR0(6)),

	dump_register(DEPCMDPAR0(7)),

	dump_register(DEPCMDPAR0(8)),

	dump_register(DEPCMDPAR0(9)),

	dump_register(DEPCMDPAR0(10)),

	dump_register(DEPCMDPAR0(11)),

	dump_register(DEPCMDPAR0(12)),

	dump_register(DEPCMDPAR0(13)),

	dump_register(DEPCMDPAR0(14)),

	dump_register(DEPCMDPAR0(15)),

	dump_register(DEPCMDPAR0(16)),

	dump_register(DEPCMDPAR0(17)),

	dump_register(DEPCMDPAR0(18)),

	dump_register(DEPCMDPAR0(19)),

	dump_register(DEPCMDPAR0(20)),

	dump_register(DEPCMDPAR0(21)),

	dump_register(DEPCMDPAR0(22)),

	dump_register(DEPCMDPAR0(23)),

	dump_register(DEPCMDPAR0(24)),

	dump_register(DEPCMDPAR0(25)),

	dump_register(DEPCMDPAR0(26)),

	dump_register(DEPCMDPAR0(27)),

	dump_register(DEPCMDPAR0(28)),

	dump_register(DEPCMDPAR0(29)),

	dump_register(DEPCMDPAR0(30)),

	dump_register(DEPCMDPAR0(31)),



	dump_register(DEPCMD(0)),

	dump_register(DEPCMD(1)),

	dump_register(DEPCMD(2)),

	dump_register(DEPCMD(3)),

	dump_register(DEPCMD(4)),

	dump_register(DEPCMD(5)),

	dump_register(DEPCMD(6)),

	dump_register(DEPCMD(7)),

	dump_register(DEPCMD(8)),

	dump_register(DEPCMD(9)),

	dump_register(DEPCMD(10)),

	dump_register(DEPCMD(11)),

	dump_register(DEPCMD(12)),

	dump_register(DEPCMD(13)),

	dump_register(DEPCMD(14)),

	dump_register(DEPCMD(15)),

	dump_register(DEPCMD(16)),

	dump_register(DEPCMD(17)),

	dump_register(DEPCMD(18)),

	dump_register(DEPCMD(19)),

	dump_register(DEPCMD(20)),

	dump_register(DEPCMD(21)),

	dump_register(DEPCMD(22)),

	dump_register(DEPCMD(23)),

	dump_register(DEPCMD(24)),

	dump_register(DEPCMD(25)),

	dump_register(DEPCMD(26)),

	dump_register(DEPCMD(27)),

	dump_register(DEPCMD(28)),

	dump_register(DEPCMD(29)),

	dump_register(DEPCMD(30)),

	dump_register(DEPCMD(31)),

	dump_ep_register_set(0),

	dump_ep_register_set(1),

	dump_ep_register_set(2),

	dump_ep_register_set(3),

	dump_ep_register_set(4),

	dump_ep_register_set(5),

	dump_ep_register_set(6),

	dump_ep_register_set(7),

	dump_ep_register_set(8),

	dump_ep_register_set(9),

	dump_ep_register_set(10),

	dump_ep_register_set(11),

	dump_ep_register_set(12),

	dump_ep_register_set(13),

	dump_ep_register_set(14),

	dump_ep_register_set(15),

	dump_ep_register_set(16),

	dump_ep_register_set(17),

	dump_ep_register_set(18),

	dump_ep_register_set(19),

	dump_ep_register_set(20),

	dump_ep_register_set(21),

	dump_ep_register_set(22),

	dump_ep_register_set(23),

	dump_ep_register_set(24),

	dump_ep_register_set(25),

	dump_ep_register_set(26),

	dump_ep_register_set(27),

	dump_ep_register_set(28),

	dump_ep_register_set(29),

	dump_ep_register_set(30),

	dump_ep_register_set(31),



	dump_register(OCFG),

	dump_register(OCTL),
@@ -939,7 +863,7 @@ void dwc3_debugfs_init(struct dwc3 *dwc) 


	dwc->regset->regs = dwc3_regs;

	dwc->regset->nregs = ARRAY_SIZE(dwc3_regs);

	dwc->regset->base = dwc->regs;

	dwc->regset->base = dwc->regs - DWC3_GLOBALS_REGS_START;



	file = debugfs_create_regset32("regdump", S_IRUGO, root, dwc->regset);

	if (!file)

drivers/usb/dwc3/ep0.c

+1 −3
Original line number Diff line number Diff line
@@ -106,9 +106,7 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma, 
	}



	dep->flags |= DWC3_EP_BUSY;

	dep->resource_index = dwc3_gadget_ep_get_transfer_index(dwc,

			dep->number);



	dep->resource_index = dwc3_gadget_ep_get_transfer_index(dep);

	dwc->ep0_next_event = DWC3_EP0_COMPLETE;



	return 0;

drivers/usb/dwc3/gadget.c

+7 −9
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, 
	int			susphy = false;

	int			ret = -EINVAL;



	unsigned		ep = dep->number;



	trace_dwc3_gadget_ep_cmd(dep, cmd, params);



	/*
@@ -281,13 +279,13 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd, 
		}

	}



	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0);

	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1);

	dwc3_writel(dwc->regs, DWC3_DEPCMDPAR2(ep), params->param2);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR0, params->param0);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR1, params->param1);

	dwc3_writel(dep->regs, DWC3_DEPCMDPAR2, params->param2);



	dwc3_writel(dwc->regs, DWC3_DEPCMD(ep), cmd | DWC3_DEPCMD_CMDACT);

	dwc3_writel(dep->regs, DWC3_DEPCMD, cmd | DWC3_DEPCMD_CMDACT);

	do {

		reg = dwc3_readl(dwc->regs, DWC3_DEPCMD(ep));

		reg = dwc3_readl(dep->regs, DWC3_DEPCMD);

		if (!(reg & DWC3_DEPCMD_CMDACT)) {

			int cmd_status = DWC3_DEPCMD_STATUS(reg);
@@ -1025,8 +1023,7 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param) 
	dep->flags |= DWC3_EP_BUSY;



	if (starting) {

		dep->resource_index = dwc3_gadget_ep_get_transfer_index(dwc,

				dep->number);

		dep->resource_index = dwc3_gadget_ep_get_transfer_index(dep);

		WARN_ON_ONCE(!dep->resource_index);

	}
@@ -1830,6 +1827,7 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, 
		dep->dwc = dwc;

		dep->number = epnum;

		dep->direction = !!direction;

		dep->regs = dwc->regs + DWC3_DEP_BASE(epnum);

		dwc->eps[epnum] = dep;



		snprintf(dep->name, sizeof(dep->name), "ep%d%s", epnum >> 1,

drivers/usb/dwc3/gadget.h

+2 −2
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol); 
 *

 * Caller should take care of locking

 */

static inline u32 dwc3_gadget_ep_get_transfer_index(struct dwc3 *dwc, u8 number)

static inline u32 dwc3_gadget_ep_get_transfer_index(struct dwc3_ep *dep)

{

	u32			res_id;



	res_id = dwc3_readl(dwc->regs, DWC3_DEPCMD(number));

	res_id = dwc3_readl(dep->regs, DWC3_DEPCMD);



	return DWC3_DEPCMD_GET_RSC_IDX(res_id);

}