Received: by 10.192.165.148 with SMTP id m20csp1655594imm; Thu, 3 May 2018 03:15:59 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoMCAYg1lQvakhkrvUvjYU74Lc0TstYtpO4T0ksuKrM4/11Ix5uh/hXPluC44i4V753BQTj X-Received: by 2002:a17:902:3001:: with SMTP id u1-v6mr23410711plb.164.1525342558906; Thu, 03 May 2018 03:15:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525342558; cv=none; d=google.com; s=arc-20160816; b=RxEEJJvV2PXbir3zgw/ND/wWb+ZZtmlhDjCfQ0r+UeKs4nAAs4a30zXJoK0wQGfl9g i36fkpenOkbEP+pmkW1xXdWqG6nkS2jklXtK90F8aZTRkfXFVUkud89mMX7S1E/q3XKE lvvY0Zn9GfZBLjr+6UUHqXh6xsD6eFoQ43mYBsEjCKyUQqzyY0swzkwu0sML+AWcffm3 DLSNVVoXyqIGZ+udmxNoF2U1i1ninjRKhz17Ti3R5u2tyojjJPOGPHPE0gLPIG/LUfH2 rD/rSbb4HUC7iQyd41Mqx5CwbyW5y3PBPrWgbxuzcATO50CZoBuhYIFcK/RfAAqUReHh 0lEA== 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=FscvD/5eOMYieh1dTHstCWn/yV/uoft09stvvGVloUM=; b=r8lOW8OBrjhQdHjCdFKXJ3qzdTbwgdpWcgbd4WWSBoqaFL3McXtY/28XJQpn63DP1i oDgE32qG+hXR/qHuVB2Y4+fd3O6CP34ZsSe9o8AVfBI1y5Fh7nOXTNrd2v38ygvyTsxq birVEL+yGhZ2LZNoNdbwFtuF+zPXL/a8+GMTcpAhmsGsEquLJHGT3IHrCOyXrzTowV85 AzwV0nZqigBuo2jO563tLl/qq8HFHbY9zgoD4hNY6TbB9FOfk2uw6bBfJqFvDIlcyfpY 8Ewi1MExgQVcpQLcoAYHEG+qdxMjAkxyXGh3z44qoqIfQFWrzdPbL9EVDKQ+POwN42/q jf7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=DLPk5HfI; dkim=pass header.i=@codeaurora.org header.s=default header.b=gXR+oHb2; 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 h23si13422754pfn.287.2018.05.03.03.15.45; Thu, 03 May 2018 03:15:58 -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=DLPk5HfI; dkim=pass header.i=@codeaurora.org header.s=default header.b=gXR+oHb2; 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 S1751915AbeECKNh (ORCPT + 99 others); Thu, 3 May 2018 06:13:37 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:57482 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbeECKNc (ORCPT ); Thu, 3 May 2018 06:13:32 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7E1CB607A2; Thu, 3 May 2018 10:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525342411; bh=dz8dmPZkflD1VOHFF4HCJJemdxd80gPUux4xNOtWZEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DLPk5HfIH2DjMQr0JvH+K80zlWpsMLVwiM8CuIIgxpf6y3Ip9ibCr/XLSUZrXcKjg RRxtAdtu27Gimx6wPNKo4JNkMqyyzRNM4LaG37KqK5HavJBsvBvrHeyOhbjgMxxUz0 VOxUJGApkhadoN8CNpVtn4CLfADE9gx1/O/qFNv4= 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 17C7E607A2; Thu, 3 May 2018 10:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1525342410; bh=dz8dmPZkflD1VOHFF4HCJJemdxd80gPUux4xNOtWZEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gXR+oHb2QtVQOd138/kM3BrWeTr+ffIvJOvzkuhbyKhis3AnSi7HS5dJPggaRDCwv BOQr4OY0lDDJavKcPwEWuPhl0CKlStCZjhvE4PTOEwLOwrPIug1XhWSTXF9C6SKItl 90Cq601vTFBVMCC3b95CD7hKAXR4oNdkIoHnDyfE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 17C7E607A2 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, Lee Jones , Daniel Thompson , Jingoo Han , Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, linux-leds@vger.kernel.org, Kiran Gunda Subject: [PATCH V2 3/5] backlight: qcom-wled: Add support for short circuit handling Date: Thu, 3 May 2018 15:42:30 +0530 Message-Id: <1525342352-25072-4-git-send-email-kgunda@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1525342352-25072-1-git-send-email-kgunda@codeaurora.org> References: <1525342352-25072-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 --- drivers/video/backlight/qcom-wled.c | 134 ++++++++++++++++++++++++++++++++++-- 1 file changed, 130 insertions(+), 4 deletions(-) diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index be8b8d3..2cfba77 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 @@ -23,7 +26,9 @@ #define WLED3_SINK_REG_BRIGHT_MAX 0xFFF -/* Control registers */ +/* WLED3 Control registers */ +#define WLED3_CTRL_REG_FAULT_STATUS 0x08 + #define WLED3_CTRL_REG_MOD_EN 0x46 #define WLED3_CTRL_REG_MOD_EN_MASK BIT(7) @@ -36,7 +41,17 @@ #define WLED3_CTRL_REG_ILIMIT 0x4e #define WLED3_CTRL_REG_ILIMIT_MASK GENMASK(2, 0) -/* sink registers */ +/* WLED4 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 + +/* WLED3 sink registers */ #define WLED3_SINK_REG_SYNC 0x47 #define WLED3_SINK_REG_SYNC_MASK GENMASK(2, 0) #define WLED4_SINK_REG_SYNC_MASK GENMASK(3, 0) @@ -130,17 +145,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 ISR */ + ktime_t last_short_event; u16 ctrl_addr; u16 sink_addr; u32 brightness; u32 max_brightness; + u32 short_count; const int *version; + int short_irq; + bool force_mod_disable; struct wled_config cfg; int (*wled_set_brightness)(struct wled *wled, u16 brightness); @@ -192,6 +213,9 @@ static int wled_module_enable(struct wled *wled, int val) { int rc; + if (wled->force_mod_disable) + return 0; + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK, @@ -248,12 +272,13 @@ 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->wled_sync_toggle(wled); @@ -267,15 +292,60 @@ 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 HZ +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->force_mod_disable = 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; @@ -435,6 +505,21 @@ static int wled4_setup(struct wled *wled) 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; + } + return 0; } @@ -446,6 +531,7 @@ static int wled4_setup(struct wled *wled) .switch_freq = 11, .enabled_strings = 0xf, .cabc = false, + .external_pfet = true, }; static const u32 wled3_boost_i_limit_values[] = { @@ -628,6 +714,7 @@ static int wled_configure(struct wled *wled) { "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); @@ -701,6 +788,39 @@ static int wled_configure(struct wled *wled) return 0; } +static int wled_configure_short_irq(struct wled *wled, + struct platform_device *pdev) +{ + int rc = 0; + + /* PM8941 doesn't have the short detection support */ + if (*wled->version == WLED_PM8941) + 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; + + wled->short_irq = platform_get_irq_byname(pdev, "short"); + if (wled->short_irq < 0) { + dev_dbg(&pdev->dev, "short irq is not used\n"); + return 0; + } + + rc = devm_request_threaded_irq(wled->dev, wled->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, }; @@ -733,6 +853,8 @@ static int wled_probe(struct platform_device *pdev) return -ENODEV; } + mutex_init(&wled->lock); + rc = wled_configure(wled); if (rc) return rc; @@ -752,6 +874,10 @@ static int wled_probe(struct platform_device *pdev) } } + 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