For no apparent reason (as there's just one RPM per SoC), all RPMPDs
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:
Total: Before=92010, After=91062, chg -1.03%
Signed-off-by: Konrad Dybcio <[email protected]>
---
drivers/pmdomain/qcom/rpmpd.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c
index 7796d65f96e8..90b62767f9d0 100644
--- a/drivers/pmdomain/qcom/rpmpd.c
+++ b/drivers/pmdomain/qcom/rpmpd.c
@@ -16,6 +16,8 @@
#define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd)
+static struct qcom_smd_rpm *rpmpd_smd_rpm;
+
/* Resource types:
* RPMPD_X is X encoded as a little-endian, lower-case, ASCII string */
#define RPMPD_SMPA 0x61706d73
@@ -54,7 +56,6 @@ struct rpmpd {
bool enabled;
const int res_type;
const int res_id;
- struct qcom_smd_rpm *rpm;
unsigned int max_state;
__le32 key;
bool state_synced;
@@ -879,7 +880,7 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
.value = cpu_to_le32(enable),
};
- return qcom_rpm_smd_write(pd->rpm, QCOM_SMD_RPM_ACTIVE_STATE,
+ return qcom_rpm_smd_write(rpmpd_smd_rpm, QCOM_SMD_RPM_ACTIVE_STATE,
pd->res_type, pd->res_id, &req, sizeof(req));
}
@@ -891,7 +892,7 @@ static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner)
.value = cpu_to_le32(corner),
};
- return qcom_rpm_smd_write(pd->rpm, state, pd->res_type, pd->res_id,
+ return qcom_rpm_smd_write(rpmpd_smd_rpm, state, pd->res_type, pd->res_id,
&req, sizeof(req));
};
@@ -1004,12 +1005,11 @@ static int rpmpd_probe(struct platform_device *pdev)
int i;
size_t num;
struct genpd_onecell_data *data;
- struct qcom_smd_rpm *rpm;
struct rpmpd **rpmpds;
const struct rpmpd_desc *desc;
- rpm = dev_get_drvdata(pdev->dev.parent);
- if (!rpm) {
+ rpmpd_smd_rpm = dev_get_drvdata(pdev->dev.parent);
+ if (!rpmpd_smd_rpm) {
dev_err(&pdev->dev, "Unable to retrieve handle to RPM\n");
return -ENODEV;
}
@@ -1039,7 +1039,6 @@ static int rpmpd_probe(struct platform_device *pdev)
continue;
}
- rpmpds[i]->rpm = rpm;
rpmpds[i]->max_state = desc->max_state;
rpmpds[i]->pd.power_off = rpmpd_power_off;
rpmpds[i]->pd.power_on = rpmpd_power_on;
---
base-commit: 39676dfe52331dba909c617f213fdb21015c8d10
change-id: 20231227-topic-rpmpd_cleanup-2e043dac9f47
Best regards,
--
Konrad Dybcio <[email protected]>
On Wed, 27 Dec 2023 at 02:20, Konrad Dybcio <[email protected]> wrote:
>
> For no apparent reason (as there's just one RPM per SoC), all RPMPDs
> 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:
>
> Total: Before=92010, After=91062, chg -1.03%
>
> Signed-off-by: Konrad Dybcio <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/pmdomain/qcom/rpmpd.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c
> index 7796d65f96e8..90b62767f9d0 100644
> --- a/drivers/pmdomain/qcom/rpmpd.c
> +++ b/drivers/pmdomain/qcom/rpmpd.c
> @@ -16,6 +16,8 @@
>
> #define domain_to_rpmpd(domain) container_of(domain, struct rpmpd, pd)
>
> +static struct qcom_smd_rpm *rpmpd_smd_rpm;
> +
> /* Resource types:
> * RPMPD_X is X encoded as a little-endian, lower-case, ASCII string */
> #define RPMPD_SMPA 0x61706d73
> @@ -54,7 +56,6 @@ struct rpmpd {
> bool enabled;
> const int res_type;
> const int res_id;
> - struct qcom_smd_rpm *rpm;
> unsigned int max_state;
> __le32 key;
> bool state_synced;
> @@ -879,7 +880,7 @@ static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
> .value = cpu_to_le32(enable),
> };
>
> - return qcom_rpm_smd_write(pd->rpm, QCOM_SMD_RPM_ACTIVE_STATE,
> + return qcom_rpm_smd_write(rpmpd_smd_rpm, QCOM_SMD_RPM_ACTIVE_STATE,
> pd->res_type, pd->res_id, &req, sizeof(req));
> }
>
> @@ -891,7 +892,7 @@ static int rpmpd_send_corner(struct rpmpd *pd, int state, unsigned int corner)
> .value = cpu_to_le32(corner),
> };
>
> - return qcom_rpm_smd_write(pd->rpm, state, pd->res_type, pd->res_id,
> + return qcom_rpm_smd_write(rpmpd_smd_rpm, state, pd->res_type, pd->res_id,
> &req, sizeof(req));
> };
>
> @@ -1004,12 +1005,11 @@ static int rpmpd_probe(struct platform_device *pdev)
> int i;
> size_t num;
> struct genpd_onecell_data *data;
> - struct qcom_smd_rpm *rpm;
> struct rpmpd **rpmpds;
> const struct rpmpd_desc *desc;
>
> - rpm = dev_get_drvdata(pdev->dev.parent);
> - if (!rpm) {
> + rpmpd_smd_rpm = dev_get_drvdata(pdev->dev.parent);
> + if (!rpmpd_smd_rpm) {
> dev_err(&pdev->dev, "Unable to retrieve handle to RPM\n");
> return -ENODEV;
> }
> @@ -1039,7 +1039,6 @@ static int rpmpd_probe(struct platform_device *pdev)
> continue;
> }
>
> - rpmpds[i]->rpm = rpm;
> rpmpds[i]->max_state = desc->max_state;
> rpmpds[i]->pd.power_off = rpmpd_power_off;
> rpmpds[i]->pd.power_on = rpmpd_power_on;
>
> ---
> base-commit: 39676dfe52331dba909c617f213fdb21015c8d10
> change-id: 20231227-topic-rpmpd_cleanup-2e043dac9f47
>
> Best regards,
> --
> Konrad Dybcio <[email protected]>
>