From patchwork Tue Nov 22 01:44:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 38275 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 1c908L-0008Kg-Ej; Tue, 22 Nov 2016 01:44:29 +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-8) with esmtp id 1c908H-0005s9-mK; Tue, 22 Nov 2016 02:44:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754313AbcKVBoX (ORCPT + 1 other); Mon, 21 Nov 2016 20:44:23 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:33865 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754314AbcKVBoT (ORCPT ); Mon, 21 Nov 2016 20:44:19 -0500 Received: by mail-pf0-f175.google.com with SMTP id c4so829818pfb.1 for ; Mon, 21 Nov 2016 17:44:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XlBWMjpjhMUKgTmZLLpZTQVCdXmu7rUs9oyqq8tkrKA=; b=loyNxm7bDvGehmlFADx+/7B3tMglWL6kt13fYymp2nFNXj24h/tTIpRGd7ILabuKfA tfdd1k9vsDfoNjc69ZYa3qAVZnc66ECDcHf/w1CamgVm5t3k3UWbOVxPO20koXA0DMuj j0YNelfLea4jSP4tBzHSe0BugaoKjC8RO8THn7phLERzADL3kQp91IRPvb5oKLthG70u hv4xwhcIF2sp/mtdDXIleFu8yrx9DaDpRzf5ptTtEh0CIDXxJS1UzJUu0wv+cxUF/kbT Wz+NvcxIKu02FGN78kFasW+lUJUBjASINEgKkYJL2vfTsv3DxkxkJH5ahbrPCEjo1Hpu 3TaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XlBWMjpjhMUKgTmZLLpZTQVCdXmu7rUs9oyqq8tkrKA=; b=IBnOYJAqCFVGfstsMXM4+RXqByfHAbU7TPdP4gTuOxcKBpUWTcG4E1hBursMia0u29 CVUzirTl6hPXnOtoOUDs1wmKeVbrKIa+coi8N9cLV3o03IoPhuBub+Y2TR+EmU4jvotX 7MVaG/As+NlINaYeVcv5W0wC7VfxpkiXVzlUE56xaLDFU09XM5+QZ041LmsoH1XSMWlJ XV7fRYPkWBkyWphHJ2h5gKzi0f4pKaOLGOhhanEZUzDSp+7YC0NnJk6tFruawJhrVThV eR4acCQFojw2rPW4LoR2VFcsYLDsF56KPPlCO1+KcUd08jPSKtYU9OnAiVVdx0JUL5U9 xndA== X-Gm-Message-State: AKaTC01AvhYIHKPox9NfFOMJfaf/unfTmWjQa2rY8iKmPrZuTFHVFJqQzgEdUcxkizDLdH+L X-Received: by 10.98.68.140 with SMTP id m12mr22421634pfi.19.1479779052525; Mon, 21 Nov 2016 17:44:12 -0800 (PST) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id r74sm40212408pfl.79.2016.11.21.17.44.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 17:44:12 -0800 (PST) From: Kevin Hilman To: linux-media@vger.kernel.org, Hans Verkuil Cc: devicetree@vger.kernel.org, Sekhar Nori , Axel Haslam , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Alexandre Bailon , David Lechner Subject: [PATCH v2 2/4] [media] davinci: vpif_capture: don't lock over s_stream Date: Mon, 21 Nov 2016 17:44:06 -0800 Message-Id: <20161122014408.22388-3-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161122014408.22388-1-khilman@baylibre.com> References: <20161122014408.22388-1-khilman@baylibre.com> MIME-Version: 1.0 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: 2016.11.22.13317 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CTE 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 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, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_NO_NAME 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' Video capture subdevs may be over I2C and may sleep during xfer, so we cannot do IRQ-disabled locking when calling the subdev. Signed-off-by: Kevin Hilman --- drivers/media/platform/davinci/vpif_capture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 87ee1e2c3864..94ee6cf03f02 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -193,7 +193,10 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) } } + spin_unlock_irqrestore(&common->irqlock, flags); ret = v4l2_subdev_call(ch->sd, video, s_stream, 1); + spin_lock_irqsave(&common->irqlock, flags); + if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) { vpif_dbg(1, debug, "stream on failed in subdev\n"); goto err;