From patchwork Sat Aug 19 11:38:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 9910453 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6219360386 for ; Sat, 19 Aug 2017 11:38:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A7BD28B76 for ; Sat, 19 Aug 2017 11:38:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F4D928BBD; Sat, 19 Aug 2017 11:38:48 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 5B36328B76 for ; Sat, 19 Aug 2017 11:38:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751447AbdHSLim (ORCPT ); Sat, 19 Aug 2017 07:38:42 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37305 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751329AbdHSLil (ORCPT ); Sat, 19 Aug 2017 07:38:41 -0400 Received: by mail-wm0-f67.google.com with SMTP id t138so6825255wmt.4 for ; Sat, 19 Aug 2017 04:38:41 -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=zhKpyHsBEwp7cymxqkJIyMFGMiQkBQl7TAOqTG/Ubqw=; b=Amu+4ewyqkihIvmIsrqenfgPvd5G3K0dJsTHCaQSw9T56uGbP+6UePdfv8de+FBFRv DBbrOMk1PAbrkkrhfovFn44/h/WZUZJqrKwEJ79lr8Qb1AqQGc0P5IGVvL8vbSVQuMkY PcoxZcOeGZGzVlcUzVVcb4+CqCi5/dvBIa2NWikWfDTEsNx7XXk7pEdvkQ3vtyzuK/YT cm0gkUAVWRe2eX55o8MdShOb/sFpM0H9a+RxA/qdR6K3swLNkQMOhEsdteVBMp4nreq+ 3E88V6Ftrr9ZzTeyEIw2qEq63QrtWKLc1/MGVIDn+ha0Ao4FjcDWb+kwF8Pipbiig8zk Z6ag== 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=zhKpyHsBEwp7cymxqkJIyMFGMiQkBQl7TAOqTG/Ubqw=; b=ZMX+xaApHNo74TpDA1MxCq7YaeaN5CwGn5u9YZbd1cdE6uni0ZoImcBuzvZLQG+vW5 UUDN5wGJS/uMxBM337tv3+FWM7rw+gZFubusMxD/pGzwOEhjMNbgUF1sOGIaMh23BCr5 PggWeiWHro3HqD9ndBEcrgtfAngT5H3+FuSt02Y2j6c+qo08A59pA7ddu2+4DyxtbP+E bcvfQRbk8L+DWDuLxIdcFsh9UF4sMWiE9vXPleJm6cnc5OtQ91SlakSwbcSdtuVE3nP6 DyVeK3GjBIZAWprei0gJJt/OD4dO7EdWfW75W4aqMtY2buUxEUICZ+aKmKSU0v15N2EP Emhw== X-Gm-Message-State: AHYfb5jDYMf+xPp33aHNWkrseexrrmCAdY74RZGBOCbZxGGX1uPVoVh/ pApWURIReXdx6J4r X-Received: by 10.28.5.193 with SMTP id 184mr3357987wmf.108.1503142719543; Sat, 19 Aug 2017 04:38:39 -0700 (PDT) Received: from jemma-pc.denson.org.uk ([2001:470:6ad2:1:beae:c5ff:fe8c:e4a7]) by smtp.gmail.com with ESMTPSA id 36sm7243434wrh.77.2017.08.19.04.38.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Aug 2017 04:38:38 -0700 (PDT) From: Jemma Denson To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Patrick Boettcher , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH v4] media: isl6421: add checks for current overflow Date: Sat, 19 Aug 2017 12:38:26 +0100 Message-Id: <20170819113826.3503-1-jdenson@gmail.com> X-Mailer: git-send-email 2.13.4 In-Reply-To: <20170817193645.6159-1-jdenson@gmail.com> References: <20170817193645.6159-1-jdenson@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 This Kaffeine's BZ: https://bugs.kde.org/show_bug.cgi?id=374693 affects SkyStar S2 PCI DVB-S/S2 rev 3.3 device. It could be due to a Kernel bug. While checking the Isil 6421, comparing with its manual, available at: http://www.intersil.com/content/dam/Intersil/documents/isl6/isl6421a.pdf It was noticed that, if the output load is highly capacitive, a different approach is recomended when energizing the LNBf. Also, it is possible to detect if a current overload is happening, by checking an special flag. Add support for it. Tested on Skystar S2. Changes respect override_or option so should still work fine on cx88 based cards which disable dynamic current limit. Changes since v1: v2 - fixed incorrect checking of i2c return values v3 - fix if logic to check if dcl needs re-enabling - respect override_or values which aim to disable dcl - only do long sleep on overload if dcl enabled - add short sleep before re-enabling dcl - only check overload and potentially return EINVAL if device is on v4 - revert v3 sleep logic changes to remove tuning delays Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jemma Denson --- drivers/media/dvb-frontends/isl6421.c | 76 +++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/drivers/media/dvb-frontends/isl6421.c b/drivers/media/dvb-frontends/isl6421.c index 838b42771a05..3f3487887672 100644 --- a/drivers/media/dvb-frontends/isl6421.c +++ b/drivers/media/dvb-frontends/isl6421.c @@ -38,35 +38,101 @@ struct isl6421 { u8 override_and; struct i2c_adapter *i2c; u8 i2c_addr; + bool is_off; }; static int isl6421_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) { + int ret; + u8 buf; + bool is_off; struct isl6421 *isl6421 = (struct isl6421 *) fe->sec_priv; - struct i2c_msg msg = { .addr = isl6421->i2c_addr, .flags = 0, - .buf = &isl6421->config, - .len = sizeof(isl6421->config) }; + struct i2c_msg msg[2] = { + { + .addr = isl6421->i2c_addr, + .flags = 0, + .buf = &isl6421->config, + .len = 1, + }, { + .addr = isl6421->i2c_addr, + .flags = I2C_M_RD, + .buf = &buf, + .len = 1, + } + + }; isl6421->config &= ~(ISL6421_VSEL1 | ISL6421_EN1); switch(voltage) { case SEC_VOLTAGE_OFF: + is_off = true; break; case SEC_VOLTAGE_13: + is_off = false; isl6421->config |= ISL6421_EN1; break; case SEC_VOLTAGE_18: + is_off = false; isl6421->config |= (ISL6421_EN1 | ISL6421_VSEL1); break; default: return -EINVAL; } + /* + * If LNBf were not powered on, disable dynamic current limit, as, + * according with datasheet, highly capacitive load on the output may + * cause a difficult start-up. + */ + if (isl6421->is_off && !is_off) + isl6421->config |= ISL6421_DCL; + isl6421->config |= isl6421->override_or; isl6421->config &= isl6421->override_and; - return (i2c_transfer(isl6421->i2c, &msg, 1) == 1) ? 0 : -EIO; + ret = i2c_transfer(isl6421->i2c, msg, 2); + if (ret < 0) + return ret; + if (ret != 2) + return -EIO; + + /* Store off status now incase future commands fail */ + isl6421->is_off = is_off; + + /* On overflow, the device will try again after 900 ms (typically) */ + if (!is_off && (buf & ISL6421_OLF1)) + msleep(1000); + + /* Re-enable dynamic current limit */ + if ((isl6421->config & ISL6421_DCL) && + !(isl6421->override_or & ISL6421_DCL)) { + isl6421->config &= ~ISL6421_DCL; + + ret = i2c_transfer(isl6421->i2c, msg, 2); + if (ret < 0) + return ret; + if (ret != 2) + return -EIO; + } + + /* Check if overload flag is active. If so, disable power */ + if (!is_off && (buf & ISL6421_OLF1)) { + isl6421->config &= ~(ISL6421_VSEL1 | ISL6421_EN1); + ret = i2c_transfer(isl6421->i2c, msg, 1); + if (ret < 0) + return ret; + if (ret != 1) + return -EIO; + isl6421->is_off = true; + + dev_warn(&isl6421->i2c->dev, + "Overload current detected. disabling LNBf power\n"); + return -EINVAL; + } + + return 0; } static int isl6421_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg) @@ -148,6 +214,8 @@ struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter return NULL; } + isl6421->is_off = true; + /* install release callback */ fe->ops.release_sec = isl6421_release;