[PATCH v1 1/1] iommu/amd: fix enabling exclusion range for an exact device

[PATCH v1 1/1] iommu/amd: fix enabling exclusion range for an exact device

[Su, Friendy]

From: Su Friendy <friendy.su@sony.com.cn>

set_device_exclusion_range(u16 devid, struct ivmd_header *m) enables
exclusion range for ONE device. IOMMU does not translate the access
to the exclusion range from the device.

The device is specified by input argument 'devid'. But 'devid' is not
passed to the actual set function set_dev_entry_bit(), instead
'm->devid' is passed. 'm->devid' does not specify the exact device
which needs enable the exclusion range. 'm->devid' represents DeviceID
field of IVMD, which has different meaning depends on IVMD type.

The caller init_exclusion_range() sets 'devid' for ONE device. When
m->type is equal to ACPI_IVMD_TYPE_ALL or ACPI_IVMD_TYPE_RANGE,
'm->devid' is not equal to 'devid'.

This patch fixes 'm->devid' to 'devid'.

Signed-off-by: Su Friendy <friendy.su@sony.com.cn>
Signed-off-by: Tamori Masahiro <Masahiro.Tamori@jp.sony.com>
---
 drivers/iommu/amd_iommu_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index b76c58d..0e08545 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -788,7 +788,7 @@ static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)
 		 * per device. But we can enable the exclusion range per
 		 * device. This is done here
 		 */
-		set_dev_entry_bit(m->devid, DEV_ENTRY_EX);
+		set_dev_entry_bit(devid, DEV_ENTRY_EX);
 		iommu->exclusion_start = m->range_start;
 		iommu->exclusion_length = m->range_length;
 	}
-- 
1.8.2.1

Re: [PATCH v1 1/1] iommu/amd: fix enabling exclusion range for an exact device

[joro-zLv9SwRftAIdnm+yROfE0A]

On Wed, May 07, 2014 at 01:54:52PM +0800, Su, Friendy wrote:
> 
> From: Su Friendy <friendy.su-7U/KSKJipcvM1kAEIRd3EQ@public.gmane.org>
> 
> set_device_exclusion_range(u16 devid, struct ivmd_header *m) enables
> exclusion range for ONE device. IOMMU does not translate the access
> to the exclusion range from the device.
> 
> The device is specified by input argument 'devid'. But 'devid' is not
> passed to the actual set function set_dev_entry_bit(), instead
> 'm->devid' is passed. 'm->devid' does not specify the exact device
> which needs enable the exclusion range. 'm->devid' represents DeviceID
> field of IVMD, which has different meaning depends on IVMD type.
> 
> The caller init_exclusion_range() sets 'devid' for ONE device. When
> m->type is equal to ACPI_IVMD_TYPE_ALL or ACPI_IVMD_TYPE_RANGE,
> 'm->devid' is not equal to 'devid'.
> 
> This patch fixes 'm->devid' to 'devid'.
> 
> Signed-off-by: Su Friendy <friendy.su-7U/KSKJipcvM1kAEIRd3EQ@public.gmane.org>
> Signed-off-by: Tamori Masahiro <Masahiro.Tamori-7rVYBvDxQfZBDgjK7y7TUQ@public.gmane.org>

Applied, thanks.