From patchwork Sat Oct 13 18:02:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640433 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 EC78A933 for ; Sat, 13 Oct 2018 18:03:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAB8D2AAED for ; Sat, 13 Oct 2018 18:03:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEBEC2AB0F; Sat, 13 Oct 2018 18:03:01 +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 70CF42AAED for ; Sat, 13 Oct 2018 18:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726781AbeJNBlF (ORCPT ); Sat, 13 Oct 2018 21:41:05 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36239 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlF (ORCPT ); Sat, 13 Oct 2018 21:41:05 -0400 Received: by mail-pl1-f196.google.com with SMTP id y11-v6so7373889plt.3 for ; Sat, 13 Oct 2018 11:02:59 -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=YHBEcNE03GdEFB9cCu7UBQVnBCa7b65vfDjShqVZlwA=; b=YM9fvVI7QG5L8PIjT/JBJxIw4rrgEt+VP2jJvoJ0D+WMpm6spu6PeojEFGE0fZHPkc I8KRNfAPrmDd1Lmnurnv7JvDAv0Bz0ejs4oBZBkAw/6R12QTMWigfDReMvxVQ38sdhxb pwlAM28tawS1t28kTAMA3gZKdPbmpVIkC2iet7sziuEs2ekw4413KkXN2uzVIBAyxIDm VOrYp0BkbWSFL1TCTmNRsYmukyM1o6YZp9PPqEfobUAZVJtH21yryb9EuiOZHfsndNs2 ei3gB4JtrGkCmVf+iXGotDpQA9bjCqRn3w/0ZxvRlyR5TIreFSLqxmV36rBixjQhEbat kJUw== 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=YHBEcNE03GdEFB9cCu7UBQVnBCa7b65vfDjShqVZlwA=; b=oV5vPLpzKd4A31bUBxXyCJ9fH9agSFyw5KINWZfU+bfXH0aMGf2K3CvUtc00oz2arv e3q0QA4OHd3YVuwirRvdOpu8gSP4t3S2e8IyvAGNVF48HxVDlKBpwQ6gIyN+1I437d4o Lxgz8PD2bYF0V5PPC0BsE770RkTfDFwN1XQ69JI0EeHEXwG4L/KzNcetVBZghAGlIw7/ cZEhg41zSFC0w+VzzkrUbTWIVGIFPOPghJeq9GqL5VvbyCR4P1hrvytephJmLx2uYtcp f9zoq3QgfnEJqS/Kbul/duZ+xeW6lB01GywByDXZ5U4mZfPxoQ0h8ZIIoXrxzdr7fGvB BThQ== X-Gm-Message-State: ABuFfohOlp4A6d4/A2S5YTfoHFgQKe3jm/MfstQT0Nf+CkG9hc9BfOjK 93Sz6TApAW88qSYjCOWpEWZ83HPd X-Google-Smtp-Source: ACcGV60PKoFk5YLJybFWj1ShDJuUaVlEkjoK5zzAf5PALiZeyAvxVllveRxxXaz2kCeWLp+eRPuo1g== X-Received: by 2002:a17:902:a9c5:: with SMTP id b5-v6mr6827294plr.340.1539453778974; Sat, 13 Oct 2018 11:02:58 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.02.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:02:58 -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 v3 1/6] media: video-i2c: avoid accessing released memory area when removing driver Date: Sun, 14 Oct 2018 03:02:34 +0900 Message-Id: <1539453759-29976-2-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 device release() callback for video-i2c driver frees the whole struct video_i2c_data. If there is no user left for the video device when video_unregister_device() is called, the release callback is executed. However, in video_i2c_remove() some fields (v4l2_dev, lock, and queue_lock) in struct video_i2c_data are still accessed after video_unregister_device() is called. This fixes the use after free by moving the code from video_i2c_remove() to the release() callback. Fixes: 5cebaac60974 ("media: video-i2c: add video-i2c driver") Cc: Matt Ranostay Cc: Sakari Ailus Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Signed-off-by: Akinobu Mita Reviewed-by: Matt Ranostay --- * v3 - Move the code causing use-after-free from video_i2c_remove() to the video device release() callback. - Remove Acked-by line as there are enough changes from previous version drivers/media/i2c/video-i2c.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 06d29d8..f27d294 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -510,7 +510,12 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = { static void video_i2c_release(struct video_device *vdev) { - kfree(video_get_drvdata(vdev)); + struct video_i2c_data *data = video_get_drvdata(vdev); + + v4l2_device_unregister(&data->v4l2_dev); + mutex_destroy(&data->lock); + mutex_destroy(&data->queue_lock); + kfree(data); } static int video_i2c_probe(struct i2c_client *client, @@ -608,10 +613,6 @@ static int video_i2c_remove(struct i2c_client *client) struct video_i2c_data *data = i2c_get_clientdata(client); video_unregister_device(&data->vdev); - v4l2_device_unregister(&data->v4l2_dev); - - mutex_destroy(&data->lock); - mutex_destroy(&data->queue_lock); return 0; } From patchwork Sat Oct 13 18:02:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640435 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 73F8F933 for ; Sat, 13 Oct 2018 18:03:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 634882AAED for ; Sat, 13 Oct 2018 18:03:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 573D32AB0F; Sat, 13 Oct 2018 18:03:04 +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 BC70C2AAED for ; Sat, 13 Oct 2018 18:03:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726831AbeJNBlI (ORCPT ); Sat, 13 Oct 2018 21:41:08 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:33438 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlI (ORCPT ); Sat, 13 Oct 2018 21:41:08 -0400 Received: by mail-pl1-f196.google.com with SMTP id s4-v6so7396253plp.0 for ; Sat, 13 Oct 2018 11:03:02 -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=/I6rc1lsVrBxGiF5LNBFzqbab2bvm4lFyxNHc3llH5g=; b=avImZumi6vKG7EacB/TzI3Ajxec/aOOboS0p/z358ASYbkeD4KJmXLMsJUvg/0AICs B2IyAzAQlbFZfTmxGKN+y8JDAEDSZLgn02DXpTp2ZMYY0MpATYfqbDfQ32dHUL2cMBpd uTVau4ubX+O+UZwTfJLGzbGuPG0Mb5022Xz3UkUqSlCYeUrt7UL2EvT5/kmyTHjI6GWD nlsEFTemfW/oPLwLNLLIS8QVUfkuoFQSZeeIyTtjHuVupURs3x8PSdtoJGjTjMTxHu7o f3WWNqwOObdT3L4uFlgUhfkva1mREQD4oBl0WDMuzkXA85BwLE/DucQImE8EHV9wozWE slSw== 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=/I6rc1lsVrBxGiF5LNBFzqbab2bvm4lFyxNHc3llH5g=; b=sNcYExngWjbpMubDHlLs1+0DYiogHMuctlYLzE69A6ZQTOhqkxBwEtErtFqbxQHGg1 +z2jiHGmGXMYy1LfYFwvXtGGzoIngmiZRYvs2NKvO9M96inWOzpixfm9k4M1y6faqLx4 ixJRMktncNrbnOQ3w/1RnEQ+3UOoM/TeqCal6kAqpz6XHZCSpcHZPsDL0Ge4Ta8OGu2Y dD1Fb1ZrJm07tHWeXw+01M0S+hYPz4stJDbKXJYPQbZWbzxS73PfOdzzhLe3jWNwpmmQ aX7n6tkc2kedI4YrPbL9BNt3o05ltjAbBCS0WXUeNqEkVR/ZfYXJl16555U2bqVSy522 1S+A== X-Gm-Message-State: ABuFfogcj5kohQvSE847BkmJ/j+QAH83dFBfs/8zmi2qxYcrnRQ5EUZo 90SKcc4TaFA3MHKXevejx8s1aKNY X-Google-Smtp-Source: ACcGV60EIc5MvSp9/kPfSNjgOcC0HtH3m3RNEajHqqd5gqdbBY4Qw1SG+SXEczz33dbJRDcx+KA5Tw== X-Received: by 2002:a17:902:421:: with SMTP id 30-v6mr10856261ple.184.1539453781599; Sat, 13 Oct 2018 11:03:01 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.02.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:03:01 -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 v3 2/6] media: video-i2c: use i2c regmap Date: Sun, 14 Oct 2018 03:02:35 +0900 Message-Id: <1539453759-29976-3-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 Acked-by: Matt Ranostay Acked-by: Sakari Ailus Signed-off-by: Akinobu Mita --- * v3 - Use regmap_init_i2c() instead of devm_regmap_init_i2c() and call regmap_exit_i2c() in video device release() callback in order to avoid releasing regmap when the driver is unbound. - Add Acked-by lines drivers/media/i2c/video-i2c.c | 68 ++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index f27d294..f23cb91 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 *)® +/* Thermistor register */ +#define AMG88XX_REG_TTHL 0x0e - msg[1].addr = client->addr; - msg[1].flags = I2C_M_RD; - msg[1].len = data->chip->buffer_size; - msg[1].buf = (char *)buf; +/* Temperature register */ +#define AMG88XX_REG_T01L 0x80 - ret = i2c_transfer(client->adapter, msg, 2); - - 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)); @@ -515,6 +520,7 @@ static void video_i2c_release(struct video_device *vdev) v4l2_device_unregister(&data->v4l2_dev); mutex_destroy(&data->lock); mutex_destroy(&data->queue_lock); + regmap_exit(data->regmap); kfree(data); } @@ -537,13 +543,18 @@ static int video_i2c_probe(struct i2c_client *client, else goto error_free_device; - data->client = client; + data->regmap = regmap_init_i2c(client, data->chip->regmap_config); + if (IS_ERR(data->regmap)) { + ret = PTR_ERR(data->regmap); + goto error_free_device; + } + v4l2_dev = &data->v4l2_dev; strlcpy(v4l2_dev->name, VIDEO_I2C_DRIVER, sizeof(v4l2_dev->name)); ret = v4l2_device_register(&client->dev, v4l2_dev); if (ret < 0) - goto error_free_device; + goto error_regmap_exit; mutex_init(&data->lock); mutex_init(&data->queue_lock); @@ -602,6 +613,9 @@ static int video_i2c_probe(struct i2c_client *client, mutex_destroy(&data->lock); mutex_destroy(&data->queue_lock); +error_regmap_exit: + regmap_exit(data->regmap); + error_free_device: kfree(data); From patchwork Sat Oct 13 18:02:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640437 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 6DC3B933 for ; Sat, 13 Oct 2018 18:03:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CC8F2AAED for ; Sat, 13 Oct 2018 18:03:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 512A12AB0F; Sat, 13 Oct 2018 18:03:07 +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 019102AAED for ; Sat, 13 Oct 2018 18:03:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726837AbeJNBlL (ORCPT ); Sat, 13 Oct 2018 21:41:11 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34674 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlL (ORCPT ); Sat, 13 Oct 2018 21:41:11 -0400 Received: by mail-pf1-f195.google.com with SMTP id f78-v6so1956823pfe.1 for ; Sat, 13 Oct 2018 11:03:05 -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=C1pRe86HCiTi27Th0ekV61Pkp9kQL4ww2kyv+bh+Rmg=; b=gN+7y2SF39aEInn9AYs3ZTXTmDGSTN1mRld6kNQFEkNs0JNJSkv/sDBl23PNw/69ID OHBLo4OawrCN5mBtjUm286b2b/j65cUcTvGHQrHCr00aXXz50g4H4Wn3u2GYDJp+a93E 171dyya648SqiOnQlfqgqQhaQ68TJKvAi77xKB6rJUE83+19WaTClUf3thBr/ny0jc/t bh+IM7VmNcxnYzBH2qBzZEMk3FDQ6L9oHoUg6LElGSxuMk4iVA9C6niDNNSDt2Jqhr9X kS+9maSKp4kmJ+L47jnVpdMrIJzyj0UPXuOpmIPDzdag9fv92rMAy888V2+Hvljx2eTr O1rQ== 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=C1pRe86HCiTi27Th0ekV61Pkp9kQL4ww2kyv+bh+Rmg=; b=gm0FAdCnap4tDc55RdZ5y7BPezu22jTt2uAvnW3oA6lYz4hWpc2AalcWiQBzkkxSSY VISZziFUwF3RzVeR8NoepkqGVYCF1g17IdecNDfC18FnIGlZN9LpTzW2kpj+FZoZr5jh TOs/YmVdnwbWjaaaio9OC8+5Y8IDO+MFIsmppPtefR5UvC9c9Cr45oL4FceAkwo2fdu8 6xU8V/finFKDALGdg3m1CKAXHVcWlLRNJpGJNKMTqMwUsYdonko2T7LwKtFl03lHYGj2 v1/0aatna9UP1G6IPcwcPSzSOUlFvEu5kNKuyUIM4VF6xlPWicOZoD9iqSVg+dYCB3UL 1eSQ== X-Gm-Message-State: ABuFfoiQoBIu698MBTyI2rkF1KWcbZ65LMNJ1R9w4iV+K311nxSi/BUx PWATW1BHkVv7pMT83EXcx+oQ4r1f X-Google-Smtp-Source: ACcGV60CKC7LWPfaYwmRYPp1os9bZ0PeOoUyquoiXhYdgRkZ4X/tyqxAwiRJ5gsaM7YHj9JX+eQrVQ== X-Received: by 2002:a63:f60f:: with SMTP id m15-v6mr10108326pgh.293.1539453785142; Sat, 13 Oct 2018 11:03:05 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.03.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:03:04 -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 v3 3/6] media: v4l2-common: add V4L2_FRACT_COMPARE Date: Sun, 14 Oct 2018 03:02:36 +0900 Message-Id: <1539453759-29976-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 Acked-by: Sakari Ailus Signed-off-by: Akinobu Mita --- * v3 - Add Acked-by line 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 Sat Oct 13 18:02:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640439 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 006D514E2 for ; Sat, 13 Oct 2018 18:03:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E34C72AAED for ; Sat, 13 Oct 2018 18:03:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7BA32AB0F; Sat, 13 Oct 2018 18:03:10 +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 74B8C2AAED for ; Sat, 13 Oct 2018 18:03:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726878AbeJNBlP (ORCPT ); Sat, 13 Oct 2018 21:41:15 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34678 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlP (ORCPT ); Sat, 13 Oct 2018 21:41:15 -0400 Received: by mail-pf1-f195.google.com with SMTP id f78-v6so1956865pfe.1 for ; Sat, 13 Oct 2018 11:03:08 -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=+XZ6O1aLw3nY1S+rZehsGulLQzIRkzMdu3biGynecf0=; b=Kw3s5c3dNt0kmVg2fU+wY5LLksItiz8mXA5lKEBqai/79bKRGITAzbQmRuuj55MJoI ZrI2qR5IXelegmM5cgStZ9xQ4NqwCjKEyYxScNMmyqMDScaJ2vsIPWB0SGm8a+0s2m0U 4PrSUBvO/nzHZ5oNQf4FyZttRaiRCurPozjAaeDtGx0toYFpXqWn63HSpLfx1yNYAfWC mdOA+VXprUtlsOrjGb0yGTfa498G35AzCxRo3zW7r2EdcsBt59zqoO6QUvwtLWeuKDLS vI9ShBf2iXJgUnsYMm1h2LFVeN4xucBC7KZCcTY39RT2XasSMeY2E5cKE8Tgdzjf56fm TXIQ== 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=+XZ6O1aLw3nY1S+rZehsGulLQzIRkzMdu3biGynecf0=; b=k8EoJyiNTuZ7edUdZKeDUP/tzN1TAknjMMz8cJo9O1FEcGeZJaauWh2HgdX3honyyd 34F/4BPjbosWQ4j638zRsqd1XbYw550u0vVCgj4KA7LJhLLk3jjNnAJuP60PBFuhvdH9 JDIa34cwf2wkeK/QGAfj1tciRQeqzl0hpqhNWfyFhLCGjqWBRZ0kfqvNh5IzbABPGufF nfiTOidfUHdUptmS+c64f4yEnUjRTw13MTu1gacp4x/aahygXSVraqg5XDMD5sI96xlo wRc2iLdy5D7/pbAhRjZLTwpBnv39ps4l956nz89pbL47xVLeZxif5nk3yJyYXVjEOCMg UjWw== X-Gm-Message-State: ABuFfohWPbUOqgl1KxfT0M85xcFKHQbqKGMW3PrN2HVzg0XRBTVNngp3 4WidnW2wWIkuPNkP18k27PuxlHwX X-Google-Smtp-Source: ACcGV60IoI1/4dexCgQGe6QRedqw6Vtsd74MilAgMLyeTMpuPp1RB8pEpZxm2pBAbPY4o3R2VTCJTw== X-Received: by 2002:a63:5726:: with SMTP id l38-v6mr10093954pgb.118.1539453788438; Sat, 13 Oct 2018 11:03:08 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.03.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:03:07 -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 v3 4/6] media: vivid: use V4L2_FRACT_COMPARE Date: Sun, 14 Oct 2018 03:02:37 +0900 Message-Id: <1539453759-29976-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 Acked-by: Sakari Ailus Signed-off-by: Akinobu Mita --- * v3 - Add Acked-by line 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 Sat Oct 13 18:02:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640441 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 5D40B14E2 for ; Sat, 13 Oct 2018 18:03:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 487AB271CB for ; Sat, 13 Oct 2018 18:03:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 381871FEBD; Sat, 13 Oct 2018 18:03:14 +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 8F7E91FEBD for ; Sat, 13 Oct 2018 18:03:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbeJNBlS (ORCPT ); Sat, 13 Oct 2018 21:41:18 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:37773 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlS (ORCPT ); Sat, 13 Oct 2018 21:41:18 -0400 Received: by mail-pl1-f193.google.com with SMTP id u6-v6so4637285plz.4 for ; Sat, 13 Oct 2018 11:03:12 -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=CtJ63bLz4wWZxXXp2xOGoUAjQSSyVV1elOkqakddUS4=; b=LEwpGhaMvfVFqUhzOPCnlXS4gYbZ5U+3LzNVxUcrE7Us/4LEZY1GxAwCU/N45CWh4u yLEH+qLqT0U8BJuVeEl6xGpan5ecDEPpWNrZN0hVsAWTdPlXa0l7DJDgkzU63oEx2t4o JAD3IBlu5P2EY0mGjxtB+pMR5Xbtsv5XxaWdJ8HEzVohijyhFqRfZVBmApxVs3UCvUsy Q8Ixj+NU2f6iqpyG0l+I2wQoT0V2iJn/gZy/SmgaFwhK4vqE/wuViQyoMGcebXf6vDc9 jGSB3pDxdOJeh1utbRjVMvKG/K+Ky3giKazmwFK7AhmN9vZGLWdH0GyqVC9gxGARMYHe 0qcQ== 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=CtJ63bLz4wWZxXXp2xOGoUAjQSSyVV1elOkqakddUS4=; b=tI3SAB5SkjiH/L84ZNfslt2AiDRZuvTND8nz3iPN9m56dwHALJZ2HtRiLuTBD94uu3 xmS1NWhWrVkKprCFXQ/1AY2svET3BgOgN0+jUKqCDFgP3ogC7Vl5xGKzJMJ/8yb+dPnQ MIXKsnqR6tsmEZHn0vXw/xZXI2Wm4TONY+GTPUFo+TKuJAKEw7MVTnoKOBvePlVY1RAi ACPr5f3lHetdJhCdKxS0hcn2wjpsElJyoNBOrvtlHj1lIh0lvTZroV3AUUaPOsRgpgIa 5hlS7gkNrVchlvMzZdBBq8MRiP/gtt9tszuJkuZbcxxCHn1xh3Txc+kn4F1ZkGA8cSIy ++Iw== X-Gm-Message-State: ABuFfogMhVI3ECDIbH7jxU7dnFxQV/uA5f7rgyAsO4SajjOLN0Sb2Cg6 9Ydl5N/0/mQK+aj5EPXKOWOf+G/J X-Google-Smtp-Source: ACcGV63nwXe9rKZ2MlVLV4SQw3/2UhhsI9lCMQHjgcOn7B5+4D+eX++QK6RapwvRbXiwDEN1kIiNpw== X-Received: by 2002:a17:902:d88b:: with SMTP id b11-v6mr10538558plz.136.1539453791137; Sat, 13 Oct 2018 11:03:11 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.03.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:03:10 -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 v3 5/6] media: video-i2c: support changing frame interval Date: Sun, 14 Oct 2018 03:02:38 +0900 Message-Id: <1539453759-29976-6-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 Acked-by: Sakari Ailus Signed-off-by: Akinobu Mita --- * v3 - Add Acked-by line 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 f23cb91..3334fc2 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, @@ -591,6 +643,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 Sat Oct 13 18:02:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10640443 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 8C318933 for ; Sat, 13 Oct 2018 18:03:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BC97271CB for ; Sat, 13 Oct 2018 18:03:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FB30274D1; Sat, 13 Oct 2018 18:03:16 +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 C1589271CB for ; Sat, 13 Oct 2018 18:03:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726920AbeJNBlV (ORCPT ); Sat, 13 Oct 2018 21:41:21 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37412 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726668AbeJNBlU (ORCPT ); Sat, 13 Oct 2018 21:41:20 -0400 Received: by mail-pf1-f195.google.com with SMTP id j23-v6so7717656pfi.4 for ; Sat, 13 Oct 2018 11:03:14 -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=TqycafbwHHl4p5GJfPQHWZ1U/Laxm2cXENXbF06buNk=; b=A1n6QhfJw7R//TryMjecFhWmsn9eWFtScLzW4L9DcflC3PqTBMRnj+IHE7HL6XeonY WA5R3DMy+EQZVhShQ8IQ8N6US7lOSKFSQ0fd8DnZOOMj/qpVjjliWCSbl0MHitA2kOGl rJYY96dmAgdNxc6EWBJSfHJW8ODodroJU/ru19ySrIt0Z4D5sHtGEMkTFZm3ISngI0cy vZHnLcxc1f3NVX5TXl7AZJ1Xk0eCAJs7t6AeD4U9NBfsVWnwQ0XyxxmL9bbyezgdhaDA OtE1n4qInX6Ah7jSvVVvjNMByWi+sxJRIFqoMJN/lEn9Fd4u0Bri+/Q78Xd5h/k95Smu dNiQ== 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=TqycafbwHHl4p5GJfPQHWZ1U/Laxm2cXENXbF06buNk=; b=eM5aIhScAX6yhxuN3buNN0a48mKW5pVyxZDjJjfA8xZ8URgC91gYtVaAHXjabUCXXw dCMQlum8ncKRLZYwY20SbtOvHzDTI50sA2R0MzbVt+j165xG3A88tcFcRl6wmgmNGpnm t90GWztbJdhDuJNI1B89BmlSYv24330rumdgTsxuJC76WadMULWzmaVHqdLjgaqdUM6C wMSaVbbTsjpbZpjNuB2wApZIzx8OI8VoRORTomIsdG+uUgAaNZWcE8EOWAuNROnoTZeu MPpinSI+s5P1e+LZwRspFI4OrH73xE7hXBSGgr+Dbj3ox3WEYrUYsFw9hhGnMK+kLJY9 VHEw== X-Gm-Message-State: ABuFfojWDADY4PoyjWS9nxpvt6vLxnJr1faJy9sXzN6pFoZhKoqMmmta pLil+uvRpAiRiTos5fOQZQRuwPH2 X-Google-Smtp-Source: ACcGV60PH34m+2A9uq1iqWXIMfTGHg+H/Ku5bnFpOMI4zKyMr0/tE0QU6N7pbxjeXuY+ncXZ7Y7Zgw== X-Received: by 2002:a62:5251:: with SMTP id g78-v6mr11048631pfb.256.1539453793762; Sat, 13 Oct 2018 11:03:13 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:40bf:70f3:985:17ed]) by smtp.gmail.com with ESMTPSA id w187-v6sm2513858pfw.3.2018.10.13.11.03.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Oct 2018 11:03:13 -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 v3 6/6] media: video-i2c: support runtime PM Date: Sun, 14 Oct 2018 03:02:39 +0900 Message-Id: <1539453759-29976-7-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539453759-29976-1-git-send-email-akinobu.mita@gmail.com> References: <1539453759-29976-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 Acked-by: Sakari Ailus Signed-off-by: Akinobu Mita Acked-by: Sakari Ailus --- * v3 - Move chip->set_power() call to the video device release() callback. - Add Acked-by line drivers/media/i2c/video-i2c.c | 141 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 3334fc2..22fdc43 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); } @@ -569,6 +657,7 @@ static void video_i2c_release(struct video_device *vdev) { struct video_i2c_data *data = video_get_drvdata(vdev); + data->chip->set_power(data, false); v4l2_device_unregister(&data->v4l2_dev); mutex_destroy(&data->lock); mutex_destroy(&data->queue_lock); @@ -648,6 +737,16 @@ 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); + if (data->chip->hwmon_init) { ret = data->chip->hwmon_init(data); if (ret < 0) { @@ -658,10 +757,19 @@ 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; + + pm_runtime_mark_last_busy(&client->dev); + pm_runtime_put_autosuspend(&client->dev); return 0; +error_pm_disable: + 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); @@ -680,11 +788,39 @@ static int video_i2c_remove(struct i2c_client *client) { struct video_i2c_data *data = i2c_get_clientdata(client); + pm_runtime_get_sync(&client->dev); + pm_runtime_disable(&client->dev); + pm_runtime_set_suspended(&client->dev); + pm_runtime_put_noidle(&client->dev); + video_unregister_device(&data->vdev); 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 }, {} @@ -701,6 +837,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,