From patchwork Tue Jan 9 10:04:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 761110 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B33B35EEF for ; Tue, 9 Jan 2024 10:04:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CvrV83x3" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2cca5d81826so35766671fa.2 for ; Tue, 09 Jan 2024 02:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704794691; x=1705399491; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=miknyKwLNWMTM/CUdCtv3GjPRYtDM3k634e3VG5YdIA=; b=CvrV83x34Y4EGSGtqAzXFU3lVkrU2llswQ8qKlAXJL5hI5CW8lbqDGyMGx6vOSiRL7 Y/NoqNRfmY3EdNr1MMV4SMaW/UZ/O6D96xtqYJYwFFIYS/yTXthUWcIr3640Ianxfc1c tdkQmmEkJGRGLpIXTltOkbhbKMhOBCCPEZZOqbY4TnVv21RAsb1WtKgT7nYXSB1wl8/i xeQPTvgQ5gKLauPwzjJnvrgWeSAlVCAggKrpXq2NdEcnyeWQheYvt3PPaBWPPrCpxUtn ndRaX33Ogci7TY7dqcbvGL78dCSoR1h8S4fURIjVJsuJ7x0P8NIR5beugOJJxrjemswD oDRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704794691; x=1705399491; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=miknyKwLNWMTM/CUdCtv3GjPRYtDM3k634e3VG5YdIA=; b=cePBAxROKn+pYvgssAq2lbDsPgwg4TDH1mOflqOdqqaNu8ZiYvDuSZZLInQBFvfEbN 7hU4uy+s9xpbrN+IfnevyTrwSs8iwn+Bth0cruZqXx7GnAl9Sokq+S43hF0vTKUTJ6Mr lR979QPnrS7xAPapWSVChydCOJR3/JDeS9uVgYpx3EMsJi7pKic3mRm6RcViX2NplaGc 330xVZ5+m0JpxfBksSb1DOyge3dEXxdqYYty8yl1KbglDpHVbBJSOlivEd/e3oAOewdD RmIDXEmgNullpvGBlTPz7V68ltPiq/+WXPZJHTXFgasxP/t/TUlqkOTIDEfdWK75DT1q yKlg== X-Gm-Message-State: AOJu0YzdokI42MJI5HsSDDAgXeK6rmctwJ7M2gY2iBFzGP9wZRTccNy/ L2aWaudE2rzyo5DDAw0ktyXEMwlOGDQY2A== X-Google-Smtp-Source: AGHT+IF1PQdzWPHmXLfPvFu9bbrKMv2YpXR8bSAhucmKxaDT2gZanTZAhc8UHgp22OlOcsfbgMqWxw== X-Received: by 2002:a2e:9b03:0:b0:2cd:4a84:2b2f with SMTP id u3-20020a2e9b03000000b002cd4a842b2fmr1887094lji.57.1704794690930; Tue, 09 Jan 2024 02:04:50 -0800 (PST) Received: from [127.0.1.1] (UNUSED.212-182-62-129.lubman.net.pl. [212.182.62.129]) by smtp.gmail.com with ESMTPSA id b24-20020a05651c033800b002cd2cdda9besm314529ljp.50.2024.01.09.02.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 02:04:50 -0800 (PST) From: Konrad Dybcio Date: Tue, 09 Jan 2024 11:04:49 +0100 Subject: [PATCH v3] regulator: qcom_smd: Keep one rpm handle for all vregs Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240109-rpm_vreg_cleanup-v3-1-fa0201029f78@linaro.org> X-B4-Tracking: v=1; b=H4sIAEAanWUC/2WNwQqDMBAFf0Vy7pYkWiU99T9KkRg3GohJ2KgUx H9vKPTU4zyYNwfLSA4zu1cHI9xddjEUqC8VM7MOE4IbCzPJZcMFV0Bp6XfCqTceddgSKDsObY3 KytvIijbojDCQDmYuYti8L2MitO797TxfhS3FBdaZUP/eayFlB2tMzvw3dgkCeGM6ZRqrRNs+v Aua4jXSxM7zAwOGyMzGAAAA To: Bjorn Andersson , Liam Girdwood , Mark Brown Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.13-dev-0438c For no apparent reason (as there's just one RPM per SoC), all vregs currently store a copy of a pointer to smd_rpm. Introduce a single, global one to save up on space in each definition. bloat-o-meter reports a slight uptick: Total: Before=44008, After=44080, chg +0.16% However the saved n * sizeof(ptr) for every dynamically allocated regulator quickly makes up for it. Signed-off-by: Konrad Dybcio --- Changes in v3: - Validate that the global pointer didn't change - Update the bloat-o-meter report - Link to v2: https://lore.kernel.org/r/20231227-topic-rpm_vreg_cleanup-v2-1-04c79c4f9166@linaro.org Changes in v2: - Remove unused function argument from rpm_regulator_init_vreg kerneldoc - Do NOT add a mutex around the rpm assignment, talked to Dmitry offline and we concluded it makes no sense - Link to v1: https://lore.kernel.org/r/20231227-topic-rpm_vreg_cleanup-v1-1-949da0864ac5@linaro.org --- drivers/regulator/qcom_smd-regulator.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) --- base-commit: 0f067394dd3b2af3263339cf7183bdb6ee0ac1f8 change-id: 20240109-rpm_vreg_cleanup-9fdb63e9f25d Best regards, diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c index d1be9568025e..3b7e06b9f5ce 100644 --- a/drivers/regulator/qcom_smd-regulator.c +++ b/drivers/regulator/qcom_smd-regulator.c @@ -11,11 +11,10 @@ #include #include +struct qcom_smd_rpm *smd_vreg_rpm; + struct qcom_rpm_reg { struct device *dev; - - struct qcom_smd_rpm *rpm; - u32 type; u32 id; @@ -70,7 +69,7 @@ static int rpm_reg_write_active(struct qcom_rpm_reg *vreg) if (!reqlen) return 0; - ret = qcom_rpm_smd_write(vreg->rpm, QCOM_SMD_RPM_ACTIVE_STATE, + ret = qcom_rpm_smd_write(smd_vreg_rpm, QCOM_SMD_RPM_ACTIVE_STATE, vreg->type, vreg->id, req, sizeof(req[0]) * reqlen); if (!ret) { @@ -1384,14 +1383,13 @@ MODULE_DEVICE_TABLE(of, rpm_of_match); * @dev: Pointer to the top level qcom_smd-regulator PMIC device * @node: Pointer to the individual qcom_smd-regulator resource * device node - * @rpm: Pointer to the rpm bus node * @pmic_rpm_data: Pointer to a null-terminated array of qcom_smd-regulator * resources defined for the top level PMIC device * * Return: 0 on success, errno on failure */ static int rpm_regulator_init_vreg(struct qcom_rpm_reg *vreg, struct device *dev, - struct device_node *node, struct qcom_smd_rpm *rpm, + struct device_node *node, const struct rpm_regulator_data *pmic_rpm_data) { struct regulator_config config = {}; @@ -1409,7 +1407,6 @@ static int rpm_regulator_init_vreg(struct qcom_rpm_reg *vreg, struct device *dev } vreg->dev = dev; - vreg->rpm = rpm; vreg->type = rpm_data->type; vreg->id = rpm_data->id; @@ -1449,6 +1446,11 @@ static int rpm_reg_probe(struct platform_device *pdev) return -ENODEV; } + if (smd_vreg_rpm && rpm != smd_vreg_rpm) + return dev_err_probe(dev, -EINVAL, "RPM mismatch\n"); + + smd_vreg_rpm = rpm; + vreg_data = of_device_get_match_data(dev); if (!vreg_data) return -ENODEV; @@ -1460,8 +1462,7 @@ static int rpm_reg_probe(struct platform_device *pdev) return -ENOMEM; } - ret = rpm_regulator_init_vreg(vreg, dev, node, rpm, vreg_data); - + ret = rpm_regulator_init_vreg(vreg, dev, node, vreg_data); if (ret < 0) { of_node_put(node); return ret;