samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Reduce SMMU mapping logs

Browse Source 
Reduce the number of logs during the SMMU mapping process in
cds_smmu_mem_map_setup by refactoring the logic to reduce the number of
branches.

Change-Id: I1a8b0ece31ab51eaf6f96232b284b61d77c83084
CRs-Fixed: 2291034
This commit is contained in:
Dustin Brown
2018-08-03 16:22:56 -07:00
committed by nshrivas
parent 6099ddc417
commit d0bf6403d2
1 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
core/cds/src/cds_api.c
View File

@@ -2735,51 +2735,47 @@ void cds_incr_arp_stats_tx_tgt_acked(void)
#ifdef ENABLE_SMMU_S1_TRANSLATION #ifdef ENABLE_SMMU_S1_TRANSLATION
QDF_STATUS cds_smmu_mem_map_setup(qdf_device_t osdev, bool ipa_present) QDF_STATUS cds_smmu_mem_map_setup(qdf_device_t osdev, bool ipa_present)
{ {
struct dma_iommu_mapping *mapping;
bool ipa_smmu_enabled;
bool wlan_smmu_enabled;
mapping = pld_smmu_get_mapping(osdev->dev);
if (mapping) {
int attr = 0; int attr = 0;
bool ipa_smmu_enable = false; int errno = iommu_domain_get_attr(mapping->domain,
struct dma_iommu_mapping *mapping = pld_smmu_get_mapping(osdev->dev); DOMAIN_ATTR_S1_BYPASS, &attr);
wlan_smmu_enabled = !errno && !attr;
} else {
cds_info("No SMMU mapping present");
wlan_smmu_enabled = false;
}
if (!wlan_smmu_enabled) {
osdev->smmu_s1_enabled = false; osdev->smmu_s1_enabled = false;
goto exit_with_success;
if (ipa_present) {
ipa_smmu_enable = qdf_get_ipa_smmu_enabled();
if (ipa_smmu_enable)
cds_info("SMMU enabled from IPA side");
else
cds_info("SMMU not enabled from IPA side");
} }
if (mapping && ((iommu_domain_get_attr(mapping->domain, if (!ipa_present) {
DOMAIN_ATTR_S1_BYPASS, &attr) == 0) &&
!attr)) {
cds_info("SMMU enabled from WLAN side");
if (ipa_present) {
if (ipa_smmu_enable) {
cds_info("SMMU enabled from both IPA and WLAN side");
osdev->smmu_s1_enabled = true; osdev->smmu_s1_enabled = true;
} else { goto exit_with_success;
cds_err("SMMU mismatch: IPA: disable, WLAN: enable"); }
ipa_smmu_enabled = qdf_get_ipa_smmu_enabled();
osdev->smmu_s1_enabled = ipa_smmu_enabled && wlan_smmu_enabled;
if (ipa_smmu_enabled != wlan_smmu_enabled) {
cds_err("SMMU mismatch; IPA:%s, WLAN:%s",
ipa_smmu_enabled ? "enabled" : "disabled",
wlan_smmu_enabled ? "enabled" : "disabled");
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
} else {
osdev->smmu_s1_enabled = true;
}
} else { exit_with_success:
cds_info("No SMMU mapping present or SMMU disabled from WLAN side");
if (ipa_present) {
if (ipa_smmu_enable) {
cds_err("SMMU mismatch: IPA: enable, WLAN: disable");
return QDF_STATUS_E_FAILURE;
} else {
cds_info("SMMU disabled from both IPA and WLAN side");
}
}
}
osdev->iommu_mapping = mapping; osdev->iommu_mapping = mapping;
cds_info("SMMU S1 %s", osdev->smmu_s1_enabled ? "enabled" : "disabled");
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }