From patchwork Sun Sep 23 16:34:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C32E1161F for ; Sun, 23 Sep 2018 16:35:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0CA82925E for ; Sun, 23 Sep 2018 16:35:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A54DB292CB; Sun, 23 Sep 2018 16:35:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43F3B2925E for ; Sun, 23 Sep 2018 16:35:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726352AbeIWWdS (ORCPT ); Sun, 23 Sep 2018 18:33:18 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:44765 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWdS (ORCPT ); Sun, 23 Sep 2018 18:33:18 -0400 Received: by mail-pf1-f193.google.com with SMTP id k21-v6so8011455pff.11 for ; Sun, 23 Sep 2018 09:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GuGFKl6B5WnpLoT/Zfi/hJbQk3PwU8HibsN6Ie0H2JI=; b=X9n7LCvcXxXzTdvCZhStUyapz3RID21XMKKdKfqrDllwFXlAHBqACuBvm6ynYbHpKZ JNCNXRZA5F+bPfdvvX7Tr4+ov8gwBygwUSlr8uOqEqepB1pjNKVSETnNFA8YEX4sArk0 sTfUc4LuqYF2W3u0SLG5O1D6RQusrFP0CzkjFjyWtIRv/laHzDYKvPcZtKwJAGGF2FVK uqomvJT5xfEA3sBadWHBU4JnaLFzgAcuPwtBfqUuBJyMeJQDhVhTIBRKHUwGXSmOW+Y+ YYp3+pEMAIj2Q8/d18zIzDeu53Y0EuAYuUZdxHSSyuxi75yonp1oZd5xJcLPv9J/KMUx VkOA== 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; bh=GuGFKl6B5WnpLoT/Zfi/hJbQk3PwU8HibsN6Ie0H2JI=; b=WPJELeXlxD4EmtF0p4bSV2QwOPc8O9zhGQF11tDQ03ruzis0OyGfWwTl9EPGPrkOoO +rPPb3kdJRVn1J/PyB7vqUvUxLiWMD3A9fTd4xXazQQKlc2vpyuFttUw/QlBEcP+IXYu sGZmYsRm6H+Ji84U0O4/IO5rgtz+tLHEhEeVj4PYa1TW9E9+NbEED+AO94BHTKWO9wWC 4+6hB/oe11M7zXbxTcleUAFHyPoIMBG0VdHW0FBwcOTBNIH1H0FtA39xK0+UVCAxyDz7 2udTvXGMsQ1HoUxnhqWmFkT1FkNRPxN/+sgId8V1GG2J4LVBFDS35/AqD3AEGAEYIJvG uJWg== X-Gm-Message-State: APzg51Bt9Q00RCdskbN2963WzKvLcXorIyEEPRDnQzLpZvGl0msXCnLN ih3Ph++I0G+SQu3jhCNJcjS3h9ud X-Google-Smtp-Source: ANB0VdYSva39DWlZY6KwIE1F4GlkNgMm284MSUgd6kIZahq2r+TQRixgjE43y7ukyYw8YtyFtGTZCw== X-Received: by 2002:a62:38d0:: with SMTP id f199-v6mr2361909pfa.48.1537720512779; Sun, 23 Sep 2018 09:35:12 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:12 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 1/6] media: video-i2c: avoid accessing released memory area when removing driver Date: Mon, 24 Sep 2018 01:34:47 +0900 Message-Id: <1537720492-31201-2-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The video_i2c_data is allocated by kzalloc and released by the video device's release callback. The release callback is called when video_unregister_device() is called, but it will still be accessed after calling video_unregister_device(). Fix the use after free by allocating video_i2c_data by devm_kzalloc() with i2c_client->dev so that it will automatically be released when the i2c driver is removed. Fixes: 5cebaac60974 ("media: video-i2c: add video-i2c driver") Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Acked-by: Matt Ranostay Signed-off-by: Akinobu Mita --- * v2 - Update commit log to clarify the use after free - Add Acked-by tag drivers/media/i2c/video-i2c.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 06d29d8..b7a2af9 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -508,20 +508,15 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = { .vidioc_streamoff = vb2_ioctl_streamoff, }; -static void video_i2c_release(struct video_device *vdev) -{ - kfree(video_get_drvdata(vdev)); -} - static int video_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct video_i2c_data *data; struct v4l2_device *v4l2_dev; struct vb2_queue *queue; - int ret = -ENODEV; + int ret; - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -530,7 +525,7 @@ static int video_i2c_probe(struct i2c_client *client, else if (id) data->chip = &video_i2c_chip[id->driver_data]; else - goto error_free_device; + return -ENODEV; data->client = client; v4l2_dev = &data->v4l2_dev; @@ -538,7 +533,7 @@ static int video_i2c_probe(struct i2c_client *client, ret = v4l2_device_register(&client->dev, v4l2_dev); if (ret < 0) - goto error_free_device; + return ret; mutex_init(&data->lock); mutex_init(&data->queue_lock); @@ -568,7 +563,7 @@ static int video_i2c_probe(struct i2c_client *client, data->vdev.fops = &video_i2c_fops; data->vdev.lock = &data->lock; data->vdev.ioctl_ops = &video_i2c_ioctl_ops; - data->vdev.release = video_i2c_release; + data->vdev.release = video_device_release_empty; data->vdev.device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; @@ -597,9 +592,6 @@ static int video_i2c_probe(struct i2c_client *client, mutex_destroy(&data->lock); mutex_destroy(&data->queue_lock); -error_free_device: - kfree(data); - return ret; } From patchwork Sun Sep 23 16:34:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1502D13A4 for ; Sun, 23 Sep 2018 16:35:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 000A52925E for ; Sun, 23 Sep 2018 16:35:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8889292ED; Sun, 23 Sep 2018 16:35:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51C412925E for ; Sun, 23 Sep 2018 16:35:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726437AbeIWWdT (ORCPT ); Sun, 23 Sep 2018 18:33:19 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:46939 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWdT (ORCPT ); Sun, 23 Sep 2018 18:33:19 -0400 Received: by mail-pl1-f193.google.com with SMTP id v19-v6so388883ply.13 for ; Sun, 23 Sep 2018 09:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QW6YC/O6XJd39htXy14C0r1cJPhxfBFB2G+R8wc+oz8=; b=UGY6PBibrFrP+mWLxTpFBCz5TT07Pr8saEUkeVEAUn5AA65CeJPrVtXlNOGhpeI0m7 b2QW8e0pfhN9tUNANKwgACcZWX8f+fJgj/occHuz0oU2n4p+UpxMlxjuqicTLlHfn+ed wppLlAiji049+eqEe3Pw/wGAI512bhy4Z/d0gaGX/P/MVwV+o9vjHDAJgWu3msPnXKs2 WmtrF8mqLcVz/x4K0wB4BlzQXr+eFfbEQ9mPiPmp0TsbMnheA9ZCek1oQmvXKxE1YncS dyX3Qt4IiDRhEOJ+lmnw4Gf4iQqstoKe2rCKs1IheD5G8228v6Bpm5n2L/5UKr2BhJcm Xo6g== 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; bh=QW6YC/O6XJd39htXy14C0r1cJPhxfBFB2G+R8wc+oz8=; b=fuXX5FOz0sqjCHw/94NgCYKL8XqsTjKUzyoxQmyIJXtlSwotfNCHa8ycfsuMYkxXiJ UJ2YO9ccsCmf2DswJpFEGKQbhZ9gGLy/2cmix5vNfIeCRf+2z6dZwcl/Yt6c7Jj2YSun nIVnU9tBEXsu8UBslK2EOe78p5rdsGt/cRSYlPuzGuYeklqOsThM0ukSh0s3NEMmIjtj i3QW1nLg70tT7Ik7xPtlewlBg1dmIsQj5WnT8Ah/oROwq+pqL8rpCsvn4jGh2enviUg4 gCG6rwpvfWaRLDT9ei3ILRRJIwasFl/7KIP/XRwFVvAmV5NVD/8IADa2k+Rk8+EiPQKV rP1w== X-Gm-Message-State: ABuFfojSajO1PARpl5TZvnrEhHFBsS/E0bPiwx9LSjlVWSiOseeToMAe t9r66rPt4+gU4Qs9WsoLBX5LE3Yb X-Google-Smtp-Source: ACcGV62u7X9hEo+UIe4gnLl1kmoO0HEnpSWiAWffoUtaUOnaJAjRCUqzoEcK/bbfjHb8MPsRedKKxA== X-Received: by 2002:a17:902:44:: with SMTP id 62-v6mr7121346pla.181.1537720515328; Sun, 23 Sep 2018 09:35:15 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:14 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 2/6] media: video-i2c: use i2c regmap Date: Mon, 24 Sep 2018 01:34:48 +0900 Message-Id: <1537720492-31201-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use regmap for i2c register access. This simplifies register accesses and chooses suitable access commands based on the functionality that the adapter supports. Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita Acked-by: Matt Ranostay --- * v2 - Add thermistor and termperature register address definisions drivers/media/i2c/video-i2c.c | 60 ++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index b7a2af9..fb8509e 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -38,7 +39,7 @@ struct video_i2c_buffer { }; struct video_i2c_data { - struct i2c_client *client; + struct regmap *regmap; const struct video_i2c_chip *chip; struct mutex lock; spinlock_t slock; @@ -62,6 +63,12 @@ static const struct v4l2_frmsize_discrete amg88xx_size = { .height = 8, }; +static const struct regmap_config amg88xx_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = 0xff +}; + struct video_i2c_chip { /* video dimensions */ const struct v4l2_fmtdesc *format; @@ -76,6 +83,8 @@ struct video_i2c_chip { /* pixel size in bits */ unsigned int bpp; + const struct regmap_config *regmap_config; + /* xfer function */ int (*xfer)(struct video_i2c_data *data, char *buf); @@ -83,26 +92,16 @@ struct video_i2c_chip { int (*hwmon_init)(struct video_i2c_data *data); }; -static int amg88xx_xfer(struct video_i2c_data *data, char *buf) -{ - struct i2c_client *client = data->client; - struct i2c_msg msg[2]; - u8 reg = 0x80; - int ret; - - msg[0].addr = client->addr; - msg[0].flags = 0; - msg[0].len = 1; - msg[0].buf = (char *)® - - msg[1].addr = client->addr; - msg[1].flags = I2C_M_RD; - msg[1].len = data->chip->buffer_size; - msg[1].buf = (char *)buf; +/* Thermistor register */ +#define AMG88XX_REG_TTHL 0x0e - ret = i2c_transfer(client->adapter, msg, 2); +/* Temperature register */ +#define AMG88XX_REG_T01L 0x80 - return (ret == 2) ? 0 : -EIO; +static int amg88xx_xfer(struct video_i2c_data *data, char *buf) +{ + return regmap_bulk_read(data->regmap, AMG88XX_REG_T01L, buf, + data->chip->buffer_size); } #if IS_ENABLED(CONFIG_HWMON) @@ -133,12 +132,15 @@ static int amg88xx_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long *val) { struct video_i2c_data *data = dev_get_drvdata(dev); - struct i2c_client *client = data->client; - int tmp = i2c_smbus_read_word_data(client, 0x0e); + __le16 buf; + int tmp; - if (tmp < 0) + tmp = regmap_bulk_read(data->regmap, AMG88XX_REG_TTHL, &buf, 2); + if (tmp) return tmp; + tmp = le16_to_cpu(buf); + /* * Check for sign bit, this isn't a two's complement value but an * absolute temperature that needs to be inverted in the case of being @@ -164,8 +166,9 @@ static const struct hwmon_chip_info amg88xx_chip_info = { static int amg88xx_hwmon_init(struct video_i2c_data *data) { - void *hwmon = devm_hwmon_device_register_with_info(&data->client->dev, - "amg88xx", data, &amg88xx_chip_info, NULL); + struct device *dev = regmap_get_device(data->regmap); + void *hwmon = devm_hwmon_device_register_with_info(dev, "amg88xx", data, + &amg88xx_chip_info, NULL); return PTR_ERR_OR_ZERO(hwmon); } @@ -182,6 +185,7 @@ static const struct video_i2c_chip video_i2c_chip[] = { .max_fps = 10, .buffer_size = 128, .bpp = 16, + .regmap_config = &amg88xx_regmap_config, .xfer = &amg88xx_xfer, .hwmon_init = amg88xx_hwmon_init, }, @@ -350,7 +354,8 @@ static int video_i2c_querycap(struct file *file, void *priv, struct v4l2_capability *vcap) { struct video_i2c_data *data = video_drvdata(file); - struct i2c_client *client = data->client; + struct device *dev = regmap_get_device(data->regmap); + struct i2c_client *client = to_i2c_client(dev); strlcpy(vcap->driver, data->v4l2_dev.name, sizeof(vcap->driver)); strlcpy(vcap->card, data->vdev.name, sizeof(vcap->card)); @@ -527,7 +532,10 @@ static int video_i2c_probe(struct i2c_client *client, else return -ENODEV; - data->client = client; + data->regmap = devm_regmap_init_i2c(client, data->chip->regmap_config); + if (IS_ERR(data->regmap)) + return PTR_ERR(data->regmap); + v4l2_dev = &data->v4l2_dev; strlcpy(v4l2_dev->name, VIDEO_I2C_DRIVER, sizeof(v4l2_dev->name)); From patchwork Sun Sep 23 16:34:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1020013A4 for ; Sun, 23 Sep 2018 16:35:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1B132925E for ; Sun, 23 Sep 2018 16:35:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E60C2292ED; Sun, 23 Sep 2018 16:35:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94A9A2925E for ; Sun, 23 Sep 2018 16:35:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726463AbeIWWdU (ORCPT ); Sun, 23 Sep 2018 18:33:20 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:41224 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWdU (ORCPT ); Sun, 23 Sep 2018 18:33:20 -0400 Received: by mail-pl1-f196.google.com with SMTP id b12-v6so8059141plr.8 for ; Sun, 23 Sep 2018 09:35:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G3vFzAMBOhKX8eSaSr6JUcFFkCqYMNOVufFUtvNTwQc=; b=TE2wWgh4RbzQwyal+7QAFUft12IfIINLXLtPFaQ0ZRVK3yyHeQz+szlEx3s5hf/rq+ aWAYJFieVBgLGrpVZQu0/00107/7Wxv4Rh+qm5d0l1AJXNUq3grgPy0Diq/yw6e3KGeh Roti+9IxUEQB+l+vElZniXD2Xu7e5o6G2PCRIuRfBHWpGmtlDEgcUal1EymynzoG0Gku 9vbx6eVqo+qMIaVZToNbq0wdNRuGKnCsJiS1Yl4IZ8Dqnivjaa3iG+2RerLkiCvQGtq/ DRwcBy5n80V980C5Kx+ztee0cN4rSCdBEPSH1jIpN5wf6dbAqVCNP+QvsmL5qkSmCYUh ElQQ== 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; bh=G3vFzAMBOhKX8eSaSr6JUcFFkCqYMNOVufFUtvNTwQc=; b=VB7txI2aYh5ZlvMyW6rYwiZacnmgAu0QRF//AySLU9nt0Kq6+x1tyo5udiFSV5bUDB WchRq/gdyUS87Jse4067Bfxo/yZkDLqULfVoeL9y7qdBa72DYFGoVcgvf3r9LEcpvdJv na9cU2jj4trcscv6zYamaykPXCe1vQXovaKHMLrlFtRSLdecd4C5BUk2zjnTL937fV+1 a4+HOh+iwzujRgHWeMoSab0pMltlGqOLOq1zNHp8yynLi/znQel8dJU4buNtXTAVyPjt V5Kg8A9CycFByL6uvMYBJbWaQ0Db+rrfnKWFjaR29OLkfrto+Ku0OH+zhwBJ2+fwpVPH 0A6w== X-Gm-Message-State: ABuFfohvSUAyd5HUo7NzKw6gc4vd804Tbw02cglD8XqtKdEQQ506dAvm uVVI4U51UXRBr4dmBgNL8igPfD7D X-Google-Smtp-Source: ACcGV61qlnxyjd2U79cUUo4H77QFau8Uuvk87lCAB9jaNJUiVYkS99ZORIWEQtT+NzuhWiAPZW8/IQ== X-Received: by 2002:a17:902:4d45:: with SMTP id o5-v6mr7255810plh.78.1537720517895; Sun, 23 Sep 2018 09:35:17 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:17 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 3/6] media: v4l2-common: add V4L2_FRACT_COMPARE Date: Mon, 24 Sep 2018 01:34:49 +0900 Message-Id: <1537720492-31201-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add macro to compare two v4l2_fract values in v4l2 common internal API. The same macro FRACT_CMP() is used by vivid and bcm2835-camera. This just renames it to V4L2_FRACT_COMPARE in order to avoid namespace collision. Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- * v2 - New patch include/media/v4l2-common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index cdc87ec..eafb8a3 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -384,4 +384,9 @@ int v4l2_g_parm_cap(struct video_device *vdev, int v4l2_s_parm_cap(struct video_device *vdev, struct v4l2_subdev *sd, struct v4l2_streamparm *a); +/* Compare two v4l2_fract structs */ +#define V4L2_FRACT_COMPARE(a, OP, b) \ + ((u64)(a).numerator * (b).denominator OP \ + (u64)(b).numerator * (a).denominator) + #endif /* V4L2_COMMON_H_ */ From patchwork Sun Sep 23 16:34:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CF83174A for ; Sun, 23 Sep 2018 16:35:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A5B22925E for ; Sun, 23 Sep 2018 16:35:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EE4D292ED; Sun, 23 Sep 2018 16:35:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1951D2925E for ; Sun, 23 Sep 2018 16:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726497AbeIWWdY (ORCPT ); Sun, 23 Sep 2018 18:33:24 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:32808 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWdY (ORCPT ); Sun, 23 Sep 2018 18:33:24 -0400 Received: by mail-pg1-f193.google.com with SMTP id y18-v6so4824286pge.0 for ; Sun, 23 Sep 2018 09:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P7lNpBVo1pJ7U/uMVCSCu8fyt5PmBEeY11dXCnF7D9E=; b=tjKAphl6yg0incNQ/iMcUeD3JzkUzOaxjprhGIq6kRJpQQOzWF+A4xLPbwEUtKkx4U 6tHDgSUI6G3nAl1xu50wRhQqcE7jFgsoLS8WHrZuZpYiDhdrX4Jzxv4MzIVzrmlo14H7 W0G9H3xWKW2MEHRUma0I0jFWkQjTAnpDJNDdhxrlMBv5KZA6s67lXEVYQjbSUF43VtmQ dumsyj0KcnS2EpTq8rur0Dnj5qzc0GhQNlugq1qwM208HIrvCxuX/0Kes2YEeSMAx8cm IaYEDObj9MaRCYtN6j+Kx7HoungwdKTFc+NtJuLvPFd8PctO4d/iXxdukD75DHnceble 7EOw== 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; bh=P7lNpBVo1pJ7U/uMVCSCu8fyt5PmBEeY11dXCnF7D9E=; b=PtrmVq4xX9L1/s7rh8u+jMCksoZkhI2v7O6Lu1p2jBkf1J/E/5fSlOf+uyQIVja0yd hlRXdSrpEJaLm4O3xUZQ+0EHLjk5+R9RTMvYQpCSU6WQdNYW6caRloYFY5u9FaZf67yp 5guMNNZRvW4Fwi8i2Q8S6IBxUUxebrLKfnfAN8Cdkbo3VXnQw4SCmunjyByLnlxA8rq9 GGQsg6fL3ECNTL3JMMQ2g74mGU+iyhdadR6jiSUHIU9msv8p5EoP/bOzC2OtxeeMKsz4 mAA9BODQJcGsk8HvJC7oF5WL29VA8p3dy63+h+8piOihrXWMc20c5N8SBfGyHMhepzPB E+hg== X-Gm-Message-State: APzg51C61cG6J0SlwAG3Fo4s3CUWEWLlTihOkDqr/J5ALuvzVCfwtfSp K6aQul3VPceINxpfJ574SDlNqI4P X-Google-Smtp-Source: ANB0Vda0iuirTm2WRf58IYB8495uoVKkqBCluoU0Z5dcKImcLsLibde27rmDWPmY04Ag9chzeh0JlA== X-Received: by 2002:a62:435c:: with SMTP id q89-v6mr7032640pfa.135.1537720520299; Sun, 23 Sep 2018 09:35:20 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:19 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 4/6] media: vivid: use V4L2_FRACT_COMPARE Date: Mon, 24 Sep 2018 01:34:50 +0900 Message-Id: <1537720492-31201-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now the equivalent of FRACT_CMP() is added in v4l2 common internal API header. Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita --- * v2 - New patch drivers/media/platform/vivid/vivid-vid-cap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c index 1599159..f19c701 100644 --- a/drivers/media/platform/vivid/vivid-vid-cap.c +++ b/drivers/media/platform/vivid/vivid-vid-cap.c @@ -1824,9 +1824,6 @@ int vivid_vid_cap_g_parm(struct file *file, void *priv, return 0; } -#define FRACT_CMP(a, OP, b) \ - ((u64)(a).numerator * (b).denominator OP (u64)(b).numerator * (a).denominator) - int vivid_vid_cap_s_parm(struct file *file, void *priv, struct v4l2_streamparm *parm) { @@ -1847,14 +1844,14 @@ int vivid_vid_cap_s_parm(struct file *file, void *priv, if (tpf.denominator == 0) tpf = webcam_intervals[ival_sz - 1]; for (i = 0; i < ival_sz; i++) - if (FRACT_CMP(tpf, >=, webcam_intervals[i])) + if (V4L2_FRACT_COMPARE(tpf, >=, webcam_intervals[i])) break; if (i == ival_sz) i = ival_sz - 1; dev->webcam_ival_idx = i; tpf = webcam_intervals[dev->webcam_ival_idx]; - tpf = FRACT_CMP(tpf, <, tpf_min) ? tpf_min : tpf; - tpf = FRACT_CMP(tpf, >, tpf_max) ? tpf_max : tpf; + tpf = V4L2_FRACT_COMPARE(tpf, <, tpf_min) ? tpf_min : tpf; + tpf = V4L2_FRACT_COMPARE(tpf, >, tpf_max) ? tpf_max : tpf; /* resync the thread's timings */ dev->cap_seq_resync = true; From patchwork Sun Sep 23 16:34:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1C8E8161F for ; Sun, 23 Sep 2018 16:35:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 094D72925E for ; Sun, 23 Sep 2018 16:35:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F204B292ED; Sun, 23 Sep 2018 16:35:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A392925E for ; Sun, 23 Sep 2018 16:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726507AbeIWWd0 (ORCPT ); Sun, 23 Sep 2018 18:33:26 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38004 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWd0 (ORCPT ); Sun, 23 Sep 2018 18:33:26 -0400 Received: by mail-pg1-f193.google.com with SMTP id r77-v6so2999236pgr.5 for ; Sun, 23 Sep 2018 09:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GDLqHTB+RZY8zrvTR2wUhPCJkUG+cPdAycflF5f7C74=; b=W6o/HZ6KSnqTokGCKc7bmHiqJOa4glO1CHEQKp2uFowAyRfSUus9Kl7xU0BAeW2pSH fiLQAO8bhvvdavCmPgo+V1g8n3PjcmvTPr8AOS6m8v00mMym6QhYGEe4RIBjsvsLqVZp y92H174TUQsHODfryaMMSK5ENJQPw9jpNp8EFCGtwHsHWPOihIY54jXDDePHZNzpMZjU 6zhgYFtToy330OUv2e/CeJdQLddRiCNUox/JlHRT8eX0/kSEflfgcDDgqLqNVpcx8Hqb ZZd9EsqqiT73/pc/hJZHKRmX/OyN2Yt4dL/Ch80UQmc3hPSX+1gR3TrqW6ejT1Oq9wa9 EyPg== 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; bh=GDLqHTB+RZY8zrvTR2wUhPCJkUG+cPdAycflF5f7C74=; b=ePFaTj2919TPJRQN5DW9E7EO5bK4J1ALEF0wV9hvz7doA58IWUJBlLp44qTpcxnRXj zMtcDZklcuffs0vJJHVO9r1BjllmeJAkMFoEDk+KdC9RjumW0S73iCj/IkOLNupcVxNO 8KRqv2EDmO41PnS4n/TfupoTJ6Kw7mQHNKB41gqgyjxQV09dTd95UFfyoxfwv21d2o/y mPQdODLcc8Ean1JtZmckwmVkKB6TvEjVIz+9kFKC4/hlda7a8FOayGfL33clTPl6ulMv dt6QkD0Y9XW/YWoCnq9SvUpA8lphfiOb18oVlj1hLld9xEkSupxGaW3ss/66GMWBejFO n2+A== X-Gm-Message-State: ABuFfogFy2JuH9xBJUfDCKUyz87r9XsaMCBkwWba1tJ5Uza5BjK9hslT 1uvHVv3f+qT/2eQipsTizT8h+/lX X-Google-Smtp-Source: ACcGV63i68ZBbViF27N3ULvGFz/E7Tjvy5Zntz6VQlHdhlhTo4I/s+bCdmSPOomUIxmz6ScobNeIXA== X-Received: by 2002:a63:3089:: with SMTP id w131-v6mr6276561pgw.79.1537720523047; Sun, 23 Sep 2018 09:35:23 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:22 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 5/6] media: video-i2c: support changing frame interval Date: Mon, 24 Sep 2018 01:34:51 +0900 Message-Id: <1537720492-31201-6-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AMG88xx has a register for setting frame rate 1 or 10 FPS. This adds support changing frame interval. Reference specifications: https://docid81hrs3j1.cloudfront.net/medialibrary/2017/11/PANA-S-A0002141979-1.pdf Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Acked-by: Matt Ranostay Signed-off-by: Akinobu Mita --- * v2 - Add Acked-by tag - Add comment for frame rate register address definision - Use V4L2_FRACT_COMPARE() to find suitable frame interval drivers/media/i2c/video-i2c.c | 78 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 12 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index fb8509e..6dd1929 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -52,6 +52,8 @@ struct video_i2c_data { struct task_struct *kthread_vid_cap; struct list_head vid_cap_active; + + struct v4l2_fract frame_interval; }; static const struct v4l2_fmtdesc amg88xx_format = { @@ -74,8 +76,9 @@ struct video_i2c_chip { const struct v4l2_fmtdesc *format; const struct v4l2_frmsize_discrete *size; - /* max frames per second */ - unsigned int max_fps; + /* available frame intervals */ + const struct v4l2_fract *frame_intervals; + unsigned int num_frame_intervals; /* pixel buffer size */ unsigned int buffer_size; @@ -85,6 +88,9 @@ struct video_i2c_chip { const struct regmap_config *regmap_config; + /* setup function */ + int (*setup)(struct video_i2c_data *data); + /* xfer function */ int (*xfer)(struct video_i2c_data *data, char *buf); @@ -92,6 +98,10 @@ struct video_i2c_chip { int (*hwmon_init)(struct video_i2c_data *data); }; +/* Frame rate register */ +#define AMG88XX_REG_FPSC 0x02 +#define AMG88XX_FPSC_1FPS BIT(0) + /* Thermistor register */ #define AMG88XX_REG_TTHL 0x0e @@ -104,6 +114,19 @@ static int amg88xx_xfer(struct video_i2c_data *data, char *buf) data->chip->buffer_size); } +static int amg88xx_setup(struct video_i2c_data *data) +{ + unsigned int mask = AMG88XX_FPSC_1FPS; + unsigned int val; + + if (data->frame_interval.numerator == data->frame_interval.denominator) + val = mask; + else + val = 0; + + return regmap_update_bits(data->regmap, AMG88XX_REG_FPSC, mask, val); +} + #if IS_ENABLED(CONFIG_HWMON) static const u32 amg88xx_temp_config[] = { @@ -178,14 +201,21 @@ static int amg88xx_hwmon_init(struct video_i2c_data *data) #define AMG88XX 0 +static const struct v4l2_fract amg88xx_frame_intervals[] = { + { 1, 10 }, + { 1, 1 }, +}; + static const struct video_i2c_chip video_i2c_chip[] = { [AMG88XX] = { .size = &amg88xx_size, .format = &amg88xx_format, - .max_fps = 10, + .frame_intervals = amg88xx_frame_intervals, + .num_frame_intervals = ARRAY_SIZE(amg88xx_frame_intervals), .buffer_size = 128, .bpp = 16, .regmap_config = &amg88xx_regmap_config, + .setup = &amg88xx_setup, .xfer = &amg88xx_xfer, .hwmon_init = amg88xx_hwmon_init, }, @@ -250,7 +280,8 @@ static void buffer_queue(struct vb2_buffer *vb) static int video_i2c_thread_vid_cap(void *priv) { struct video_i2c_data *data = priv; - unsigned int delay = msecs_to_jiffies(1000 / data->chip->max_fps); + unsigned int delay = mult_frac(HZ, data->frame_interval.numerator, + data->frame_interval.denominator); set_freezable(); @@ -312,19 +343,26 @@ static void video_i2c_del_list(struct vb2_queue *vq, enum vb2_buffer_state state static int start_streaming(struct vb2_queue *vq, unsigned int count) { struct video_i2c_data *data = vb2_get_drv_priv(vq); + int ret; if (data->kthread_vid_cap) return 0; + ret = data->chip->setup(data); + if (ret) + goto error_del_list; + data->sequence = 0; data->kthread_vid_cap = kthread_run(video_i2c_thread_vid_cap, data, "%s-vid-cap", data->v4l2_dev.name); - if (!IS_ERR(data->kthread_vid_cap)) + ret = PTR_ERR_OR_ZERO(data->kthread_vid_cap); + if (!ret) return 0; +error_del_list: video_i2c_del_list(vq, VB2_BUF_STATE_QUEUED); - return PTR_ERR(data->kthread_vid_cap); + return ret; } static void stop_streaming(struct vb2_queue *vq) @@ -431,15 +469,14 @@ static int video_i2c_enum_frameintervals(struct file *file, void *priv, const struct video_i2c_data *data = video_drvdata(file); const struct v4l2_frmsize_discrete *size = data->chip->size; - if (fe->index > 0) + if (fe->index >= data->chip->num_frame_intervals) return -EINVAL; if (fe->width != size->width || fe->height != size->height) return -EINVAL; fe->type = V4L2_FRMIVAL_TYPE_DISCRETE; - fe->discrete.numerator = 1; - fe->discrete.denominator = data->chip->max_fps; + fe->discrete = data->chip->frame_intervals[fe->index]; return 0; } @@ -484,12 +521,27 @@ static int video_i2c_g_parm(struct file *filp, void *priv, parm->parm.capture.readbuffers = 1; parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; - parm->parm.capture.timeperframe.numerator = 1; - parm->parm.capture.timeperframe.denominator = data->chip->max_fps; + parm->parm.capture.timeperframe = data->frame_interval; return 0; } +static int video_i2c_s_parm(struct file *filp, void *priv, + struct v4l2_streamparm *parm) +{ + struct video_i2c_data *data = video_drvdata(filp); + int i; + + for (i = 0; i < data->chip->num_frame_intervals - 1; i++) { + if (V4L2_FRACT_COMPARE(parm->parm.capture.timeperframe, <=, + data->chip->frame_intervals[i])) + break; + } + data->frame_interval = data->chip->frame_intervals[i]; + + return video_i2c_g_parm(filp, priv, parm); +} + static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = { .vidioc_querycap = video_i2c_querycap, .vidioc_g_input = video_i2c_g_input, @@ -501,7 +553,7 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = { .vidioc_g_fmt_vid_cap = video_i2c_try_fmt_vid_cap, .vidioc_s_fmt_vid_cap = video_i2c_s_fmt_vid_cap, .vidioc_g_parm = video_i2c_g_parm, - .vidioc_s_parm = video_i2c_g_parm, + .vidioc_s_parm = video_i2c_s_parm, .vidioc_try_fmt_vid_cap = video_i2c_try_fmt_vid_cap, .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs, @@ -578,6 +630,8 @@ static int video_i2c_probe(struct i2c_client *client, spin_lock_init(&data->slock); INIT_LIST_HEAD(&data->vid_cap_active); + data->frame_interval = data->chip->frame_intervals[0]; + video_set_drvdata(&data->vdev, data); i2c_set_clientdata(client, data); From patchwork Sun Sep 23 16:34:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10611825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA48B13A4 for ; Sun, 23 Sep 2018 16:35:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6E192925E for ; Sun, 23 Sep 2018 16:35:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB402292ED; Sun, 23 Sep 2018 16:35:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A3BF2925E for ; Sun, 23 Sep 2018 16:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726749AbeIWWd3 (ORCPT ); Sun, 23 Sep 2018 18:33:29 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45929 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbeIWWd3 (ORCPT ); Sun, 23 Sep 2018 18:33:29 -0400 Received: by mail-pg1-f194.google.com with SMTP id t70-v6so3318192pgd.12 for ; Sun, 23 Sep 2018 09:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nk7coS8wVjMjbzSRcK95nn1SpNndxxuCZ/c/YL85dgA=; b=jknjnfrth0DPjUieEbfUx+G223+oyfNEbLtg9rtiqrGp9TqD/cjpx8tPEO1e1vTrVW /lu+szcobuod/J8hN9tjiN8CEkmoCXW5UN8ytAmKq0OtiAOpXTxzdjwW29k30edE//30 +k4PJLnKE5E37WDFLyNOlWRGsUaXFVnPermOzceowI+C43ntCsmlTOGtv1awxFO1ZgNt 0co8Uea6+BcLsW1PiqHX8XMdSlOXpLxWBqGjDt+oEFwL3OUZLEiaWfaXFaR3amBLTWxB IThAt4A9H3e2rdPIX2WOjn0E/wHhGKc7kTyYAlRcnA5ybvxNiZJh73AwvRkHQqGpbUjL soxQ== 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; bh=nk7coS8wVjMjbzSRcK95nn1SpNndxxuCZ/c/YL85dgA=; b=ZcaFXfOY5EO6GEpPCazb3qTuP4txOjg3ybxF9XdOpPdH1L+FTCba53wQEqRopEWjsR 09oSqI31kmdA2JMDAXos2JqvObehCHx6PezJzDaZ9Bru+0rjaU2YyykhiDHni8U1QkUr XFvHfVx11OGJjJ7ibIU+5CXJWZxSi1hSk8IrOEBwGKavLyJ9mQsfYA817RiZLruio6VO ZxffBBwv1T3D+mCtTFAMuFgu+A6PiVveZPuAjLEYw8ApN7wXcQr9InTLOx4mv6IoBB0q o6SKr8tZjbXn9WJ0iBFhvS3ZVSa954dTsi8FKmGUh1tYbpKuTEmj09uWmAnTEGT3r0DF eq/g== X-Gm-Message-State: ABuFfoi4Y4tn+B1B4b40A4ZuerTx+dvYAvu01Rz77RpWCI7H/1aOP9Ho 5HcjBxpneK8iJsrqv06yd4xiqmaK X-Google-Smtp-Source: ACcGV61vYpTwfCWhOuliFUzKcO2jPwj+VyHZ2yJWodV8UQRcs4XhL3Gj+HEusy2XASWwnDvuxXSYfA== X-Received: by 2002:a63:dd09:: with SMTP id t9-v6mr6219235pgg.370.1537720525456; Sun, 23 Sep 2018 09:35:25 -0700 (PDT) Received: from mita-MS-7A45.lan ([240f:34:212d:1:9f:aa8:eeac:60f7]) by smtp.gmail.com with ESMTPSA id d129-v6sm18286250pga.69.2018.09.23.09.35.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Sep 2018 09:35:24 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org Cc: Akinobu Mita , Matt Ranostay , Sakari Ailus , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH v2 6/6] media: video-i2c: support runtime PM Date: Mon, 24 Sep 2018 01:34:52 +0900 Message-Id: <1537720492-31201-7-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> References: <1537720492-31201-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AMG88xx has a register for setting operating mode. This adds support runtime PM by changing the operating mode. The instruction for changing sleep mode to normal mode is from the reference specifications. https://docid81hrs3j1.cloudfront.net/medialibrary/2017/11/PANA-S-A0002141979-1.pdf Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Reviewed-by: Matt Ranostay Signed-off-by: Akinobu Mita --- * v2 - Add Reviewed-by tag - Add comment for register address definisions drivers/media/i2c/video-i2c.c | 142 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 6dd1929..f7058cf 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -94,10 +95,23 @@ struct video_i2c_chip { /* xfer function */ int (*xfer)(struct video_i2c_data *data, char *buf); + /* power control function */ + int (*set_power)(struct video_i2c_data *data, bool on); + /* hwmon init function */ int (*hwmon_init)(struct video_i2c_data *data); }; +/* Power control register */ +#define AMG88XX_REG_PCTL 0x00 +#define AMG88XX_PCTL_NORMAL 0x00 +#define AMG88XX_PCTL_SLEEP 0x10 + +/* Reset register */ +#define AMG88XX_REG_RST 0x01 +#define AMG88XX_RST_FLAG 0x30 +#define AMG88XX_RST_INIT 0x3f + /* Frame rate register */ #define AMG88XX_REG_FPSC 0x02 #define AMG88XX_FPSC_1FPS BIT(0) @@ -127,6 +141,59 @@ static int amg88xx_setup(struct video_i2c_data *data) return regmap_update_bits(data->regmap, AMG88XX_REG_FPSC, mask, val); } +static int amg88xx_set_power_on(struct video_i2c_data *data) +{ + int ret; + + ret = regmap_write(data->regmap, AMG88XX_REG_PCTL, AMG88XX_PCTL_NORMAL); + if (ret) + return ret; + + msleep(50); + + ret = regmap_write(data->regmap, AMG88XX_REG_RST, AMG88XX_RST_INIT); + if (ret) + return ret; + + msleep(2); + + ret = regmap_write(data->regmap, AMG88XX_REG_RST, AMG88XX_RST_FLAG); + if (ret) + return ret; + + /* + * Wait two frames before reading thermistor and temperature registers + */ + msleep(200); + + return 0; +} + +static int amg88xx_set_power_off(struct video_i2c_data *data) +{ + int ret; + + ret = regmap_write(data->regmap, AMG88XX_REG_PCTL, AMG88XX_PCTL_SLEEP); + if (ret) + return ret; + /* + * Wait for a while to avoid resuming normal mode immediately after + * entering sleep mode, otherwise the device occasionally goes wrong + * (thermistor and temperature registers are not updated at all) + */ + msleep(100); + + return 0; +} + +static int amg88xx_set_power(struct video_i2c_data *data, bool on) +{ + if (on) + return amg88xx_set_power_on(data); + + return amg88xx_set_power_off(data); +} + #if IS_ENABLED(CONFIG_HWMON) static const u32 amg88xx_temp_config[] = { @@ -158,7 +225,15 @@ static int amg88xx_read(struct device *dev, enum hwmon_sensor_types type, __le16 buf; int tmp; + tmp = pm_runtime_get_sync(regmap_get_device(data->regmap)); + if (tmp < 0) { + pm_runtime_put_noidle(regmap_get_device(data->regmap)); + return tmp; + } + tmp = regmap_bulk_read(data->regmap, AMG88XX_REG_TTHL, &buf, 2); + pm_runtime_mark_last_busy(regmap_get_device(data->regmap)); + pm_runtime_put_autosuspend(regmap_get_device(data->regmap)); if (tmp) return tmp; @@ -217,6 +292,7 @@ static const struct video_i2c_chip video_i2c_chip[] = { .regmap_config = &amg88xx_regmap_config, .setup = &amg88xx_setup, .xfer = &amg88xx_xfer, + .set_power = amg88xx_set_power, .hwmon_init = amg88xx_hwmon_init, }, }; @@ -343,14 +419,21 @@ static void video_i2c_del_list(struct vb2_queue *vq, enum vb2_buffer_state state static int start_streaming(struct vb2_queue *vq, unsigned int count) { struct video_i2c_data *data = vb2_get_drv_priv(vq); + struct device *dev = regmap_get_device(data->regmap); int ret; if (data->kthread_vid_cap) return 0; + ret = pm_runtime_get_sync(dev); + if (ret < 0) { + pm_runtime_put_noidle(dev); + goto error_del_list; + } + ret = data->chip->setup(data); if (ret) - goto error_del_list; + goto error_rpm_put; data->sequence = 0; data->kthread_vid_cap = kthread_run(video_i2c_thread_vid_cap, data, @@ -359,6 +442,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) if (!ret) return 0; +error_rpm_put: + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); error_del_list: video_i2c_del_list(vq, VB2_BUF_STATE_QUEUED); @@ -374,6 +460,8 @@ static void stop_streaming(struct vb2_queue *vq) kthread_stop(data->kthread_vid_cap); data->kthread_vid_cap = NULL; + pm_runtime_mark_last_busy(regmap_get_device(data->regmap)); + pm_runtime_put_autosuspend(regmap_get_device(data->regmap)); video_i2c_del_list(vq, VB2_BUF_STATE_ERROR); } @@ -635,6 +723,18 @@ static int video_i2c_probe(struct i2c_client *client, video_set_drvdata(&data->vdev, data); i2c_set_clientdata(client, data); + ret = data->chip->set_power(data, true); + if (ret) + goto error_unregister_device; + + pm_runtime_get_noresume(&client->dev); + pm_runtime_set_active(&client->dev); + pm_runtime_enable(&client->dev); + pm_runtime_set_autosuspend_delay(&client->dev, 2000); + pm_runtime_use_autosuspend(&client->dev); + pm_runtime_mark_last_busy(&client->dev); + pm_runtime_put_autosuspend(&client->dev); + if (data->chip->hwmon_init) { ret = data->chip->hwmon_init(data); if (ret < 0) { @@ -645,10 +745,17 @@ static int video_i2c_probe(struct i2c_client *client, ret = video_register_device(&data->vdev, VFL_TYPE_GRABBER, -1); if (ret < 0) - goto error_unregister_device; + goto error_pm_disable; return 0; +error_pm_disable: + pm_runtime_get_sync(&client->dev); + pm_runtime_disable(&client->dev); + pm_runtime_set_suspended(&client->dev); + pm_runtime_put_noidle(&client->dev); + data->chip->set_power(data, false); + error_unregister_device: v4l2_device_unregister(v4l2_dev); mutex_destroy(&data->lock); @@ -662,6 +769,13 @@ static int video_i2c_remove(struct i2c_client *client) struct video_i2c_data *data = i2c_get_clientdata(client); video_unregister_device(&data->vdev); + + pm_runtime_get_sync(&client->dev); + pm_runtime_disable(&client->dev); + pm_runtime_set_suspended(&client->dev); + pm_runtime_put_noidle(&client->dev); + data->chip->set_power(data, false); + v4l2_device_unregister(&data->v4l2_dev); mutex_destroy(&data->lock); @@ -670,6 +784,29 @@ static int video_i2c_remove(struct i2c_client *client) return 0; } +#ifdef CONFIG_PM + +static int video_i2c_pm_runtime_suspend(struct device *dev) +{ + struct video_i2c_data *data = i2c_get_clientdata(to_i2c_client(dev)); + + return data->chip->set_power(data, false); +} + +static int video_i2c_pm_runtime_resume(struct device *dev) +{ + struct video_i2c_data *data = i2c_get_clientdata(to_i2c_client(dev)); + + return data->chip->set_power(data, true); +} + +#endif + +static const struct dev_pm_ops video_i2c_pm_ops = { + SET_RUNTIME_PM_OPS(video_i2c_pm_runtime_suspend, + video_i2c_pm_runtime_resume, NULL) +}; + static const struct i2c_device_id video_i2c_id_table[] = { { "amg88xx", AMG88XX }, {} @@ -686,6 +823,7 @@ static struct i2c_driver video_i2c_driver = { .driver = { .name = VIDEO_I2C_DRIVER, .of_match_table = video_i2c_of_match, + .pm = &video_i2c_pm_ops, }, .probe = video_i2c_probe, .remove = video_i2c_remove,