lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iommu/amd: Make sure iommu->need_sync contains correct value

Browse Source 
The value is only set to true but never set back to false,
which causes to many completion-wait commands to be sent to
hardware. Fix it with this patch.

Cc: stable@kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel
2011-09-02 14:10:32 +02:00
parent c6a389f123
commit f1ca1512e7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/amd_iommu.c
View File

@@ -605,7 +605,9 @@ static void build_inv_all(struct iommu_cmd *cmd)
* Writes the command to the IOMMUs command buffer and informs the * Writes the command to the IOMMUs command buffer and informs the
* hardware about the new command. * hardware about the new command.
*/ */
static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd) static int iommu_queue_command_sync(struct amd_iommu *iommu,
struct iommu_cmd *cmd,
bool sync)
{ {
u32 left, tail, head, next_tail; u32 left, tail, head, next_tail;
unsigned long flags; unsigned long flags;
@@ -639,13 +641,18 @@ again:
copy_cmd_to_buffer(iommu, cmd, tail); copy_cmd_to_buffer(iommu, cmd, tail);
/* We need to sync now to make sure all commands are processed */ /* We need to sync now to make sure all commands are processed */
iommu->need_sync = true; iommu->need_sync = sync;
spin_unlock_irqrestore(&iommu->lock, flags); spin_unlock_irqrestore(&iommu->lock, flags);
return 0; return 0;
} }
static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
{
return iommu_queue_command_sync(iommu, cmd, true);
}
/* /*
* This function queues a completion wait command into the command * This function queues a completion wait command into the command
* buffer of an IOMMU * buffer of an IOMMU
@@ -661,7 +668,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
build_completion_wait(&cmd, (u64)&sem); build_completion_wait(&cmd, (u64)&sem);
ret = iommu_queue_command(iommu, &cmd); ret = iommu_queue_command_sync(iommu, &cmd, false);
if (ret) if (ret)
return ret; return ret;