Merge "Revert "Revert "msm: ipa3: Changes to support 2X PINE."""
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
5f4172edcd
File diff suppressed because it is too large
Load Diff
@@ -979,6 +979,7 @@ struct ipa_smmu_cb_ctx *ipa3_get_smmu_ctx(enum ipa_smmu_cb_type cb_type)
|
|||||||
{
|
{
|
||||||
return &smmu_cb[cb_type];
|
return &smmu_cb[cb_type];
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(ipa3_get_smmu_ctx);
|
||||||
|
|
||||||
static int ipa3_open(struct inode *inode, struct file *filp)
|
static int ipa3_open(struct inode *inode, struct file *filp)
|
||||||
{
|
{
|
||||||
@@ -11932,6 +11933,7 @@ int ipa3_iommu_map(struct iommu_domain *domain,
|
|||||||
|
|
||||||
return iommu_map(domain, iova, paddr, size, prot);
|
return iommu_map(domain, iova, paddr, size, prot);
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(ipa3_iommu_map);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ipa3_get_smmu_params()- Return the ipa3 smmu related params.
|
* ipa3_get_smmu_params()- Return the ipa3 smmu related params.
|
||||||
|
@@ -4186,7 +4186,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
|
|||||||
IPA_TX_INSTANCE_NA },
|
IPA_TX_INSTANCE_NA },
|
||||||
[IPA_5_0][IPA_CLIENT_WLAN3_PROD] = {
|
[IPA_5_0][IPA_CLIENT_WLAN3_PROD] = {
|
||||||
true, IPA_v5_0_GROUP_UL,
|
true, IPA_v5_0_GROUP_UL,
|
||||||
false,
|
true,
|
||||||
IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
|
IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
|
||||||
QMB_MASTER_SELECT_DDR,
|
QMB_MASTER_SELECT_DDR,
|
||||||
{ 1 , 0, 8, 16, IPA_EE_AP, GSI_SMART_PRE_FETCH, 2},
|
{ 1 , 0, 8, 16, IPA_EE_AP, GSI_SMART_PRE_FETCH, 2},
|
||||||
@@ -9362,11 +9362,13 @@ int ipa3_write_qmap_id(struct ipa_ioc_write_qmapid *param_in)
|
|||||||
param_in->client == IPA_CLIENT_RTK_ETHERNET_PROD) {
|
param_in->client == IPA_CLIENT_RTK_ETHERNET_PROD) {
|
||||||
result = ipa3_cfg_ep_metadata(ipa_ep_idx, &meta);
|
result = ipa3_cfg_ep_metadata(ipa_ep_idx, &meta);
|
||||||
} else if (param_in->client == IPA_CLIENT_WLAN1_PROD ||
|
} else if (param_in->client == IPA_CLIENT_WLAN1_PROD ||
|
||||||
param_in->client == IPA_CLIENT_WLAN2_PROD) {
|
param_in->client == IPA_CLIENT_WLAN2_PROD ||
|
||||||
|
param_in->client == IPA_CLIENT_WLAN3_PROD) {
|
||||||
ipa3_ctx->ep[ipa_ep_idx].cfg.meta = meta;
|
ipa3_ctx->ep[ipa_ep_idx].cfg.meta = meta;
|
||||||
if (param_in->client == IPA_CLIENT_WLAN2_PROD)
|
if (param_in->client == IPA_CLIENT_WLAN2_PROD ||
|
||||||
result = ipa3_write_qmapid_wdi3_gsi_pipe(
|
param_in->client == IPA_CLIENT_WLAN3_PROD)
|
||||||
ipa_ep_idx, meta.qmap_id);
|
result = ipa3_write_qmapid_wdi3_gsi_pipe(
|
||||||
|
ipa_ep_idx, meta.qmap_id);
|
||||||
else
|
else
|
||||||
result = ipa3_write_qmapid_wdi_pipe(
|
result = ipa3_write_qmapid_wdi_pipe(
|
||||||
ipa_ep_idx, meta.qmap_id);
|
ipa_ep_idx, meta.qmap_id);
|
||||||
|
Reference in New Issue
Block a user