Merge "msm: ipa4: Fix to change the header address to u64" (5b40f23e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/platform/msm/ipa/ipa_v3/ipa_hdr.c

+4 −4

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		*/

		#include "ipa_i.h"
		@@ -54,7 +54,7 @@ static int ipa3_generate_hdr_hw_tbl(struct ipa_mem_buffer *mem)
		}

		static int ipa3_hdr_proc_ctx_to_hw_format(struct ipa_mem_buffer *mem,
		u32 hdr_base_addr)
		u64 hdr_base_addr)
		{
		struct ipa3_hdr_proc_ctx_entry *entry;
		int ret;
		@@ -109,10 +109,10 @@ static int ipa3_hdr_proc_ctx_to_hw_format(struct ipa_mem_buffer *mem,
		*
		* Returns: 0 on success, negative on failure
		*/
		static int ipa3_generate_hdr_proc_ctx_hw_tbl(u32 hdr_sys_addr,
		static int ipa3_generate_hdr_proc_ctx_hw_tbl(u64 hdr_sys_addr,
		struct ipa_mem_buffer mem, struct ipa_mem_buffer aligned_mem)
		{
		u32 hdr_base_addr;
		u64 hdr_base_addr;

		mem->size = (ipa3_ctx->hdr_proc_ctx_tbl.end) ? : 4;

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1197,7 +1197,7 @@ static void ipahal_cp_hdr_to_hw_buff_v3(void *const base, u32 offset,
		static int ipahal_cp_proc_ctx_to_hw_buff_v3(enum ipa_hdr_proc_type type,
		void *const base, u32 offset,
		u32 hdr_len, bool is_hdr_proc_ctx,
		dma_addr_t phys_base, u32 hdr_base_addr,
		dma_addr_t phys_base, u64 hdr_base_addr,
		struct ipa_hdr_offset_entry *offset_entry,
		struct ipa_l2tp_hdr_proc_ctx_params l2tp_params)
		{
		@@ -1346,7 +1346,7 @@ struct ipahal_hdr_funcs {
		int (*ipahal_cp_proc_ctx_to_hw_buff)(enum ipa_hdr_proc_type type,
		void *const base, u32 offset, u32 hdr_len,
		bool is_hdr_proc_ctx, dma_addr_t phys_base,
		u32 hdr_base_addr,
		u64 hdr_base_addr,
		struct ipa_hdr_offset_entry *offset_entry,
		struct ipa_l2tp_hdr_proc_ctx_params l2tp_params);

		@@ -1418,11 +1418,11 @@ void ipahal_cp_hdr_to_hw_buff(void base, u32 offset, u8 const hdr,
		int ipahal_cp_proc_ctx_to_hw_buff(enum ipa_hdr_proc_type type,
		void *const base, u32 offset, u32 hdr_len,
		bool is_hdr_proc_ctx, dma_addr_t phys_base,
		u32 hdr_base_addr, struct ipa_hdr_offset_entry *offset_entry,
		u64 hdr_base_addr, struct ipa_hdr_offset_entry *offset_entry,
		struct ipa_l2tp_hdr_proc_ctx_params l2tp_params)
		{
		IPAHAL_DBG(
		"type %d, base %pK, offset %d, hdr_len %d, is_hdr_proc_ctx %d, hdr_base_addr %d, offset_entry %pK\n"
		"type %d, base %pK, offset %d, hdr_len %d, is_hdr_proc_ctx %d, hdr_base_addr %llu, offset_entry %pK\n"
		, type, base, offset, hdr_len, is_hdr_proc_ctx,
		hdr_base_addr, offset_entry);

		@@ -1432,7 +1432,7 @@ int ipahal_cp_proc_ctx_to_hw_buff(enum ipa_hdr_proc_type type,
		(!is_hdr_proc_ctx && !offset_entry) \|\|
		(!is_hdr_proc_ctx && !hdr_base_addr)) {
		IPAHAL_ERR(
		"invalid input: hdr_len:%u phys_base:%pad hdr_base_addr:%u is_hdr_proc_ctx:%d offset_entry:%pK\n"
		"invalid input: hdr_len:%u phys_base:%pad hdr_base_addr:%llu is_hdr_proc_ctx:%d offset_entry:%pK\n"
		, hdr_len, &phys_base, hdr_base_addr
		, is_hdr_proc_ctx, offset_entry);
		return -EINVAL;

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.h

+2 −2

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		/*
		* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		*/

		#ifndef _IPAHAL_H_
		@@ -634,7 +634,7 @@ void ipahal_cp_hdr_to_hw_buff(void base, u32 offset, u8 hdr, u32 hdr_len);
		int ipahal_cp_proc_ctx_to_hw_buff(enum ipa_hdr_proc_type type,
		void *base, u32 offset, u32 hdr_len,
		bool is_hdr_proc_ctx, dma_addr_t phys_base,
		u32 hdr_base_addr,
		u64 hdr_base_addr,
		struct ipa_hdr_offset_entry *offset_entry,
		struct ipa_l2tp_hdr_proc_ctx_params l2tp_params);