| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <dc2dae02-cae8-93c1-3abd-4dd37b565863@linaro.org>
Date: Thu, 6 Apr 2023 15:28:06 +0200
From: Konrad Dybcio <konrad.dybcio@...aro.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Vinod Koul <vkoul@...nel.org>,
Bard Liao <yung-chuan.liao@...ux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@...ux.intel.com>,
Sanyog Kale <sanyog.r.kale@...el.com>,
Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
Rao Mandadapu <quic_srivasam@...cinc.com>,
linux-arm-msm@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, alsa-devel@...a-project.org
Cc: Patrick Lai <quic_plai@...cinc.com>
Subject: Re: [PATCH v2 6/7] soundwire: qcom: add support for v2.0.0 controller
On 3.04.2023 15:25, Krzysztof Kozlowski wrote:
> Add support for Qualcomm Soundwire Controller with a bit different
> register layout.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@...aro.org>
Konrad
> drivers/soundwire/qcom.c | 65 +++++++++++++++++++++++++++++++++++-----
> 1 file changed, 57 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index b6666ffe37ae..f2e1135ef113 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -31,6 +31,7 @@
> #define SWRM_VERSION_1_3_0 0x01030000
> #define SWRM_VERSION_1_5_1 0x01050001
> #define SWRM_VERSION_1_7_0 0x01070000
> +#define SWRM_VERSION_2_0_0 0x02000000
> #define SWRM_COMP_HW_VERSION 0x00
> #define SWRM_COMP_CFG_ADDR 0x04
> #define SWRM_COMP_CFG_IRQ_LEVEL_OR_PULSE_MSK BIT(1)
> @@ -42,6 +43,7 @@
> #define SWRM_COMP_PARAMS_DIN_PORTS_MASK GENMASK(9, 5)
> #define SWRM_COMP_MASTER_ID 0x104
> #define SWRM_V1_3_INTERRUPT_STATUS 0x200
> +#define SWRM_V2_0_INTERRUPT_STATUS 0x5000
> #define SWRM_INTERRUPT_STATUS_RMSK GENMASK(16, 0)
> #define SWRM_INTERRUPT_STATUS_SLAVE_PEND_IRQ BIT(0)
> #define SWRM_INTERRUPT_STATUS_NEW_SLAVE_ATTACHED BIT(1)
> @@ -54,24 +56,32 @@
> #define SWRM_INTERRUPT_STATUS_DOUT_PORT_COLLISION BIT(8)
> #define SWRM_INTERRUPT_STATUS_READ_EN_RD_VALID_MISMATCH BIT(9)
> #define SWRM_INTERRUPT_STATUS_SPECIAL_CMD_ID_FINISHED BIT(10)
> +#define SWRM_INTERRUPT_STATUS_AUTO_ENUM_FAILED BIT(11)
> +#define SWRM_INTERRUPT_STATUS_AUTO_ENUM_TABLE_IS_FULL BIT(12)
> #define SWRM_INTERRUPT_STATUS_BUS_RESET_FINISHED_V2 BIT(13)
> #define SWRM_INTERRUPT_STATUS_CLK_STOP_FINISHED_V2 BIT(14)
> #define SWRM_INTERRUPT_STATUS_EXT_CLK_STOP_WAKEUP BIT(16)
> #define SWRM_INTERRUPT_MAX 17
> #define SWRM_V1_3_INTERRUPT_MASK_ADDR 0x204
> #define SWRM_V1_3_INTERRUPT_CLEAR 0x208
> +#define SWRM_V2_0_INTERRUPT_CLEAR 0x5008
> #define SWRM_V1_3_INTERRUPT_CPU_EN 0x210
> +#define SWRM_V2_0_INTERRUPT_CPU_EN 0x5004
> #define SWRM_V1_3_CMD_FIFO_WR_CMD 0x300
> +#define SWRM_V2_0_CMD_FIFO_WR_CMD 0x5020
> #define SWRM_V1_3_CMD_FIFO_RD_CMD 0x304
> +#define SWRM_V2_0_CMD_FIFO_RD_CMD 0x5024
> #define SWRM_CMD_FIFO_CMD 0x308
> #define SWRM_CMD_FIFO_FLUSH 0x1
> #define SWRM_V1_3_CMD_FIFO_STATUS 0x30C
> +#define SWRM_V2_0_CMD_FIFO_STATUS 0x5050
> #define SWRM_RD_CMD_FIFO_CNT_MASK GENMASK(20, 16)
> #define SWRM_WR_CMD_FIFO_CNT_MASK GENMASK(12, 8)
> #define SWRM_CMD_FIFO_CFG_ADDR 0x314
> #define SWRM_CONTINUE_EXEC_ON_CMD_IGNORE BIT(31)
> #define SWRM_RD_WR_CMD_RETRIES 0x7
> #define SWRM_V1_3_CMD_FIFO_RD_FIFO_ADDR 0x318
> +#define SWRM_V2_0_CMD_FIFO_RD_FIFO_ADDR 0x5040
> #define SWRM_RD_FIFO_CMD_ID_MASK GENMASK(11, 8)
> #define SWRM_ENUMERATOR_CFG_ADDR 0x500
> #define SWRM_ENUMERATOR_SLAVE_DEV_ID_1(m) (0x530 + 0x8 * (m))
> @@ -98,6 +108,11 @@
> #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_V1_3_MSTR_MAX_REG_ADDR 0x1740
> +#define SWR_V2_0_MSTR_MAX_REG_ADDR 0x50ac
> +
> +#define SWRM_V2_0_CLK_CTRL 0x5060
> +#define SWRM_V2_0_CLK_CTRL_CLK_START BIT(0)
> +#define SWRM_V2_0_LINK_STATUS 0x5064
>
> #define SWRM_DP_PORT_CTRL_EN_CHAN_SHFT 0x18
> #define SWRM_DP_PORT_CTRL_OFFSET2_SHFT 0x10
> @@ -243,6 +258,26 @@ static const struct qcom_swrm_data swrm_v1_6_data = {
> .reg_layout = swrm_v1_3_reg_layout,
> };
>
> +static const unsigned int swrm_v2_0_reg_layout[] = {
> + [SWRM_REG_FRAME_GEN_ENABLED] = SWRM_V2_0_LINK_STATUS,
> + [SWRM_REG_INTERRUPT_STATUS] = SWRM_V2_0_INTERRUPT_STATUS,
> + [SWRM_REG_INTERRUPT_MASK_ADDR] = 0, /* Not present */
> + [SWRM_REG_INTERRUPT_CLEAR] = SWRM_V2_0_INTERRUPT_CLEAR,
> + [SWRM_REG_INTERRUPT_CPU_EN] = SWRM_V2_0_INTERRUPT_CPU_EN,
> + [SWRM_REG_CMD_FIFO_WR_CMD] = SWRM_V2_0_CMD_FIFO_WR_CMD,
> + [SWRM_REG_CMD_FIFO_RD_CMD] = SWRM_V2_0_CMD_FIFO_RD_CMD,
> + [SWRM_REG_CMD_FIFO_STATUS] = SWRM_V2_0_CMD_FIFO_STATUS,
> + [SWRM_REG_CMD_FIFO_RD_FIFO_ADDR] = SWRM_V2_0_CMD_FIFO_RD_FIFO_ADDR,
> +};
> +
> +static const struct qcom_swrm_data swrm_v2_0_data = {
> + .default_rows = 50,
> + .default_cols = 16,
> + .sw_clk_gate_required = true,
> + .max_reg = SWR_V2_0_MSTR_MAX_REG_ADDR,
> + .reg_layout = swrm_v2_0_reg_layout,
> +};
> +
> #define to_qcom_sdw(b) container_of(b, struct qcom_swrm_ctrl, bus)
>
> static int qcom_swrm_ahb_reg_read(struct qcom_swrm_ctrl *ctrl, int reg,
> @@ -748,18 +783,23 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl)
>
> ctrl->intr_mask = SWRM_INTERRUPT_STATUS_RMSK;
> /* Mask soundwire interrupts */
> - ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> - SWRM_INTERRUPT_STATUS_RMSK);
> + if (ctrl->version < SWRM_VERSION_2_0_0)
> + ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> + SWRM_INTERRUPT_STATUS_RMSK);
>
> /* Configure No pings */
> ctrl->reg_read(ctrl, SWRM_MCP_CFG_ADDR, &val);
> u32p_replace_bits(&val, SWRM_DEF_CMD_NO_PINGS, SWRM_MCP_CFG_MAX_NUM_OF_CMD_NO_PINGS_BMSK);
> ctrl->reg_write(ctrl, SWRM_MCP_CFG_ADDR, val);
>
> - if (ctrl->version >= SWRM_VERSION_1_7_0) {
> + if (ctrl->version == SWRM_VERSION_1_7_0) {
> ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
> ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
> SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
> + } else if (ctrl->version >= SWRM_VERSION_2_0_0) {
> + ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
> + ctrl->reg_write(ctrl, SWRM_V2_0_CLK_CTRL,
> + SWRM_V2_0_CLK_CTRL_CLK_START);
> } else {
> ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
> }
> @@ -1609,10 +1649,14 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
> } else {
> reset_control_reset(ctrl->audio_cgcr);
>
> - if (ctrl->version >= SWRM_VERSION_1_7_0) {
> + if (ctrl->version == SWRM_VERSION_1_7_0) {
> ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
> ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL,
> SWRM_MCP_BUS_CLK_START << SWRM_EE_CPU);
> + } else if (ctrl->version >= SWRM_VERSION_2_0_0) {
> + ctrl->reg_write(ctrl, SWRM_LINK_MANAGER_EE, SWRM_EE_CPU);
> + ctrl->reg_write(ctrl, SWRM_V2_0_CLK_CTRL,
> + SWRM_V2_0_CLK_CTRL_CLK_START);
> } else {
> ctrl->reg_write(ctrl, SWRM_MCP_BUS_CTRL, SWRM_MCP_BUS_CLK_START);
> }
> @@ -1620,8 +1664,10 @@ static int __maybe_unused swrm_runtime_resume(struct device *dev)
> SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET);
>
> ctrl->intr_mask |= SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;
> - ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> - ctrl->intr_mask);
> + if (ctrl->version < SWRM_VERSION_2_0_0)
> + ctrl->reg_write(ctrl,
> + ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> + ctrl->intr_mask);
> ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_CPU_EN],
> ctrl->intr_mask);
>
> @@ -1645,8 +1691,10 @@ static int __maybe_unused swrm_runtime_suspend(struct device *dev)
> if (!ctrl->clock_stop_not_supported) {
> /* Mask bus clash interrupt */
> ctrl->intr_mask &= ~SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET;
> - ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> - ctrl->intr_mask);
> + if (ctrl->version < SWRM_VERSION_2_0_0)
> + ctrl->reg_write(ctrl,
> + ctrl->reg_layout[SWRM_REG_INTERRUPT_MASK_ADDR],
> + ctrl->intr_mask);
> ctrl->reg_write(ctrl, ctrl->reg_layout[SWRM_REG_INTERRUPT_CPU_EN],
> ctrl->intr_mask);
> /* Prepare slaves for clock stop */
> @@ -1684,6 +1732,7 @@ static const struct of_device_id qcom_swrm_of_match[] = {
> { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data },
> { .compatible = "qcom,soundwire-v1.6.0", .data = &swrm_v1_6_data },
> { .compatible = "qcom,soundwire-v1.7.0", .data = &swrm_v1_5_data },
> + { .compatible = "qcom,soundwire-v2.0.0", .data = &swrm_v2_0_data },
> {/* sentinel */},
> };
>
Powered by blists - more mailing lists