From patchwork Mon Aug 11 10:50:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 4706531 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DEAAC0338 for ; Mon, 11 Aug 2014 10:51:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8E2820115 for ; Mon, 11 Aug 2014 10:51:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D4152010B for ; Mon, 11 Aug 2014 10:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461AbaHKKvH (ORCPT ); Mon, 11 Aug 2014 06:51:07 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35447 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbaHKKvG (ORCPT ); Mon, 11 Aug 2014 06:51:06 -0400 Received: by mail-pa0-f42.google.com with SMTP id lf10so11024124pab.29 for ; Mon, 11 Aug 2014 03:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=QM8B7TD+VpefWrtnNqzdkFsKZuTpMPFOSqmuZVRfb5I=; b=iV3+pR9aEOiEDl52HWSZsgTTT7H/6cE1+LVCuj7C7VISm2U5kJ4/ab/38VF4vJHtdc zlCiVBDxTz2NQIji1T3/pTWH77MsmoblT+QNjj10NqfVpRyCR3UnIu4RNU4GPZwDlS0D qYCDI19H2eTDYOQhjLYy5Yl5fVVDUG+JERGv4pvD/DHbJxQ445o9Xp1af2UnKtW+0+bA ivWej55ULZn7BZosqhSmI2UF5IRgwGgoNR/IXTAn8VLKmGu9J3PSMHzNZ7L4osGos/E4 bM0qwE2RSgiGaR1Lm09tiQGhjdNTnJLIMOxX+ElHow8LvUt9trocWj6a501SWQZlTrdf xS4A== X-Received: by 10.69.12.33 with SMTP id en1mr41358302pbd.66.1407754265401; Mon, 11 Aug 2014 03:51:05 -0700 (PDT) Received: from linux-rxt1.site ([130.57.30.250]) by mx.google.com with ESMTPSA id xc1sm851666pab.39.2014.08.11.03.51.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Aug 2014 03:51:04 -0700 (PDT) From: "Lee, Chun-Yi" X-Google-Original-From: "Lee, Chun-Yi" To: "Rafael J. Wysocki" , Len Brown , Pavel Machek Cc: Takashi Iwai , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Lee, Chun-Yi" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH] Hibernate: Do not assume the first e820 area to be RAM Date: Mon, 11 Aug 2014 18:50:52 +0800 Message-Id: <1407754252-22779-1-git-send-email-jlee@suse.com> X-Mailer: git-send-email 1.8.4.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In arch/x86/kernel/setup.c::trim_bios_range(), the codes introduced by 1b5576e6 (base on d8a9e6a5), it updates the first 4Kb of memory to be E820_RESERVED region. That's because it's a BIOS owned area but generally not listed in the E820 table: [ 0.000000] e820: BIOS-provided physical RAM map: [ 0.000000] BIOS-e820: [mem 0x0000000000000000-0x0000000000096fff] usable [ 0.000000] BIOS-e820: [mem 0x0000000000097000-0x0000000000097fff] reserved ... [ 0.000000] e820: update [mem 0x00000000-0x00000fff] usable ==> reserved [ 0.000000] e820: remove [mem 0x000a0000-0x000fffff] usable But the region of first 4Kb didn't register to nosave memory: [ 0.000000] PM: Registered nosave memory: [mem 0x00097000-0x00097fff] [ 0.000000] PM: Registered nosave memory: [mem 0x000a0000-0x000fffff] The codes in e820_mark_nosave_regions() assumes the first e820 area to be RAM, so it causes the first 4Kb E820_RESERVED region ignored when register to nosave. This patch removed assumption of the first e820 area. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Signed-off-by: Lee, Chun-Yi Acked-by: Pavel Machek Acked-by: Pavel Machek --- arch/x86/kernel/e820.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 988c00a..d595240 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -682,18 +682,17 @@ void __init parse_e820_ext(u64 phys_addr, u32 data_len) * hibernation (32 bit) or software suspend and suspend to RAM (64 bit). * * This function requires the e820 map to be sorted and without any - * overlapping entries and assumes the first e820 area to be RAM. + * overlapping entries. */ void __init e820_mark_nosave_regions(unsigned long limit_pfn) { int i; unsigned long pfn; - pfn = PFN_DOWN(e820.map[0].addr + e820.map[0].size); - for (i = 1; i < e820.nr_map; i++) { + for (i = 0; i < e820.nr_map; i++) { struct e820entry *ei = &e820.map[i]; - if (pfn < PFN_UP(ei->addr)) + if (i > 0 && pfn < PFN_UP(ei->addr)) register_nosave_region(pfn, PFN_UP(ei->addr)); pfn = PFN_DOWN(ei->addr + ei->size);