From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frank Pan Subject: [PATCH] pvops: Make suspend work when CONFIG_SUSPEND=n Date: Fri, 4 Mar 2011 19:20:39 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=002354186dfc266fde049da65726 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com, Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Ian Campbell List-Id: xen-devel@lists.xenproject.org --002354186dfc266fde049da65726 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Recent pvops kernel fails on suspending some of devices on the following configuration: CONFIG_SUSPEND=3Dn CONFIG_PM_SLEEP=3Dy Command suspend on control/shutdown is recognized when CONFIG_PM_SLEEP=3Dy. This indicates the device suspend logic should also be enabled on this configuration. The following patch works. --- linux-2.6-xen/drivers/base/power/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen/drivers/base/power/main.c b/linux-2.6-xen/drivers/base/power/main.c index 8aa2443..4d40fc4 100644 --- a/linux-2.6-xen/drivers/base/power/main.c +++ b/linux-2.6-xen/drivers/base/power/main.c @@ -174,7 +174,7 @@ static int pm_op(struct device *dev, int error =3D 0; switch (state.event) { -#ifdef CONFIG_SUSPEND +#if defined(CONFIG_SUSPEND) || defined(CONFIG_XEN_SAVE_RESTORE) case PM_EVENT_SUSPEND: if (ops->suspend) { error =3D ops->suspend(dev); @@ -238,7 +238,7 @@ static int pm_noirq_op(struct device *dev, int error =3D 0; switch (state.event) { -#ifdef CONFIG_SUSPEND +#if defined(CONFIG_SUSPEND) || defined(CONFIG_XEN_SAVE_RESTORE) case PM_EVENT_SUSPEND: if (ops->suspend_noirq) { error =3D ops->suspend_noirq(dev); --=20 1.7.0.4 --=20 =E6=BD=98=E9=9C=87=E7=9A=93, Frank Pan Computer Science and Technology Tsinghua University --002354186dfc266fde049da65726 Content-Type: text/x-patch; charset=US-ASCII; name="0001-Make-suspend-work-when-CONFIG_SUSPEND-n.patch" Content-Disposition: attachment; filename="0001-Make-suspend-work-when-CONFIG_SUSPEND-n.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gkv0e7600 RnJvbSA5NDFiNzIyMmVmZThiZTIwZWEyODVmNTMyNWZiZTQ2NzA2YzU1NDY0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGcmFuayBQYW4gPGZyYW5rcHpoQGdtYWlsLmNvbT4KRGF0ZTog RnJpLCA0IE1hciAyMDExIDE4OjQ5OjM4ICswODAwClN1YmplY3Q6IFtQQVRDSF0gTWFrZSBzdXNw ZW5kIHdvcmsgd2hlbiBDT05GSUdfU1VTUEVORD1uCgpSZWNlbnQgcHZvcHMga2VybmVsIGZhaWxz IG9uIHN1c3BlbmRpbmcgc29tZSBvZiBkZXZpY2VzIG9uIHRoZSBmb2xsb3dpbmcgY29uZmlndXJh dGlvbjoKCkNPTkZJR19TVVNQRU5EPW4KQ09ORklHX1BNX1NMRUVQPXkKCkNvbW1hbmQgc3VzcGVu ZCBvbiBjb250cm9sL3NodXRkb3duIGlzIHJlY29nbml6ZWQgd2hlbiBDT05GSUdfUE1fU0xFRVA9 eS4gVGhpcyBpbmRpY2F0ZXMgdGhlIGRldmljZSBzdXNwZW5kIGxvZ2ljIHNob3VsZCBhbHNvIGJl IGVuYWJsZWQgb24gdGhpcyBjb25maWd1cmF0aW9uLgpUaGUgZm9sbG93aW5nIHBhdGNoIHdvcmtz LgotLS0KIGxpbnV4LTIuNi14ZW4vZHJpdmVycy9iYXNlL3Bvd2VyL21haW4uYyB8ICAgIDQgKyst LQogMSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvbGludXgtMi42LXhlbi9kcml2ZXJzL2Jhc2UvcG93ZXIvbWFpbi5jIGIvbGludXgt Mi42LXhlbi9kcml2ZXJzL2Jhc2UvcG93ZXIvbWFpbi5jCmluZGV4IDhhYTI0NDMuLjRkNDBmYzQg MTAwNjQ0Ci0tLSBhL2xpbnV4LTIuNi14ZW4vZHJpdmVycy9iYXNlL3Bvd2VyL21haW4uYworKysg Yi9saW51eC0yLjYteGVuL2RyaXZlcnMvYmFzZS9wb3dlci9tYWluLmMKQEAgLTE3NCw3ICsxNzQs NyBAQCBzdGF0aWMgaW50IHBtX29wKHN0cnVjdCBkZXZpY2UgKmRldiwKIAlpbnQgZXJyb3IgPSAw OwogCiAJc3dpdGNoIChzdGF0ZS5ldmVudCkgewotI2lmZGVmIENPTkZJR19TVVNQRU5ECisjaWYg ZGVmaW5lZChDT05GSUdfU1VTUEVORCkgfHwgZGVmaW5lZChDT05GSUdfWEVOX1NBVkVfUkVTVE9S RSkKIAljYXNlIFBNX0VWRU5UX1NVU1BFTkQ6CiAJCWlmIChvcHMtPnN1c3BlbmQpIHsKIAkJCWVy cm9yID0gb3BzLT5zdXNwZW5kKGRldik7CkBAIC0yMzgsNyArMjM4LDcgQEAgc3RhdGljIGludCBw bV9ub2lycV9vcChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJaW50IGVycm9yID0gMDsKIAogCXN3aXRj aCAoc3RhdGUuZXZlbnQpIHsKLSNpZmRlZiBDT05GSUdfU1VTUEVORAorI2lmIGRlZmluZWQoQ09O RklHX1NVU1BFTkQpIHx8IGRlZmluZWQoQ09ORklHX1hFTl9TQVZFX1JFU1RPUkUpCiAJY2FzZSBQ TV9FVkVOVF9TVVNQRU5EOgogCQlpZiAob3BzLT5zdXNwZW5kX25vaXJxKSB7CiAJCQllcnJvciA9 IG9wcy0+c3VzcGVuZF9ub2lycShkZXYpOwotLSAKMS43LjAuNAoK --002354186dfc266fde049da65726 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --002354186dfc266fde049da65726--