From patchwork Wed Sep 15 01:50:12 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: 77009 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 1mQK4S-00AbFA-QX; Wed, 15 Sep 2021 01:50:45 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233061AbhIOBv7 (ORCPT + 1 other); Tue, 14 Sep 2021 21:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233059AbhIOBv7 (ORCPT ); Tue, 14 Sep 2021 21:51:59 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 159B9C061764 for ; Tue, 14 Sep 2021 18:50:41 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id 196-20020a1c04cd000000b002fa489ffe1fso3540850wme.4 for ; Tue, 14 Sep 2021 18:50:41 -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=ve0ND4UBUtoUsSmBb/d0sk2VLmXxugvcGbqrng16nFQ=; b=oJWx0DOL9rcSzv32jyMD4k6BUzlr3HdVDeBWS9DfSoIR1I2kpAZ4rgRU0cdgI4LXkn 6E675WS2hhXPXfma8Jx+LrKeO6n69vEiuY254K21yI0iCvtbsh3R7w0QWHBRvemxHOPG 6d3cjF7ML4bPbGQFXeANdIUo+v8OKYvll9dxExLDIAw/SuGwigTxDcTPy2ILk23EHW6m FWFXPXADkg35GYVk/b+Zpm2fd4tYktkw9y4ul6eXdUX+fL+dA9mGiTismfNwlS8LSc6S 6S3kxaAhvO+Q0XQMFiZ+jJo8/sFSjAHH0HKhZPoC/i/y9QqSFm3h/RnKjkSe3Sec4Yul W8yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ve0ND4UBUtoUsSmBb/d0sk2VLmXxugvcGbqrng16nFQ=; b=oL12tTpTDTwfVJgMLS0XRRC2/DGWRACAG6vE3jg7O6pmQdNF2AGVBi2dZueAzSQJXm 2pB2t8ze/Wqi2nGuvDwGoIhE7cOPavRsVHrL+JVb5r2sTn3iuRKmKegd7l3aarT2PUOP YOf4u2xaIOPKilDWZgfxqQA0HxY5J/k7/CM4V/YPA/LZF466AK5dKbZWdo050JPFwc93 DSv64T5QOWXZBkLtx4JRty984RaAI2rnKdEGkTIRGj6M0WHbT17b3DHJM8CmXsUKK8H2 UKSJHava65xbIpcNdlhfR10Qht+kU7bgFjCXWvvTOXjMV5fziaMdhC0CUadinoeOrc1H hvwQ== X-Gm-Message-State: AOAM530kQyYfHOwSWuXRp0MxF7wdKwGvTJILi1ycpOVALPV4Ecxb9YRa 6G3HQiyEli8IEsAiOVSkAohmzQ== X-Google-Smtp-Source: ABdhPJzNOU+4RJWC02/KeeE88/YDMG42AWECECOz94A7GVN0VoTAmVd7kgSO6bp/UyECdlf7cSrv5w== X-Received: by 2002:a1c:2705:: with SMTP id n5mr1847214wmn.176.1631670639666; Tue, 14 Sep 2021 18:50:39 -0700 (PDT) Received: from bismarck.berto.se (p54ac5892.dip0.t-ipconnect.de. [84.172.88.146]) by smtp.googlemail.com with ESMTPSA id k17sm3486863wmj.0.2021.09.14.18.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 18:50:39 -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?= , Jacopo Mondi Subject: [PATCH v2 1/2] media: rcar-csi2: Cleanup mutex on remove and fail Date: Wed, 15 Sep 2021 03:50:12 +0200 Message-Id: <20210915015013.3169934-2-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210915015013.3169934-1-niklas.soderlund+renesas@ragnatech.se> References: <20210915015013.3169934-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: -4.7 (----) X-LSpam-Report: No, score=-4.7 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_MED=-2.3 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 Reviewed-by: Kieran Bingham --- 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 Wed Sep 15 01:50:13 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: 77010 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 1mQK4U-00AbFA-F0; Wed, 15 Sep 2021 01:50:46 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233988AbhIOBwA (ORCPT + 1 other); Tue, 14 Sep 2021 21:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbhIOBwA (ORCPT ); Tue, 14 Sep 2021 21:52:00 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD9B0C061574 for ; Tue, 14 Sep 2021 18:50:41 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id l7-20020a1c2507000000b002e6be5d86b3so854364wml.3 for ; Tue, 14 Sep 2021 18:50:41 -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=zM8FsXiM9O4eBZdkXaqFVNn1tTornIe046XH9M/vUAo=; b=ITTklQFgG3s6JDx1la106SAbbJymHKIxsXGMVxvhhjWdDYHTqhnC+9/zigBbwHNwsC j7ksWU2Ygjjtcgu2SZokKjzBzjIXIuXUyZ5cul0byJs4VQ5JO/6x524dmwzYshLXeMq1 1eYOL1kL9NJTUyoZuTKkj2vP60nk1WotYueH8uCxMtc42YNRf9c75QoVl3Z4NjKasqcQ AkLlpjRi6E4kXsIl8alY0Dx3Lc8S9hsBIAP/RYeoY+QxktgieHW0ulgpj5jDDqG9nura xr0QPnaeJH58Q0hRzvL0bZeRxZr4YFFeZMXCHwZ3bwYwWzTDCXw3vuLtJFx7xLD+PRkB 0m9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zM8FsXiM9O4eBZdkXaqFVNn1tTornIe046XH9M/vUAo=; b=el6rnwE74BCbILUBVqFxl+vE2icVrSoogYZcyuKVtQPiPG00c2Od8vifd1klA5XP1s vU72djQidd0ZrvjLxJLlSIONCQwevvffe/YGAgoCzG99sErEG5M7ErMuk+F7sEpAKbji f3ytwjF3SPc30CCpD7KRF/OXRuJj2A0xSdZ/otAehjiPNldaSxnRg60IU9xq3CXx+5Rg HB2qf85nbZjYYWCxcHdTq2mFkMp4VossowYiPeYZMsEsCRS1sWp8Fuvm6bsT27Ir2ioK oNEoCPe8tnm3Y4ty2S+5Mu7rQltoH0OcL9x0PDUT63BjDeOhfIFVwi8AviVbnkbwFVuG Go7g== X-Gm-Message-State: AOAM531s2rBk5flSfR0VtGp9qxhE/Q9xH6HbnnAlb80j5gfpffmWHVtX 7rqbrdXoB1hxuLH3HVAqIvHYcw== X-Google-Smtp-Source: ABdhPJwbRo5NrwKJhg2n6ORF2bczxZ4tl+VhEo+No1jKxRFo79yONd7Liw3MJQ42pjX/XDzUkco6OQ== X-Received: by 2002:a7b:c30b:: with SMTP id k11mr1747912wmj.49.1631670640385; Tue, 14 Sep 2021 18:50:40 -0700 (PDT) Received: from bismarck.berto.se (p54ac5892.dip0.t-ipconnect.de. [84.172.88.146]) by smtp.googlemail.com with ESMTPSA id k17sm3486863wmj.0.2021.09.14.18.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 18:50:40 -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?= , Jacopo Mondi Subject: [PATCH v2 2/2] media: rcar-csi2: Serialize access to set_fmt and get_fmt Date: Wed, 15 Sep 2021 03:50:13 +0200 Message-Id: <20210915015013.3169934-3-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210915015013.3169934-1-niklas.soderlund+renesas@ragnatech.se> References: <20210915015013.3169934-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: -4.7 (----) X-LSpam-Report: No, score=-4.7 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_MED=-2.3 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 Reviewed-by: Kieran Bingham --- 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; }