From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756938AbYE0Jun (ORCPT ); Tue, 27 May 2008 05:50:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755599AbYE0Juf (ORCPT ); Tue, 27 May 2008 05:50:35 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:40808 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755839AbYE0Jue (ORCPT ); Tue, 27 May 2008 05:50:34 -0400 Date: Tue, 27 May 2008 11:51:21 +0200 From: Pavel Machek To: kernel list , Ingo Molnar , davej@elf.ucw.cz, Andi Kleen , "H. Peter Anvin" , "Rafael J. Wysocki" Subject: suspend vs. iommu: prevent suspend if we could not resume Message-ID: <20080527095121.GA3689@elf.ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org iommu/gart support misses suspend/resume code, which can do bad stuff, including memory corruption on resume. Prevent system suspend in case we would be unable to resume. Signed-off-by: Pavel Machek Tested-by: Patrick --- commit 7724af033ea084f0b037ae8a2032da5e40255088 tree 06de661a106ba83a96cab2ee0e76e3f3c44823ab parent e9f4353b46ec2b05f73e1a84085c305de211bd3e author Pavel Sun, 25 May 2008 23:08:17 +0200 committer Pavel Sun, 25 May 2008 23:08:17 +0200 arch/x86/kernel/pci-gart_64.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index 620ec3a..926af9c 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c @@ -26,6 +26,7 @@ #include #include #include #include +#include #include #include #include @@ -548,6 +549,28 @@ static __init unsigned read_aperture(str return aper_base; } +static int gart_resume(struct sys_device *dev) +{ + return 0; +} + +static int gart_suspend(struct sys_device *dev, pm_message_t state) +{ + return -EINVAL; +} + +static struct sysdev_class gart_sysdev_class = { + .name = "gart", + .suspend = gart_suspend, + .resume = gart_resume, + +}; + +static struct sys_device device_gart = { + .id = 0, + .cls = &gart_sysdev_class, +}; + /* * Private Northbridge GATT initialization in case we cannot use the * AGP driver for some reason. @@ -558,7 +581,7 @@ static __init int init_k8_gatt(struct ag unsigned aper_base, new_aper_base; struct pci_dev *dev; void *gatt; - int i; + int i, error; printk(KERN_INFO "PCI-DMA: Disabling AGP.\n"); aper_size = aper_base = info->aper_size = 0; @@ -595,6 +618,12 @@ static __init int init_k8_gatt(struct ag dev = k8_northbridges[i]; enable_gart_translation(dev, __pa(gatt)); } + + error = sysdev_class_register(&gart_sysdev_class); + if (!error) + error = sysdev_register(&device_gart); + if (error) + panic("Could not register gart_sysdev -- would corrupt data on next suspend"); flush_gart(); printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html