Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "iommu: msm: Invoke secure fault handler for non-secure CBs"

This commit is contained in:
Linux Build Service Account 2015-03-24 01:54:35 -07:00 committed by Gerrit - the friendly Code Review server
parent 4d998604ed 66ce877464
commit 4658b651f0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/msm_iommu_dev-v1.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
*
* 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
@ -486,8 +486,17 @@ static int msm_iommu_ctx_parse_dt(struct platform_device *pdev,
get_secure_ctx(pdev->dev.of_node, drvdata, ctx_drvdata);
if (ctx_drvdata->secure_context) {
if (drvdata->sec_id != -1) {
irq = platform_get_irq(pdev, 1);
/*
* This is for supporting old DTs where it was assumed
* that interrupt 0 is only required as their CB is
* non-secure.
*/
if (irq < 0)
irq = platform_get_irq(pdev, 0);
if (irq > 0) {
ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
msm_iommu_secure_fault_handler_v2,