From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934486AbeCHAvv (ORCPT ); Wed, 7 Mar 2018 19:51:51 -0500 Received: from mail-dm3nam03on0103.outbound.protection.outlook.com ([104.47.41.103]:35986 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754709AbeCHAvr (ORCPT ); Wed, 7 Mar 2018 19:51:47 -0500 Authentication-Results: spf=pass (sender IP is 117.103.190.43) smtp.mailfrom=sony.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sony.com; From: To: CC: , , , , , , , , , , Subject: RE: [PATCH v5 02/12] [media] cxd2880-spi: Add support for CXD2880 SPI interface Thread-Topic: [PATCH v5 02/12] [media] cxd2880-spi: Add support for CXD2880 SPI interface Thread-Index: AQHTkDg3Ow2lTpwQtUeAT9NJCo3KraPE2f+AgADxuQA= Date: Thu, 8 Mar 2018 00:51:32 +0000 Message-ID: <02699364973B424C83A42A84B04FDA85475303@JPYOKXMS113.jp.sony.com> References: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> <20180118084610.20967-1-Yasunari.Takiguchi@sony.com> <20180307071529.66e33f54@vento.lan> In-Reply-To: <20180307071529.66e33f54@vento.lan> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [2001:cf8:1:aec:0:dddd:19e1:c008] Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:117.103.190.43;IPV:NLI;CTRY:JP;EFV:NLI;SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(39380400002)(396003)(2980300002)(438002)(51914003)(13464003)(199004)(189003)(4326008)(5890100001)(6246003)(305945005)(39060400002)(33656002)(46406003)(107886003)(97756001)(2351001)(6116002)(2920100001)(23726003)(2900100001)(47776003)(55846006)(50466002)(2876002)(86152003)(2906002)(55016002)(7636002)(53546011)(5660300001)(106466001)(356003)(2950100002)(7696005)(7736002)(6916009)(102836004)(77096007)(8676002)(26005)(336012)(59450400001)(345774005)(106002)(16586007)(86362001)(229853002)(54906003)(575784001)(246002)(8936002)(478600001)(316002)(72206003)(76176011)(186003);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR13MB1486;H:jp.sony.com;FPR:;SPF:Pass;PTR:jpyokxeg103.jp.sony.com;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1NAM02FT016;1:seRoriIkKrcSkv5TYbDY2yTJqxizj+Ek519+lOmSoiRaVpycggPwyAIF0tC12/N0c1UBLAn7iRuGUezu47hlc7wkgYuHmbaMrpPByVmhAJKv6xzyRLrdQGAU13ZOvrSE X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20f56602-1eb8-407f-b0e4-08d5848ec368 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:MWHPR13MB1486; X-Microsoft-Exchange-Diagnostics: 1;MWHPR13MB1486;3:07L9RrkF7P8iCNhfRF4+mMsMDrYAPuCtBl3JmnqXqyuAi3UumE6+UkGWon13dpFvCRDq/R16d24eDvN3sJDmpHZrKZRwabKc/DFPBIKtRlqJuHBoRvzcqPPTfE0q11c1EWg5gcGzVZLWcLTTUbIZukqqZnijk8ozZgO7ORzsc066mtWZnrWpvY+l//AFEZ46Wt2hcwx0FA0JONNm1cZy2eG8+/Lx4AothjU9RkLBi4tQlqxNxuBhlNemoPyngJ7RHR+7ht1aiTX6fEnVnMg313Hfg78EVyILdnTkRcrbpxcuHkcqKm+0aNN8CNYW5mGW7fiv3eSlRnW3aot3txVGWaxpl5nx3ZEdLBrW1SjHRFE=;25:ZYq1TXVsb/4NJq3nQREKGIm7GXM803YIg2F5INIFSKCVtr5xuGewe6at00W/xRbDsQwqIgklXunv2s5tqwB552zmGiuwm9DhpjkTDb/LpJkR2XJITHAGiaBvgOz2mhP9lH2mUosJAO60E+QVM0f6DcoNsIzy86tGTUVVRdwvnr0VQTlu46/d3qn/4H7PlvFYhZqTY6UPf/8Ffx2rFHNAacXL+EXSh8PsnBt1zlgeBQ7UPgruKHwEYWFdxl6ThSOqH0EewMJGCm24Ija14y/E2FR8KSFvKuID8JxVRivQ9fk7oEtzh5Qv9vyeLPZ/M/hTm7L38VjK5WXWJ7Hm7pmGBA== X-MS-TrafficTypeDiagnostic: MWHPR13MB1486: X-Microsoft-Exchange-Diagnostics: 1;MWHPR13MB1486;31:MCWxpJu2HLckPtXCv7QdsKXTKnz1wOKrol/oxcUlmP7FxnoLPdQUi3FQNZeUf0TJtiat+DA4Tb56SZTTt4ckZnBDYzQg54oqkTklUK/NqHqrWK/z4tJOhhUqxj0r6fkRFP4S064ujY2G8rC+ofJguv6J2U8DW/b8P+/j1Tbi6xAQaI9LUu0Jwhn2+LP3OnYlGk+clS2l7e3yphJ3Of0GiU71zpCxGBo6RzeIezU6ep8=;20:LPka4dDnBl1tlCzVclb+G9D3Yb6AIlkVZiJ0tRwfpuQqhVbDRPaaR44kect02bzplFyQPNj6kZusm+Hrx4s7+TmrI6KwFWke171vDg3jJX0e3SqYM7O/Pzi+1ESToWh9mLFDsdpkbMU6xSPdJJS7WC/ZBYxxGLIwnxnJjExgllMf0XxRBOzmT3KRDKEMYLsKmS4DKuRBX7a1Ilq/EEL73KdssN3FgMRMHvic+lTqEe2WVe33YXOOscT//2qqUK1nD3UPFeAUg7/9n/2L3EM544u8Bx7oa8YZgzm3msbjRnMq7JZ6EkuD2dOjZNzRJQW0BtYvb5Jkw5+NN2oCsp2LzzWKWREvj4uw/eZAoXMMyktF3EHDC58q60SSQONaMRkIJfmYnRdM1WOtkMNhC0UvivQsNLcLysau2HDL23VDagAqfwIzca5lm/+mhQNWATeQ8o5qA0Pwkh0VobsJ+4bezRPFA/6I+VlZbE6Eaj3ovYblO4AKaGD0TV5Jl0u7KSK2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(182409339516656)(9452136761055)(85827821059158)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231220)(11241501184)(944501244)(52105095)(3002001)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:MWHPR13MB1486;BCL:0;PCL:0;RULEID:;SRVR:MWHPR13MB1486; X-Microsoft-Exchange-Diagnostics: 1;MWHPR13MB1486;4:L+SihRHJSev4U9dfZulesvjFAqtK5orOR1qzyksTECwXft2Rp5IR0MQ1R0Pt09kd2o1eSO5Qjfp3f8thdCsFtbWiHaEJbu+Z0jaCqKbv0VYMUPMwe4vgU3yArbBMEu+eLY1H81kCoHjX13VU9BwU52pQNuj10bHsL+Peugz+CaA234hy5KcVAEGAP9HsQyq2KWQiyob9gMJgb/lM5KUA/i45czgcYhoDkAjqwzUrp5JZvX3ES0lj7KAZYCp4wtlV3n9KdABqYtQRG0+MrJRtit9MNWCYH0+i7+7aZlTXaqiLmSPtd5gQFB6Ttj7Gg61ba+ZktLahs0gTPRm2dJAHaHo8bAWH4YPcUExOTEpRBrlSceItiFNLilaMsIilOLKyv4gP4yS0Co4M/03kWWgoxpTG626HjJro1y9zHSjnWGU= X-Forefront-PRVS: 060503E79B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR13MB1486;23:ZmPu4xq1bO0J6l7mz8465LgO7RQZNmokYxMpNI70q?= =?us-ascii?Q?UFrW0iuzurb3nYcP+RK4YpfHMIC5XCjyHsi+sipQChO7MNFp8hucb3H/kos9?= =?us-ascii?Q?a38JMxw+mV19giAH/uOPnQYi4RBdA2aJD8uo6Y6a7s5j2EmpqxtnixTddF68?= =?us-ascii?Q?NfIZRrgkKYmUxF3+bRjr2rbgFnMazSrN872Y/oZpP8JzfHz60KfT3bJsiEUa?= =?us-ascii?Q?gh9sNi/NG/P7BaDT2/63sycCdHUjDDD7xemnJlH5sS6gXd4Eaw23rAsyHru/?= =?us-ascii?Q?J5r8maZxGBgXWKmNcA9ioloXYUJPssaY/HmCbzMQ7ChQM4nkNZ3QovIVL+IB?= =?us-ascii?Q?YU6RiZNbyDfGS0cLMjw1vXS/KsGOG3M9U6vfVq8LKa8BiYLCXNZVAacwBXHK?= =?us-ascii?Q?+FhTBiRw0oy0JLbjcI+Sz1uaIE7a+FXlfM3uMScdSzDFrx2t7qDL5Kk0rnhO?= =?us-ascii?Q?/crz81W1UeIkXEQO3Q0gpFrcyiUJ9wBQ0zag0PUeFslNPYEZ4q09s+ZCX/ya?= =?us-ascii?Q?pIia1DrZCbM/xgrR5YZzziftA+/gX1Msrpwbr51wXTV45oWXXz9gf7FFlgVZ?= =?us-ascii?Q?SOVjKlz1GFVtvo2gDuYbR6jHC5yY2WxEO3QcgCN+juItekL1nAGI9UXNJPip?= =?us-ascii?Q?BREVQA6u6/y9lM6n4Bx7nCkBiNQzxBjw/1/A9Q6B34y164ENUDy3S8R9vHeL?= =?us-ascii?Q?/WhzUgUDYEFXorIXUvo+M7Tj+xu+C9vcSlyZ1W8vKgaeyKt0XKxtW7hEOHmT?= =?us-ascii?Q?ltu4PV+PiveX2/xkHaD2ipz7H6hsQ7ppqyQIM4tdrepb0fK2gfJ8Z+0DeO9E?= =?us-ascii?Q?UePTBBoEljubcPAjtH4j/yyFkRC93Wd08WK8KNgFYOnDGKvMAdc8ciO69k57?= =?us-ascii?Q?AsRbkkI3kCj7S5cTFtSW6yXGtRJ5FLYjE2apJ1NUBZ5VnzG38PGWmRZvsIZt?= =?us-ascii?Q?Ezz703dy1bHWZ9qgjXRTvn7I16LPWEjpQ2MZuSqVHEt51K1QGpMjqPi4BIAD?= =?us-ascii?Q?TUAyU6LAa7tMZduFsIMLCsZgnVtFprJc0ExUUWCQtUvJ/b4b1e7HYN5UbYHd?= =?us-ascii?Q?bRIUeQfey9Vbo2pLGG/hjPGxme4Mw7Z3WdKOiVM+hyE+qVebkMkenvWr0X6L?= =?us-ascii?Q?vZxBUxbnan5EE57Id9PDiOgreQ4eXIrbB2vziijegfZVjK+QXj1BhGFX83lL?= =?us-ascii?Q?LRdzOSasXp6/zDQ3RMXnm5BczyjVpaYlMhgTw5ef6GHl/8XKp5ai9WBji7Fw?= =?us-ascii?Q?X0Wpg3jbGAk9jkuZ24Woyc3aGPK4RSlq6cleUpzOZHSNiiZjbzFYhiuCIr6J?= =?us-ascii?Q?tqxIf+QjKtaDkc09DYDbRxi2pmrCLH3HhkXrCooErH6jhZ258vRMHoHDeFsw?= =?us-ascii?Q?swwPb4S/i1GhSAcRLYkxN2yqu92MtLz9aHyGVGsWZapGtCD?= X-Microsoft-Antispam-Message-Info: lNE2MKtInjb2wuVlD6eBY6FkqxbEM/EJdl8r9SSqrA8SnDYCQ1WF4mWCIsdy5jvyF/UexUE2MeOt5DgZjMFGSaKLr+lIlvp6GmUWEpi3TzDaJ4tnL8uefVni8rmo2306bpx6BD7Bs0CGscX9XoQOJ+J4rMhfdn+JhlVi4USyp9pyvYnZY3pHbIgi9/nBx42H X-Microsoft-Exchange-Diagnostics: 1;MWHPR13MB1486;6:Ov82sRUorNljmY+63abKKo4oBzxL79NA9bFw7/lR8hLPXmNFNhQZp/f4yUy8bPC/BR6LBbyvJ64s0nPJDPmRqHsA8plblNGWcSexzfI5c1eIYmL3pWCE5cgDEJoqtbwmIgXKtZMBhQAnmChNMHo8B6jkffdUSGH30SBmaZZ62CtNTwuKiv3AXh67CChjJCr8ZdGYixvzPUgBFMjEXHHAAfBcvcPxGPmgor9tuOSQ7z6+x9Gg9djVWP7uk+ss2Q/2G+b0iogTSi2b+Ef2MNZVm6BA2wltwmia6lnFnz70NcoPj9TnBs160LlzcsPtNwtKB+dyIr9e3mYZvb9oEERLGz2nxWhb9DrotDzxkj6xhMU=;5:4b9wVlzl1K9HkxAdwNqQh2U6tc5dykIlkmH9J6ADZLJltUkq7/M7G9dYucM5yNhbx/z+K8CRJ8CuC8sLa8GQ+Nleq8y6Y0PveFmI1vAu0jQLRruI1QC+Vt4n1BBI/0bt2seY9xYthZkWYpcwWbQTTwq0UUVg+nrSt3rbMo4O9Q4=;24:O07eKT/ytQ1Ydac6lxaefNafLit2eyGfB81XHRlopjTMgKJjgCWHZ6vM/npN+G4+JWmAPOVbe0sjmyoxjY4js7KbZTYRUFYe8WZeAnJaB0s=;7:LKuCbKo90WKRtCtArCZI4QGCB25lilkWOp4EElZwEb45DTVKbI1L0Vy7KxEIflHfz2j2pV3/2j25QHTrnMJZz9QlviU/qgdz69JIZTKEl3AMO/8OY+ZkibVL7IJvq6HnUnTBQDh9djd8jCq5d2MCI7O17FikKYiPadf0vFenksD2Vj3NupFsCj8kqrJkqcbKjQKAVmlh5BQ5dvkk9zZ7AyEXPaCin50K/HDlFhr5iEOULPTMLYXYa5J+XIqzJiGV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: sony.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 00:51:43.6277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20f56602-1eb8-407f-b0e4-08d5848ec368 X-MS-Exchange-CrossTenant-Id: 66c65d8a-9158-4521-a2d8-664963db48e4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=66c65d8a-9158-4521-a2d8-664963db48e4;Ip=[117.103.190.43];Helo=[jp.sony.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR13MB1486 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear Mauro I am very glad to hear your message. Being busy, thank you for taking care of fixing patches as well also. And we will improve about your below comments continuously. Regards & Thanks Takiguchi > -----Original Message----- > From: Mauro Carvalho Chehab [mailto:mchehab@s-opensource.com] > Sent: Wednesday, March 7, 2018 7:15 PM > To: Takiguchi, Yasunari (SSS) > Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; > linux-media@vger.kernel.org; tbird20d@gmail.com; > frowand.list@gmail.com; Yamamoto, Masayuki (SSS); Nozawa, Hideki (STWN); > Yonezawa, Kota (SSS); Matsumoto, Toshihiko (SSS); Watanabe, Satoshi (SSS) > Subject: Re: [PATCH v5 02/12] [media] cxd2880-spi: Add support for CXD2880 > SPI interface > > Em Thu, 18 Jan 2018 17:46:10 +0900 > escreveu: > > > From: Yasunari Takiguchi > > > > This is the SPI adapter part of the driver for the Sony CXD2880 > > DVB-T2/T tuner + demodulator. > > Thanks for the patches! > > The patch series look ok. Just a few nitpicks that could be solved later. > > I had to apply a few patches to make it build and remove some warnings > with W=1. Patches sent. > > With that, I'm applying this series. > > Regards, > Mauro > > > > > Signed-off-by: Yasunari Takiguchi > > Signed-off-by: Masayuki Yamamoto > > Signed-off-by: Hideki Nozawa > > Signed-off-by: Kota Yonezawa > > Signed-off-by: Toshihiko Matsumoto > > Signed-off-by: Satoshi Watanabe > > --- > > > > [Change list] > > Changes in V5 > > Using SPDX-License-Identifier > > drivers/media/spi/cxd2880-spi.c > > -modified typo about "ivnalid" -> "invalid" > > -modified typo about "drvier" -> "driver" > > -removed unnecessary if() > > -modified return error code > > -reduction of valiable names > > -removed unnecessary parentheses > > -changed members of struct cxd2880_ts_buf_info > > > > Changes in V4 > > drivers/media/spi/cxd2880-spi.c > > -removed Camel case > > -removed unnecessary initialization at variable declaration > > -removed unnecessary brace {} > > > > Changes in V3 > > drivers/media/spi/cxd2880-spi.c > > -adjusted of indent spaces > > -removed unnecessary cast > > -changed debugging code > > -changed timeout method > > -modified coding style of if() > > -changed hexadecimal code to lower case. > > > > Changes in V2 > > drivers/media/spi/cxd2880-spi.c > > -Modified PID filter setting. > > > > drivers/media/spi/cxd2880-spi.c | 670 > > ++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 670 insertions(+) > > create mode 100644 drivers/media/spi/cxd2880-spi.c > > > > diff --git a/drivers/media/spi/cxd2880-spi.c > > b/drivers/media/spi/cxd2880-spi.c new file mode 100644 index > > 000000000000..857e4c0d7a92 > > --- /dev/null > > +++ b/drivers/media/spi/cxd2880-spi.c > > @@ -0,0 +1,670 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * cxd2880-spi.c > > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > > + * SPI adapter > > + * > > + * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions > > +Corporation */ > > + > > +#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ > > + > > +#include > > +#include > > + > > +#include "dvb_demux.h" > > +#include "dmxdev.h" > > +#include "dvb_frontend.h" > > +#include "cxd2880.h" > > + > > +#define CXD2880_MAX_FILTER_SIZE 32 > > +#define BURST_WRITE_MAX 128 > > +#define MAX_TRANS_PKT 300 > > + > > +struct cxd2880_ts_buf_info { > > + u8 read_ready:1; > > + u8 almost_full:1; > > + u8 almost_empty:1; > > + u8 overflow:1; > > + u8 underflow:1; > > + u16 pkt_num; > > +}; > > + > > +struct cxd2880_pid_config { > > + u8 is_enable; > > + u16 pid; > > +}; > > + > > +struct cxd2880_pid_filter_config { > > + u8 is_negative; > > + struct cxd2880_pid_config pid_config[CXD2880_MAX_FILTER_SIZE]; > > +}; > > + > > +struct cxd2880_dvb_spi { > > + struct dvb_frontend dvb_fe; > > + struct dvb_adapter adapter; > > + struct dvb_demux demux; > > + struct dmxdev dmxdev; > > + struct dmx_frontend dmx_fe; > > + struct task_struct *cxd2880_ts_read_thread; > > + struct spi_device *spi; > > + struct mutex spi_mutex; /* For SPI access exclusive control */ > > + int feed_count; > > + int all_pid_feed_count; > > + u8 *ts_buf; > > + struct cxd2880_pid_filter_config filter_config; }; > > + > > +DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); > > + > > +static int cxd2880_write_spi(struct spi_device *spi, u8 *data, u32 > > +size) { > > + struct spi_message msg; > > + struct spi_transfer tx; > > + > > + if (!spi || !data) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + memset(&tx, 0, sizeof(tx)); > > Nitpick: > > instead, you could just declare tx as: > > struct spi_transfer tx = {}; > > and get rid of memset (same applies to similar code blocks). > > > > + tx.tx_buf = data; > > + tx.len = size; > > + > > + spi_message_init(&msg); > > + spi_message_add_tail(&tx, &msg); > > + > > + return spi_sync(spi, &msg); > > +} > > + > > +static int cxd2880_write_reg(struct spi_device *spi, > > + u8 sub_address, const u8 *data, u32 size) > { > > + u8 send_data[BURST_WRITE_MAX + 4]; > > + const u8 *write_data_top = NULL; > > + int ret = 0; > > + > > + if (!spi || !data) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + if (size > BURST_WRITE_MAX) { > > + pr_err("data size > WRITE_MAX\n"); > > + return -EINVAL; > > + } > > + > > + if (sub_address + size > 0x100) { > > + pr_err("out of range\n"); > > + return -EINVAL; > > + } > > It is better to use dev_err(spi->dev, ...) instead of pr_err(). > > > > + > > + send_data[0] = 0x0e; > > + write_data_top = data; > > + > > + while (size > 0) { > > + send_data[1] = sub_address; > > + if (size > 255) > > + send_data[2] = 255; > > + else > > + send_data[2] = (u8)size; > > + > > + memcpy(&send_data[3], write_data_top, send_data[2]); > > + > > + ret = cxd2880_write_spi(spi, send_data, send_data[2] + > 3); > > + if (ret) { > > + pr_err("write spi failed %d\n", ret); > > + break; > > + } > > + sub_address += send_data[2]; > > + write_data_top += send_data[2]; > > + size -= send_data[2]; > > + } > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_read_ts(struct spi_device *spi, > > + u8 *read_data, > > + u32 packet_num) > > +{ > > + int ret; > > + u8 data[3]; > > + struct spi_message message; > > + struct spi_transfer transfer[2]; > > + > > + if (!spi || !read_data || !packet_num) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + if (packet_num > 0xffff) { > > + pr_err("packet num > 0xffff\n"); > > + return -EINVAL; > > + } > > + > > + data[0] = 0x10; > > + data[1] = packet_num >> 8; > > + data[2] = packet_num; > > + > > + spi_message_init(&message); > > + memset(transfer, 0, sizeof(transfer)); > > + > > + transfer[0].len = 3; > > + transfer[0].tx_buf = data; > > + spi_message_add_tail(&transfer[0], &message); > > + transfer[1].len = packet_num * 188; > > + transfer[1].rx_buf = read_data; > > + spi_message_add_tail(&transfer[1], &message); > > + > > + ret = spi_sync(spi, &message); > > + if (ret) > > + pr_err("spi_write_then_read failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_read_ts_buffer_info(struct spi_device *spi, > > + struct cxd2880_ts_buf_info > *info) { > > + u8 send_data = 0x20; > > + u8 recv_data[2]; > > + int ret; > > + > > + if (!spi || !info) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + ret = spi_write_then_read(spi, &send_data, 1, > > + recv_data, sizeof(recv_data)); > > + if (ret) > > + pr_err("spi_write_then_read failed\n"); > > + > > + info->read_ready = (recv_data[0] & 0x80) ? 1 : 0; > > + info->almost_full = (recv_data[0] & 0x40) ? 1 : 0; > > + info->almost_empty = (recv_data[0] & 0x20) ? 1 : 0; > > + info->overflow = (recv_data[0] & 0x10) ? 1 : 0; > > + info->underflow = (recv_data[0] & 0x08) ? 1 : 0; > > + info->pkt_num = ((recv_data[0] & 0x07) << 8) | recv_data[1]; > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_clear_ts_buffer(struct spi_device *spi) { > > + u8 data = 0x03; > > + int ret; > > + > > + ret = cxd2880_write_spi(spi, &data, 1); > > + > > + if (ret) > > + pr_err("write spi failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_set_pid_filter(struct spi_device *spi, > > + struct cxd2880_pid_filter_config > *cfg) { > > + u8 data[65]; > > + int i; > > + u16 pid = 0; > > + int ret; > > + > > + if (!spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + data[0] = 0x00; > > + ret = cxd2880_write_reg(spi, 0x00, &data[0], 1); > > + if (ret) > > + return ret; > > + if (!cfg) { > > + data[0] = 0x02; > > + ret = cxd2880_write_reg(spi, 0x50, &data[0], 1); > > + } else { > > + data[0] = cfg->is_negative ? 0x01 : 0x00; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + pid = cfg->pid_config[i].pid; > > + if (cfg->pid_config[i].is_enable) { > > + data[1 + (i * 2)] = (pid >> 8) | 0x20; > > + data[2 + (i * 2)] = pid & 0xff; > > + } else { > > + data[1 + (i * 2)] = 0x00; > > + data[2 + (i * 2)] = 0x00; > > + } > > + } > > + ret = cxd2880_write_reg(spi, 0x50, data, 65); > > + } > > + > > + return ret; > > +} > > + > > +static int cxd2880_update_pid_filter(struct cxd2880_dvb_spi > *dvb_spi, > > + struct cxd2880_pid_filter_config > *cfg, > > + bool is_all_pid_filter) > > +{ > > + int ret; > > + > > + if (!dvb_spi || !cfg) { > > + pr_err("invalid arg.\n"); > > + return -EINVAL; > > + } > > + > > + mutex_lock(&dvb_spi->spi_mutex); > > + if (is_all_pid_filter) { > > + struct cxd2880_pid_filter_config tmpcfg; > > + > > + memset(&tmpcfg, 0, sizeof(tmpcfg)); > > + tmpcfg.is_negative = 1; > > + tmpcfg.pid_config[0].is_enable = 1; > > + tmpcfg.pid_config[0].pid = 0x1fff; > > + > > + ret = cxd2880_set_pid_filter(dvb_spi->spi, &tmpcfg); > > + } else { > > + ret = cxd2880_set_pid_filter(dvb_spi->spi, cfg); > > + } > > + mutex_unlock(&dvb_spi->spi_mutex); > > + > > + if (ret) > > + pr_err("set_pid_filter failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_ts_read(void *arg) { > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + struct cxd2880_ts_buf_info info; > > + ktime_t start; > > + u32 i; > > + int ret; > > + > > + dvb_spi = arg; > > + if (!dvb_spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + ret = cxd2880_spi_clear_ts_buffer(dvb_spi->spi); > > + if (ret) { > > + pr_err("set_clear_ts_buffer failed\n"); > > + return ret; > > + } > > + > > + start = ktime_get(); > > + while (!kthread_should_stop()) { > > + ret = cxd2880_spi_read_ts_buffer_info(dvb_spi->spi, > > + &info); > > + if (ret) { > > + pr_err("spi_read_ts_buffer_info error\n"); > > + return ret; > > + } > > + > > + if (info.pkt_num > MAX_TRANS_PKT) { > > + for (i = 0; i < info.pkt_num / MAX_TRANS_PKT; i++) > { > > + cxd2880_spi_read_ts(dvb_spi->spi, > > + dvb_spi->ts_buf, > > + MAX_TRANS_PKT); > > + dvb_dmx_swfilter(&dvb_spi->demux, > > + dvb_spi->ts_buf, > > + MAX_TRANS_PKT * 188); > > + } > > + start = ktime_get(); > > + } else if ((info.pkt_num > 0) && > > + (ktime_to_ms(ktime_sub(ktime_get(), start)) > >= 500)) { > > + cxd2880_spi_read_ts(dvb_spi->spi, > > + dvb_spi->ts_buf, > > + info.pkt_num); > > + dvb_dmx_swfilter(&dvb_spi->demux, > > + dvb_spi->ts_buf, > > + info.pkt_num * 188); > > + start = ktime_get(); > > + } else { > > + usleep_range(10000, 11000); > > + } > > + } > > + > > + return 0; > > +} > > + > > +static int cxd2880_start_feed(struct dvb_demux_feed *feed) { > > + int ret = 0; > > + int i = 0; > > + struct dvb_demux *demux = NULL; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + > > + if (!feed) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + demux = feed->demux; > > + if (!demux) { > > + pr_err("feed->demux is NULL\n"); > > + return -EINVAL; > > + } > > + dvb_spi = demux->priv; > > + > > + if (dvb_spi->feed_count == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("Exceeded maximum PID count (32)."); > > + pr_err("Selected PID cannot be enabled.\n"); > > + return -EINVAL; > > + } > > + > > + if (feed->pid == 0x2000) { > > + if (dvb_spi->all_pid_feed_count == 0) { > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + > &dvb_spi->filter_config, > > + true); > > + if (ret) { > > + pr_err("update pid filter failed\n"); > > + return ret; > > + } > > + } > > + dvb_spi->all_pid_feed_count++; > > + > > + pr_debug("all PID feed (count = %d)\n", > > + dvb_spi->all_pid_feed_count); > > + } else { > > + struct cxd2880_pid_filter_config cfgtmp; > > + > > + cfgtmp = dvb_spi->filter_config; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + if (cfgtmp.pid_config[i].is_enable == 0) { > > + cfgtmp.pid_config[i].is_enable = 1; > > + cfgtmp.pid_config[i].pid = feed->pid; > > + pr_debug("store PID %d to #%d\n", > > + feed->pid, i); > > + break; > > + } > > + } > > + if (i == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("PID filter is full. Assumed bug.\n"); > > "Assumed bug"? What do you mean? > > If the hardware filters are full, it is likely an userspace problem, not > a Kernel bug. > > > + return -EINVAL; > > + } > > + if (!dvb_spi->all_pid_feed_count) > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + &cfgtmp, > > + false); > > + if (ret) > > + return ret; > > + > > + dvb_spi->filter_config = cfgtmp; > > + } > > + > > + if (dvb_spi->feed_count == 0) { > > + dvb_spi->ts_buf = > > + kmalloc(MAX_TRANS_PKT * 188, > > + GFP_KERNEL | GFP_DMA); > > > + if (!dvb_spi->ts_buf) { > > + pr_err("ts buffer allocate failed\n"); > > + memset(&dvb_spi->filter_config, 0, > > + sizeof(dvb_spi->filter_config)); > > + dvb_spi->all_pid_feed_count = 0; > > + return -ENOMEM; > > + } > > + dvb_spi->cxd2880_ts_read_thread = > kthread_run(cxd2880_ts_read, > > + dvb_spi, > > + > "cxd2880_ts_read"); > > + if (IS_ERR(dvb_spi->cxd2880_ts_read_thread)) { > > + pr_err("kthread_run failed/\n"); > > + kfree(dvb_spi->ts_buf); > > + dvb_spi->ts_buf = NULL; > > + memset(&dvb_spi->filter_config, 0, > > + sizeof(dvb_spi->filter_config)); > > + dvb_spi->all_pid_feed_count = 0; > > + return > PTR_ERR(dvb_spi->cxd2880_ts_read_thread); > > + } > > + } > > + > > + dvb_spi->feed_count++; > > + > > + pr_debug("start feed (count %d)\n", dvb_spi->feed_count); > > + return 0; > > +} > > + > > +static int cxd2880_stop_feed(struct dvb_demux_feed *feed) { > > + int i = 0; > > + int ret; > > + struct dvb_demux *demux = NULL; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + > > + if (!feed) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + demux = feed->demux; > > + if (!demux) { > > + pr_err("feed->demux is NULL\n"); > > + return -EINVAL; > > + } > > + dvb_spi = demux->priv; > > + > > + if (!dvb_spi->feed_count) { > > + pr_err("no feed is started\n"); > > + return -EINVAL; > > + } > > + > > + if (feed->pid == 0x2000) { > > + /* > > + * Special PID case. > > + * Number of 0x2000 feed request was stored > > + * in dvb_spi->all_pid_feed_count. > > + */ > > + if (dvb_spi->all_pid_feed_count <= 0) { > > + pr_err("PID %d not found.\n", feed->pid); > > + return -EINVAL; > > + } > > + dvb_spi->all_pid_feed_count--; > > + } else { > > + struct cxd2880_pid_filter_config cfgtmp; > > + > > + cfgtmp = dvb_spi->filter_config; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + if (feed->pid == cfgtmp.pid_config[i].pid && > > + cfgtmp.pid_config[i].is_enable != 0) { > > + cfgtmp.pid_config[i].is_enable = 0; > > + cfgtmp.pid_config[i].pid = 0; > > + pr_debug("removed PID %d from #%d\n", > > + feed->pid, i); > > + break; > > + } > > + } > > + dvb_spi->filter_config = cfgtmp; > > + > > + if (i == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("PID %d not found\n", feed->pid); > > + return -EINVAL; > > + } > > + } > > + > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + &dvb_spi->filter_config, > > + dvb_spi->all_pid_feed_count > > 0); > > + dvb_spi->feed_count--; > > + > > + if (dvb_spi->feed_count == 0) { > > + int ret_stop = 0; > > + > > + ret_stop = > kthread_stop(dvb_spi->cxd2880_ts_read_thread); > > + if (ret_stop) { > > + pr_err("'kthread_stop failed. (%d)\n", > ret_stop); > > + ret = ret_stop; > > + } > > + kfree(dvb_spi->ts_buf); > > + dvb_spi->ts_buf = NULL; > > + } > > + > > + pr_debug("stop feed ok.(count %d)\n", dvb_spi->feed_count); > > + > > + return ret; > > +} > > + > > +static const struct of_device_id cxd2880_spi_of_match[] = { > > + { .compatible = "sony,cxd2880" }, > > + { /* sentinel */ } > > +}; > > + > > +MODULE_DEVICE_TABLE(of, cxd2880_spi_of_match); > > + > > +static int > > +cxd2880_spi_probe(struct spi_device *spi) { > > + int ret; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + struct cxd2880_config config; > > + > > + if (!spi) { > > + pr_err("invalid arg.\n"); > > + return -EINVAL; > > + } > > + > > + dvb_spi = kzalloc(sizeof(struct cxd2880_dvb_spi), GFP_KERNEL); > > + if (!dvb_spi) > > + return -ENOMEM; > > + > > + dvb_spi->spi = spi; > > + mutex_init(&dvb_spi->spi_mutex); > > + dev_set_drvdata(&spi->dev, dvb_spi); > > + config.spi = spi; > > + config.spi_mutex = &dvb_spi->spi_mutex; > > + > > + ret = dvb_register_adapter(&dvb_spi->adapter, > > + "CXD2880", > > + THIS_MODULE, > > + &spi->dev, > > + adapter_nr); > > + if (ret < 0) { > > + pr_err("dvb_register_adapter() failed\n"); > > + goto fail_adapter; > > + } > > + > > + if (!dvb_attach(cxd2880_attach, &dvb_spi->dvb_fe, &config)) { > > + pr_err("cxd2880_attach failed\n"); > > + goto fail_attach; > > + } > > + > > + ret = dvb_register_frontend(&dvb_spi->adapter, > > + &dvb_spi->dvb_fe); > > + if (ret < 0) { > > + pr_err("dvb_register_frontend() failed\n"); > > + goto fail_frontend; > > + } > > + > > + dvb_spi->demux.dmx.capabilities = DMX_TS_FILTERING; > > + dvb_spi->demux.priv = dvb_spi; > > + dvb_spi->demux.filternum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->demux.feednum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->demux.start_feed = cxd2880_start_feed; > > + dvb_spi->demux.stop_feed = cxd2880_stop_feed; > > + > > + ret = dvb_dmx_init(&dvb_spi->demux); > > + if (ret < 0) { > > + pr_err("dvb_dmx_init() failed\n"); > > + goto fail_dmx; > > + } > > + > > + dvb_spi->dmxdev.filternum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->dmxdev.demux = &dvb_spi->demux.dmx; > > + dvb_spi->dmxdev.capabilities = 0; > > + ret = dvb_dmxdev_init(&dvb_spi->dmxdev, > > + &dvb_spi->adapter); > > + if (ret < 0) { > > + pr_err("dvb_dmxdev_init() failed\n"); > > + goto fail_dmxdev; > > + } > > + > > + dvb_spi->dmx_fe.source = DMX_FRONTEND_0; > > + ret = dvb_spi->demux.dmx.add_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + if (ret < 0) { > > + pr_err("add_frontend() failed\n"); > > + goto fail_dmx_fe; > > + } > > + > > + ret = dvb_spi->demux.dmx.connect_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + if (ret < 0) { > > + pr_err("dvb_register_frontend() failed\n"); > > + goto fail_fe_conn; > > + } > > + > > + pr_info("Sony CXD2880 has successfully attached.\n"); > > + > > + return 0; > > + > > +fail_fe_conn: > > + dvb_spi->demux.dmx.remove_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > +fail_dmx_fe: > > + dvb_dmxdev_release(&dvb_spi->dmxdev); > > +fail_dmxdev: > > + dvb_dmx_release(&dvb_spi->demux); > > +fail_dmx: > > + dvb_unregister_frontend(&dvb_spi->dvb_fe); > > +fail_frontend: > > + dvb_frontend_detach(&dvb_spi->dvb_fe); > > +fail_attach: > > + dvb_unregister_adapter(&dvb_spi->adapter); > > +fail_adapter: > > + kfree(dvb_spi); > > + return ret; > > +} > > + > > +static int > > +cxd2880_spi_remove(struct spi_device *spi) { > > + struct cxd2880_dvb_spi *dvb_spi; > > + > > + if (!spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + dvb_spi = dev_get_drvdata(&spi->dev); > > + > > + if (!dvb_spi) { > > + pr_err("failed\n"); > > + return -EINVAL; > > + } > > + dvb_spi->demux.dmx.remove_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + dvb_dmxdev_release(&dvb_spi->dmxdev); > > + dvb_dmx_release(&dvb_spi->demux); > > + dvb_unregister_frontend(&dvb_spi->dvb_fe); > > + dvb_frontend_detach(&dvb_spi->dvb_fe); > > + dvb_unregister_adapter(&dvb_spi->adapter); > > + > > + kfree(dvb_spi); > > + pr_info("cxd2880_spi remove ok.\n"); > > + > > + return 0; > > +} > > + > > +static const struct spi_device_id cxd2880_spi_id[] = { > > + { "cxd2880", 0 }, > > + { /* sentinel */ } > > +}; > > +MODULE_DEVICE_TABLE(spi, cxd2880_spi_id); > > + > > +static struct spi_driver cxd2880_spi_driver = { > > + .driver = { > > + .name = "cxd2880", > > + .of_match_table = cxd2880_spi_of_match, > > + }, > > + .id_table = cxd2880_spi_id, > > + .probe = cxd2880_spi_probe, > > + .remove = cxd2880_spi_remove, > > +}; > > +module_spi_driver(cxd2880_spi_driver); > > + > > +MODULE_DESCRIPTION("Sony CXD2880 DVB-T2/T tuner + demod driver SPI > > +adapter"); MODULE_AUTHOR("Sony Semiconductor Solutions > Corporation"); > > +MODULE_LICENSE("GPL v2"); > > > > Thanks, > Mauro From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: RE: [PATCH v5 02/12] [media] cxd2880-spi: Add support for CXD2880 SPI interface Date: Thu, 8 Mar 2018 00:51:32 +0000 Message-ID: <02699364973B424C83A42A84B04FDA85475303@JPYOKXMS113.jp.sony.com> References: <20180118084016.20689-1-Yasunari.Takiguchi@sony.com> <20180118084610.20967-1-Yasunari.Takiguchi@sony.com> <20180307071529.66e33f54@vento.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: In-Reply-To: <20180307071529.66e33f54@vento.lan> Content-Language: ja-JP Sender: linux-kernel-owner@vger.kernel.org To: mchehab@s-opensource.com Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-media@vger.kernel.org, tbird20d@gmail.com, frowand.list@gmail.com, Masayuki.Yamamoto@sony.com, Hideki.Nozawa@sony.com, Kota.Yonezawa@sony.com, Toshihiko.Matsumoto@sony.com, Satoshi.C.Watanabe@sony.com, Yasunari.Takiguchi@sony.com List-Id: devicetree@vger.kernel.org Dear Mauro I am very glad to hear your message. Being busy, thank you for taking care of fixing patches as well also. And we will improve about your below comments continuously. Regards & Thanks Takiguchi > -----Original Message----- > From: Mauro Carvalho Chehab [mailto:mchehab@s-opensource.com] > Sent: Wednesday, March 7, 2018 7:15 PM > To: Takiguchi, Yasunari (SSS) > Cc: linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; > linux-media@vger.kernel.org; tbird20d@gmail.com; > frowand.list@gmail.com; Yamamoto, Masayuki (SSS); Nozawa, Hideki (STWN); > Yonezawa, Kota (SSS); Matsumoto, Toshihiko (SSS); Watanabe, Satoshi (SSS) > Subject: Re: [PATCH v5 02/12] [media] cxd2880-spi: Add support for CXD2880 > SPI interface > > Em Thu, 18 Jan 2018 17:46:10 +0900 > escreveu: > > > From: Yasunari Takiguchi > > > > This is the SPI adapter part of the driver for the Sony CXD2880 > > DVB-T2/T tuner + demodulator. > > Thanks for the patches! > > The patch series look ok. Just a few nitpicks that could be solved later. > > I had to apply a few patches to make it build and remove some warnings > with W=1. Patches sent. > > With that, I'm applying this series. > > Regards, > Mauro > > > > > Signed-off-by: Yasunari Takiguchi > > Signed-off-by: Masayuki Yamamoto > > Signed-off-by: Hideki Nozawa > > Signed-off-by: Kota Yonezawa > > Signed-off-by: Toshihiko Matsumoto > > Signed-off-by: Satoshi Watanabe > > --- > > > > [Change list] > > Changes in V5 > > Using SPDX-License-Identifier > > drivers/media/spi/cxd2880-spi.c > > -modified typo about "ivnalid" -> "invalid" > > -modified typo about "drvier" -> "driver" > > -removed unnecessary if() > > -modified return error code > > -reduction of valiable names > > -removed unnecessary parentheses > > -changed members of struct cxd2880_ts_buf_info > > > > Changes in V4 > > drivers/media/spi/cxd2880-spi.c > > -removed Camel case > > -removed unnecessary initialization at variable declaration > > -removed unnecessary brace {} > > > > Changes in V3 > > drivers/media/spi/cxd2880-spi.c > > -adjusted of indent spaces > > -removed unnecessary cast > > -changed debugging code > > -changed timeout method > > -modified coding style of if() > > -changed hexadecimal code to lower case. > > > > Changes in V2 > > drivers/media/spi/cxd2880-spi.c > > -Modified PID filter setting. > > > > drivers/media/spi/cxd2880-spi.c | 670 > > ++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 670 insertions(+) > > create mode 100644 drivers/media/spi/cxd2880-spi.c > > > > diff --git a/drivers/media/spi/cxd2880-spi.c > > b/drivers/media/spi/cxd2880-spi.c new file mode 100644 index > > 000000000000..857e4c0d7a92 > > --- /dev/null > > +++ b/drivers/media/spi/cxd2880-spi.c > > @@ -0,0 +1,670 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * cxd2880-spi.c > > + * Sony CXD2880 DVB-T2/T tuner + demodulator driver > > + * SPI adapter > > + * > > + * Copyright (C) 2016, 2017, 2018 Sony Semiconductor Solutions > > +Corporation */ > > + > > +#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ > > + > > +#include > > +#include > > + > > +#include "dvb_demux.h" > > +#include "dmxdev.h" > > +#include "dvb_frontend.h" > > +#include "cxd2880.h" > > + > > +#define CXD2880_MAX_FILTER_SIZE 32 > > +#define BURST_WRITE_MAX 128 > > +#define MAX_TRANS_PKT 300 > > + > > +struct cxd2880_ts_buf_info { > > + u8 read_ready:1; > > + u8 almost_full:1; > > + u8 almost_empty:1; > > + u8 overflow:1; > > + u8 underflow:1; > > + u16 pkt_num; > > +}; > > + > > +struct cxd2880_pid_config { > > + u8 is_enable; > > + u16 pid; > > +}; > > + > > +struct cxd2880_pid_filter_config { > > + u8 is_negative; > > + struct cxd2880_pid_config pid_config[CXD2880_MAX_FILTER_SIZE]; > > +}; > > + > > +struct cxd2880_dvb_spi { > > + struct dvb_frontend dvb_fe; > > + struct dvb_adapter adapter; > > + struct dvb_demux demux; > > + struct dmxdev dmxdev; > > + struct dmx_frontend dmx_fe; > > + struct task_struct *cxd2880_ts_read_thread; > > + struct spi_device *spi; > > + struct mutex spi_mutex; /* For SPI access exclusive control */ > > + int feed_count; > > + int all_pid_feed_count; > > + u8 *ts_buf; > > + struct cxd2880_pid_filter_config filter_config; }; > > + > > +DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); > > + > > +static int cxd2880_write_spi(struct spi_device *spi, u8 *data, u32 > > +size) { > > + struct spi_message msg; > > + struct spi_transfer tx; > > + > > + if (!spi || !data) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + memset(&tx, 0, sizeof(tx)); > > Nitpick: > > instead, you could just declare tx as: > > struct spi_transfer tx = {}; > > and get rid of memset (same applies to similar code blocks). > > > > + tx.tx_buf = data; > > + tx.len = size; > > + > > + spi_message_init(&msg); > > + spi_message_add_tail(&tx, &msg); > > + > > + return spi_sync(spi, &msg); > > +} > > + > > +static int cxd2880_write_reg(struct spi_device *spi, > > + u8 sub_address, const u8 *data, u32 size) > { > > + u8 send_data[BURST_WRITE_MAX + 4]; > > + const u8 *write_data_top = NULL; > > + int ret = 0; > > + > > + if (!spi || !data) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + if (size > BURST_WRITE_MAX) { > > + pr_err("data size > WRITE_MAX\n"); > > + return -EINVAL; > > + } > > + > > + if (sub_address + size > 0x100) { > > + pr_err("out of range\n"); > > + return -EINVAL; > > + } > > It is better to use dev_err(spi->dev, ...) instead of pr_err(). > > > > + > > + send_data[0] = 0x0e; > > + write_data_top = data; > > + > > + while (size > 0) { > > + send_data[1] = sub_address; > > + if (size > 255) > > + send_data[2] = 255; > > + else > > + send_data[2] = (u8)size; > > + > > + memcpy(&send_data[3], write_data_top, send_data[2]); > > + > > + ret = cxd2880_write_spi(spi, send_data, send_data[2] + > 3); > > + if (ret) { > > + pr_err("write spi failed %d\n", ret); > > + break; > > + } > > + sub_address += send_data[2]; > > + write_data_top += send_data[2]; > > + size -= send_data[2]; > > + } > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_read_ts(struct spi_device *spi, > > + u8 *read_data, > > + u32 packet_num) > > +{ > > + int ret; > > + u8 data[3]; > > + struct spi_message message; > > + struct spi_transfer transfer[2]; > > + > > + if (!spi || !read_data || !packet_num) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + if (packet_num > 0xffff) { > > + pr_err("packet num > 0xffff\n"); > > + return -EINVAL; > > + } > > + > > + data[0] = 0x10; > > + data[1] = packet_num >> 8; > > + data[2] = packet_num; > > + > > + spi_message_init(&message); > > + memset(transfer, 0, sizeof(transfer)); > > + > > + transfer[0].len = 3; > > + transfer[0].tx_buf = data; > > + spi_message_add_tail(&transfer[0], &message); > > + transfer[1].len = packet_num * 188; > > + transfer[1].rx_buf = read_data; > > + spi_message_add_tail(&transfer[1], &message); > > + > > + ret = spi_sync(spi, &message); > > + if (ret) > > + pr_err("spi_write_then_read failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_read_ts_buffer_info(struct spi_device *spi, > > + struct cxd2880_ts_buf_info > *info) { > > + u8 send_data = 0x20; > > + u8 recv_data[2]; > > + int ret; > > + > > + if (!spi || !info) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + ret = spi_write_then_read(spi, &send_data, 1, > > + recv_data, sizeof(recv_data)); > > + if (ret) > > + pr_err("spi_write_then_read failed\n"); > > + > > + info->read_ready = (recv_data[0] & 0x80) ? 1 : 0; > > + info->almost_full = (recv_data[0] & 0x40) ? 1 : 0; > > + info->almost_empty = (recv_data[0] & 0x20) ? 1 : 0; > > + info->overflow = (recv_data[0] & 0x10) ? 1 : 0; > > + info->underflow = (recv_data[0] & 0x08) ? 1 : 0; > > + info->pkt_num = ((recv_data[0] & 0x07) << 8) | recv_data[1]; > > + > > + return ret; > > +} > > + > > +static int cxd2880_spi_clear_ts_buffer(struct spi_device *spi) { > > + u8 data = 0x03; > > + int ret; > > + > > + ret = cxd2880_write_spi(spi, &data, 1); > > + > > + if (ret) > > + pr_err("write spi failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_set_pid_filter(struct spi_device *spi, > > + struct cxd2880_pid_filter_config > *cfg) { > > + u8 data[65]; > > + int i; > > + u16 pid = 0; > > + int ret; > > + > > + if (!spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + data[0] = 0x00; > > + ret = cxd2880_write_reg(spi, 0x00, &data[0], 1); > > + if (ret) > > + return ret; > > + if (!cfg) { > > + data[0] = 0x02; > > + ret = cxd2880_write_reg(spi, 0x50, &data[0], 1); > > + } else { > > + data[0] = cfg->is_negative ? 0x01 : 0x00; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + pid = cfg->pid_config[i].pid; > > + if (cfg->pid_config[i].is_enable) { > > + data[1 + (i * 2)] = (pid >> 8) | 0x20; > > + data[2 + (i * 2)] = pid & 0xff; > > + } else { > > + data[1 + (i * 2)] = 0x00; > > + data[2 + (i * 2)] = 0x00; > > + } > > + } > > + ret = cxd2880_write_reg(spi, 0x50, data, 65); > > + } > > + > > + return ret; > > +} > > + > > +static int cxd2880_update_pid_filter(struct cxd2880_dvb_spi > *dvb_spi, > > + struct cxd2880_pid_filter_config > *cfg, > > + bool is_all_pid_filter) > > +{ > > + int ret; > > + > > + if (!dvb_spi || !cfg) { > > + pr_err("invalid arg.\n"); > > + return -EINVAL; > > + } > > + > > + mutex_lock(&dvb_spi->spi_mutex); > > + if (is_all_pid_filter) { > > + struct cxd2880_pid_filter_config tmpcfg; > > + > > + memset(&tmpcfg, 0, sizeof(tmpcfg)); > > + tmpcfg.is_negative = 1; > > + tmpcfg.pid_config[0].is_enable = 1; > > + tmpcfg.pid_config[0].pid = 0x1fff; > > + > > + ret = cxd2880_set_pid_filter(dvb_spi->spi, &tmpcfg); > > + } else { > > + ret = cxd2880_set_pid_filter(dvb_spi->spi, cfg); > > + } > > + mutex_unlock(&dvb_spi->spi_mutex); > > + > > + if (ret) > > + pr_err("set_pid_filter failed\n"); > > + > > + return ret; > > +} > > + > > +static int cxd2880_ts_read(void *arg) { > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + struct cxd2880_ts_buf_info info; > > + ktime_t start; > > + u32 i; > > + int ret; > > + > > + dvb_spi = arg; > > + if (!dvb_spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + ret = cxd2880_spi_clear_ts_buffer(dvb_spi->spi); > > + if (ret) { > > + pr_err("set_clear_ts_buffer failed\n"); > > + return ret; > > + } > > + > > + start = ktime_get(); > > + while (!kthread_should_stop()) { > > + ret = cxd2880_spi_read_ts_buffer_info(dvb_spi->spi, > > + &info); > > + if (ret) { > > + pr_err("spi_read_ts_buffer_info error\n"); > > + return ret; > > + } > > + > > + if (info.pkt_num > MAX_TRANS_PKT) { > > + for (i = 0; i < info.pkt_num / MAX_TRANS_PKT; i++) > { > > + cxd2880_spi_read_ts(dvb_spi->spi, > > + dvb_spi->ts_buf, > > + MAX_TRANS_PKT); > > + dvb_dmx_swfilter(&dvb_spi->demux, > > + dvb_spi->ts_buf, > > + MAX_TRANS_PKT * 188); > > + } > > + start = ktime_get(); > > + } else if ((info.pkt_num > 0) && > > + (ktime_to_ms(ktime_sub(ktime_get(), start)) > >= 500)) { > > + cxd2880_spi_read_ts(dvb_spi->spi, > > + dvb_spi->ts_buf, > > + info.pkt_num); > > + dvb_dmx_swfilter(&dvb_spi->demux, > > + dvb_spi->ts_buf, > > + info.pkt_num * 188); > > + start = ktime_get(); > > + } else { > > + usleep_range(10000, 11000); > > + } > > + } > > + > > + return 0; > > +} > > + > > +static int cxd2880_start_feed(struct dvb_demux_feed *feed) { > > + int ret = 0; > > + int i = 0; > > + struct dvb_demux *demux = NULL; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + > > + if (!feed) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + demux = feed->demux; > > + if (!demux) { > > + pr_err("feed->demux is NULL\n"); > > + return -EINVAL; > > + } > > + dvb_spi = demux->priv; > > + > > + if (dvb_spi->feed_count == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("Exceeded maximum PID count (32)."); > > + pr_err("Selected PID cannot be enabled.\n"); > > + return -EINVAL; > > + } > > + > > + if (feed->pid == 0x2000) { > > + if (dvb_spi->all_pid_feed_count == 0) { > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + > &dvb_spi->filter_config, > > + true); > > + if (ret) { > > + pr_err("update pid filter failed\n"); > > + return ret; > > + } > > + } > > + dvb_spi->all_pid_feed_count++; > > + > > + pr_debug("all PID feed (count = %d)\n", > > + dvb_spi->all_pid_feed_count); > > + } else { > > + struct cxd2880_pid_filter_config cfgtmp; > > + > > + cfgtmp = dvb_spi->filter_config; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + if (cfgtmp.pid_config[i].is_enable == 0) { > > + cfgtmp.pid_config[i].is_enable = 1; > > + cfgtmp.pid_config[i].pid = feed->pid; > > + pr_debug("store PID %d to #%d\n", > > + feed->pid, i); > > + break; > > + } > > + } > > + if (i == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("PID filter is full. Assumed bug.\n"); > > "Assumed bug"? What do you mean? > > If the hardware filters are full, it is likely an userspace problem, not > a Kernel bug. > > > + return -EINVAL; > > + } > > + if (!dvb_spi->all_pid_feed_count) > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + &cfgtmp, > > + false); > > + if (ret) > > + return ret; > > + > > + dvb_spi->filter_config = cfgtmp; > > + } > > + > > + if (dvb_spi->feed_count == 0) { > > + dvb_spi->ts_buf = > > + kmalloc(MAX_TRANS_PKT * 188, > > + GFP_KERNEL | GFP_DMA); > > > + if (!dvb_spi->ts_buf) { > > + pr_err("ts buffer allocate failed\n"); > > + memset(&dvb_spi->filter_config, 0, > > + sizeof(dvb_spi->filter_config)); > > + dvb_spi->all_pid_feed_count = 0; > > + return -ENOMEM; > > + } > > + dvb_spi->cxd2880_ts_read_thread = > kthread_run(cxd2880_ts_read, > > + dvb_spi, > > + > "cxd2880_ts_read"); > > + if (IS_ERR(dvb_spi->cxd2880_ts_read_thread)) { > > + pr_err("kthread_run failed/\n"); > > + kfree(dvb_spi->ts_buf); > > + dvb_spi->ts_buf = NULL; > > + memset(&dvb_spi->filter_config, 0, > > + sizeof(dvb_spi->filter_config)); > > + dvb_spi->all_pid_feed_count = 0; > > + return > PTR_ERR(dvb_spi->cxd2880_ts_read_thread); > > + } > > + } > > + > > + dvb_spi->feed_count++; > > + > > + pr_debug("start feed (count %d)\n", dvb_spi->feed_count); > > + return 0; > > +} > > + > > +static int cxd2880_stop_feed(struct dvb_demux_feed *feed) { > > + int i = 0; > > + int ret; > > + struct dvb_demux *demux = NULL; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + > > + if (!feed) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + demux = feed->demux; > > + if (!demux) { > > + pr_err("feed->demux is NULL\n"); > > + return -EINVAL; > > + } > > + dvb_spi = demux->priv; > > + > > + if (!dvb_spi->feed_count) { > > + pr_err("no feed is started\n"); > > + return -EINVAL; > > + } > > + > > + if (feed->pid == 0x2000) { > > + /* > > + * Special PID case. > > + * Number of 0x2000 feed request was stored > > + * in dvb_spi->all_pid_feed_count. > > + */ > > + if (dvb_spi->all_pid_feed_count <= 0) { > > + pr_err("PID %d not found.\n", feed->pid); > > + return -EINVAL; > > + } > > + dvb_spi->all_pid_feed_count--; > > + } else { > > + struct cxd2880_pid_filter_config cfgtmp; > > + > > + cfgtmp = dvb_spi->filter_config; > > + > > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) { > > + if (feed->pid == cfgtmp.pid_config[i].pid && > > + cfgtmp.pid_config[i].is_enable != 0) { > > + cfgtmp.pid_config[i].is_enable = 0; > > + cfgtmp.pid_config[i].pid = 0; > > + pr_debug("removed PID %d from #%d\n", > > + feed->pid, i); > > + break; > > + } > > + } > > + dvb_spi->filter_config = cfgtmp; > > + > > + if (i == CXD2880_MAX_FILTER_SIZE) { > > + pr_err("PID %d not found\n", feed->pid); > > + return -EINVAL; > > + } > > + } > > + > > + ret = cxd2880_update_pid_filter(dvb_spi, > > + &dvb_spi->filter_config, > > + dvb_spi->all_pid_feed_count > > 0); > > + dvb_spi->feed_count--; > > + > > + if (dvb_spi->feed_count == 0) { > > + int ret_stop = 0; > > + > > + ret_stop = > kthread_stop(dvb_spi->cxd2880_ts_read_thread); > > + if (ret_stop) { > > + pr_err("'kthread_stop failed. (%d)\n", > ret_stop); > > + ret = ret_stop; > > + } > > + kfree(dvb_spi->ts_buf); > > + dvb_spi->ts_buf = NULL; > > + } > > + > > + pr_debug("stop feed ok.(count %d)\n", dvb_spi->feed_count); > > + > > + return ret; > > +} > > + > > +static const struct of_device_id cxd2880_spi_of_match[] = { > > + { .compatible = "sony,cxd2880" }, > > + { /* sentinel */ } > > +}; > > + > > +MODULE_DEVICE_TABLE(of, cxd2880_spi_of_match); > > + > > +static int > > +cxd2880_spi_probe(struct spi_device *spi) { > > + int ret; > > + struct cxd2880_dvb_spi *dvb_spi = NULL; > > + struct cxd2880_config config; > > + > > + if (!spi) { > > + pr_err("invalid arg.\n"); > > + return -EINVAL; > > + } > > + > > + dvb_spi = kzalloc(sizeof(struct cxd2880_dvb_spi), GFP_KERNEL); > > + if (!dvb_spi) > > + return -ENOMEM; > > + > > + dvb_spi->spi = spi; > > + mutex_init(&dvb_spi->spi_mutex); > > + dev_set_drvdata(&spi->dev, dvb_spi); > > + config.spi = spi; > > + config.spi_mutex = &dvb_spi->spi_mutex; > > + > > + ret = dvb_register_adapter(&dvb_spi->adapter, > > + "CXD2880", > > + THIS_MODULE, > > + &spi->dev, > > + adapter_nr); > > + if (ret < 0) { > > + pr_err("dvb_register_adapter() failed\n"); > > + goto fail_adapter; > > + } > > + > > + if (!dvb_attach(cxd2880_attach, &dvb_spi->dvb_fe, &config)) { > > + pr_err("cxd2880_attach failed\n"); > > + goto fail_attach; > > + } > > + > > + ret = dvb_register_frontend(&dvb_spi->adapter, > > + &dvb_spi->dvb_fe); > > + if (ret < 0) { > > + pr_err("dvb_register_frontend() failed\n"); > > + goto fail_frontend; > > + } > > + > > + dvb_spi->demux.dmx.capabilities = DMX_TS_FILTERING; > > + dvb_spi->demux.priv = dvb_spi; > > + dvb_spi->demux.filternum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->demux.feednum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->demux.start_feed = cxd2880_start_feed; > > + dvb_spi->demux.stop_feed = cxd2880_stop_feed; > > + > > + ret = dvb_dmx_init(&dvb_spi->demux); > > + if (ret < 0) { > > + pr_err("dvb_dmx_init() failed\n"); > > + goto fail_dmx; > > + } > > + > > + dvb_spi->dmxdev.filternum = CXD2880_MAX_FILTER_SIZE; > > + dvb_spi->dmxdev.demux = &dvb_spi->demux.dmx; > > + dvb_spi->dmxdev.capabilities = 0; > > + ret = dvb_dmxdev_init(&dvb_spi->dmxdev, > > + &dvb_spi->adapter); > > + if (ret < 0) { > > + pr_err("dvb_dmxdev_init() failed\n"); > > + goto fail_dmxdev; > > + } > > + > > + dvb_spi->dmx_fe.source = DMX_FRONTEND_0; > > + ret = dvb_spi->demux.dmx.add_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + if (ret < 0) { > > + pr_err("add_frontend() failed\n"); > > + goto fail_dmx_fe; > > + } > > + > > + ret = dvb_spi->demux.dmx.connect_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + if (ret < 0) { > > + pr_err("dvb_register_frontend() failed\n"); > > + goto fail_fe_conn; > > + } > > + > > + pr_info("Sony CXD2880 has successfully attached.\n"); > > + > > + return 0; > > + > > +fail_fe_conn: > > + dvb_spi->demux.dmx.remove_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > +fail_dmx_fe: > > + dvb_dmxdev_release(&dvb_spi->dmxdev); > > +fail_dmxdev: > > + dvb_dmx_release(&dvb_spi->demux); > > +fail_dmx: > > + dvb_unregister_frontend(&dvb_spi->dvb_fe); > > +fail_frontend: > > + dvb_frontend_detach(&dvb_spi->dvb_fe); > > +fail_attach: > > + dvb_unregister_adapter(&dvb_spi->adapter); > > +fail_adapter: > > + kfree(dvb_spi); > > + return ret; > > +} > > + > > +static int > > +cxd2880_spi_remove(struct spi_device *spi) { > > + struct cxd2880_dvb_spi *dvb_spi; > > + > > + if (!spi) { > > + pr_err("invalid arg\n"); > > + return -EINVAL; > > + } > > + > > + dvb_spi = dev_get_drvdata(&spi->dev); > > + > > + if (!dvb_spi) { > > + pr_err("failed\n"); > > + return -EINVAL; > > + } > > + dvb_spi->demux.dmx.remove_frontend(&dvb_spi->demux.dmx, > > + &dvb_spi->dmx_fe); > > + dvb_dmxdev_release(&dvb_spi->dmxdev); > > + dvb_dmx_release(&dvb_spi->demux); > > + dvb_unregister_frontend(&dvb_spi->dvb_fe); > > + dvb_frontend_detach(&dvb_spi->dvb_fe); > > + dvb_unregister_adapter(&dvb_spi->adapter); > > + > > + kfree(dvb_spi); > > + pr_info("cxd2880_spi remove ok.\n"); > > + > > + return 0; > > +} > > + > > +static const struct spi_device_id cxd2880_spi_id[] = { > > + { "cxd2880", 0 }, > > + { /* sentinel */ } > > +}; > > +MODULE_DEVICE_TABLE(spi, cxd2880_spi_id); > > + > > +static struct spi_driver cxd2880_spi_driver = { > > + .driver = { > > + .name = "cxd2880", > > + .of_match_table = cxd2880_spi_of_match, > > + }, > > + .id_table = cxd2880_spi_id, > > + .probe = cxd2880_spi_probe, > > + .remove = cxd2880_spi_remove, > > +}; > > +module_spi_driver(cxd2880_spi_driver); > > + > > +MODULE_DESCRIPTION("Sony CXD2880 DVB-T2/T tuner + demod driver SPI > > +adapter"); MODULE_AUTHOR("Sony Semiconductor Solutions > Corporation"); > > +MODULE_LICENSE("GPL v2"); > > > > Thanks, > Mauro