linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: linuxppc-dev@ozlabs.org
Cc: linux-pm@lists.osdl.org, Torrance <torrance123@gmail.com>
Subject: [RFC 08/10] powerpc: dart iommu suspend
Date: Mon, 05 Feb 2007 19:30:35 +0100	[thread overview]
Message-ID: <20070205185838.029827000@sipsolutions.net> (raw)
In-Reply-To: 20070205183026.989209000@sipsolutions.net

This implements suspend and resume code for the dart iommu.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

---
Just come to think of it, I made it conditional on
CONFIG_SOFTWARE_SUSPEND but could imagine that it should
instead depend on CONFIG_PM... There is no lowlevel suspend
to RAM code yet which would call this so for now it's
probably fine.

--- mb-wireless.orig/arch/powerpc/sysdev/dart_iommu.c	2007-02-05 14:24:04.834526864 +0100
+++ mb-wireless/arch/powerpc/sysdev/dart_iommu.c	2007-02-05 14:24:40.684526864 +0100
@@ -54,6 +54,9 @@ static unsigned long dart_tablesize;
 
 /* Virtual base address of the DART table */
 static u32 *dart_vbase;
+#ifdef CONFIG_SOFTWARE_SUSPEND
+static u32 *dart_copy;
+#endif
 
 /* Mapped base address for the dart */
 static unsigned int __iomem *dart;
@@ -346,6 +349,52 @@ void iommu_init_early_dart(void)
 	pci_dma_ops = &dma_direct_ops;
 }
 
+#ifdef CONFIG_SOFTWARE_SUSPEND
+static int iommu_init_late_dart(void)
+{
+	unsigned long i;
+	struct page *p;
+
+	/* this 16MB area is left unmapped because of caching
+	 * considerations. that happens early so we can't mark
+	 * it there, do it now instead */
+	for (i = 0; i < (1<<24); i+= PAGE_SIZE)
+		SetPageNosave(virt_to_page((void*)((unsigned long)dart_tablebase + i)));
+
+	/* if no dart table exists then we don't need to save it */
+	if (!dart_tablebase)
+		return 0;
+
+	/* For suspend we need to copy the dart contents because
+	 * it is not part of the regular mapping (see above) and
+	 * thus not saved automatically. The memory for this copy
+	 * must be allocated early because we need 2 MB. */
+	p = alloc_pages(GFP_KERNEL, 21 - PAGE_SHIFT);
+	BUG_ON(!p);
+	dart_copy = page_address(p);
+
+	return 0;
+}
+
+late_initcall(iommu_init_late_dart);
+
+void iommu_dart_save(void)
+{
+	if (!dart_tablebase)
+		return;
+
+	memcpy(dart_copy, dart_vbase, 2*1024*1024);
+}
+
+void iommu_dart_restore(void)
+{
+	if (!dart_tablebase)
+		return;
+
+	memcpy(dart_vbase, dart_copy, 2*1024*1024);
+	dart_tlb_invalidate_all();
+}
+#endif
 
 void __init alloc_dart_table(void)
 {
--- mb-wireless.orig/include/asm-powerpc/iommu.h	2007-02-05 14:24:05.014526864 +0100
+++ mb-wireless/include/asm-powerpc/iommu.h	2007-02-05 14:24:40.684526864 +0100
@@ -108,6 +108,10 @@ static inline void pci_iommu_init(void) 
 #endif
 
 extern void alloc_dart_table(void);
+#if defined(CONFIG_SOFTWARE_SUSPEND) && defined(CONFIG_U3_DART)
+extern void iommu_dart_save(void);
+extern void iommu_dart_restore(void);
+#endif
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_IOMMU_H */

--

  parent reply	other threads:[~2007-02-05 19:09 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-05 18:30 [PATCH/RFC 00/10] suspend to disk for powermac G5 Johannes Berg
2007-02-05 18:30 ` [PATCH 01/10] dont copy pages that arent RAM Johannes Berg
2007-02-05 18:30 ` [PATCH 02/10] windfarm: dont die on suspend thread signal Johannes Berg
2007-02-05 22:43   ` Christoph Hellwig
2007-02-05 22:54     ` [PATCH revision 2] " Johannes Berg
2007-02-05 23:04       ` Benjamin Herrenschmidt
2007-02-05 23:04         ` Benjamin Herrenschmidt
2007-02-05 22:54   ` [PATCH 02/10] " Andrew Morton
2007-02-05 22:55     ` Johannes Berg
2007-02-05 22:58   ` Benjamin Herrenschmidt
2007-02-05 18:30 ` [PATCH 03/10] powerpc: fix comment in kernel/irq.c Johannes Berg
2007-02-05 22:59   ` Benjamin Herrenschmidt
2007-02-05 23:18     ` Andrew Morton
2007-02-05 23:53       ` Benjamin Herrenschmidt
2007-02-05 18:30 ` [PATCH 04/10] powermac: clean up PIC initialisation code Johannes Berg
2007-02-08  4:41   ` Paul Mackerras
2007-02-08 13:03     ` Johannes Berg
2007-02-05 18:30 ` [PATCH 05/10] powermac: generic time suspend/resume code Johannes Berg
2007-02-19 10:00   ` [linux-pm] " Guennadi Liakhovetski
2007-02-19 23:19     ` Guennadi Liakhovetski
2007-02-05 18:30 ` [RFC 06/10] powerpc: MPIC sys_device & suspend/resume Johannes Berg
2007-02-07 12:24   ` Johannes Berg
2007-02-05 18:30 ` [RFC 07/10] powermac: support G5 CPU hotplug Johannes Berg
2007-02-06 12:42   ` [linux-pm] " Pavel Machek
2007-02-07 11:40     ` Johannes Berg
2007-02-07 12:23   ` Johannes Berg
2007-02-05 18:30 ` Johannes Berg [this message]
2007-02-06  1:19   ` [RFC 08/10] powerpc: dart iommu suspend Olof Johansson
2007-02-06  1:26     ` Johannes Berg
2007-02-06  1:52     ` Johannes Berg
2007-02-07 12:22       ` Johannes Berg
2007-02-06 12:40   ` [linux-pm] " Pavel Machek
2007-02-07 11:42     ` Johannes Berg
2007-02-05 18:30 ` [RFC 09/10] powermac: suspend to disk on G5 Johannes Berg
2007-02-05 18:30 ` [RFC 10/10] powermac: fix G5-cpufreq for cpu on/offline Johannes Berg
2007-02-07 12:21   ` Johannes Berg

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=20070205185838.029827000@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=linux-pm@lists.osdl.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=torrance123@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).