| Message ID | 20200709081705.46084-1-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v2,1/2] firmware: arm_scmi: Keep the discrete clock rates sorted | expand |
On Thu, 9 Jul 2020 09:17:04 +0100, Sudeep Holla wrote: > Instead of relying on the firmware to keep the clock rates sorted, let > us sort the list. This is not essential for clock layer but it helps > to find the min and max rates easily from the list. Applied to sudeep.holla/linux (for-next/scmi), thanks! [1/2] firmware: arm_scmi: Keep the discrete clock rates sorted https://git.kernel.org/sudeep.holla/c/dccec73de9 [2/2] clk: scmi: Fix min and max rate when registering clocks with discrete rates https://git.kernel.org/sudeep.holla/c/fcd2e0deae -- Regards, Sudeep
diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index 4c2227662b26..c90f23a812f5 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -5,6 +5,8 @@ * Copyright (C) 2018 ARM Ltd. */ +#include <linux/sort.h> + #include "common.h" enum scmi_clock_protocol_cmd { @@ -121,6 +123,13 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, return ret; } +static int rate_cmp_func(const void *_r1, const void *_r2) +{ + const u64 *r1 = _r1, *r2 = _r2; + + return r1 - r2; +} + static int scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, struct scmi_clock_info *clk) @@ -184,8 +193,10 @@ scmi_clock_describe_rates_get(const struct scmi_handle *handle, u32 clk_id, */ } while (num_returned && num_remaining); - if (rate_discrete) + if (rate_discrete) { clk->list.num_rates = tot_rate_cnt; + sort(rate, tot_rate_cnt, sizeof(*rate), rate_cmp_func, NULL); + } clk->rate_discrete = rate_discrete;
Instead of relying on the firmware to keep the clock rates sorted, let us sort the list. This is not essential for clock layer but it helps to find the min and max rates easily from the list. Link: https://lore.kernel.org/r/20200708110725.18017-1-sudeep.holla@arm.com Fixes: 5f6c6430e904 ("firmware: arm_scmi: add initial support for clock protocol") Reported-by: Dien Pham <dien.pham.ry@renesas.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/firmware/arm_scmi/clock.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) Hi Dien-san, If you could review/test these patches, I can queue them ASAP. I am planning to send the PR for ARM SoC later this week, so I need your tested-by. v1[1]->v2: - Fixed the warning, sent the wrong version earlier Regards, Sudeep [1] https://lore.kernel.org/r/20200708110725.18017-1-sudeep.holla@arm.com -- 2.17.1