Merge "msm: ipa3: embellish access control policy algorithm" (2f8dad8f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/platform/msm/ipa/ipa_v3/dump/ipa_reg_dump.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -696,7 +696,7 @@ static struct reg_access_funcs_s *get_access_funcs(u32 addr)

		for (i = 0; i < ARRAY_SIZE(mem_access_map); i++) {
		if (addr >= mem_access_map[i].addr_range_begin &&
		addr <= mem_access_map[i].addr_range_end) {
		addr < mem_access_map[i].addr_range_end) {
		return mem_access_map[i].access[asub];
		}
		}

+2 −12

Original line number	Diff line number	Diff line
		@@ -13,16 +13,6 @@
		#include "ipa_pkt_cntxt.h"
		#include "ipa_hw_common_ex.h"

		/*
		* The following macros are used to peek and poke register values and
		* are required by some of the macros and include files that follow...
		*/
		#define my_in_dword(addr) \
		(readl(addr))

		#define my_out_dword(addr, val) \
		({ __iowmb(); writel_relaxed((val), (addr)); })

		#define IPA_0_IPA_WRAPPER_BASE 0 /* required by following includes */

		#include "ipa_hwio.h"
		@@ -1292,7 +1282,7 @@ struct regs_save_hierarchy_s {
		static inline u32
		act_read(void __iomem *addr)
		{
		u32 val = my_in_dword(addr);
		u32 val = ioread32(addr);

		return val;
		}
		@@ -1303,7 +1293,7 @@ act_read(void __iomem *addr)
		static inline void
		act_write(void __iomem *addr, u32 val)
		{
		my_out_dword(addr, val);
		iowrite32(val, addr);
		}

		/*