From: Joerg Roedel <joerg.roedel@amd.com>
To: mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com
Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 4/4] AMD IOMMU: initialize dma_ops after sysfs registration
Date: Thu, 14 Aug 2008 19:55:18 +0200 [thread overview]
Message-ID: <1218736518-25301-5-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1218736518-25301-1-git-send-email-joerg.roedel@amd.com>
If sysfs registration fails all memory used by IOMMU is freed. This happens
after dma_ops initialization and the functions will access the freed memory
then. Fix this by initializing dma_ops after the sysfs registration.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kernel/amd_iommu_init.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index ceba338..a69cc0f 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -972,15 +972,15 @@ int __init amd_iommu_init(void)
if (acpi_table_parse("IVRS", init_memory_definitions) != 0)
goto free;
- ret = amd_iommu_init_dma_ops();
+ ret = sysdev_class_register(&amd_iommu_sysdev_class);
if (ret)
goto free;
- ret = sysdev_class_register(&amd_iommu_sysdev_class);
+ ret = sysdev_register(&device_amd_iommu);
if (ret)
goto free;
- ret = sysdev_register(&device_amd_iommu);
+ ret = amd_iommu_init_dma_ops();
if (ret)
goto free;
--
1.5.3.7
next prev parent reply other threads:[~2008-08-14 17:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-14 17:55 [PATCH 0/4] AMD IOMMU updates for 2.6.27-rc3 Joerg Roedel
2008-08-14 17:55 ` [PATCH 1/4] AMD IOMMU: use status bit instead of memory write-back for completion wait Joerg Roedel
2008-08-14 18:35 ` Ingo Oeser
2008-08-14 20:02 ` Joerg Roedel
2008-08-14 17:55 ` [PATCH 2/4] AMD IOMMU: initialize device table properly Joerg Roedel
2008-08-14 17:55 ` [PATCH 3/4] AMD IOMMU: replace LOW_U32 macro with generic lower_32_bits Joerg Roedel
2008-08-14 17:55 ` Joerg Roedel [this message]
2008-08-15 11:57 ` [PATCH 0/4] AMD IOMMU updates for 2.6.27-rc3 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1218736518-25301-5-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®