From patchwork Wed Jul 24 13:06:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Alves X-Patchwork-Id: 2832686 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 07B159F4D4 for ; Wed, 24 Jul 2013 13:05:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B309920137 for ; Wed, 24 Jul 2013 13:05:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5A0A20125 for ; Wed, 24 Jul 2013 13:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751085Ab3GXNFv (ORCPT ); Wed, 24 Jul 2013 09:05:51 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:58510 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751005Ab3GXNFu (ORCPT ); Wed, 24 Jul 2013 09:05:50 -0400 Received: by mail-wi0-f178.google.com with SMTP id hi5so411016wib.11 for ; Wed, 24 Jul 2013 06:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=jlki2T3MSLyBMSwSxOIpZ35tPzoR/IzvkrNxt39PNc0=; b=Nf23jo5Dbal2Hfwwm4g5CIYx0UQ6HcPdkp+QqHIMnz0xc4EsRP+sGXsKspDOSVHjE8 CYljn8PFx3DZcsHiTkMVU/HsxuXwUUPW2pzvcwDpvEeUSeEftnBHCibIFQejS1D/ZAXA QGrfF32MP8YvPbDU/InzTo9rmGe/cm0lLxN1YHtJlNLy/2ODpEYmxkzpzpeMUBYoC2r1 sbkVUUk+RqOKSGe0yV2RoF9w/F5vqG7cjBfDKyZoetRlUWIzY5dadwWaV8YKBx8396l/ 3y0S5qmhqXKiiY38oOklHPyq+5lcAIzCetaAserJDoRLwe/tNLKMtsnI2p/6oyS9RT+V g5ig== X-Received: by 10.194.58.11 with SMTP id m11mr27103378wjq.45.1374671149324; Wed, 24 Jul 2013 06:05:49 -0700 (PDT) Received: from xsys-lnx.lan (a89-152-208-145.cpe.netcabo.pt. [89.152.208.145]) by mx.google.com with ESMTPSA id eu1sm5183770wib.8.2013.07.24.06.05.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Jul 2013 06:05:48 -0700 (PDT) From: Luis Alves To: linux-media@vger.kernel.org Cc: mchehab@infradead.org, crope@iki.fi, awalls@md.metrocast.net, Luis Alves Subject: [PATCH] cx23885[v4]: Fix interrupt storm when enabling IR receiver. Date: Wed, 24 Jul 2013 14:06:01 +0100 Message-Id: <1374671161-3144-1-git-send-email-ljalvs@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, Removed wrong description in the header file. Sorry about that... New patch for this issue. Changes: - Added flatiron readreg and writereg functions prototypes (new header file). - Modified the av work handler to preserve all other register bits when dealing with the interrupt flag. Regards, Luis Signed-off-by: Luis Alves Acked-by: Andy Walls --- drivers/media/pci/cx23885/cx23885-av.c | 13 +++++++++++++ drivers/media/pci/cx23885/cx23885-video.c | 4 ++-- drivers/media/pci/cx23885/cx23885-video.h | 26 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 drivers/media/pci/cx23885/cx23885-video.h diff --git a/drivers/media/pci/cx23885/cx23885-av.c b/drivers/media/pci/cx23885/cx23885-av.c index e958a01..c443b7a 100644 --- a/drivers/media/pci/cx23885/cx23885-av.c +++ b/drivers/media/pci/cx23885/cx23885-av.c @@ -23,6 +23,7 @@ #include "cx23885.h" #include "cx23885-av.h" +#include "cx23885-video.h" void cx23885_av_work_handler(struct work_struct *work) { @@ -32,5 +33,17 @@ void cx23885_av_work_handler(struct work_struct *work) v4l2_subdev_call(dev->sd_cx25840, core, interrupt_service_routine, PCI_MSK_AV_CORE, &handled); + + /* Getting here with the interrupt not handled + then probbaly flatiron does have pending interrupts. + */ + if (!handled) { + /* clear left and right adc channel interrupt request flag */ + cx23885_flatiron_write(dev, 0x1f, + cx23885_flatiron_read(dev, 0x1f) | 0x80); + cx23885_flatiron_write(dev, 0x23, + cx23885_flatiron_read(dev, 0x23) | 0x80); + } + cx23885_irq_enable(dev, PCI_MSK_AV_CORE); } diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index e33d1a7..f4e7cef 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c @@ -417,7 +417,7 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh, mutex_unlock(&dev->lock); } -static int cx23885_flatiron_write(struct cx23885_dev *dev, u8 reg, u8 data) +int cx23885_flatiron_write(struct cx23885_dev *dev, u8 reg, u8 data) { /* 8 bit registers, 8 bit values */ u8 buf[] = { reg, data }; @@ -428,7 +428,7 @@ static int cx23885_flatiron_write(struct cx23885_dev *dev, u8 reg, u8 data) return i2c_transfer(&dev->i2c_bus[2].i2c_adap, &msg, 1); } -static u8 cx23885_flatiron_read(struct cx23885_dev *dev, u8 reg) +u8 cx23885_flatiron_read(struct cx23885_dev *dev, u8 reg) { /* 8 bit registers, 8 bit values */ int ret; diff --git a/drivers/media/pci/cx23885/cx23885-video.h b/drivers/media/pci/cx23885/cx23885-video.h new file mode 100644 index 0000000..c961a2b --- /dev/null +++ b/drivers/media/pci/cx23885/cx23885-video.h @@ -0,0 +1,26 @@ +/* + * Driver for the Conexant CX23885/7/8 PCIe bridge + * + * Copyright (C) 2010 Andy Walls + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#ifndef _CX23885_VIDEO_H_ +#define _CX23885_VIDEO_H_ +int cx23885_flatiron_write(struct cx23885_dev *dev, u8 reg, u8 data); +u8 cx23885_flatiron_read(struct cx23885_dev *dev, u8 reg); +#endif