Re: [PATCH v2 3/3] soundwire: qcom: get max rows and cols info from compatible

On 16/09/2020 13:49, Vinod Koul wrote:

On 16-09-20, 10:21, Srinivas Kandagatla wrote:

...

currently the max rows and cols values are hardcoded. In reality these values depend on the IP version. So get these based on device tree compatible strings.

Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org

drivers/soundwire/qcom.c | 50 ++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 76963a7bdaa3..1dbf33684470 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -66,11 +66,6 @@ #define SWRM_REG_VAL_PACK(data, dev, id, reg) \ ((reg) | ((id) << 16) | ((dev) << 20) | ((data) << 24))

-#define SWRM_MAX_ROW_VAL 0 /* Rows = 48 */ -#define SWRM_DEFAULT_ROWS 48 -#define SWRM_MIN_COL_VAL 0 /* Cols = 2 */ -#define SWRM_DEFAULT_COL 16 -#define SWRM_MAX_COL_VAL 7 #define SWRM_SPECIAL_CMD_ID 0xF #define MAX_FREQ_NUM 1 #define TIMEOUT_MS (2 * HZ) @@ -104,6 +99,8 @@ struct qcom_swrm_ctrl { unsigned int version; int num_din_ports; int num_dout_ports;

• int cols_index;
• int rows_index; unsigned long dout_port_mask; unsigned long din_port_mask; struct qcom_swrm_port_config pconfig[QCOM_SDW_MAX_PORTS];

@@ -113,6 +110,21 @@ struct qcom_swrm_ctrl { int (*reg_write)(struct qcom_swrm_ctrl *ctrl, int reg, int val); };

+struct qcom_swrm_data {

• u32 default_cols;
• u32 default_rows;

+};

+static struct qcom_swrm_data swrm_v1_3_data = {

• .default_rows = 48,
• .default_cols = 16,

+};

+static struct qcom_swrm_data swrm_v1_5_data = {

• .default_rows = 50,
• .default_cols = 16,

+};

• #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,

@@ -299,8 +311,10 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) u32 val;

/* Clear Rows and Cols */

• val = FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK, SWRM_MAX_ROW_VAL);
• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK, SWRM_MIN_COL_VAL);

• val = FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK,

• 	 ctrl->rows_index);
  

• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK,

• 	  ctrl->cols_index);
  

single line for these ?

My vimrc had this 80 line autowrap thingy which might have done this!!

...

ctrl->reg_write(ctrl, SWRM_MCP_FRAME_CTRL_BANK_ADDR(0), val);

@@ -378,8 +392,10 @@ static int qcom_swrm_pre_bank_switch(struct sdw_bus *bus) val &= ~SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK; val &= ~SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK;

• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK, SWRM_MAX_COL_VAL);
• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK, SWRM_MAX_ROW_VAL);

• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK,

• 	  ctrl->cols_index);
  

• val |= FIELD_PREP(SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK,

• 	  ctrl->rows_index);
  

here as well

...

return ctrl->reg_write(ctrl, reg, val); } @@ -780,6 +796,7 @@ static int qcom_swrm_probe(struct platform_device *pdev) struct sdw_master_prop *prop; struct sdw_bus_params *params; struct qcom_swrm_ctrl *ctrl;

• const struct qcom_swrm_data *data; int ret; u32 val;

@@ -787,6 +804,9 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (!ctrl) return -ENOMEM;

• data = of_device_get_match_data(dev);

Wont it be good to check if data is valid, we do dereference it few line below

We Should not hit that case as we will never reach here without matching compatible! If you insist, I can add a check but data will be always be valid at the time of check!

...

• ctrl->rows_index = sdw_find_row_index(data->default_rows);
• ctrl->cols_index = sdw_find_col_index(data->default_cols); #if IS_ENABLED(CONFIG_SLIMBUS) if (dev->parent->bus == &slimbus_bus) { #else

@@ -836,8 +856,8 @@ static int qcom_swrm_probe(struct platform_device *pdev) params = &ctrl->bus.params; params->max_dr_freq = DEFAULT_CLK_FREQ; params->curr_dr_freq = DEFAULT_CLK_FREQ;

• params->col = SWRM_DEFAULT_COL;
• params->row = SWRM_DEFAULT_ROWS;

• params->col = data->default_cols;
• params->row = data->default_rows; ctrl->reg_read(ctrl, SWRM_MCP_STATUS, &val); params->curr_bank = val & SWRM_MCP_STATUS_BANK_NUM_MASK; params->next_bank = !params->curr_bank;

@@ -847,8 +867,8 @@ static int qcom_swrm_probe(struct platform_device *pdev) prop->num_clk_gears = 0; prop->num_clk_freq = MAX_FREQ_NUM; prop->clk_freq = &qcom_swrm_freq_tbl[0];

• prop->default_col = SWRM_DEFAULT_COL;
• prop->default_row = SWRM_DEFAULT_ROWS;

• prop->default_col = data->default_cols;

• prop->default_row = data->default_rows;

  ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &ctrl->version);

@@ -899,8 +919,8 @@ static int qcom_swrm_remove(struct platform_device *pdev) }

static const struct of_device_id qcom_swrm_of_match[] = {

• { .compatible = "qcom,soundwire-v1.3.0", },
• { .compatible = "qcom,soundwire-v1.5.1", },

• { .compatible = "qcom,soundwire-v1.3.0", .data = &swrm_v1_3_data },
• { .compatible = "qcom,soundwire-v1.5.1", .data = &swrm_v1_5_data }, {/* sentinel */}, };

-- 2.21.0