niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mailbox: mtk-cmdq: Dynamically allocate clk_bulk_data structure

Browse source 
Now that the clock probing code uses devm_kasprintf(), there is
no more restriction on the number of GCEs: dynamically allocate
the clk_bulk_data clocks array to improve flexibility and also
to get a slight memory saving on platforms featuring only one
CMDQ mailbox (and consequently only one Global Command Engine).

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
This commit is contained in:
AngeloGioacchino Del Regno 2024-06-20 12:07:49 +02:00 • committed by Jassi Brar
parent 0af932c5fc
commit aa1609f571
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/mailbox/mtk-cmdq-mailbox.c
View file

@ -22,7 +22,6 @@
#define CMDQ_OP_CODE_MASK (0xff << CMDQ_OP_CODE_SHIFT) #define CMDQ_OP_CODE_MASK (0xff << CMDQ_OP_CODE_SHIFT)
#define CMDQ_NUM_CMD(t) (t->cmd_buf_size / CMDQ_INST_SIZE) #define CMDQ_NUM_CMD(t) (t->cmd_buf_size / CMDQ_INST_SIZE)
#define CMDQ_GCE_NUM_MAX (2)
#define CMDQ_CURR_IRQ_STATUS 0x10 #define CMDQ_CURR_IRQ_STATUS 0x10
#define CMDQ_SYNC_TOKEN_UPDATE 0x68 #define CMDQ_SYNC_TOKEN_UPDATE 0x68
@ -81,7 +80,7 @@ struct cmdq {
u32 irq_mask; u32 irq_mask;
const struct gce_plat *pdata; const struct gce_plat *pdata;
struct cmdq_thread *thread; struct cmdq_thread *thread;
struct clk_bulk_data clocks[CMDQ_GCE_NUM_MAX]; struct clk_bulk_data *clocks;
bool suspended; bool suspended;
}; };
@ -584,6 +583,11 @@ static int cmdq_get_clocks(struct device *dev, struct cmdq *cmdq)
struct device_node *node, *parent = dev->of_node->parent; struct device_node *node, *parent = dev->of_node->parent;
struct clk_bulk_data *clks; struct clk_bulk_data *clks;
cmdq->clocks = devm_kcalloc(dev, cmdq->pdata->gce_num,
sizeof(cmdq->clocks), GFP_KERNEL);
if (!cmdq->clocks)
return -ENOMEM;
if (cmdq->pdata->gce_num == 1) { if (cmdq->pdata->gce_num == 1) {
clks = &cmdq->clocks[0]; clks = &cmdq->clocks[0];