[GIT PULL] more AMD IOMMU fixes for 2.6.28-rc8

[GIT PULL] more AMD IOMMU fixes for 2.6.28-rc8

[Joerg Roedel]

Hi Ingo,

The following changes since commit 83fd5cc6481c6b7fa8b45f8a7e0aa7120213430b:
  Joerg Roedel (1):
        AMD IOMMU: allocate rlookup_table with __GFP_ZERO

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu-fixes-2.6.28

Joerg Roedel (2):
      AMD IOMMU: set cmd buffer pointers to zero manually
      AMD IOMMU: panic if completion wait loop fails

 arch/x86/kernel/amd_iommu.c      |    5 +++--
 arch/x86/kernel/amd_iommu_init.c |    4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

They fix another problem discovered in long-running reboot tests. Please
pull. The diff is attached.

Joerg


diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index a7b6dec..0a60d60 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -235,8 +235,9 @@ static int iommu_completion_wait(struct amd_iommu *iommu)
 	status &= ~MMIO_STATUS_COM_WAIT_INT_MASK;
 	writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET);
 
-	if (unlikely((i == EXIT_LOOP_COUNT) && printk_ratelimit()))
-		printk(KERN_WARNING "AMD IOMMU: Completion wait loop failed\n");
+	if (unlikely(i == EXIT_LOOP_COUNT))
+		panic("AMD IOMMU: Completion wait loop failed\n");
+
 out:
 	spin_unlock_irqrestore(&iommu->lock, flags);
 
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index c90a15e..c6cc228 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -427,6 +427,10 @@ static u8 * __init alloc_command_buffer(struct amd_iommu *iommu)
 	memcpy_toio(iommu->mmio_base + MMIO_CMD_BUF_OFFSET,
 			&entry, sizeof(entry));
 
+	/* set head and tail to zero manually */
+	writel(0x00, iommu->mmio_base + MMIO_CMD_HEAD_OFFSET);
+	writel(0x00, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
+
 	iommu_feature_enable(iommu, CONTROL_CMDBUF_EN);
 
 	return cmd_buf;
-- 
           |           AMD Saxony Limited Liability Company & Co. KG
 Operating |         Wilschdorfer Landstr. 101, 01109 Dresden, Germany
 System    |                  Register Court Dresden: HRA 4896
 Research  |              General Partner authorized to represent:
 Center    |             AMD Saxony LLC (Wilmington, Delaware, US)
           | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy

Re: [GIT PULL] more AMD IOMMU fixes for 2.6.28-rc8

[Ingo Molnar]

* Joerg Roedel <joerg.roedel@amd.com> wrote:

> Hi Ingo,
> 
> The following changes since commit 83fd5cc6481c6b7fa8b45f8a7e0aa7120213430b:
>   Joerg Roedel (1):
>         AMD IOMMU: allocate rlookup_table with __GFP_ZERO
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu-fixes-2.6.28
> 
> Joerg Roedel (2):
>       AMD IOMMU: set cmd buffer pointers to zero manually
>       AMD IOMMU: panic if completion wait loop fails
> 
>  arch/x86/kernel/amd_iommu.c      |    5 +++--
>  arch/x86/kernel/amd_iommu_init.c |    4 ++++
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> They fix another problem discovered in long-running reboot tests. Please 
> pull. The diff is attached.

pulled, thanks Joerg!

	Ingo