From patchwork Thu Jun 27 20:52:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 167983 Delivered-To: patches@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2821885ilk; Thu, 27 Jun 2019 13:52:48 -0700 (PDT) X-Received: by 2002:a65:5144:: with SMTP id g4mr5596061pgq.116.1561668768001; Thu, 27 Jun 2019 13:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561668767; cv=none; d=google.com; s=arc-20160816; b=tmiFn6OqF+qeJWnkcVDLTchayVQ28Du4eOq8W8qhBtJ17zAEqh7aCpno52K+AyBEub 0v4WsTU6m3X5A/lfGaBgdexiCJgeMD+qHEDLGz9s+pDa+8BKEbbcvI2N29da0LBflqea OSAL29WwUpHfAg1c7YrfRjxPXC8Z2Z4rEVlpNv3SpPJhgGXXD4vwWr3SlYDT9uMQwBRE 6qR/p+61aqbVF/35dwLaELJAiLmckYhQo60mGVtS+xaLjtyVGXmkxzwS35GwreBY7eqv eWKZDNO42f8ZuCnfAIERbVSmFO7YZY/0SDgsLC+Gu+uQI2FNRN5TnUoRYEBIVjnfxGQ1 /djg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4Ag3DptOQlKFvwhPzNLWrHIQu/RujtBlVJPxwQgjUZ4=; b=mX8t5K9YtT0Z0v44Vm0qlyqjv42dWzpWPV1aOGVcg3T195DVPadThIjAM/NbpKqn0Z M2Sv0QMqepB/mPrAuhXN19A1b2ytXAVzjuOdIuql+rY0tg+FkkHzjiz4jH78eDolLhX+ 8sgEvMJH5XyTApkJwmql8Nm8q7MzUkmtnEX7Nzo+KsKOUU12F4WeTPFWPS9LRDt2HS75 0iy7zy0JLFHklqlW4sd0MtmG4XmQYA2cRUle2Vn6ho/XoWQCik2kHFOwURoMp4VSdhSU FGzN8WMFmxms9qNPFBgX4UumAVNA+CH+LMhxKFVONFPNWthN4Ogr+l18lkBmkNFYK8xP rOfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xHiJhrSX; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id bx14sor7818402pjb.21.2019.06.27.13.52.47 for (Google Transport Security); Thu, 27 Jun 2019 13:52:47 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xHiJhrSX; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4Ag3DptOQlKFvwhPzNLWrHIQu/RujtBlVJPxwQgjUZ4=; b=xHiJhrSX+JSre8rOd6Cct+h18tuOFNpJtHqH//2drv/WJrQ6DlvS6OjN+XkAzsSJ7p 5PGrfaHh8wCqeYYjfEkBEyoMNJv9B2jxgxogc8EE5RgIoDIweZHyEUI6gQjx7oNCB33d BRxXXO1g6O8f9BZu9HY400wvD7gnICKH88EKc4tLwdhBfBGXqTGbPNjEvl2jzw8fhYZQ /OCY8sLnUW6bsKHR/pgTJwJGLXMUu2MkuHeSG0XygFeBU7INB584rv6oPHJH5hsjNu32 zec75NOMp0HZM9oEmfWX2KCFQAYgAXO5A9eGXCOT2pokFSMya5iYtzOCkmro7ugBtjnU 5zrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4Ag3DptOQlKFvwhPzNLWrHIQu/RujtBlVJPxwQgjUZ4=; b=bR1uclQSq53VQn8rHaYA0mkpJD9ckL+x3P/XjFNeE93XbFbUv68y6HYztG8KOIqRiz xU/B+OteWFxUmQnqU1n7qHQl1S6aqn8KodR0Gzt0P20YhrmryVQ7ZSO0ZnNwt2b6qhfV mCQ9J2DN443h6nBgKDs3DBJIdydx71ucEcTgrh4sWnSuLvPXt62QK4wC46fesn2hqclM acA9GJsmUZqtNe90LHKnV7rIozaZ/Jj8W6NAagSvqvPSAse0JUMd/F2alauD/Jp0u/qg evjUA/o1AdY57CE2YHv6o3+pyUzqZG8XrxIB6p8RSj6whQMzk0MCEN50RB0E0BjIYNtd ZxIA== X-Gm-Message-State: APjAAAXdGJRnj6t0k7wmAG3x5KuIkstwCqyhskopurs+uvwkO0nyQ8ft YDoXzDmjM+V2rdwc9Y7jsoLQpCPEN7Frng== X-Google-Smtp-Source: APXvYqwFzFzc5WG5FDPcHRdqb2AaRR84Y9E3us/OjEIh46TdQGH18lAYeE49opbpuX3HCTe4z8EjjA== X-Received: by 2002:a17:90a:270f:: with SMTP id o15mr8423034pje.56.1561668767538; Thu, 27 Jun 2019 13:52:47 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id 2sm3674083pff.174.2019.06.27.13.52.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 13:52:46 -0700 (PDT) From: John Stultz To: stable@vger.kernel.org Cc: Felipe Balbi , Fei Yang , Sam Protsenko , Felipe Balbi , linux-usb@vger.kernel.org, John Stultz Subject: [PATCH 4.19.y 2/9] usb: dwc3: gadget: track number of TRBs per request Date: Thu, 27 Jun 2019 20:52:33 +0000 Message-Id: <20190627205240.38366-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190627205240.38366-1-john.stultz@linaro.org> References: <20190627205240.38366-1-john.stultz@linaro.org> From: Felipe Balbi commit 09fe1f8d7e2f461275b1cdd832f2cfa5e9be346d upstream This will help us remove the wait_event() from our ->dequeue(). Cc: Fei Yang Cc: Sam Protsenko Cc: Felipe Balbi Cc: linux-usb@vger.kernel.org Cc: stable@vger.kernel.org # 4.19.y Signed-off-by: Felipe Balbi (cherry picked from commit 09fe1f8d7e2f461275b1cdd832f2cfa5e9be346d) Signed-off-by: John Stultz --- drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/gadget.c | 6 ++++++ 2 files changed, 9 insertions(+) -- 2.17.1 diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 4872cba8699b..0de78cb29f2c 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -847,6 +847,7 @@ struct dwc3_hwparams { * @epnum: endpoint number to which this request refers * @trb: pointer to struct dwc3_trb * @trb_dma: DMA address of @trb + * @num_trbs: number of TRBs used by this request * @needs_extra_trb: true when request needs one extra TRB (either due to ZLP * or unaligned OUT) * @direction: IN or OUT direction flag @@ -867,6 +868,8 @@ struct dwc3_request { struct dwc3_trb *trb; dma_addr_t trb_dma; + unsigned num_trbs; + unsigned needs_extra_trb:1; unsigned direction:1; unsigned mapped:1; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4894fed1441c..019643a6ce9d 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1043,6 +1043,8 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep, req->trb_dma = dwc3_trb_dma_offset(dep, trb); } + req->num_trbs++; + __dwc3_prepare_one_trb(dep, trb, dma, length, chain, node, stream_id, short_not_ok, no_interrupt); } @@ -1077,6 +1079,7 @@ static void dwc3_prepare_one_trb_sg(struct dwc3_ep *dep, /* Now prepare one extra TRB to align transfer size */ trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; __dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr, maxp - rem, false, 1, req->request.stream_id, @@ -1121,6 +1124,7 @@ static void dwc3_prepare_one_trb_linear(struct dwc3_ep *dep, /* Now prepare one extra TRB to align transfer size */ trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; __dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr, maxp - rem, false, 1, req->request.stream_id, req->request.short_not_ok, @@ -1137,6 +1141,7 @@ static void dwc3_prepare_one_trb_linear(struct dwc3_ep *dep, /* Now prepare one extra TRB to handle ZLP */ trb = &dep->trb_pool[dep->trb_enqueue]; + req->num_trbs++; __dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr, 0, false, 1, req->request.stream_id, req->request.short_not_ok, @@ -2233,6 +2238,7 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, dwc3_ep_inc_deq(dep); trace_dwc3_complete_trb(dep, trb); + req->num_trbs--; /* * If we're in the middle of series of chained TRBs and we