linux-kernel - Re: [ 117/175] iommu/amd: Make sure IOMMU interrupts are re-enabled on resume

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120411154522.GH2428@amd.com>
Date:	Wed, 11 Apr 2012 17:45:22 +0200
From:	Joerg Roedel <joerg.roedel@....com>
To:	Ben Hutchings <ben@...adent.org.uk>
CC:	Greg KH <gregkh@...uxfoundation.org>,
	<linux-kernel@...r.kernel.org>, <stable@...r.kernel.org>,
	<torvalds@...ux-foundation.org>, <akpm@...ux-foundation.org>,
	<alan@...rguk.ukuu.org.uk>
Subject: Re: [ 117/175] iommu/amd: Make sure IOMMU interrupts are re-enabled
 on resume

Right, this fix is also required for 3.2 and 3.0.

On Tue, Apr 03, 2012 at 04:28:06AM +0100, Ben Hutchings wrote:
> On Fri, 2012-03-30 at 12:50 -0700, Greg KH wrote:
> > 3.3-stable review patch.  If anyone has any objections, please let me know.
> > 
> > ------------------
> > 
> > From: Joerg Roedel <joerg.roedel@....com>
> > 
> > commit 9ddd592a191b32f2ee6c4b6ed2bd52665c3a49f5 upstream.
> > 
> > Unfortunatly the interrupts for the event log and the
> > peripheral page-faults are only enabled at boot but not
> > re-enabled at resume. Fix that.
> [...]
> 
> It looks like this should be applicable to 3.0 and 3.2 as well, but only
> for the event log.  I'm attaching my (untested) backports for
> consideration.

The backport looks good.

Acked-by: Joerg Roedel <joerg.roedel@....com>

> 
> Ben.
> 
> -- 
> Ben Hutchings
> Reality is just a crutch for people who can't handle science fiction.

> From ed3845ba84e5dbe3593dddf06b6377960f95712d Mon Sep 17 00:00:00 2001
> From: Joerg Roedel <joerg.roedel@....com>
> Date: Thu, 15 Mar 2012 16:29:47 +0100
> Subject: [PATCH] iommu/amd: Make sure IOMMU interrupts are re-enabled on
>  resume
> 
> commit 9ddd592a191b32f2ee6c4b6ed2bd52665c3a49f5 upstream.
> 
> Unfortunatly the interrupts for the event log and the
> peripheral page-faults are only enabled at boot but not
> re-enabled at resume. Fix that.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@....com>
> [bwh: Backport to 3.0:
>  - Drop change to PPR log which was added in 3.3
>  - Source is under arch/x86/kernel]
> Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
> ---
>  arch/x86/kernel/amd_iommu_init.c |   24 +++++++++++++++++-------
>  1 file changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
> index bfc8453..33df6e8 100644
> --- a/arch/x86/kernel/amd_iommu_init.c
> +++ b/arch/x86/kernel/amd_iommu_init.c
> @@ -1031,8 +1031,9 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
>  {
>  	int r;
>  
> -	if (pci_enable_msi(iommu->dev))
> -		return 1;
> +	r = pci_enable_msi(iommu->dev);
> +	if (r)
> +		return r;
>  
>  	r = request_threaded_irq(iommu->dev->irq,
>  				 amd_iommu_int_handler,
> @@ -1042,24 +1043,33 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
>  
>  	if (r) {
>  		pci_disable_msi(iommu->dev);
> -		return 1;
> +		return r;
>  	}
>  
>  	iommu->int_enabled = true;
> -	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
>  
>  	return 0;
>  }
>  
>  static int iommu_init_msi(struct amd_iommu *iommu)
>  {
> +	int ret;
> +
>  	if (iommu->int_enabled)
> -		return 0;
> +		goto enable_faults;
>  
>  	if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
> -		return iommu_setup_msi(iommu);
> +		ret = iommu_setup_msi(iommu);
> +	else
> +		ret = -ENODEV;
>  
> -	return 1;
> +	if (ret)
> +		return ret;
> +
> +enable_faults:
> +	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
> +
> +	return 0;
>  }
>  
>  /****************************************************************************
> -- 
> 1.7.9.5
> 

> From ce1ae4a46ead4899939002d48e23678601ec6969 Mon Sep 17 00:00:00 2001
> From: Joerg Roedel <joerg.roedel@....com>
> Date: Thu, 15 Mar 2012 16:29:47 +0100
> Subject: [PATCH] iommu/amd: Make sure IOMMU interrupts are re-enabled on
>  resume
> 
> commit 9ddd592a191b32f2ee6c4b6ed2bd52665c3a49f5 upstream.
> 
> Unfortunatly the interrupts for the event log and the
> peripheral page-faults are only enabled at boot but not
> re-enabled at resume. Fix that.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@....com>
> [bwh: Backport to 3.2: drop change to PPR log which was added in 3.3]
> Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
> ---
>  drivers/iommu/amd_iommu_init.c |   24 +++++++++++++++++-------
>  1 file changed, 17 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
> index 5c74179..20d5852 100644
> --- a/drivers/iommu/amd_iommu_init.c
> +++ b/drivers/iommu/amd_iommu_init.c
> @@ -1033,8 +1033,9 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
>  {
>  	int r;
>  
> -	if (pci_enable_msi(iommu->dev))
> -		return 1;
> +	r = pci_enable_msi(iommu->dev);
> +	if (r)
> +		return r;
>  
>  	r = request_threaded_irq(iommu->dev->irq,
>  				 amd_iommu_int_handler,
> @@ -1044,24 +1045,33 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
>  
>  	if (r) {
>  		pci_disable_msi(iommu->dev);
> -		return 1;
> +		return r;
>  	}
>  
>  	iommu->int_enabled = true;
> -	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
>  
>  	return 0;
>  }
>  
>  static int iommu_init_msi(struct amd_iommu *iommu)
>  {
> +	int ret;
> +
>  	if (iommu->int_enabled)
> -		return 0;
> +		goto enable_faults;
>  
>  	if (pci_find_capability(iommu->dev, PCI_CAP_ID_MSI))
> -		return iommu_setup_msi(iommu);
> +		ret = iommu_setup_msi(iommu);
> +	else
> +		ret = -ENODEV;
>  
> -	return 1;
> +	if (ret)
> +		return ret;
> +
> +enable_faults:
> +	iommu_feature_enable(iommu, CONTROL_EVT_INT_EN);
> +
> +	return 0;
>  }
>  
>  /****************************************************************************
> -- 
> 1.7.9.5
> 




-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/