* [PATCH] HAX: kernel/swsusp: Show invalid swap signature
@ 2017-10-17 23:23 Chris Wilson
2017-10-17 23:45 ` ✓ Fi.CI.BAT: success for HAX: kernel/swsusp: Show invalid swap signature (rev2) Patchwork
2017-10-18 10:20 ` ✓ Fi.CI.IGT: " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wilson @ 2017-10-17 23:23 UTC (permalink / raw)
To: intel-gfx
---
kernel/power/swap.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index d7cdc426ee38..1eed3fa04e21 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -306,9 +306,12 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
{
int error;
- hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
- swsusp_header, NULL);
- if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
+ error = hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
+ swsusp_header, NULL);
+ if (error) {
+ printk(KERN_ERR "PM: Unable to read Swap header, error %d.\n",
+ error);
+ } else if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
!memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
memcpy(swsusp_header->sig, HIBERNATE_SIG, 10);
@@ -319,7 +322,8 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
error = hib_submit_io(REQ_OP_WRITE, REQ_SYNC,
swsusp_resume_block, swsusp_header, NULL);
} else {
- printk(KERN_ERR "PM: Swap header not found!\n");
+ printk(KERN_ERR "PM: Swap header not found! Found %10s instead.\n",
+ swsusp_header->sig);
error = -ENODEV;
}
return error;
--
2.15.0.rc1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* ✓ Fi.CI.BAT: success for HAX: kernel/swsusp: Show invalid swap signature (rev2)
2017-10-17 23:23 [PATCH] HAX: kernel/swsusp: Show invalid swap signature Chris Wilson
@ 2017-10-17 23:45 ` Patchwork
2017-10-18 10:20 ` ✓ Fi.CI.IGT: " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2017-10-17 23:45 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: HAX: kernel/swsusp: Show invalid swap signature (rev2)
URL : https://patchwork.freedesktop.org/series/32130/
State : success
== Summary ==
Series 32130v2 HAX: kernel/swsusp: Show invalid swap signature
https://patchwork.freedesktop.org/api/1.0/series/32130/revisions/2/mbox/
Test chamelium:
Subgroup dp-edid-read:
incomplete -> SKIP (fi-hsw-4770r)
Subgroup dp-crc-fast:
dmesg-fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-cfl-s) fdo#102673
fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102673 https://bugs.freedesktop.org/show_bug.cgi?id=102673
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:441s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:457s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:371s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:520s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:265s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:501s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:492s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:488s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:489s
fi-cfl-s total:246 pass:214 dwarn:1 dfail:0 fail:0 skip:30
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:416s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:251s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:581s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:420s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:429s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:492s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:461s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:482s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:571s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:477s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:584s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:538s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:449s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:646s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:520s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:497s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:455s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:563s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:422s
17972293741c44cf70b30bb740bc3d4f2333403c drm-tip: 2017y-10m-17d-18h-04m-07s UTC integration manifest
657f54136fd5 HAX: kernel/swsusp: Show invalid swap signature
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6086/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* ✓ Fi.CI.IGT: success for HAX: kernel/swsusp: Show invalid swap signature (rev2)
2017-10-17 23:23 [PATCH] HAX: kernel/swsusp: Show invalid swap signature Chris Wilson
2017-10-17 23:45 ` ✓ Fi.CI.BAT: success for HAX: kernel/swsusp: Show invalid swap signature (rev2) Patchwork
@ 2017-10-18 10:20 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2017-10-18 10:20 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: HAX: kernel/swsusp: Show invalid swap signature (rev2)
URL : https://patchwork.freedesktop.org/series/32130/
State : success
== Summary ==
shard-hsw total:2551 pass:1441 dwarn:0 dfail:0 fail:9 skip:1101 time:9283s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6086/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-18 10:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-17 23:23 [PATCH] HAX: kernel/swsusp: Show invalid swap signature Chris Wilson
2017-10-17 23:45 ` ✓ Fi.CI.BAT: success for HAX: kernel/swsusp: Show invalid swap signature (rev2) Patchwork
2017-10-18 10:20 ` ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.