Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp371891imm; Mon, 9 Jul 2018 03:26:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfgLM4g8UR7fQVhG9g7rjBaYhPW9J62zUmg+Mz+0FNYe+cLWFjjKskrwNZlwP0KGd7uMV9i X-Received: by 2002:a17:902:2983:: with SMTP id h3-v6mr20189522plb.232.1531131996655; Mon, 09 Jul 2018 03:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531131996; cv=none; d=google.com; s=arc-20160816; b=RaFIxeHmoE0Vnmlncwyf+0ZXCTK3pOEiuu6hzfpRwUqrL/QoA3aTSsygRMlRBIsCHp qug3sWoPVbm6Kn3+kJo6DO2C9VMR6iU/f9Y9eZwI0zT6PLCF7W59H2gR73SNInCW5Ted 48l8c5GUf4LO7zkW34Ak20vtsKXaVjSxd/3OHooeWPKTO8vVEJKUVspUtrkdvetXJOHg Q/KseBLj4JiIc74PAfUFYN1nmj1iUoBvSG1xw3EnpmMyoYHngV99zwxp1S/cMnp6RT1Z YeNozl5TbOwX66XS6ovIpeujyBOQslHcys9L1BG8/QnzTx3ZW90a+sSu80ApZtsR3n1k 1vmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=/lpPB/XGFGEwZLh+JzllhyhqtQw+qFSt3EAzaGaQEmk=; b=RDr5PV+ec1k8wiqG30zfzYh6dgY9UjvoubSGATRJ2IaAJYcxK5XiRu19bFNpMAWzNF 8OqmkkFkH31BtW71u4k9xlrbroHhNzAucxkfEB/qMrf+QF9TCQyYV9o5VFIHptqPym/E i3G5eLvZe8pH8K/i92uj2zwuQPDeEVFDl9QI4ZWfn+IYd9vk2qzBA1/0EVPdA6Nx0hgO qARDj3PxQU8ZbityoQjKBby2vTIGiBnpfi1LQd8xhRcQPbKlI1f9fH7pUPWe9w3ysx/W 9PQkm51K0N/aG5pXqH+xF7JZ7coZaMTfKQCUPcZGAqj8TAewKckB4jN/96+Ozq3OahLS eR9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=CxrxS7Yq; dkim=pass header.i=@codeaurora.org header.s=default header.b=VNlHrKof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a74-v6si1826708pfe.301.2018.07.09.03.25.58; Mon, 09 Jul 2018 03:26:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=CxrxS7Yq; dkim=pass header.i=@codeaurora.org header.s=default header.b=VNlHrKof; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932948AbeGIKYI (ORCPT + 99 others); Mon, 9 Jul 2018 06:24:08 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:33402 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932601AbeGIKYE (ORCPT ); Mon, 9 Jul 2018 06:24:04 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 179F4602AE; Mon, 9 Jul 2018 10:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1531131844; bh=X6xn3oIq44/dLDtF3w/W4oOJ0iae8cUAcQ3HlcxaHa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CxrxS7Yq9c6rDDyob2RAJslNRQU/LXg8Xf7ZL5QCHw65x5edVMDTaNxpSnJrIrXpw gIlc8rgAyHPUjwaa++J5zv/8V/N5TokIh+gmmZqCyOnwEhpp17L3KhcaFSm9K7TWNx YgOWZZ39YhxR62PmEqKniFDslRC4Wi3PhH8MCtfA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from kgunda-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: kgunda@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id C451E607EB; Mon, 9 Jul 2018 10:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1531131842; bh=X6xn3oIq44/dLDtF3w/W4oOJ0iae8cUAcQ3HlcxaHa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VNlHrKof+Ncyp7Hjhbrmb9aka3bQYXVUkaVqQmlX2drUHiua7mQmfUZX0OOtC4Dgh BYYA6PYySEd8s5dokT6Hqu8Rnv27Er7GG21KBsPdGY4TMfJqgs7bbx1QXFluRDlA7f BGDWYEBONmhyWwSdneue4T/V3uhiheBAIB+Z11ig= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C451E607EB Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=kgunda@codeaurora.org From: Kiran Gunda To: bjorn.andersson@linaro.org, jingoohan1@gmail.com, lee.jones@linaro.org, b.zolnierkie@samsung.com, dri-devel@lists.freedesktop.org, daniel.thompson@linaro.org, jacek.anaszewski@gmail.com, pavel@ucw.cz, robh+dt@kernel.org, mark.rutland@arm.com, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, Kiran Gunda Subject: [PATCH V4 7/8] backlight: qcom-wled: add support for short circuit handling Date: Mon, 9 Jul 2018 15:52:20 +0530 Message-Id: <1531131741-19971-8-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531131741-19971-1-git-send-email-kgunda@codeaurora.org> References: <1531131741-19971-1-git-send-email-kgunda@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Handle the short circuit interrupt and check if the short circuit interrupt is valid. Re-enable the module to check if it goes away. Disable the module altogether if the short circuit event persists. Signed-off-by: Kiran Gunda Reviewed-by: Bjorn Andersson --- Changes from V3: - Added Reviewed by tag. - Addressed minor comments from Vinod drivers/video/backlight/qcom-wled.c | 132 ++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 4 deletions(-) diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index 362d254..a14f1a6 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -10,6 +10,9 @@ * GNU General Public License for more details. */ +#include +#include +#include #include #include #include @@ -64,6 +67,16 @@ #define WLED3_SINK_REG_STR_CABC(n) (0x66 + (n * 0x10)) #define WLED3_SINK_REG_STR_CABC_MASK BIT(7) +/* WLED4 specific control registers */ +#define WLED4_CTRL_REG_SHORT_PROTECT 0x5e +#define WLED4_CTRL_REG_SHORT_EN_MASK BIT(7) + +#define WLED4_CTRL_REG_SEC_ACCESS 0xd0 +#define WLED4_CTRL_REG_SEC_UNLOCK 0xa5 + +#define WLED4_CTRL_REG_TEST1 0xe2 +#define WLED4_CTRL_REG_TEST1_EXT_FET_DTEST2 0x09 + /* WLED4 specific sink registers */ #define WLED4_SINK_REG_CURR_SINK 0x46 #define WLED4_SINK_REG_CURR_SINK_MASK GENMASK(7, 4) @@ -113,17 +126,23 @@ struct wled_config { bool cs_out_en; bool ext_gen; bool cabc; + bool external_pfet; }; struct wled { const char *name; struct device *dev; struct regmap *regmap; + struct mutex lock; /* Lock to avoid race from thread irq handler */ + ktime_t last_short_event; u16 ctrl_addr; u16 sink_addr; u16 max_string_count; u32 brightness; u32 max_brightness; + u32 short_count; + bool disabled_by_short; + bool has_short_detect; struct wled_config cfg; int (*wled_set_brightness)(struct wled *wled, u16 brightness); @@ -174,6 +193,9 @@ static int wled_module_enable(struct wled *wled, int val) { int rc; + if (wled->disabled_by_short) + return -EFAULT; + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED_CTRL_REG_MOD_EN, WLED_CTRL_REG_MOD_EN_MASK, @@ -210,18 +232,19 @@ static int wled_update_status(struct backlight_device *bl) bl->props.state & BL_CORE_FBBLANK) brightness = 0; + mutex_lock(&wled->lock); if (brightness) { rc = wled->wled_set_brightness(wled, brightness); if (rc < 0) { dev_err(wled->dev, "wled failed to set brightness rc:%d\n", rc); - return rc; + goto unlock_mutex; } rc = wled_sync_toggle(wled); if (rc < 0) { dev_err(wled->dev, "wled sync failed rc:%d\n", rc); - return rc; + goto unlock_mutex; } } @@ -229,15 +252,61 @@ static int wled_update_status(struct backlight_device *bl) rc = wled_module_enable(wled, !!brightness); if (rc < 0) { dev_err(wled->dev, "wled enable failed rc:%d\n", rc); - return rc; + goto unlock_mutex; } } wled->brightness = brightness; +unlock_mutex: + mutex_unlock(&wled->lock); + return rc; } +#define WLED_SHORT_DLY_MS 20 +#define WLED_SHORT_CNT_MAX 5 +#define WLED_SHORT_RESET_CNT_DLY_US USEC_PER_SEC + +static irqreturn_t wled_short_irq_handler(int irq, void *_wled) +{ + struct wled *wled = _wled; + int rc; + s64 elapsed_time; + + wled->short_count++; + mutex_lock(&wled->lock); + rc = wled_module_enable(wled, false); + if (rc < 0) { + dev_err(wled->dev, "wled disable failed rc:%d\n", rc); + goto unlock_mutex; + } + + elapsed_time = ktime_us_delta(ktime_get(), + wled->last_short_event); + if (elapsed_time > WLED_SHORT_RESET_CNT_DLY_US) + wled->short_count = 0; + + if (wled->short_count > WLED_SHORT_CNT_MAX) { + dev_err(wled->dev, "Short trigged %d times, disabling WLED forever!\n", + wled->short_count); + wled->disabled_by_short = true; + goto unlock_mutex; + } + + wled->last_short_event = ktime_get(); + + msleep(WLED_SHORT_DLY_MS); + rc = wled_module_enable(wled, true); + if (rc < 0) + dev_err(wled->dev, "wled enable failed rc:%d\n", rc); + +unlock_mutex: + mutex_unlock(&wled->lock); + + return IRQ_HANDLED; +} + static int wled3_setup(struct wled *wled) { u16 addr; @@ -325,7 +394,7 @@ static int wled4_setup(struct wled *wled) int rc, temp, i, j; u16 addr; u8 sink_en = 0; - u32 sink_cfg = 0; + u32 sink_cfg; rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED_CTRL_REG_OVP, @@ -347,6 +416,21 @@ static int wled4_setup(struct wled *wled) if (rc < 0) return rc; + if (wled->cfg.external_pfet) { + /* Unlock the secure register access */ + rc = regmap_write(wled->regmap, wled->ctrl_addr + + WLED4_CTRL_REG_SEC_ACCESS, + WLED4_CTRL_REG_SEC_UNLOCK); + if (rc < 0) + return rc; + + rc = regmap_write(wled->regmap, + wled->ctrl_addr + WLED4_CTRL_REG_TEST1, + WLED4_CTRL_REG_TEST1_EXT_FET_DTEST2); + if (rc < 0) + return rc; + } + rc = regmap_read(wled->regmap, wled->sink_addr + WLED4_SINK_REG_CURR_SINK, &sink_cfg); if (rc < 0) @@ -432,6 +516,7 @@ static int wled4_setup(struct wled *wled) .num_strings = 4, .switch_freq = 11, .cabc = false, + .external_pfet = false, }; static const u32 wled3_boost_i_limit_values[] = { @@ -600,6 +685,7 @@ static int wled_configure(struct wled *wled, int version) { "qcom,cs-out", &cfg->cs_out_en, }, { "qcom,ext-gen", &cfg->ext_gen, }, { "qcom,cabc", &cfg->cabc, }, + { "qcom,external-pfet", &cfg->external_pfet, }, }; prop_addr = of_get_address(dev->of_node, 0, NULL, NULL); @@ -688,6 +774,38 @@ static int wled_configure(struct wled *wled, int version) return 0; } +static int wled_configure_short_irq(struct wled *wled, + struct platform_device *pdev) +{ + int rc, short_irq; + + if (!wled->has_short_detect) + return 0; + + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + + WLED4_CTRL_REG_SHORT_PROTECT, + WLED4_CTRL_REG_SHORT_EN_MASK, + WLED4_CTRL_REG_SHORT_EN_MASK); + if (rc < 0) + return rc; + + short_irq = platform_get_irq_byname(pdev, "short"); + if (short_irq < 0) { + dev_dbg(&pdev->dev, "short irq is not used\n"); + return 0; + } + + rc = devm_request_threaded_irq(wled->dev, short_irq, + NULL, wled_short_irq_handler, + IRQF_ONESHOT, + "wled_short_irq", wled); + if (rc < 0) + dev_err(wled->dev, "Unable to request short_irq (err:%d)\n", + rc); + + return rc; +} + static const struct backlight_ops wled_ops = { .update_status = wled_update_status, }; @@ -721,6 +839,7 @@ static int wled_probe(struct platform_device *pdev) return -ENODEV; } + mutex_init(&wled->lock); rc = wled_configure(wled, version); if (rc) return rc; @@ -735,6 +854,7 @@ static int wled_probe(struct platform_device *pdev) break; case WLED4: + wled->has_short_detect = true; rc = wled4_setup(wled); if (rc) { dev_err(&pdev->dev, "wled4_setup failed\n"); @@ -747,6 +867,10 @@ static int wled_probe(struct platform_device *pdev) break; } + rc = wled_configure_short_irq(wled, pdev); + if (rc < 0) + return rc; + val = WLED_DEFAULT_BRIGHTNESS; of_property_read_u32(pdev->dev.of_node, "default-brightness", &val); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project