Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1330052ybz; Fri, 1 May 2020 20:24:46 -0700 (PDT) X-Google-Smtp-Source: APiQypJxIT1hOGaRXeKmdBvvrdjJ+REdSJANbl4WwDCMSqASPnXZdSkB7LjFivLXaVoz3oxHnodc X-Received: by 2002:a17:906:660f:: with SMTP id b15mr4156639ejp.113.1588389886422; Fri, 01 May 2020 20:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588389886; cv=none; d=google.com; s=arc-20160816; b=GL1+BRClDm4uocOdldaaBwuKjorHWShqQLR88PA2OlVZtDLmSsyA4DHKj+FYMn0CPd LEq0z7CUSa/6mCHMCDkiykgoWCovwQ/cXKHxyGcI2RI3BlGYaX1McsMz7AHCMdAszCn+ HG5xf0Acf3ajulcOb0/unMt+SR2WS86mKesMOYUWIBzSvycHSNncQdB63e49ARDFPJub 8D/SGoxMS7clxTD5bZ+MGS8RE+gEH//nj6c+IA7U/OWFwEpZrBhaeuBZd7MzfNOBb43s 8vA3oD3MmMvaTvYizO+PPw8f8WYiiF9vt355ZoxjGfXj6kUXfwH3/axZ+saaPe2g5cN9 7i+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ypDA5jJe/YEdzp8yPczC7cUQkpm/2QHAT8cMv9NRwek=; b=shr/oV4/TR6fEupc82430cy2PArKtOffiQcZhponryDvpHqrrBCoR7zdteBBiLCSFs uFhNih0ZMrDGVlD+4gftPcPciuolULtW+PR/tDLbV6y1mgRYStl+oBIydoUPFCW67ldd shubieVxnqb6DNbj7RrZYADMAzLlJh1mCxqqYUmHo6/qmztyZLCj1tWnsaI2+BWlxZz4 +CFjFd/DW0FvsNu1WnXTRiPVWSr1yyKGlNm3V9w8+7S2jLxEgOsVSMJ48x9mUyj21gmr uUqlT6b9mfPSHGu2SH1qRvbVST4EzFCIS+ZsYidMonMKT7vQ6st/7/Xeryt3AaRSRd1I 8keg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h+ZkInoM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id co4si2766293edb.83.2020.05.01.20.24.23; Fri, 01 May 2020 20:24:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=h+ZkInoM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727854AbgEBDWu (ORCPT + 99 others); Fri, 1 May 2020 23:22:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbgEBDWt (ORCPT ); Fri, 1 May 2020 23:22:49 -0400 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AAFEC061A0C; Fri, 1 May 2020 20:22:49 -0700 (PDT) Received: by mail-qk1-x744.google.com with SMTP id t3so11242799qkg.1; Fri, 01 May 2020 20:22:49 -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 :mime-version:content-transfer-encoding; bh=ypDA5jJe/YEdzp8yPczC7cUQkpm/2QHAT8cMv9NRwek=; b=h+ZkInoMZb/Dz7B2oshu55sqjepgTxrPfQ7+eKXAnysKvJ4A/CA9hqAMnduT/2NQFN JeRijdC3+bKvX8zTNWrcC0ujKCkAluELMlL1DhgQDDcv413FyBJUrVzZ2zLau07YfHGi l70PITUYkbZHEjt1EcG1YjU4t7f5aeeWIrT8jPo9J9BU0cdv4u/w2HN9VPIPE57xCIYT ATHIEKN5odbxCPV8DJbobz4icD3JO9sVjgUKD3OYDaxwenopqJkVAXuOE5Vbn5yJ/K96 Dq9sOdVMx5UCAdjc9lgJEDPwRetNcOq79QvlsReQb6asi3vkmbjTUvFplGYDTIZd1mY9 Xulw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ypDA5jJe/YEdzp8yPczC7cUQkpm/2QHAT8cMv9NRwek=; b=rfwni56Imj6rLm3j5ZNhszrCwjw4VBSa/oUoGWRBTNWIr14skSeJQ/RPDT1crdUFnx rspK2Sa04syv9p442mIuUFb9Rt7XaWBI3S3UHtMCEkj8SWpWD948JQQ4N4XWYiKkve47 CPcstuiGRUz3C25757sBklQRVMnYWmDTogSsrZ49NTRPOVNWmciMfeIrYwTtubxBjTCF Z7juEowvUf9CIanF9qg2TG3k53+4Gnf/lI6biCwnG+qt673HQd61GRDXLOjVK7G0ZpjU GV4FfUpVFfCc4BskmOxsqXwyWvASkRlSqypx96foongxcaOgcDzJbTMzJzo3hkys39Tx jT2Q== X-Gm-Message-State: AGi0PuY12Qsmhs4qKLo9ewt4dRKAunCDDVkY7WcnccZfVSzKGmQH56jq MGweBDqyO1qHrwl/pjSQVzM= X-Received: by 2002:a37:6cc7:: with SMTP id h190mr6591036qkc.115.1588389768441; Fri, 01 May 2020 20:22:48 -0700 (PDT) Received: from localhost.localdomain ([2804:18:602b:723a:1b2a:57a1:a611:34ed]) by smtp.gmail.com with ESMTPSA id c41sm4410399qta.96.2020.05.01.20.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 20:22:47 -0700 (PDT) From: "Daniel W. S. Almeida" X-Google-Original-From: Daniel W. S. Almeida To: mchehab+huawei@kernel.org, sean@mess.org, kstewart@linuxfoundation.org, allison@lohutok.net, tglx@linutronix.de Cc: "Daniel W. S. Almeida" , linux-media@vger.kernel.org, skhan@linuxfoundation.org, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [RFC, WIP, v4 05/11] media: vidtv: add a bridge driver Date: Sat, 2 May 2020 00:22:10 -0300 Message-Id: <20200502032216.197977-6-dwlsalmeida@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200502032216.197977-1-dwlsalmeida@gmail.com> References: <20200502032216.197977-1-dwlsalmeida@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Daniel W. S. Almeida" Digital TV devices consist of several independent hardware components which are controlled by different drivers. Each media device is controlled by a group of cooperating drivers with the bridge driver as the main driver. This patch adds a bridge driver for the Virtual Digital TV driver [vidtv]. The bridge driver binds to the other drivers, that is, vidtv_tuner and vidtv_demod and implements the digital demux logic, providing userspace with a MPEG Transport Stream. Move config structs to a common header so they can be used by the bridge driver and by their respective drivers. Signed-off-by: Daniel W. S. Almeida --- drivers/media/test-drivers/vidtv/Makefile | 2 +- .../media/test-drivers/vidtv/vidtv_bridge.c | 379 ++++++++++++++++++ .../media/test-drivers/vidtv/vidtv_bridge.h | 37 ++ 3 files changed, 417 insertions(+), 1 deletion(-) create mode 100644 drivers/media/test-drivers/vidtv/vidtv_bridge.c create mode 100644 drivers/media/test-drivers/vidtv/vidtv_bridge.h diff --git a/drivers/media/test-drivers/vidtv/Makefile b/drivers/media/test-drivers/vidtv/Makefile index 36ba00ddc0d1e..a9f1993dd5443 100644 --- a/drivers/media/test-drivers/vidtv/Makefile +++ b/drivers/media/test-drivers/vidtv/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_DVB_VIDTV) += vidtv_tuner.o vidtv_demod.o +obj-$(CONFIG_DVB_VIDTV) += vidtv_tuner.o vidtv_demod.o vidtv_bridge.o diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c new file mode 100644 index 0000000000000..05ca4027c869f --- /dev/null +++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c @@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * The Virtual DTV test driver serves as a reference DVB driver and helps + * validate the existing APIs in the media subsystem. It can also aid + * developers working on userspace applications. + * + * Written by Daniel W. S. Almeida + */ + +#include +#include +#include +#include +#include +#include "vidtv_bridge.h" + +#define TS_BUF_MAX_SZ (128 * 188) +#define TUNER_DEFAULT_ADDR 0x68 +#define DEMOD_DEFAULT_ADDR 0x60 + +MODULE_AUTHOR("Daniel W. S. Almeida"); +MODULE_LICENSE("GPL"); + +static unsigned int drop_tslock_prob_on_low_snr; +module_param(drop_tslock_prob_on_low_snr, uint, 0644); +MODULE_PARM_DESC(drop_tslock_prob_on_low_snr, + "Probability of losing the TS lock if the signal quality is bad"); + +static unsigned int recover_tslock_prob_on_good_snr; +module_param(recover_tslock_prob_on_good_snr, uint, 0644); +MODULE_PARM_DESC(recover_tslock_prob_on_good_snr, + "Probability recovering the TS lock when the signal improves"); + +static unsigned int mock_power_up_delay_msec; +module_param(mock_power_up_delay_msec, uint, 0644); +MODULE_PARM_DESC(mock_power_up_delay_msec, "Simulate a power up delay"); + +static unsigned int mock_tune_delay_msec; +module_param(mock_tune_delay_msec, uint, 0644); +MODULE_PARM_DESC(mock_tune_delay_msec, "Simulate a tune delay"); + +static unsigned int vidtv_valid_dvb_t_freqs[8]; +module_param_array(vidtv_valid_dvb_t_freqs, uint, NULL, 0644); +MODULE_PARM_DESC(vidtv_valid_dvb_t_freqs, + "Valid DVB-T frequencies to simulate"); + +static unsigned int vidtv_valid_dvb_c_freqs[8]; +module_param_array(vidtv_valid_dvb_c_freqs, uint, NULL, 0644); +MODULE_PARM_DESC(vidtv_valid_dvb_c_freqs, + "Valid DVB-C frequencies to simulate"); + +static unsigned int vidtv_valid_dvb_s_freqs[8]; +module_param_array(vidtv_valid_dvb_s_freqs, uint, NULL, 0644); +MODULE_PARM_DESC(vidtv_valid_dvb_s_freqs, + "Valid DVB-C frequencies to simulate"); + +static unsigned int max_frequency_shift_hz; +module_param(max_frequency_shift_hz, uint, 0644); +MODULE_PARM_DESC(max_frequency_shift_hz, + "Maximum shift in HZ allowed when tuning in a channel"); + +static unsigned int chosen_delsys = SYS_DVBT; +module_param(chosen_delsys, uint, 0644); +MODULE_PARM_DESC(chosen_delsys, + "The delivery system to simulate. Currently supported: DVB-T, DVB-C, DVB-S"); + +static unsigned int ts_buf_sz = 20 * 188; +module_param(ts_buf_sz, uint, 0644); +MODULE_PARM_DESC(ts_buf_sz, "Optional size for the TS buffer"); + +DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nums); + +static int vidtv_start_streaming(struct vidtv_dvb *dvb) +{ + WARN_ON(dvb->streaming); + dvb->streaming = true; + + return 0; +} + +static int vidtv_stop_streaming(struct vidtv_dvb *dvb) +{ + /* mpeg thread will quit */ + dvb->streaming = false; + + return 0; +} + +static int vidtv_start_feed(struct dvb_demux_feed *feed) +{ + struct dvb_demux *demux = feed->demux; + struct vidtv_dvb *dvb = demux->priv; + int rc, ret; + + if (!demux->dmx.frontend) + return -EINVAL; + + mutex_lock(&dvb->feed_lock); + + dvb->nfeeds++; + rc = dvb->nfeeds; + + if (dvb->nfeeds == 1) { + ret = vidtv_start_streaming(dvb); + if (ret < 0) + rc = ret; + } + + mutex_unlock(&dvb->feed_lock); + return rc; +} + +static int vidtv_stop_feed(struct dvb_demux_feed *feed) +{ + struct dvb_demux *demux = feed->demux; + struct vidtv_dvb *dvb = demux->priv; + int err = 0; + + mutex_lock(&dvb->feed_lock); + dvb->nfeeds--; + + if (!dvb->nfeeds) + err = vidtv_stop_streaming(dvb); + + mutex_unlock(&dvb->feed_lock); + return err; +} + +static int vidtv_master_xfer(struct i2c_adapter *i2c_adap, + struct i2c_msg msgs[], + int num) +{ + return 0; +} + +static u32 vidtv_i2c_func(struct i2c_adapter *adapter) +{ + return I2C_FUNC_I2C; +} + +struct i2c_algorithm vidtv_i2c_algorithm = { + .master_xfer = vidtv_master_xfer, + .functionality = vidtv_i2c_func, +}; + +static int vidtv_bridge_i2c_register_adap(struct vidtv_dvb *dvb) +{ + struct i2c_adapter *i2c_adapter = dvb->i2c_adapter; + + strscpy(i2c_adapter->name, "vidtv_i2c", sizeof(i2c_adapter->name)); + i2c_adapter->owner = THIS_MODULE; + i2c_adapter->algo = &vidtv_i2c_algorithm; + i2c_adapter->algo_data = NULL; + i2c_adapter->timeout = 500; + i2c_adapter->retries = 3; + i2c_adapter->dev.parent = NULL; + + i2c_set_adapdata(i2c_adapter, dvb); + return i2c_add_adapter(dvb->i2c_adapter); +} + +static int vidtv_bridge_register_adap(struct vidtv_dvb *dvb) +{ + int ret = 0; + + ret = dvb_register_adapter(&dvb->adapter, + KBUILD_MODNAME, + THIS_MODULE, + &dvb->i2c_adapter->dev, + adapter_nums); + + return ret; +} + +static int vidtv_bridge_dmx_init(struct vidtv_dvb *dvb) +{ + dvb->demux.dmx.capabilities = DMX_TS_FILTERING | + DMX_SECTION_FILTERING; + + dvb->demux.priv = dvb; + dvb->demux.filternum = 256; + dvb->demux.feednum = 256; + dvb->demux.start_feed = vidtv_start_feed; + dvb->demux.stop_feed = vidtv_stop_feed; + + return dvb_dmx_init(&dvb->demux); +} + +static int vidtv_bridge_dmxdev_init(struct vidtv_dvb *dvb) +{ + dvb->dmx_dev.filternum = 256; + dvb->dmx_dev.demux = &dvb->demux.dmx; + dvb->dmx_dev.capabilities = 0; + + return dvb_dmxdev_init(&dvb->dmx_dev, &dvb->adapter); +} + +static void vidtv_bridge_probe_demod(struct vidtv_dvb *dvb, u32 n) +{ + struct vidtv_demod_config cfg = {0}; + + cfg.drop_tslock_prob_on_low_snr = drop_tslock_prob_on_low_snr; + cfg.recover_tslock_prob_on_good_snr = recover_tslock_prob_on_good_snr; + cfg.chosen_delsys = chosen_delsys; + + dvb->i2c_client_demod[n] = dvb_module_probe("vidtv_demod", + NULL, + dvb->i2c_adapter, + DEMOD_DEFAULT_ADDR, + &cfg); + + /* retrieve a pointer to struct dvb_frontend */ + dvb->fe[n] = cfg.frontend; +} + +static void vidtv_bridge_probe_tuner(struct vidtv_dvb *dvb, u32 n) +{ + struct vidtv_tuner_config cfg = {0}; + + cfg.fe = dvb->fe[n]; + cfg.mock_power_up_delay_msec = mock_power_up_delay_msec; + cfg.mock_tune_delay_msec = mock_tune_delay_msec; + + memcpy(cfg.vidtv_valid_dvb_t_freqs, + vidtv_valid_dvb_t_freqs, + sizeof(vidtv_valid_dvb_t_freqs)); + + memcpy(cfg.vidtv_valid_dvb_c_freqs, + vidtv_valid_dvb_c_freqs, + sizeof(vidtv_valid_dvb_c_freqs)); + + memcpy(cfg.vidtv_valid_dvb_s_freqs, + vidtv_valid_dvb_s_freqs, + sizeof(vidtv_valid_dvb_s_freqs)); + + cfg.max_frequency_shift_hz = max_frequency_shift_hz; + + dvb->i2c_client_tuner[n] = dvb_module_probe("vidtv_tuner", + NULL, + dvb->i2c_adapter, + TUNER_DEFAULT_ADDR, + &cfg); +} + +static int vidtv_bridge_dvb_init(struct vidtv_dvb *dvb) +{ + int ret; + int i, j; + + ret = vidtv_bridge_i2c_register_adap(dvb); + if (ret < 0) + goto fail_i2c; + + ret = vidtv_bridge_register_adap(dvb); + if (ret < 0) + goto fail_adapter; + + vidtv_bridge_probe_demod(dvb, 0); + vidtv_bridge_probe_tuner(dvb, 0); + + for (i = 0; i < NUM_FE; ++i) { + ret = dvb_register_frontend(&dvb->adapter, dvb->fe[i]); + if (ret < 0) + goto fail_fe; + } + + ret = vidtv_bridge_dmx_init(dvb); + if (ret < 0) + goto fail_dmx; + + ret = vidtv_bridge_dmxdev_init(dvb); + if (ret < 0) + goto fail_dmx_dev; + + for (j = 0; j < NUM_FE; ++j) { + ret = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, + &dvb->dmx_fe[j]); + if (ret < 0) + goto fail_dmx_conn; + + /* + * The source of the demux is a frontend connected + * to the demux. + */ + dvb->dmx_fe[j].source = DMX_FRONTEND_0; + } + + return ret; + +fail_dmx_conn: + for (j = j - 1; j >= 0; --j) + dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, + &dvb->dmx_fe[j]); +fail_dmx_dev: + dvb_dmxdev_release(&dvb->dmx_dev); +fail_dmx: + dvb_dmx_release(&dvb->demux); +fail_fe: + for (i = i - 1; i >= 0; --i) + dvb_unregister_frontend(dvb->fe[i]); + +fail_adapter: + dvb_unregister_adapter(&dvb->adapter); + +fail_i2c: + i2c_del_adapter(dvb->i2c_adapter); + + return ret; +} + +static int vidtv_bridge_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + int ret; + struct vidtv_dvb *dvb; + + dvb = kzalloc(sizeof(*dvb), GFP_KERNEL); + if (!dvb) + return -ENOMEM; + + ret = vidtv_bridge_dvb_init(dvb); + if (ret < 0) + goto err_dvb; + + mutex_init(&dvb->feed_lock); + + i2c_set_clientdata(client, dvb); + + return ret; + +err_dvb: + kfree(dvb); + return ret; +} + +static int vidtv_bridge_i2c_remove(struct i2c_client *client) +{ + struct vidtv_dvb *dvb; + u32 i; + + dvb = i2c_get_clientdata(client); + + mutex_destroy(&dvb->feed_lock); + + for (i = 0; i < NUM_FE; ++i) + dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, + &dvb->dmx_fe[i]); + + dvb_dmxdev_release(&dvb->dmx_dev); + dvb_dmx_release(&dvb->demux); + + for (i = 0; i < NUM_FE; ++i) { + dvb_unregister_frontend(dvb->fe[i]); + dvb_frontend_detach(dvb->fe[i]); + } + + dvb_unregister_adapter(&dvb->adapter); + + return 0; +} + +static const struct i2c_device_id vidtv_bridge_id_table[] = { + {"vidtv_bridge", 0}, + {} +}; + +MODULE_DEVICE_TABLE(i2c, vidtv_bridge_id_table); + +static struct i2c_driver vidtv_bridge_driver = { + .driver = { + .name = "vidtv_bridge", + .suppress_bind_attrs = true, + }, + .probe = vidtv_bridge_i2c_probe, + .remove = vidtv_bridge_i2c_remove, + .id_table = vidtv_bridge_id_table, +}; + +module_i2c_driver(vidtv_bridge_driver); diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.h b/drivers/media/test-drivers/vidtv/vidtv_bridge.h new file mode 100644 index 0000000000000..ef5c7cd2d64e3 --- /dev/null +++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * The Virtual DTV test driver serves as a reference DVB driver and helps + * validate the existing APIs in the media subsystem. It can also aid + * developers working on userspace applications. + * + * Written by Daniel W. S. Almeida + */ + +#ifndef VIDTV_BRIDGE_H +#define VIDTV_BRIDGE_H + +#define NUM_FE 1 + +#include +#include +#include +#include +#include + +struct vidtv_dvb { + struct dvb_frontend *fe[NUM_FE]; + struct dvb_adapter adapter; + struct dvb_demux demux; + struct dmxdev dmx_dev; + struct dmx_frontend dmx_fe[NUM_FE]; + struct i2c_adapter *i2c_adapter; + struct i2c_client *i2c_client_demod[NUM_FE]; + struct i2c_client *i2c_client_tuner[NUM_FE]; + + u32 nfeeds; + struct mutex feed_lock; /* start/stop feed */ + + bool streaming; +}; + +#endif // VIDTV_BRIDGE_H -- 2.26.2