The port sample interval was always 16-bit, split into low and high
bytes. This split was unnecessary, although harmless for older devices
because all of them used only lower byte (so values < 0xff). With
support for Soundwire controller on Qualcomm SM8550 and its devices,
both bytes will be used, thus add a new 'qcom,ports-sinterval' property
to allow 16-bit sample intervals.
Reviewed-by: Konrad Dybcio <[email protected]>
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Changes since v2:
1. Use uint16 for qcom,ports-sinterval.
2. Add tags.
Changes since v1:
1. Drop unneeded semicolon.
---
drivers/soundwire/qcom.c | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index c296e0bf897b..d051dc408532 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -95,6 +95,7 @@
#define SWRM_DP_BLOCK_CTRL2_BANK(n, m) (0x1130 + 0x100 * (n - 1) + 0x40 * m)
#define SWRM_DP_PORT_HCTRL_BANK(n, m) (0x1134 + 0x100 * (n - 1) + 0x40 * m)
#define SWRM_DP_BLOCK_CTRL3_BANK(n, m) (0x1138 + 0x100 * (n - 1) + 0x40 * m)
+#define SWRM_DP_SAMPLECTRL2_BANK(n, m) (0x113C + 0x100 * (n - 1) + 0x40 * m)
#define SWRM_DIN_DPn_PCM_PORT_CTRL(n) (0x1054 + 0x100 * (n - 1))
#define SWR_MSTR_MAX_REG_ADDR (0x1740)
@@ -131,7 +132,7 @@ enum {
};
struct qcom_swrm_port_config {
- u8 si;
+ u16 si;
u8 off1;
u8 off2;
u8 bp_mode;
@@ -806,12 +807,20 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
value = pcfg->off1 << SWRM_DP_PORT_CTRL_OFFSET1_SHFT;
value |= pcfg->off2 << SWRM_DP_PORT_CTRL_OFFSET2_SHFT;
- value |= pcfg->si;
+ value |= pcfg->si & 0xff;
ret = ctrl->reg_write(ctrl, reg, value);
if (ret)
goto err;
+ if (pcfg->si > 0xff) {
+ value = (pcfg->si >> 8) & 0xff;
+ reg = SWRM_DP_SAMPLECTRL2_BANK(params->port_num, bank);
+ ret = ctrl->reg_write(ctrl, reg, value);
+ if (ret)
+ goto err;
+ }
+
if (pcfg->lane_control != SWR_INVALID_PARAM) {
reg = SWRM_DP_PORT_CTRL_2_BANK(params->port_num, bank);
value = pcfg->lane_control;
@@ -1185,7 +1194,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
struct device_node *np = ctrl->dev->of_node;
u8 off1[QCOM_SDW_MAX_PORTS];
u8 off2[QCOM_SDW_MAX_PORTS];
- u8 si[QCOM_SDW_MAX_PORTS];
+ u16 si[QCOM_SDW_MAX_PORTS];
u8 bp_mode[QCOM_SDW_MAX_PORTS] = { 0, };
u8 hstart[QCOM_SDW_MAX_PORTS];
u8 hstop[QCOM_SDW_MAX_PORTS];
@@ -1193,6 +1202,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
u8 blk_group_count[QCOM_SDW_MAX_PORTS];
u8 lane_control[QCOM_SDW_MAX_PORTS];
int i, ret, nports, val;
+ bool si_16 = false;
ctrl->reg_read(ctrl, SWRM_COMP_PARAMS, &val);
@@ -1236,9 +1246,14 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
return ret;
ret = of_property_read_u8_array(np, "qcom,ports-sinterval-low",
- si, nports);
- if (ret)
- return ret;
+ (u8 *)si, nports);
+ if (ret) {
+ ret = of_property_read_u16_array(np, "qcom,ports-sinterval",
+ si, nports);
+ if (ret)
+ return ret;
+ si_16 = true;
+ }
ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",
bp_mode, nports);
@@ -1266,7 +1281,10 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
for (i = 0; i < nports; i++) {
/* Valid port number range is from 1-14 */
- ctrl->pconfig[i + 1].si = si[i];
+ if (si_16)
+ ctrl->pconfig[i + 1].si = si[i];
+ else
+ ctrl->pconfig[i + 1].si = ((u8 *)si)[i];
ctrl->pconfig[i + 1].off1 = off1[i];
ctrl->pconfig[i + 1].off2 = off2[i];
ctrl->pconfig[i + 1].bp_mode = bp_mode[i];
--
2.34.1
On 18/04/2023 10:54, Krzysztof Kozlowski wrote:
> The port sample interval was always 16-bit, split into low and high
> bytes. This split was unnecessary, although harmless for older devices
> because all of them used only lower byte (so values < 0xff). With
> support for Soundwire controller on Qualcomm SM8550 and its devices,
> both bytes will be used, thus add a new 'qcom,ports-sinterval' property
> to allow 16-bit sample intervals.
>
> Reviewed-by: Konrad Dybcio <[email protected]>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> ---
>
LGTM,
Reviewed-by: Srinivas Kandagatla <[email protected]>
--srini
> Changes since v2:
> 1. Use uint16 for qcom,ports-sinterval.
> 2. Add tags.
>
> Changes since v1:
> 1. Drop unneeded semicolon.
> ---
> drivers/soundwire/qcom.c | 32 +++++++++++++++++++++++++-------
> 1 file changed, 25 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index c296e0bf897b..d051dc408532 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -95,6 +95,7 @@
> #define SWRM_DP_BLOCK_CTRL2_BANK(n, m) (0x1130 + 0x100 * (n - 1) + 0x40 * m)
> #define SWRM_DP_PORT_HCTRL_BANK(n, m) (0x1134 + 0x100 * (n - 1) + 0x40 * m)
> #define SWRM_DP_BLOCK_CTRL3_BANK(n, m) (0x1138 + 0x100 * (n - 1) + 0x40 * m)
> +#define SWRM_DP_SAMPLECTRL2_BANK(n, m) (0x113C + 0x100 * (n - 1) + 0x40 * m)
> #define SWRM_DIN_DPn_PCM_PORT_CTRL(n) (0x1054 + 0x100 * (n - 1))
> #define SWR_MSTR_MAX_REG_ADDR (0x1740)
>
> @@ -131,7 +132,7 @@ enum {
> };
>
> struct qcom_swrm_port_config {
> - u8 si;
> + u16 si;
> u8 off1;
> u8 off2;
> u8 bp_mode;
> @@ -806,12 +807,20 @@ static int qcom_swrm_transport_params(struct sdw_bus *bus,
>
> value = pcfg->off1 << SWRM_DP_PORT_CTRL_OFFSET1_SHFT;
> value |= pcfg->off2 << SWRM_DP_PORT_CTRL_OFFSET2_SHFT;
> - value |= pcfg->si;
> + value |= pcfg->si & 0xff;
>
> ret = ctrl->reg_write(ctrl, reg, value);
> if (ret)
> goto err;
>
> + if (pcfg->si > 0xff) {
> + value = (pcfg->si >> 8) & 0xff;
> + reg = SWRM_DP_SAMPLECTRL2_BANK(params->port_num, bank);
> + ret = ctrl->reg_write(ctrl, reg, value);
> + if (ret)
> + goto err;
> + }
> +
> if (pcfg->lane_control != SWR_INVALID_PARAM) {
> reg = SWRM_DP_PORT_CTRL_2_BANK(params->port_num, bank);
> value = pcfg->lane_control;
> @@ -1185,7 +1194,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
> struct device_node *np = ctrl->dev->of_node;
> u8 off1[QCOM_SDW_MAX_PORTS];
> u8 off2[QCOM_SDW_MAX_PORTS];
> - u8 si[QCOM_SDW_MAX_PORTS];
> + u16 si[QCOM_SDW_MAX_PORTS];
> u8 bp_mode[QCOM_SDW_MAX_PORTS] = { 0, };
> u8 hstart[QCOM_SDW_MAX_PORTS];
> u8 hstop[QCOM_SDW_MAX_PORTS];
> @@ -1193,6 +1202,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
> u8 blk_group_count[QCOM_SDW_MAX_PORTS];
> u8 lane_control[QCOM_SDW_MAX_PORTS];
> int i, ret, nports, val;
> + bool si_16 = false;
>
> ctrl->reg_read(ctrl, SWRM_COMP_PARAMS, &val);
>
> @@ -1236,9 +1246,14 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
> return ret;
>
> ret = of_property_read_u8_array(np, "qcom,ports-sinterval-low",
> - si, nports);
> - if (ret)
> - return ret;
> + (u8 *)si, nports);
> + if (ret) {
> + ret = of_property_read_u16_array(np, "qcom,ports-sinterval",
> + si, nports);
> + if (ret)
> + return ret;
> + si_16 = true;
> + }
>
> ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",
> bp_mode, nports);
> @@ -1266,7 +1281,10 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
>
> for (i = 0; i < nports; i++) {
> /* Valid port number range is from 1-14 */
> - ctrl->pconfig[i + 1].si = si[i];
> + if (si_16)
> + ctrl->pconfig[i + 1].si = si[i];
> + else
> + ctrl->pconfig[i + 1].si = ((u8 *)si)[i];
> ctrl->pconfig[i + 1].off1 = off1[i];
> ctrl->pconfig[i + 1].off2 = off2[i];
> ctrl->pconfig[i + 1].bp_mode = bp_mode[i];