* [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate
@ 2022-09-30 10:00 Krzysztof Kozlowski
2022-09-30 10:00 ` [PATCH v2 2/2] slimbus: qcom-ngd-ctrl: add support for 44.1 Khz frequency Krzysztof Kozlowski
2022-10-31 18:28 ` [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Srinivas Kandagatla
0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-30 10:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Srinivas Kandagatla,
linux-arm-msm, alsa-devel, linux-kernel
Cc: Krzysztof Kozlowski
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@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
Changes since v1:
1. Rebase (drop development pieces in the context).
2. Return prrate (which has errno) instead of -EINVAL.
3. Add Rb tag.
---
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 d5ce974e880b..f631d5ed9809 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;
if (rt->ports) {
dev_err(&rt->dev->dev, "Stream already Prepared\n");
@@ -221,6 +221,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 prrate;
+ }
+
if (cfg->rate % ctrl->a_framer->superfreq) {
/*
* data rate not exactly multiple of super frame,
@@ -241,7 +248,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;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 2/2] slimbus: qcom-ngd-ctrl: add support for 44.1 Khz frequency
2022-09-30 10:00 [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Krzysztof Kozlowski
@ 2022-09-30 10:00 ` Krzysztof Kozlowski
2022-10-31 18:28 ` [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-30 10:00 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Srinivas Kandagatla,
linux-arm-msm, alsa-devel, linux-kernel
Cc: Krzysztof Kozlowski, Prudhvi Yarlagadda
Add support for 44.1Khz frequency by dynamically calculating the slimbus
parameters instead of statically defining them.
Co-developed-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
Signed-off-by: Prudhvi Yarlagadda <pyarlaga@codeaurora.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes since v1:
1. Rebase (drop development pieces in the context).
---
drivers/slimbus/qcom-ngd-ctrl.c | 64 ++++++++++++++++++++++++++++++---
1 file changed, 59 insertions(+), 5 deletions(-)
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index ac84fdc2822f..051ac5cba207 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -944,6 +944,54 @@ static int qcom_slim_ngd_xfer_msg_sync(struct slim_controller *ctrl,
return ret;
}
+static int qcom_slim_calc_coef(struct slim_stream_runtime *rt, int *exp)
+{
+ struct slim_controller *ctrl = rt->dev->ctrl;
+ int coef;
+
+ if (rt->ratem * ctrl->a_framer->superfreq < rt->rate)
+ rt->ratem++;
+
+ coef = rt->ratem;
+ *exp = 0;
+
+ /*
+ * CRM = Cx(2^E) is the formula we are using.
+ * Here C is the coffecient and E is the exponent.
+ * CRM is the Channel Rate Multiplier.
+ * Coefficeint should be either 1 or 3 and exponenet
+ * should be an integer between 0 to 9, inclusive.
+ */
+ while (1) {
+ while ((coef & 0x1) != 0x1) {
+ coef >>= 1;
+ *exp = *exp + 1;
+ }
+
+ if (coef <= 3)
+ break;
+
+ coef++;
+ }
+
+ /*
+ * we rely on the coef value (1 or 3) to set a bit
+ * in the slimbus message packet. This bit is
+ * BIT(5) which is the segment rate coefficient.
+ */
+ if (coef == 1) {
+ if (*exp > 9)
+ return -EIO;
+ coef = 0;
+ } else {
+ if (*exp > 8)
+ return -EIO;
+ coef = 1;
+ }
+
+ return coef;
+}
+
static int qcom_slim_ngd_enable_stream(struct slim_stream_runtime *rt)
{
struct slim_device *sdev = rt->dev;
@@ -967,16 +1015,22 @@ static int qcom_slim_ngd_enable_stream(struct slim_stream_runtime *rt)
struct slim_port *port = &rt->ports[i];
if (txn.msg->num_bytes == 0) {
- int seg_interval = SLIM_SLOTS_PER_SUPERFRAME/rt->ratem;
- int exp;
+ int exp = 0, coef = 0;
wbuf[txn.msg->num_bytes++] = sdev->laddr;
wbuf[txn.msg->num_bytes] = rt->bps >> 2 |
(port->ch.aux_fmt << 6);
- /* Data channel segment interval not multiple of 3 */
- exp = seg_interval % 3;
- if (exp)
+ /* calculate coef dynamically */
+ coef = qcom_slim_calc_coef(rt, &exp);
+ if (coef < 0) {
+ dev_err(&sdev->dev,
+ "%s: error calculating coef %d\n", __func__,
+ coef);
+ return -EIO;
+ }
+
+ if (coef)
wbuf[txn.msg->num_bytes] |= BIT(5);
txn.msg->num_bytes++;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate
2022-09-30 10:00 [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Krzysztof Kozlowski
2022-09-30 10:00 ` [PATCH v2 2/2] slimbus: qcom-ngd-ctrl: add support for 44.1 Khz frequency Krzysztof Kozlowski
@ 2022-10-31 18:28 ` Srinivas Kandagatla
1 sibling, 0 replies; 3+ messages in thread
From: Srinivas Kandagatla @ 2022-10-31 18:28 UTC (permalink / raw)
To: Krzysztof Kozlowski, Andy Gross, Bjorn Andersson, Konrad Dybcio,
linux-arm-msm, alsa-devel, linux-kernel
On 30/09/2022 11:00, 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@linaro.org>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>
> ---
Applied both,
thanks,
--srini
>
> Changes since v1:
> 1. Rebase (drop development pieces in the context).
> 2. Return prrate (which has errno) instead of -EINVAL.
> 3. Add Rb tag.
> ---
> 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 d5ce974e880b..f631d5ed9809 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;
>
> if (rt->ports) {
> dev_err(&rt->dev->dev, "Stream already Prepared\n");
> @@ -221,6 +221,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 prrate;
> + }
> +
> if (cfg->rate % ctrl->a_framer->superfreq) {
> /*
> * data rate not exactly multiple of super frame,
> @@ -241,7 +248,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;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-31 18:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-30 10:00 [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Krzysztof Kozlowski
2022-09-30 10:00 ` [PATCH v2 2/2] slimbus: qcom-ngd-ctrl: add support for 44.1 Khz frequency Krzysztof Kozlowski
2022-10-31 18:28 ` [PATCH v2 1/2] slimbus: stream: handle unsupported bitrates for presence rate Srinivas Kandagatla
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).