Merge "msm: ipa: Add dummy API to check if NAPI LAN rx is enabled" (31025a42) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_api.c

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3403,6 +3403,19 @@ int ipa_disable_wdi_pipes(int ipa_ep_idx_tx, int ipa_ep_idx_rx)
	return ret;		return ret;
	}		}

			/**
			* ipa_get_lan_rx_napi() - returns if NAPI is enabled in LAN RX
			*/
			bool ipa_get_lan_rx_napi(void)
			{
			bool ret;

			IPA_API_DISPATCH_RETURN_BOOL(ipa_get_lan_rx_napi);

			return ret;
			}
			EXPORT_SYMBOL(ipa_get_lan_rx_napi);

	/**		/**
	* ipa_tz_unlock_reg() - Allow AP access to memory regions controlled by TZ		* ipa_tz_unlock_reg() - Allow AP access to memory regions controlled by TZ
	*/		*/

+3 −1

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.		/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -433,6 +433,8 @@ struct ipa_api_controller {
	int (ipa_is_vlan_mode)(enum ipa_vlan_ifaces iface, bool res);		int (ipa_is_vlan_mode)(enum ipa_vlan_ifaces iface, bool res);

	bool (*ipa_pm_is_used)(void);		bool (*ipa_pm_is_used)(void);

			bool (*ipa_get_lan_rx_napi)(void);
	};		};

	#ifdef CONFIG_IPA		#ifdef CONFIG_IPA

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6913,6 +6913,11 @@ struct ipa3_context *ipa3_get_ctx(void)
	return ipa3_ctx;		return ipa3_ctx;
	}		}

			bool ipa3_get_lan_rx_napi(void)
			{
			return false;
			}

	static void ipa_gsi_notify_cb(struct gsi_per_notify *notify)		static void ipa_gsi_notify_cb(struct gsi_per_notify *notify)
	{		{
	switch (notify->evt_id) {		switch (notify->evt_id) {

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2293,6 +2293,8 @@ u8 ipa3_get_qmb_master_sel(enum ipa_client_type client);
	int ipa3_get_smmu_params(struct ipa_smmu_in_params *in,		int ipa3_get_smmu_params(struct ipa_smmu_in_params *in,
	struct ipa_smmu_out_params *out);		struct ipa_smmu_out_params *out);

			bool ipa3_get_lan_rx_napi(void);

	/* internal functions */		/* internal functions */

	int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type,		int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type,

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5132,6 +5132,7 @@ int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type,
	api_ctrl->ipa_get_smmu_params = ipa3_get_smmu_params;		api_ctrl->ipa_get_smmu_params = ipa3_get_smmu_params;
	api_ctrl->ipa_is_vlan_mode = ipa3_is_vlan_mode;		api_ctrl->ipa_is_vlan_mode = ipa3_is_vlan_mode;
	api_ctrl->ipa_pm_is_used = ipa3_pm_is_used;		api_ctrl->ipa_pm_is_used = ipa3_pm_is_used;
			api_ctrl->ipa_get_lan_rx_napi = ipa3_get_lan_rx_napi;

	return 0;		return 0;
	}		}