On 30.09.2022 11:20, Krzysztof Kozlowski wrote:
> Handle errors of getting presence rate for unsupported stream bitrate,
> instead of sending -EINVAL in change content message.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx>
Konrad
> drivers/slimbus/stream.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c
> index f8eade1e0132..28fbecb3907d 100644
> --- a/drivers/slimbus/stream.c
> +++ b/drivers/slimbus/stream.c
> @@ -204,7 +204,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
> {
> struct slim_controller *ctrl = rt->dev->ctrl;
> struct slim_port *port;
> - int num_ports, i, port_id;
> + int num_ports, i, port_id, prrate;
>
> pr_err("%s:%d AAAA\n", __func__, __LINE__);
> if (rt->ports) {
> @@ -222,6 +222,13 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
> rt->bps = cfg->bps;
> rt->direction = cfg->direction;
>
> + prrate = slim_get_prate_code(cfg->rate);
> + if (prrate < 0) {
> + dev_err(&rt->dev->dev, "Cannot get presence rate for rate %d Hz\n",
> + cfg->rate);
> + return -EINVAL;
> + }
> +
> if (cfg->rate % ctrl->a_framer->superfreq) {
> /*
> * data rate not exactly multiple of super frame,
> @@ -242,7 +249,7 @@ int slim_stream_prepare(struct slim_stream_runtime *rt,
> port = &rt->ports[i];
> port->state = SLIM_PORT_DISCONNECTED;
> port->id = port_id;
> - port->ch.prrate = slim_get_prate_code(cfg->rate);
> + port->ch.prrate = prrate;
> port->ch.id = cfg->chs[i];
> port->ch.data_fmt = SLIM_CH_DATA_FMT_NOT_DEFINED;
> port->ch.aux_fmt = SLIM_CH_AUX_FMT_NOT_APPLICABLE;
