From patchwork Tue Nov 22 15:52:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 38288 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 1c9DNc-0003wu-PA; Tue, 22 Nov 2016 15:53:08 +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-6) with esmtp id 1c9DNa-0005yU-52; Tue, 22 Nov 2016 16:53:08 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755526AbcKVPw6 (ORCPT + 1 other); Tue, 22 Nov 2016 10:52:58 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35457 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755539AbcKVPws (ORCPT ); Tue, 22 Nov 2016 10:52:48 -0500 Received: by mail-pf0-f180.google.com with SMTP id i88so4808655pfk.2 for ; Tue, 22 Nov 2016 07:52:48 -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=qHcYRsZxMqeNF68tt/Tt6FNdTW9CxvhnKbFdJ/5gBiyu3jmokcJ4zhXRUO1AIID5eP XTCJ6Z4ZwU6OwhIPt4gK/RV2NgsTGuV8/UMmkyGSsRmHtvY25PtotfP60ZCXIWdwRKET nDLHqhAJ6eHGt22lddxr5giQSAZ3XwhHgcfgd6oCVuSBfxML0fYaAPhQ/52hyHScriEW MGnsysGsN12iv6lZz5gqOClW6bNwrNO22jQ4Qiotu5mz9MnpzLl706MVjshlQ9Es5HTJ I65zdKiHxBjfpDH/eypIUc4NQZH2w5rnIKD59U8Xo67eZfB6ndBtsZGPZ2+ycjO1MDcZ /70g== 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=czLiY+K5jiSXS15gu+y469uzlGD/WTuZzfd0ez8Cw14xmZh8e2cKoe9zyGQu/6i/XE yVOQYrI1oDr9BFyl0YOKOjbtMp9/8FlE5xqO5Uur4lli6O4bJtW8PVisbytsSQx5Fl0L T1FEJJABKI58c8BWMceNK6J6K3x4eAgJSnBYlNrcupHmWYr+iVOQ3peZoSnlwsO7QPtE nF6X4QYixRW7aM//N58lNJjppvp2LW8kDpd9+HYCgLBqlEaZFaOyQN9vsh3z6HlRG7AF zuUSaH6741DaX9uOA2MmUews5z4arxPtM9xWGZubSjzn1/XAmPxkDuu8WcJjYpN8wopa 8YkA== X-Gm-Message-State: AKaTC0195qQ1E9HdMBt6ckKvS+eWS2X/MgLr+U7r8DSqu2vwOYBIz8nW/nfW3Qi9z/Fn8RmM X-Received: by 10.84.197.165 with SMTP id n34mr972870pld.34.1479829968138; Tue, 22 Nov 2016 07:52:48 -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 r88sm46202386pfe.93.2016.11.22.07.52.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 07:52:47 -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 v3 2/4] [media] davinci: vpif_capture: don't lock over s_stream Date: Tue, 22 Nov 2016 07:52:42 -0800 Message-Id: <20161122155244.802-3-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161122155244.802-1-khilman@baylibre.com> References: <20161122155244.802-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.154817 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;