From patchwork Sun Aug 15 02:49:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 76348 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1mF6Dy-00Giip-70; Sun, 15 Aug 2021 02:50:14 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234662AbhHOCuP (ORCPT + 1 other); Sat, 14 Aug 2021 22:50:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232750AbhHOCuO (ORCPT ); Sat, 14 Aug 2021 22:50:14 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BA8BC0617AD for ; Sat, 14 Aug 2021 19:49:45 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id g138so9314956wmg.4 for ; Sat, 14 Aug 2021 19:49:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jjixc7LVMXe0bD3rZWuXthNBA6KrBliq5QpvQpx/lIY=; b=UJgLNKravN1J4O5txgp+u/5e/AvMSWEksFZBgkNzrfSKY4qCzwlDH/fDvyoMI34jKH vNQ1GDmzERx8PbsGHKWDaXkA6YLSY2231zkjx5tripTvXKkz3MQJoT+VXvqDKKbEXkPr IxJXeQETQtZQNimAH/9xr1CDL5xDYNJAuyw+IvnOmSJhcAYy+IUSZSnsu5ltAutMPdV3 Uf0Jm5rFdtLkEZr6r08yv0DqWTT8i/bNKLTTnZdFlaJUj1aFjj/i5XPJmXQC6kaDNyXc FCkZLQeAOf1Tm4/Au5ZdgumERb7CVRlqNQZUbptDYi/a9gpLBb4kvcSsCWQEZB+4pIE3 48pA== 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:mime-version:content-transfer-encoding; bh=Jjixc7LVMXe0bD3rZWuXthNBA6KrBliq5QpvQpx/lIY=; b=EyFQQSYw/Waigd4rCUk0sRgrCjBoJpIaQhYsM/SH+Ein3rIOjwlKW9p3s3qdFo44Yr MzL9G441kvBKbfYltA3uKawm78PSkm+BAijZOLOnsybS5TI4bBU+ffPaz92pSfLYLiPO ubd0c7dvO0FvDffFsnv28OpaC2WmmMu0hKuCnAo/f7ByHXFcJ7hqXa613Auh+E9VKQsx d+inaRWjAxzp43yMNi1WX1xKbHuCO5JDJ13X00a6hAHGgtAKntmzB0WXvNwGaLRk4Lc1 IQSkGOwZFkXB7jxGpQHN5sTLuVLtVkVEImtjIKsGg2qT6aGbqH3uxMhWblSTC6IYMMji PIaQ== X-Gm-Message-State: AOAM532bolr8VfDWIwIm4lIXa2WrXjRim0xZZHz6dcCES+W8NEWmIbOL zpPMo2w0gaxhkikDBfV53x4xIA== X-Google-Smtp-Source: ABdhPJypWSh6UFvRp+cVUxpN/vFejFYry3wjQAPIMUN62oEA06odK+faFb3zPJrWLllI5tjEHWLF4g== X-Received: by 2002:a05:600c:350a:: with SMTP id h10mr9287501wmq.89.1628995783659; Sat, 14 Aug 2021 19:49:43 -0700 (PDT) Received: from bismarck.berto.se (p54ac5892.dip0.t-ipconnect.de. [84.172.88.146]) by smtp.googlemail.com with ESMTPSA id h9sm5866342wmb.35.2021.08.14.19.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 19:49:43 -0700 (PDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Hans Verkuil , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 1/2] media: rcar-csi2: Cleanup mutex on remove and fail Date: Sun, 15 Aug 2021 04:49:14 +0200 Message-Id: <20210815024915.1183417-2-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210815024915.1183417-1-niklas.soderlund+renesas@ragnatech.se> References: <20210815024915.1183417-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_LOW=-0.7 autolearn=ham autolearn_force=no The mutex was not destroyed on remove or failed probe, fix this. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- drivers/media/platform/rcar-vin/rcar-csi2.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c index e28eff0396888f2d..a02573dbd5da4f62 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -1245,14 +1245,14 @@ static int rcsi2_probe(struct platform_device *pdev) ret = rcsi2_probe_resources(priv, pdev); if (ret) { dev_err(priv->dev, "Failed to get resources\n"); - return ret; + goto error_mutex; } platform_set_drvdata(pdev, priv); ret = rcsi2_parse_dt(priv); if (ret) - return ret; + goto error_mutex; priv->subdev.owner = THIS_MODULE; priv->subdev.dev = &pdev->dev; @@ -1272,21 +1272,23 @@ static int rcsi2_probe(struct platform_device *pdev) ret = media_entity_pads_init(&priv->subdev.entity, NR_OF_RCAR_CSI2_PAD, priv->pads); if (ret) - goto error; + goto error_async; pm_runtime_enable(&pdev->dev); ret = v4l2_async_register_subdev(&priv->subdev); if (ret < 0) - goto error; + goto error_async; dev_info(priv->dev, "%d lanes found\n", priv->lanes); return 0; -error: +error_async: v4l2_async_notifier_unregister(&priv->notifier); v4l2_async_notifier_cleanup(&priv->notifier); +error_mutex: + mutex_destroy(&priv->lock); return ret; } @@ -1301,6 +1303,8 @@ static int rcsi2_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); + mutex_destroy(&priv->lock); + return 0; } From patchwork Sun Aug 15 02:49:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 76349 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1mF6E2-00Giip-Mk; Sun, 15 Aug 2021 02:50:18 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234929AbhHOCuP (ORCPT + 1 other); Sat, 14 Aug 2021 22:50:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbhHOCuP (ORCPT ); Sat, 14 Aug 2021 22:50:15 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3DCDC061764 for ; Sat, 14 Aug 2021 19:49:45 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id x10so12299401wrt.8 for ; Sat, 14 Aug 2021 19:49:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+uWJKEuzVCQFca12BS6BPlTfrO9jNYAl/Ixczig0hiA=; b=bld7193XBVPHLgBbM+bbRrNbFzpcvOzTeE2m3NgTJko8+5+H0jlqpm5qOoFB4zD08h tSplXU3C/fnmyUj/keLIgiDHgFEQbpBo0Oxh5dVyganmznmh3tg57t8VgmP8ZYT7vxCv KjrFnxm9uAcd0fPt8XFhEPkQiTS19PnCYq6+axK/cxrRjLEsyO7MTDJXyhOJPvpJFfrL SDOCnNP6YZXTOJ2kRkLoCF1TmzK5efxTf8USWOMPfFQyLNxZ0YHbnpow5YW/uZkXDGg8 GJpkSQaW6I/w5Otno+7iajXeEl9uPFkvYtjKfAcXm3j/MpvgRe6nDpOPsxbqKnFYg7WZ acTQ== 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:mime-version:content-transfer-encoding; bh=+uWJKEuzVCQFca12BS6BPlTfrO9jNYAl/Ixczig0hiA=; b=ZqR5n2Ik09LiMeg1A936lOtDbmlX8wOH+Yjceg6Zt4Z7hLfGwpEWy9RUdiKcYgxUA4 exCDhqJZ936se1st9xa+suKvYwUwnJW2M2lPdJXYjJOXUS+di3eR1HmN/kC0Uv05SdaZ +KTsJ/oubwOIvFeyhsDoun5cuJGL9VwSxYhZDa+LBGGOe9s8JGW2lIAawKCrezx3SgTn iHchLSMVlgJdfwwMOcaQE0rug+usW0IzrUFXYkMqbIUD7JGOT89NeK3rHULEExv1dYqg ppopPSfmkez15GK4K8Vf1ABYC23wkvpHnmoQxEMINJ4IX04EX/N4exkQbjdj9XP2GTaW SK5A== X-Gm-Message-State: AOAM532kvZ67bMrYYQE+MeiZyytjt7v+nYODwpFNMWgeK9net+mGB3FA ApcGpyVXlWtFnxEV0LW7MxtLNA== X-Google-Smtp-Source: ABdhPJx//7m+Zn+R4N5G7obBEucwKrCJ7l41gv2uEizQydXEex3ty54p+mMmjAjgJm/cWssalg+xgA== X-Received: by 2002:a05:6000:1b02:: with SMTP id f2mr10876770wrz.274.1628995784318; Sat, 14 Aug 2021 19:49:44 -0700 (PDT) Received: from bismarck.berto.se (p54ac5892.dip0.t-ipconnect.de. [84.172.88.146]) by smtp.googlemail.com with ESMTPSA id h9sm5866342wmb.35.2021.08.14.19.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Aug 2021 19:49:44 -0700 (PDT) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Hans Verkuil , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 2/2] media: rcar-csi2: Serialize access to set_fmt and get_fmt Date: Sun, 15 Aug 2021 04:49:15 +0200 Message-Id: <20210815024915.1183417-3-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210815024915.1183417-1-niklas.soderlund+renesas@ragnatech.se> References: <20210815024915.1183417-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_LOW=-0.7 autolearn=ham autolearn_force=no The access to the internal storage of the format rcar_csi2.mf should be serialized, extend the exciting lock mutex to also cover this. While at it document the mutex. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- drivers/media/platform/rcar-vin/rcar-csi2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c index a02573dbd5da4f62..2fdfdc38de424c72 100644 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c @@ -370,9 +370,8 @@ struct rcar_csi2 { struct v4l2_subdev *remote; unsigned int remote_pad; + struct mutex lock; /* Protects mf and stream_count. */ struct v4l2_mbus_framefmt mf; - - struct mutex lock; int stream_count; unsigned short lanes; @@ -725,6 +724,8 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd, struct rcar_csi2 *priv = sd_to_csi2(sd); struct v4l2_mbus_framefmt *framefmt; + mutex_lock(&priv->lock); + if (!rcsi2_code_to_fmt(format->format.code)) format->format.code = rcar_csi2_formats[0].code; @@ -735,6 +736,8 @@ static int rcsi2_set_pad_format(struct v4l2_subdev *sd, *framefmt = format->format; } + mutex_unlock(&priv->lock); + return 0; } @@ -744,11 +747,15 @@ static int rcsi2_get_pad_format(struct v4l2_subdev *sd, { struct rcar_csi2 *priv = sd_to_csi2(sd); + mutex_lock(&priv->lock); + if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) format->format = priv->mf; else format->format = *v4l2_subdev_get_try_format(sd, sd_state, 0); + mutex_unlock(&priv->lock); + return 0; }