Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753828AbbDCRMm (ORCPT ); Fri, 3 Apr 2015 13:12:42 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:37890 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753490AbbDCRMj (ORCPT ); Fri, 3 Apr 2015 13:12:39 -0400 MIME-Version: 1.0 In-Reply-To: <1428077687.31093.120.camel@misato.fc.hp.com> References: <1427872339-6688-1-git-send-email-hch@lst.de> <1427872339-6688-2-git-send-email-hch@lst.de> <1428077687.31093.120.camel@misato.fc.hp.com> Date: Fri, 3 Apr 2015 10:12:39 -0700 X-Google-Sender-Auth: 2t33M9R5cOJ53UkH_JsPkhsdKJE Message-ID: Subject: Re: [Linux-nvdimm] [PATCH 1/2] x86: add support for the non-standard protected e820 type From: Yinghai Lu To: Toshi Kani Cc: Christoph Hellwig , linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, Linux Kernel Mailing List , "the arch/x86 maintainers" , Jens Axboe Content-Type: multipart/mixed; boundary=047d7bdc153c3419e90512d50ee1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3541 Lines: 67 --047d7bdc153c3419e90512d50ee1 Content-Type: text/plain; charset=UTF-8 On Fri, Apr 3, 2015 at 9:14 AM, Toshi Kani wrote: > On Wed, 2015-04-01 at 09:12 +0200, Christoph Hellwig wrote: > : >> @@ -748,7 +758,7 @@ u64 __init early_reserve_e820(u64 size, u64 align) >> /* >> * Find the highest page frame number we have available >> */ >> -static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) >> +static unsigned long __init e820_end_pfn(unsigned long limit_pfn) >> { >> int i; >> unsigned long last_pfn = 0; >> @@ -759,7 +769,11 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) >> unsigned long start_pfn; >> unsigned long end_pfn; >> >> - if (ei->type != type) >> + /* >> + * Persistent memory is accounted as ram for purposes of >> + * establishing max_pfn and mem_map. >> + */ >> + if (ei->type != E820_RAM && ei->type != E820_PRAM) >> continue; > > Should we also delete this code, accounting E820_PRAM as ram, along with > the deletion of reserve_pmem() in this version? should revert those end_of_ram change as attached. --047d7bdc153c3419e90512d50ee1 Content-Type: text/x-patch; charset=US-ASCII; name="revert_end_of_ram_change.patch" Content-Disposition: attachment; filename="revert_end_of_ram_change.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i81um5ka0 ZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9lODIwLmMgYi9hcmNoL3g4Ni9rZXJuZWwvZTgy MC5jCmluZGV4IGUyY2U4NWQuLmUwOWEzNDYgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9l ODIwLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2U4MjAuYwpAQCAtNzUyLDcgKzc1Miw3IEBAIHU2 NCBfX2luaXQgZWFybHlfcmVzZXJ2ZV9lODIwKHU2NCBzaXplLCB1NjQgYWxpZ24pCiAvKgogICog RmluZCB0aGUgaGlnaGVzdCBwYWdlIGZyYW1lIG51bWJlciB3ZSBoYXZlIGF2YWlsYWJsZQogICov Ci1zdGF0aWMgdW5zaWduZWQgbG9uZyBfX2luaXQgZTgyMF9lbmRfcGZuKHVuc2lnbmVkIGxvbmcg bGltaXRfcGZuKQorc3RhdGljIHVuc2lnbmVkIGxvbmcgX19pbml0IGU4MjBfZW5kX3Bmbih1bnNp Z25lZCBsb25nIGxpbWl0X3BmbiwgdW5zaWduZWQgdHlwZSkKIHsKIAlpbnQgaTsKIAl1bnNpZ25l ZCBsb25nIGxhc3RfcGZuID0gMDsKQEAgLTc2MywxMSArNzYzLDcgQEAgc3RhdGljIHVuc2lnbmVk IGxvbmcgX19pbml0IGU4MjBfZW5kX3Bmbih1bnNpZ25lZCBsb25nIGxpbWl0X3BmbikKIAkJdW5z aWduZWQgbG9uZyBzdGFydF9wZm47CiAJCXVuc2lnbmVkIGxvbmcgZW5kX3BmbjsKIAotCQkvKgot CQkgKiBQZXJzaXN0ZW50IG1lbW9yeSBpcyBhY2NvdW50ZWQgYXMgcmFtIGZvciBwdXJwb3NlcyBv ZgotCQkgKiBlc3RhYmxpc2hpbmcgbWF4X3BmbiBhbmQgbWVtX21hcC4KLQkJICovCi0JCWlmIChl aS0+dHlwZSAhPSBFODIwX1JBTSAmJiBlaS0+dHlwZSAhPSBFODIwX1BSQU0pCisJCWlmIChlaS0+ dHlwZSAhPSB0eXBlKQogCQkJY29udGludWU7CiAKIAkJc3RhcnRfcGZuID0gZWktPmFkZHIgPj4g UEFHRV9TSElGVDsKQEAgLTc5MiwxMiArNzg4LDEyIEBAIHN0YXRpYyB1bnNpZ25lZCBsb25nIF9f aW5pdCBlODIwX2VuZF9wZm4odW5zaWduZWQgbG9uZyBsaW1pdF9wZm4pCiB9CiB1bnNpZ25lZCBs b25nIF9faW5pdCBlODIwX2VuZF9vZl9yYW1fcGZuKHZvaWQpCiB7Ci0JcmV0dXJuIGU4MjBfZW5k X3BmbihNQVhfQVJDSF9QRk4pOworCXJldHVybiBlODIwX2VuZF9wZm4oTUFYX0FSQ0hfUEZOLCBF ODIwX1JBTSk7CiB9CiAKIHVuc2lnbmVkIGxvbmcgX19pbml0IGU4MjBfZW5kX29mX2xvd19yYW1f cGZuKHZvaWQpCiB7Ci0JcmV0dXJuIGU4MjBfZW5kX3BmbigxVUwgPDwgKDMyLVBBR0VfU0hJRlQp KTsKKwlyZXR1cm4gZTgyMF9lbmRfcGZuKDFVTDw8KDMyIC0gUEFHRV9TSElGVCksIEU4MjBfUkFN KTsKIH0KIAogc3RhdGljIHZvaWQgZWFybHlfcGFuaWMoY2hhciAqbXNnKQo= --047d7bdc153c3419e90512d50ee1-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/