Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9bc03ac authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'iommu-fixes-2.6.28' of... 

Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
parents 55aab5f4 84df8175

arch/x86/kernel/amd_iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/amd_iommu_init.c

+4 −0
Original line number Diff line number Diff line
@@ -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;