evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa: Fix to use GFP_DMA flag"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-09 01:36:43 -08:00 • committed by Gerrit - the friendly Code Review server
commit dc27c14f6b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/platform/msm/ipa/ipa_v2/ipa.c
View file

@ -2001,6 +2001,7 @@ static int ipa_q6_set_ex_path_dis_agg(void)
int index; int index;
struct ipa_register_write *reg_write; struct ipa_register_write *reg_write;
int retval; int retval;
gfp_t flag = GFP_KERNEL | (ipa_ctx->use_dma_zone ? GFP_DMA : 0);
desc = kcalloc(ipa_ctx->ipa_num_pipes, sizeof(struct ipa_desc), desc = kcalloc(ipa_ctx->ipa_num_pipes, sizeof(struct ipa_desc),
GFP_KERNEL); GFP_KERNEL);
@ -2018,7 +2019,7 @@ static int ipa_q6_set_ex_path_dis_agg(void)
if (ipa_ctx->ep[ep_idx].valid && if (ipa_ctx->ep[ep_idx].valid &&
ipa_ctx->ep[ep_idx].skip_ep_cfg) { ipa_ctx->ep[ep_idx].skip_ep_cfg) {
BUG_ON(num_descs >= ipa_ctx->ipa_num_pipes); BUG_ON(num_descs >= ipa_ctx->ipa_num_pipes);
reg_write = kzalloc(sizeof(*reg_write), GFP_KERNEL); reg_write = kzalloc(sizeof(*reg_write), flag);
if (!reg_write) { if (!reg_write) {
IPAERR("failed to allocate memory\n"); IPAERR("failed to allocate memory\n");
@ -2051,7 +2052,7 @@ static int ipa_q6_set_ex_path_dis_agg(void)
continue; continue;
if (IPA_CLIENT_IS_Q6_NON_ZIP_CONS(client_idx) || if (IPA_CLIENT_IS_Q6_NON_ZIP_CONS(client_idx) ||
IPA_CLIENT_IS_Q6_ZIP_CONS(client_idx)) { IPA_CLIENT_IS_Q6_ZIP_CONS(client_idx)) {
reg_write = kzalloc(sizeof(*reg_write), GFP_KERNEL); reg_write = kzalloc(sizeof(*reg_write), flag);
if (!reg_write) { if (!reg_write) {
IPAERR("failed to allocate memory\n"); IPAERR("failed to allocate memory\n");

8
drivers/platform/msm/ipa/ipa_v2/ipa_utils.c
View file

@ -4538,7 +4538,7 @@ int ipa_tag_process(struct ipa_desc desc[],
} }
/* IP_PACKET_INIT IC for tag status to be sent to apps */ /* IP_PACKET_INIT IC for tag status to be sent to apps */
pkt_init = kzalloc(sizeof(*pkt_init), GFP_KERNEL); pkt_init = kzalloc(sizeof(*pkt_init), flag);
if (!pkt_init) { if (!pkt_init) {
IPAERR("failed to allocate memory\n"); IPAERR("failed to allocate memory\n");
res = -ENOMEM; res = -ENOMEM;
@ -4557,7 +4557,7 @@ int ipa_tag_process(struct ipa_desc desc[],
desc_idx++; desc_idx++;
/* NO-OP IC for ensuring that IPA pipeline is empty */ /* NO-OP IC for ensuring that IPA pipeline is empty */
reg_write_nop = kzalloc(sizeof(*reg_write_nop), GFP_KERNEL); reg_write_nop = kzalloc(sizeof(*reg_write_nop), flag);
if (!reg_write_nop) { if (!reg_write_nop) {
IPAERR("no mem\n"); IPAERR("no mem\n");
res = -ENOMEM; res = -ENOMEM;
@ -4576,7 +4576,7 @@ int ipa_tag_process(struct ipa_desc desc[],
desc_idx++; desc_idx++;
/* status IC */ /* status IC */
status = kzalloc(sizeof(*status), GFP_KERNEL); status = kzalloc(sizeof(*status), flag);
if (!status) { if (!status) {
IPAERR("no mem\n"); IPAERR("no mem\n");
res = -ENOMEM; res = -ENOMEM;
@ -4612,7 +4612,7 @@ int ipa_tag_process(struct ipa_desc desc[],
atomic_set(&comp->cnt, 2); atomic_set(&comp->cnt, 2);
/* dummy packet to send to IPA. packet payload is a completion object */ /* dummy packet to send to IPA. packet payload is a completion object */
dummy_skb = alloc_skb(sizeof(comp), GFP_KERNEL); dummy_skb = alloc_skb(sizeof(comp), flag);
if (!dummy_skb) { if (!dummy_skb) {
IPAERR("failed to allocate memory\n"); IPAERR("failed to allocate memory\n");
res = -ENOMEM; res = -ENOMEM;