From patchwork Fri Oct 18 05:24:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 176766 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp362732ill; Thu, 17 Oct 2019 22:24:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzI+Uqw4Tbzr7v8bq8C1Nav8/bJU+E7HThMisCKZGItenmMY4eGrw1you+BGrTjKp9lX5kV X-Received: by 2002:aa7:c890:: with SMTP id p16mr7649900eds.296.1571376253885; Thu, 17 Oct 2019 22:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571376253; cv=none; d=google.com; s=arc-20160816; b=wJZEVPhuOxkNmbmXjUxAbpPH+WSLAO4SNZDvuAx5BmoQXroyL5pMmp9gNzJzjPtPSa lo8sC3bvFnXLHWnytQlySsaNPPc05vurrjiLMKrB/GkKz1RXulJrFt2tqPTNV2gdBNLf IypoJfJA2/cPaDA99nC6t0BCtS4Eu+j4JgtH454t3OIyypbd4JfTN/aazyIPIl1ZT+5s wCdwtLfqRsAA5pLXssiOIw8GLCSPe8zuUmU7U76O6O18HTqUnAEyLklemCu110i44pWt EuQ+wJVE0O77mAhkCXMGQ9fVRr2Y/snAEVbKHBFVtsQuW0JyCUU33whkbt5b1pW3nz87 F0Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jDq5W42aFu1uYq0Wf8hvxLigwHa6+BiXckCc47UbuNo=; b=dWS/zoqI6EPUPzsujfq8+PPWGaE2xq0FQMS/MgvDryJMHDXdtfAMCovhdMajw3jhl6 auB2zPA7riZb6t3bJabtZMW8CYvASAKcre3ZRATspeeRgEAArVSNmz5Rc3NE9AKZ6wJW VXmccP545wzG3NZ6gLs5l4y5igKxawe2x8YAE7ec1GZiI3NZ0GO7dI3S2IWZkE9bjyO2 MGL9oYhT+42Si271SmuGbjh9/JjQ5jfsze9zz9pXDnpTsbFrkkniQIavyLnkF70DEIX3 6DJh5UkpmoPvNfSvVf27tq/f2V8oX47Zkkd1sQHkj0R6zUt0NUDF9vRu+DEdWQHkG4lH 63bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pwVGwpyv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p28si2857411ejn.88.2019.10.17.22.24.13; Thu, 17 Oct 2019 22:24:13 -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=@linaro.org header.s=google header.b=pwVGwpyv; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442005AbfJRFYM (ORCPT + 26 others); Fri, 18 Oct 2019 01:24:12 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39793 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395042AbfJRFYK (ORCPT ); Fri, 18 Oct 2019 01:24:10 -0400 Received: by mail-pf1-f195.google.com with SMTP id v4so3112736pff.6 for ; Thu, 17 Oct 2019 22:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jDq5W42aFu1uYq0Wf8hvxLigwHa6+BiXckCc47UbuNo=; b=pwVGwpyvQv+pshWx85LTbypti0ekQXXbxw/w/zZDphsXBvkSuLrySfri6X+lvRjV7h nClLK/yOUe7XNSihPqlLnE94DyXPhNlUmpufyT5aTtKMpbsDctNH9upkqD0akX9BaghO nva/hRKa/F2qh8c5AHFeNg/SJYT7fStW+H0c7oEZlONcl3bPHhCVVqMS1/MB+OCE2EqJ 2SdnSUZcub8AxIvp1baJmgKYKpaJPEjWFFf6oe8QcG/FIzl/Wh/Lb4C0j+B+xYfGsvVJ gY95+KKx0ad0wMuuD/8V2Q8n1uw9BqYeYwehpOXYbWqVzpyGArmAmWC1Pp3tm0VhLdK3 lCHg== 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:mime-version:content-transfer-encoding; bh=jDq5W42aFu1uYq0Wf8hvxLigwHa6+BiXckCc47UbuNo=; b=NvqrjdP/2+ufGWKYPc7YWET75qifrrbKMN9wQ7LV52CqVvQT9h+X66JEPa1WeJA6UG Qv+wOeqxY4OHUN2FdmMlN6P4ox1KNOl2cRipwBNQ4Jf5UfQubrYy3zrgme7jJf1V0+jS j1/y6N/AuSFrAwDXAyzsPrehTvBKG2v81+BkWsikcAux2Dkm9gXvB9gIqyTUQ4iqhl2d QOeBS9UKPjw+e1VAkmpY+qm40oSeUGCZuO0ySNY2CfKNBQlLfcHQgcuHqReNb8Jk8uxQ zPe0ohHGPrSqCO3Ob53c5TnkVsWnY2+VLp7Gi1xzd8f2EiN+xkp7VkKLCyAbbqHgch/q vUgg== X-Gm-Message-State: APjAAAWl10GxJiMmFuVeyR+twa/1OY3TE4fLdSkKoV4pW9wuf2yZZ30v vSa/t0qSUTVM56Y72wKZm0EQYA== X-Received: by 2002:a62:1a15:: with SMTP id a21mr4491058pfa.5.1571376249793; Thu, 17 Oct 2019 22:24:09 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u11sm2178760pgc.61.2019.10.17.22.24.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 22:24:09 -0700 (PDT) From: Bjorn Andersson To: Marcel Holtmann , Johan Hedberg Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo , linux-arm-msm@vger.kernel.org Subject: [PATCH 1/4] Bluetooth: hci_qca: Update regulator_set_load() usage Date: Thu, 17 Oct 2019 22:24:01 -0700 Message-Id: <20191018052405.3693555-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191018052405.3693555-1-bjorn.andersson@linaro.org> References: <20191018052405.3693555-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the introduction of '5451781dadf8 ("regulator: core: Only count load for enabled consumers")' in v5.0, the requested load of a regulator consumer is only accounted for when said consumer is voted enabled. So there's no need to vote for load ever time the regulator is enabled or disabled. Signed-off-by: Bjorn Andersson --- drivers/bluetooth/hci_qca.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) -- 2.23.0 diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index e3164c200eac..c07c529b0d81 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1393,13 +1393,6 @@ static int qca_enable_regulator(struct qca_vreg vregs, if (ret) return ret; - if (vregs.load_uA) - ret = regulator_set_load(regulator, - vregs.load_uA); - - if (ret) - return ret; - return regulator_enable(regulator); } @@ -1409,8 +1402,6 @@ static void qca_disable_regulator(struct qca_vreg vregs, { regulator_disable(regulator); regulator_set_voltage(regulator, 0, vregs.max_uV); - if (vregs.load_uA) - regulator_set_load(regulator, 0); } @@ -1462,18 +1453,30 @@ static int qca_power_setup(struct hci_uart *hu, bool on) static int qca_init_regulators(struct qca_power *qca, const struct qca_vreg *vregs, size_t num_vregs) { + struct regulator_bulk_data *bulk; + int ret; int i; - qca->vreg_bulk = devm_kcalloc(qca->dev, num_vregs, - sizeof(struct regulator_bulk_data), - GFP_KERNEL); - if (!qca->vreg_bulk) + bulk = devm_kcalloc(qca->dev, num_vregs, sizeof(*bulk), GFP_KERNEL); + if (!bulk) return -ENOMEM; for (i = 0; i < num_vregs; i++) - qca->vreg_bulk[i].supply = vregs[i].name; + bulk[i].supply = vregs[i].name; + + ret = devm_regulator_bulk_get(qca->dev, num_vregs, bulk); + if (ret < 0) + return ret; - return devm_regulator_bulk_get(qca->dev, num_vregs, qca->vreg_bulk); + for (i = 0; i < num_vregs; i++) { + ret = regulator_set_load(bulk[i].consumer, vregs[i].load_uA); + if (ret) + return ret; + } + + qca->vreg_bulk = bulk; + + return 0; } static int qca_serdev_probe(struct serdev_device *serdev) From patchwork Fri Oct 18 05:24:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 176769 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp362891ill; Thu, 17 Oct 2019 22:24:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZ3wSvT+7YlbyfkLZM9J5G7L4xyU7MVHQvnQjN9As468icDH0DT42X2igJOm85VnR3kKjl X-Received: by 2002:a17:906:d928:: with SMTP id rn8mr6755269ejb.143.1571376263967; Thu, 17 Oct 2019 22:24:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571376263; cv=none; d=google.com; s=arc-20160816; b=KguFfJ29sDgyp7Xrkns2a9ZoWFApWJ+FtMDu8c4z7LWJ/BhcD8uwffKJ/TLR1Pofld MPndS6ecTVGgageA4oWi08rHyxNq7LkBmfIRpzgopQcT4SSaMnju01CD3kyk2HXYjLX7 +iZjtxkDHjTNCBsyyRlteebKK9Kr2Cb1fKL8zS1BNN3wPoohXiHoxtjfyqND+eG+nfGI aUAOAdziTTcTAUubu13zokiGcD8poRBhq0KR7iZrbv4Pp2rZi++Jd8DDrG+JMB9WHVLN 33/VwiOhUEhKfhVjuDeJ4HPogrfUHRypDolDfs8uSCzswsHgoreUYBMWxrmayQnr61C0 TuRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yvdpNgVZVW1ID8m+eY6Fjz43lKaX01Op/76I7ccP//M=; b=M+54fwLvvSXnrOeKSb7aMKeHH6eAEO3nc2gN19um9fOW5DqiXTn2TclEjJQioP2r8P xtxLB2WNRBVLaioBzYxrlIE4tNhLn34QeyJYLZvi/T1iTygIdVHr7Bs9R+EdRcKGfgrt AIIg3PFqrKgRawibedR5c4zBGLuVW63PP+2LWuSXCp1EVoifUDfYIYa8Vbey03/Qcbvj yZ59QIyXsZS/s23N9FZyb5M3V/nrAEEFaC86MYNerHEoY7SVMolqbOQOTNmIS6GAQmZy FLSO/aeal/LUOXcUHl63vjDFa1YZwn6apuwAEf6iVU84PGmVC3JRhoZKKOTKwPbOZSJU o3gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nUpMW9IO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i20si2860846edy.426.2019.10.17.22.24.23; Thu, 17 Oct 2019 22:24:23 -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=@linaro.org header.s=google header.b=nUpMW9IO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504026AbfJRFYU (ORCPT + 26 others); Fri, 18 Oct 2019 01:24:20 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:34671 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2442014AbfJRFYO (ORCPT ); Fri, 18 Oct 2019 01:24:14 -0400 Received: by mail-pl1-f196.google.com with SMTP id k7so2290015pll.1 for ; Thu, 17 Oct 2019 22:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yvdpNgVZVW1ID8m+eY6Fjz43lKaX01Op/76I7ccP//M=; b=nUpMW9IOCBO3b7o+mUbj+BZ/SJeboSTEvqdXBozkFKDFOiB6KkrRWZGxA+dXTVLvnc NbZ+eEP57xv1HtIhnVhA+gr7WYS3+2M2XwG7OQ55FkY5WCFeNKCoDJxDzm3HFrXL9x7X 0LCoL+jG3ra1twhebvIy4bOiBLVhvfDuS7ImW1cMdF53D5ou5RBBAqxI3QyLx2OaYkyH 31ODpZTkZdbK8X92s2MC2r62YjEeoycIwMpdt0pbniQ/OHHx2+95DFy+DpugK8oKRmXm mwOO5WDUkdtBOc4qctdK9eDW0n6QxbnbANPl+cGYr0NjzX56aJXnW6ixP+iBRmP/EeGL 27Lw== 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:mime-version:content-transfer-encoding; bh=yvdpNgVZVW1ID8m+eY6Fjz43lKaX01Op/76I7ccP//M=; b=d5BCcXvSYO2O4Q+LVcy1YSgpQ/+yjaXQWumA4p+yFgAmaVrmvuCTdySsQ53Tt0yGpi MCAtvzuCE/uckyqgj9GB4kq1dOQ9Fnj0HlDM9robrdPZ+TDFqgfxRPq/8lngP99jH9Xq VSf7AVy1+yr0evOMlemrOZuqo5Ff91Sghv/gO/T82grCf6NTIKn9Xue8w3H+pEBSaP69 FigtIXa/+AaoK/tbW+Azdddddf8mg2BWOfbHe9B2IXMhapDZhcw5AhlJUdxblig50etY +RzEtj7tmIcm0XondsmBIaqiPqyAbW3FO6US5u2FFEKzbzeVIHWnrfISrJ5TFilf7tbz ZA+w== X-Gm-Message-State: APjAAAWqBdQs/iwEpmP4JEapdh1pKC3e/UmY2mgRYIbmVrCCDdn/p3Af CI/jgAtWG/3eNXMDi1bRIgdkug== X-Received: by 2002:a17:902:8d89:: with SMTP id v9mr7661064plo.247.1571376252173; Thu, 17 Oct 2019 22:24:12 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u11sm2178760pgc.61.2019.10.17.22.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 22:24:11 -0700 (PDT) From: Bjorn Andersson To: Marcel Holtmann , Johan Hedberg Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo , linux-arm-msm@vger.kernel.org Subject: [PATCH 3/4] Bluetooth: hci_qca: Use regulator bulk enable/disable Date: Thu, 17 Oct 2019 22:24:03 -0700 Message-Id: <20191018052405.3693555-4-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191018052405.3693555-1-bjorn.andersson@linaro.org> References: <20191018052405.3693555-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the regulator_set_load() and regulator_set_voltage() out of the enable/disable code paths the code can now use the standard regulator bulk enable/disable API. By cloning num_vregs into struct qca_power there's no need to lug around a reference to the struct qca_vreg_data, which further simplifies qca_power_setup(). Signed-off-by: Bjorn Andersson --- drivers/bluetooth/hci_qca.c | 55 +++++++++---------------------------- 1 file changed, 13 insertions(+), 42 deletions(-) -- 2.23.0 diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 54aafcc69d06..01f941e9adf3 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -144,8 +144,8 @@ struct qca_vreg_data { */ struct qca_power { struct device *dev; - const struct qca_vreg_data *vreg_data; struct regulator_bulk_data *vreg_bulk; + int num_vregs; bool vregs_on; }; @@ -1381,63 +1381,34 @@ static int qca_power_off(struct hci_dev *hdev) return 0; } -static int qca_enable_regulator(struct qca_vreg vregs, - struct regulator *regulator) -{ - return regulator_enable(regulator); - -} - -static void qca_disable_regulator(struct qca_vreg vregs, - struct regulator *regulator) -{ - regulator_disable(regulator); - -} - static int qca_power_setup(struct hci_uart *hu, bool on) { - struct qca_vreg *vregs; struct regulator_bulk_data *vreg_bulk; struct qca_serdev *qcadev; - int i, num_vregs, ret = 0; + int num_vregs; + int ret = 0; qcadev = serdev_device_get_drvdata(hu->serdev); - if (!qcadev || !qcadev->bt_power || !qcadev->bt_power->vreg_data || - !qcadev->bt_power->vreg_bulk) + if (!qcadev || !qcadev->bt_power || !qcadev->bt_power->vreg_bulk) return -EINVAL; - vregs = qcadev->bt_power->vreg_data->vregs; vreg_bulk = qcadev->bt_power->vreg_bulk; - num_vregs = qcadev->bt_power->vreg_data->num_vregs; - BT_DBG("on: %d", on); + num_vregs = qcadev->bt_power->num_vregs; + BT_DBG("on: %d (%d regulators)", on, num_vregs); if (on && !qcadev->bt_power->vregs_on) { - for (i = 0; i < num_vregs; i++) { - ret = qca_enable_regulator(vregs[i], - vreg_bulk[i].consumer); - if (ret) - break; - } + ret = regulator_bulk_enable(num_vregs, vreg_bulk); + if (ret) + return ret; - if (ret) { - BT_ERR("failed to enable regulator:%s", vregs[i].name); - /* turn off regulators which are enabled */ - for (i = i - 1; i >= 0; i--) - qca_disable_regulator(vregs[i], - vreg_bulk[i].consumer); - } else { - qcadev->bt_power->vregs_on = true; - } + qcadev->bt_power->vregs_on = true; } else if (!on && qcadev->bt_power->vregs_on) { /* turn off regulator in reverse order */ - i = qcadev->bt_power->vreg_data->num_vregs - 1; - for ( ; i >= 0; i--) - qca_disable_regulator(vregs[i], vreg_bulk[i].consumer); + regulator_bulk_disable(num_vregs, vreg_bulk); qcadev->bt_power->vregs_on = false; } - return ret; + return 0; } static int qca_init_regulators(struct qca_power *qca, @@ -1465,6 +1436,7 @@ static int qca_init_regulators(struct qca_power *qca, } qca->vreg_bulk = bulk; + qca->num_vregs = num_vregs; return 0; } @@ -1493,7 +1465,6 @@ static int qca_serdev_probe(struct serdev_device *serdev) return -ENOMEM; qcadev->bt_power->dev = &serdev->dev; - qcadev->bt_power->vreg_data = data; err = qca_init_regulators(qcadev->bt_power, data->vregs, data->num_vregs); if (err) {