Skip to content

audioreach-driver: fix const-correctness and header rewrite #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quic-aditrath merged 1 commit into from
Mar 4, 2026
Merged

audioreach-driver: fix const-correctness and header rewrite #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions audioreach-driver/q6apm_audio_pkt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,28 +590,30 @@ static int q6apm_audio_pkt_probe(gpr_device_t *adev)
return ret;
}

static int q6apm_audio_pkt_callback(struct gpr_resp_pkt *data, void *priv, int op)
static int q6apm_audio_pkt_callback(const struct gpr_resp_pkt *data, void *priv, int op)
{
gpr_device_t *gdev = priv;
struct q6apm_audio_pkt *apm = dev_get_drvdata(&gdev->dev);
struct gpr_ibasic_rsp_result_t *result;
struct gpr_hdr *hdr = &data->hdr;
const struct gpr_ibasic_rsp_result_t *result;
const struct gpr_hdr *hdr = &data->hdr;
uint8_t *pkt = NULL;
uint16_t hdr_size, pkt_size;
unsigned long flags;
struct sk_buff *skb;
int ret;
struct gpr_port_map *audpkt_port_map;

u16 new_dest_port = 0, new_src_port = 0;
bool remap_ports = false;

hdr_size = hdr->hdr_size * 4;
pkt_size = hdr->pkt_size;

mutex_lock(&apm->audpkt_port_lock);
audpkt_port_map = idr_find(&apm->audpkt_port_idr, hdr->token);
if (audpkt_port_map) {
hdr->dest_port = audpkt_port_map->src_port;
hdr->src_port = audpkt_port_map->dst_port;
new_dest_port = audpkt_port_map->src_port;
new_src_port = audpkt_port_map->dst_port;
remap_ports = true;

idr_remove(&apm->audpkt_port_idr, hdr->token);
kfree(audpkt_port_map);
Expand All @@ -627,9 +629,18 @@ static int q6apm_audio_pkt_callback(struct gpr_resp_pkt *data, void *priv, int o
memcpy(pkt, (uint8_t *)data, hdr_size);
memcpy(pkt + hdr_size, (uint8_t *)data->payload, pkt_size - hdr_size);

if (remap_ports) {
struct gpr_hdr *out_hdr = (struct gpr_hdr *)pkt;

out_hdr->dest_port = new_dest_port;
out_hdr->src_port = new_src_port;
}

skb = alloc_skb(pkt_size, GFP_ATOMIC);
if (!skb)
if (!skb) {
kfree(pkt);
return -ENOMEM;
}

skb_put_data(skb, (void *)pkt, pkt_size);

Expand Down
6 changes: 3 additions & 3 deletions audioreach-driver/q6prm_audioreach.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@ int q6prm_audioreach_set_lpass_clock(struct device *dev, int clk_id, int clk_att
return q6prm_audioreach_release_lpass_clock(dev, clk_id, clk_attr, clk_root, freq);
}

static int prm_audioreach_callback(struct gpr_resp_pkt *data, void *priv, int op)
static int prm_audioreach_callback(const struct gpr_resp_pkt *data, void *priv, int op)
{
gpr_device_t *gdev = priv;
struct q6prm *prm = dev_get_drvdata(&gdev->dev);
struct gpr_ibasic_rsp_result_t *result;
struct gpr_hdr *hdr = &data->hdr;
const struct gpr_ibasic_rsp_result_t *result;
const struct gpr_hdr *hdr = &data->hdr;

switch (hdr->opcode) {
case PRM_CMD_RSP_REQUEST_HW_RSC:
Expand Down
Loading