From patchwork Wed Apr 19 23:13:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40914 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d0yoB-0002t4-7M; Wed, 19 Apr 2017 23:14:47 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1d0yo9-0006BG-03; Thu, 20 Apr 2017 01:14:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940342AbdDSXOl (ORCPT + 1 other); Wed, 19 Apr 2017 19:14:41 -0400 Received: from mail-qk0-f182.google.com ([209.85.220.182]:36659 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940326AbdDSXOh (ORCPT ); Wed, 19 Apr 2017 19:14:37 -0400 Received: by mail-qk0-f182.google.com with SMTP id d131so33190521qkc.3 for ; Wed, 19 Apr 2017 16:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernellabs-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8GQSMSI5/6DoSEmmaMSaO6IW1K9/anRSD3kVBVY/IX0=; b=lhnpp1uIpn4MvUw3fuHYFMzLbvI+ZNouTKO8IeCUfRHt7NAvQEEFJBi0XGFR50fmSW NpPedOs6LipNUi2KD/UmXEBOgZk2O5WzBD//jouRtxWmhuHF+3OSidvgl9cnhGpNQJs/ eeWjjlhLxYS8GUsVY3/uYSYk/gj67OdjuZD3O4eyKlR9J2ip4ihmfc4Zvhyux8rZTXI/ wAeJun5fiZe+E+RFGwR7EHJiSRTHBv8AkGFfw0lxGH6W8mXQA82bcOWhhsruRGn1MM4X NWiI87vmbJ3ZGPOujn7kIcpFEepwiUC214MSIClUMU1+vp4V+z9VsRBNiYUk758xEEjj QiDg== 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=8GQSMSI5/6DoSEmmaMSaO6IW1K9/anRSD3kVBVY/IX0=; b=tuewnpCnbw+JjtBUbZ/siJBV4CZhmxrrC40LKcaLfP8Y7qAcm7AglTAoUUzfYWsoop wMO7W5XXoqCYHDjnt7dSR4nl/GH092RLU+GKwUqb6meuZyNe3n0kDgEqaPu4fy/WamID a13hR//lNPMV/jB/vcETFPrpXt4XmE2TL2F0c+s0ZkmWzNWaRYVEd8wsubxYkHV/eC1q K+900pTJLRG0TwL43z4lykeD7bA0Bd8MO/1eUIhCtvnYMpY1KyQsTF5IVoSbKh+g8nO7 cR8I6V8Y9uQeEaKbSpPJfqeEu5fLCw5FQ1dE2N8XEIHQHylKLfE3c7gYDdNM++l2ZXYb mMdw== X-Gm-Message-State: AN3rC/50ASYFFnYtr7xgD/jMnqIJNEvF9xGEqLdGJFBmv8+7NvrcOHdK y03wjtLdJ9fiKcnh X-Received: by 10.55.8.19 with SMTP id 19mr5520293qki.63.1492643676374; Wed, 19 Apr 2017 16:14:36 -0700 (PDT) Received: from localhost.localdomain (cpe-74-71-114-159.nyc.res.rr.com. [74.71.114.159]) by smtp.gmail.com with ESMTPSA id 123sm2951916qkm.22.2017.04.19.16.14.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Apr 2017 16:14:36 -0700 (PDT) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller Subject: [PATCH 12/12] au0828: Add timer to restart TS stream if no data arrives on bulk endpoint Date: Wed, 19 Apr 2017 19:13:55 -0400 Message-Id: <1492643635-30823-13-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492643635-30823-1-git-send-email-dheitmueller@kernellabs.com> References: <1492643635-30823-1-git-send-email-dheitmueller@kernellabs.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.4.19.230617 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' For reasons unclear, we intermittently see a case where the tune is successful but the bulk stream fails to deliver any packets. Add a timer to automatically stop/start the data pump if we encounter such a case. Signed-off-by: Devin Heitmueller --- drivers/media/usb/au0828/au0828-dvb.c | 30 ++++++++++++++++++++++++++++++ drivers/media/usb/au0828/au0828.h | 2 ++ 2 files changed, 32 insertions(+) diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c index 7e0c9b7..34dc7e0 100644 --- a/drivers/media/usb/au0828/au0828-dvb.c +++ b/drivers/media/usb/au0828/au0828-dvb.c @@ -105,6 +105,15 @@ static void au0828_restart_dvb_streaming(struct work_struct *work); +static void au0828_bulk_timeout(unsigned long data) +{ + struct au0828_dev *dev = (struct au0828_dev *) data; + + dprintk(1, "%s called\n", __func__); + dev->bulk_timeout_running = 0; + schedule_work(&dev->restart_streaming); +} + /*-------------------------------------------------------------------*/ static void urb_completion(struct urb *purb) { @@ -138,6 +147,13 @@ static void urb_completion(struct urb *purb) ptr[0], purb->actual_length); schedule_work(&dev->restart_streaming); return; + } else if (dev->bulk_timeout_running == 1) { + /* The URB handler has fired, so cancel timer which would + * restart endpoint if we hadn't + */ + dprintk(1, "%s cancelling bulk timeout\n", __func__); + dev->bulk_timeout_running = 0; + del_timer(&dev->bulk_timeout); } /* Feed the transport payload into the kernel demux */ @@ -160,6 +176,11 @@ static int stop_urb_transfer(struct au0828_dev *dev) if (!dev->urb_streaming) return 0; + if (dev->bulk_timeout_running == 1) { + dev->bulk_timeout_running = 0; + del_timer(&dev->bulk_timeout); + } + dev->urb_streaming = false; for (i = 0; i < URB_COUNT; i++) { if (dev->urbs[i]) { @@ -232,6 +253,11 @@ static int start_urb_transfer(struct au0828_dev *dev) } dev->urb_streaming = true; + + /* If we don't valid data within 1 second, restart stream */ + mod_timer(&dev->bulk_timeout, jiffies + (HZ)); + dev->bulk_timeout_running = 1; + return 0; } @@ -622,6 +648,10 @@ int au0828_dvb_register(struct au0828_dev *dev) return ret; } + dev->bulk_timeout.function = au0828_bulk_timeout; + dev->bulk_timeout.data = (unsigned long) dev; + init_timer(&dev->bulk_timeout); + return 0; } diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h index 88e5974..05e445f 100644 --- a/drivers/media/usb/au0828/au0828.h +++ b/drivers/media/usb/au0828/au0828.h @@ -195,6 +195,8 @@ struct au0828_dev { /* Digital */ struct au0828_dvb dvb; struct work_struct restart_streaming; + struct timer_list bulk_timeout; + int bulk_timeout_running; #ifdef CONFIG_VIDEO_AU0828_V4L2 /* Analog */