Received: by 2002:a05:7412:d002:b0:f9:9049:d2ea with SMTP id bd2csp46559rdb; Wed, 20 Dec 2023 03:39:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGk8zEonXwAWdnZvvwfyJHA6xHjALd45ZTcRyPLLoMvHFcOiMYyRUurS6XTW6zzdTfZpI0 X-Received: by 2002:a05:6e02:214e:b0:35f:c6f5:21a5 with SMTP id d14-20020a056e02214e00b0035fc6f521a5mr1812508ilv.58.1703072370911; Wed, 20 Dec 2023 03:39:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703072370; cv=none; d=google.com; s=arc-20160816; b=UX3SHz9y3UPBfRAeuoQzcbj+NjVmc7u60FgXHXpfkU9PIsQBMZqV+z+J1nvGfI8vCi PKDoKG2pFlZsX8ArmAOWqpu8KoKLpMNgsBxWkoENaUkdZpeZvhkRx+/OrMBXNcnonjyM OKoNnVDxRZpZQBIhZv+AJo6j50fUvZ6oZySaXzlzO5sh5tO/MWkvaY/AVQRQCHqbw5y7 nLUog10VppMPo3NryTqWTUlA5ofEcPjlOpt8dBi/Znss6uEGy1q4O9j46Yyg5/teRIqj bUrcIsXzE0qF2GIgNwmR6gC5J5BoH5DP/QRqy8JaUSlwHgIeCnPon0/0nzD+i8ZTbIKg 66hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=Bgz0vrp9uufNtP+3tIuB9XwqBCFPd/YS6lCrIhWwWzM=; fh=yFFfmksCYrZx9KBlBazuNGjXI8fgCRbzhjFy6n9sUxM=; b=W/k93Fcks16p30DDx3+UvHH14k09HI4uNDEI5BNFURqXClzPavlcP4MVJuu3KY7aKz jssekDtxn0u25z5wdLgbZYkeIbunFNep/KufhQSO6EKLwMlJa4udH5CkDJwKn8/2jlUh RWh5QislO7H2K9dP0Pg2frsuWjxrThQ+FHbZf/rDjaWxAd729Kq9WHn3xTf3xdM70NYE omtLn4fqknRbmGFTYoqK9GBJWeU5Q57CNSc9+1a6QW3s5YmyZ6NavoaPOQ/FlUItrkZ5 5JvgDsN5Gpo5Js1vFyOe1VHlVuFwcVdGJArRox55LhmvHWFS8rLwxhZVYZg2SOlSDMxJ tLwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=c0GjTnVB; spf=pass (google.com: domain of linux-kernel+bounces-6818-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6818-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id bf15-20020a656d0f000000b005c673af4e7bsi21752653pgb.393.2023.12.20.03.39.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 03:39:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-6818-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=c0GjTnVB; spf=pass (google.com: domain of linux-kernel+bounces-6818-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-6818-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 84F1F28AA76 for ; Wed, 20 Dec 2023 11:29:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8207021378; Wed, 20 Dec 2023 11:29:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="c0GjTnVB" X-Original-To: linux-kernel@vger.kernel.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FA3122303; Wed, 20 Dec 2023 11:28:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 863B52B3; Wed, 20 Dec 2023 12:28:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1703071686; bh=KCvxPrpXmCuPas6rpwGf1ARzqD0A17poEDZ6OvkEOGU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=c0GjTnVBHbOTsjeB+U/VOuVp1Q1G05CaF1JDMyF5d5ATHUe4AluVEwibOrm/wNcbq gMaBX26sPg3n0+MquWTMvCGIpeS86GIlK2cDrsTLnJSqacWSztMGl/6eqDi/ZN64pC mISaWwzRH85LsmcTgNqnA2JzpKPSG7zkysl2I0as= Date: Wed, 20 Dec 2023 13:29:02 +0200 From: Laurent Pinchart To: Tommaso Merciai Cc: linuxfancy@googlegroups.com, martin.hecht@avnet.eu, Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/4] media: i2c: alvium: removal of fr field Message-ID: <20231220112902.GE25366@pendragon.ideasonboard.com> References: <20231220085609.2595732-1-tomm.merciai@gmail.com> <20231220085609.2595732-3-tomm.merciai@gmail.com> <20231220091309.GG29638@pendragon.ideasonboard.com> <20231220100643.GJ29638@pendragon.ideasonboard.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: On Wed, Dec 20, 2023 at 12:19:23PM +0100, Tommaso Merciai wrote: > On Wed, Dec 20, 2023 at 12:06:43PM +0200, Laurent Pinchart wrote: > > On Wed, Dec 20, 2023 at 11:02:51AM +0100, Tommaso Merciai wrote: > > > On Wed, Dec 20, 2023 at 11:13:09AM +0200, Laurent Pinchart wrote: > > > > Hi Tommaso, > > > > > > > > Thank you for the patch. > > > > > > > > Use the imperative in the subject line: > > > > > > > > media: i2c: alvium: Remove the fr field of the alvium_dev structure > > > > > > > > On Wed, Dec 20, 2023 at 09:56:07AM +0100, Tommaso Merciai wrote: > > > > > The fr (frame rate) field of the alvium_dev structure is > > > > > only used to pass result from alvium_set_frame_interval() to > > > > > alvium_set_frame_rate() that writes this info into the hw reg. > > > > > Replace them with function parameter. > > > > > > > > Replace it with a function parameter. > > > > > > Thanks I'll fix this in v3. > > > > > > > > > > > > > Signed-off-by: Tommaso Merciai > > > > > --- > > > > > drivers/media/i2c/alvium-csi2.c | 24 ++++++++++++------------ > > > > > drivers/media/i2c/alvium-csi2.h | 1 - > > > > > 2 files changed, 12 insertions(+), 13 deletions(-) > > > > > > > > > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > > > > > index 0dcd69bf9f92..a9ff6cc97cff 100644 > > > > > --- a/drivers/media/i2c/alvium-csi2.c > > > > > +++ b/drivers/media/i2c/alvium-csi2.c > > > > > @@ -1185,19 +1185,19 @@ static int alvium_get_frame_interval(struct alvium_dev *alvium, > > > > > return ret; > > > > > } > > > > > > > > > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > > > > > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > > > > > { > > > > > struct device *dev = &alvium->i2c_client->dev; > > > > > int ret; > > > > > > > > > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > > > > > - alvium->fr); > > > > > + fr); > > > > > if (ret) { > > > > > dev_err(dev, "Fail to set frame rate lanes reg\n"); > > > > > return ret; > > > > > } > > > > > > > > > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > > > > > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > > > > > > > > > return 0; > > > > > } > > > > > @@ -1661,10 +1661,11 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > > > > > } > > > > > > > > > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > > > > > - struct v4l2_subdev_frame_interval *fi) > > > > > + struct v4l2_subdev_frame_interval *fi, > > > > > + u64 *req_fr) > > > > > { > > > > > struct device *dev = &alvium->i2c_client->dev; > > > > > - u64 req_fr, dft_fr, min_fr, max_fr; > > > > > + u64 dft_fr, min_fr, max_fr; > > > > > int ret; > > > > > > > > > > if (fi->interval.denominator == 0) > > > > > @@ -1681,13 +1682,12 @@ static int alvium_set_frame_interval(struct alvium_dev *alvium, > > > > > dev_dbg(dev, "fi->interval.denominator = %d\n", > > > > > fi->interval.denominator); > > > > > > > > > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > > > > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > > > > fi->interval.numerator); > > > > > > > > > > - if (req_fr >= max_fr && req_fr <= min_fr) > > > > > - req_fr = dft_fr; > > > > > + if (*req_fr >= max_fr && *req_fr <= min_fr) > > > > > + *req_fr = dft_fr; > > > > > > > > Shouldn't we clamp the value to [min, max] instead of using the default > > > > if it's out of range ? Something like > > > > > > > > *req_fr = clamp(*req_fr, min_fr, max_fr) > > > > > > > > This makes me realize that the current code is wrong, req_fr can't be >= > > > > max and <= min at the same time. You probably meant || instead of &&. > > > > > > > > This should be fixed in a separate patch. > > > > > > If this is ok for you, after this series I can put a patch with || fix > > > instead of clamping, because if we clamp dft_fr is not used any more. > > > After if you agree I will work on clamping. > > > Thanks for the catch! :) > > > > It's fine to fix this on top of the series, but I don't see why you > > would need to first use ||. You can call clamp() and remove dft_fr. > > I'm just thinking out loud eh :) > > Maybe in the future we need to expose fr infos to the user to play with > that. But we are writing for now, then we can replan to readd dft_fr > read later. > > I think this is what your are suggesting: > > +++ b/drivers/media/i2c/alvium-csi2.c > @@ -1171,12 +1171,10 @@ static int alvium_set_bayer_pattern(struct alvium_dev *alvium, > } > > static int alvium_get_frame_interval(struct alvium_dev *alvium, > - u64 *dft_fr, u64 *min_fr, u64 *max_fr) > + u64 *min_fr, u64 *max_fr) > { > int ret = 0; > > - alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > - dft_fr, &ret); > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MIN_R, > min_fr, &ret); > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MAX_R, > @@ -1647,7 +1645,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > { > struct alvium_dev *alvium = sd_to_alvium(sd); > struct device *dev = &alvium->i2c_client->dev; > - u64 req_fr, dft_fr, min_fr, max_fr; > + u64 req_fr, min_fr, max_fr; > struct v4l2_fract *interval; > int ret; > > @@ -1657,7 +1655,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > if (fi->interval.denominator == 0) > return -EINVAL; > > - ret = alvium_get_frame_interval(alvium, &dft_fr, &min_fr, &max_fr); > + ret = alvium_get_frame_interval(alvium, &min_fr, &max_fr); > if (ret) { > dev_err(dev, "Fail to get frame interval\n"); > return ret; > @@ -1670,9 +1668,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > fi->interval.numerator); > - > - if (req_fr >= max_fr && req_fr <= min_fr) > - req_fr = dft_fr; > + req_fr = clamp(req_fr, min_fr, max_fr); > > interval = v4l2_subdev_state_get_interval(sd_state, 0); > > right? Yes this looks good to me. > > > > > > > > > > - alvium->fr = req_fr; > > > > > alvium->frame_interval.numerator = fi->interval.numerator; > > > > > alvium->frame_interval.denominator = fi->interval.denominator; > > > > > > > > > > @@ -1699,6 +1699,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > > > struct v4l2_subdev_frame_interval *fi) > > > > > { > > > > > struct alvium_dev *alvium = sd_to_alvium(sd); > > > > > + u64 req_fr = ALVIUM_DEFAULT_FR_HZ; > > > > > > > > Do you need to initialize the variable ? It doesn't seem to be required. > > > > > > Really not, it's just to maintain the logic of alvium->fr. I will drop > > > this in v3, thanks! > > > > > > > With these small issues fixed, > > > > > > > > Reviewed-by: Laurent Pinchart > > > > > > > > > int ret; > > > > > > > > > > /* > > > > > @@ -1711,9 +1712,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > > > if (alvium->streaming) > > > > > return -EBUSY; > > > > > > > > > > - ret = alvium_set_frame_interval(alvium, fi); > > > > > + ret = alvium_set_frame_interval(alvium, fi, &req_fr); > > > > > if (!ret) > > > > > - ret = alvium_set_frame_rate(alvium); > > > > > + ret = alvium_set_frame_rate(alvium, req_fr); > > > > > > > > > > return ret; > > > > > } > > > > > @@ -2273,7 +2274,6 @@ static int alvium_subdev_init(struct alvium_dev *alvium) > > > > > /* Setup initial frame interval*/ > > > > > alvium->frame_interval.numerator = 1; > > > > > alvium->frame_interval.denominator = ALVIUM_DEFAULT_FR_HZ; > > > > > - alvium->fr = ALVIUM_DEFAULT_FR_HZ; > > > > > > > > > > /* Setup the initial mode */ > > > > > alvium->mode.fmt = alvium_csi2_default_fmt; > > > > > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > > > > > index 17f0bbbd1839..80066ac25047 100644 > > > > > --- a/drivers/media/i2c/alvium-csi2.h > > > > > +++ b/drivers/media/i2c/alvium-csi2.h > > > > > @@ -443,7 +443,6 @@ struct alvium_dev { > > > > > > > > > > struct alvium_mode mode; > > > > > struct v4l2_fract frame_interval; > > > > > - u64 fr; > > > > > > > > > > u8 h_sup_csi_lanes; > > > > > u64 link_freq; -- Regards, Laurent Pinchart