Skip to content

Commit b81b2d5

Browse files
Chun-Kuang HuAngeloGioacchino Del Regno
authored andcommitted
soc: mediatek: cmdq: Refine cmdq_pkt_create() and cmdq_pkt_destroy()
cmdq_pkt_create() and cmdq_pkt_destroy() is not suitable for client drivers so each client driver has implement its own function. This refinement would pass struct cmdq_pkt pointer into cmdq_pkt_create(). In addition, client driver has the struct cmdq_client information, so it's not necessary to store this information in struct cmdq_pkt. After this refinement, client drivers could use these helper funciton instead of implementing its own version. Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://lore.kernel.org/r/20240222154120.16959-8-chunkuang.hu@kernel.org Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
1 parent 9935af9 commit b81b2d5

2 files changed

Lines changed: 15 additions & 23 deletions

File tree

drivers/soc/mediatek/mtk-cmdq-helper.c

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,47 +106,37 @@ void cmdq_mbox_destroy(struct cmdq_client *client)
106106
}
107107
EXPORT_SYMBOL(cmdq_mbox_destroy);
108108

109-
struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t size)
109+
int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t size)
110110
{
111-
struct cmdq_pkt *pkt;
112111
struct device *dev;
113112
dma_addr_t dma_addr;
114113

115-
pkt = kzalloc(sizeof(*pkt), GFP_KERNEL);
116-
if (!pkt)
117-
return ERR_PTR(-ENOMEM);
118114
pkt->va_base = kzalloc(size, GFP_KERNEL);
119-
if (!pkt->va_base) {
120-
kfree(pkt);
121-
return ERR_PTR(-ENOMEM);
122-
}
115+
if (!pkt->va_base)
116+
return -ENOMEM;
117+
123118
pkt->buf_size = size;
124-
pkt->cl = (void *)client;
125119

126120
dev = client->chan->mbox->dev;
127121
dma_addr = dma_map_single(dev, pkt->va_base, pkt->buf_size,
128122
DMA_TO_DEVICE);
129123
if (dma_mapping_error(dev, dma_addr)) {
130124
dev_err(dev, "dma map failed, size=%u\n", (u32)(u64)size);
131125
kfree(pkt->va_base);
132-
kfree(pkt);
133-
return ERR_PTR(-ENOMEM);
126+
return -ENOMEM;
134127
}
135128

136129
pkt->pa_base = dma_addr;
137130

138-
return pkt;
131+
return 0;
139132
}
140133
EXPORT_SYMBOL(cmdq_pkt_create);
141134

142-
void cmdq_pkt_destroy(struct cmdq_pkt *pkt)
135+
void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt)
143136
{
144-
struct cmdq_client *client = (struct cmdq_client *)pkt->cl;
145-
146137
dma_unmap_single(client->chan->mbox->dev, pkt->pa_base, pkt->buf_size,
147138
DMA_TO_DEVICE);
148139
kfree(pkt->va_base);
149-
kfree(pkt);
150140
}
151141
EXPORT_SYMBOL(cmdq_pkt_destroy);
152142

include/linux/soc/mediatek/mtk-cmdq.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,19 @@ void cmdq_mbox_destroy(struct cmdq_client *client);
6262
/**
6363
* cmdq_pkt_create() - create a CMDQ packet
6464
* @client: the CMDQ mailbox client
65+
* @pkt: the CMDQ packet
6566
* @size: required CMDQ buffer size
6667
*
67-
* Return: CMDQ packet pointer
68+
* Return: 0 for success; else the error code is returned
6869
*/
69-
struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t size);
70+
int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t size);
7071

7172
/**
7273
* cmdq_pkt_destroy() - destroy the CMDQ packet
74+
* @client: the CMDQ mailbox client
7375
* @pkt: the CMDQ packet
7476
*/
75-
void cmdq_pkt_destroy(struct cmdq_pkt *pkt);
77+
void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt);
7678

7779
/**
7880
* cmdq_pkt_write() - append write command to the CMDQ packet
@@ -318,12 +320,12 @@ static inline struct cmdq_client *cmdq_mbox_create(struct device *dev, int index
318320

319321
static inline void cmdq_mbox_destroy(struct cmdq_client *client) { }
320322

321-
static inline struct cmdq_pkt *cmdq_pkt_create(struct cmdq_client *client, size_t size)
323+
static inline int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t size)
322324
{
323-
return ERR_PTR(-EINVAL);
325+
return -EINVAL;
324326
}
325327

326-
static inline void cmdq_pkt_destroy(struct cmdq_pkt *pkt) { }
328+
static inline void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt) { }
327329

328330
static inline int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value)
329331
{

0 commit comments

Comments
 (0)