From patchwork Sat Jan 19 13:27:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772031 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C2D317FB for ; Sat, 19 Jan 2019 13:28:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBE312E2AB for ; Sat, 19 Jan 2019 13:28:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF9DD2E2B8; Sat, 19 Jan 2019 13:28:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F5D22E2B7 for ; Sat, 19 Jan 2019 13:28:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MIMrD+LTHevFcDEQ4OPbjWYZu5dIiSMPYdu04xUdfxA=; b=eu1HYK845tGkFq cl8dMQDI7z76Q3IESFlKSnmly225SCdaUYp5YpD1Xm2wV3TJjn8T/qBqmc59rmcf5QlX1D8FcnEEo KBnNRjPJ0tO2CdJOECQJ5fhCqUIyODGcR4V4IdHsv20xRmg/0dhaHwqqyjaJCwUVUPGv0RUykt+pL l7ZaXRqbmEwgcPO/7B6XU+LSULv7AZt0JcbFvJ3n7fPs2E1JEAEtrJXvuFb73TBkxUy0TEW+FQX4O wQ4E742lyLbIKYt+4pqUPnEtJU/7YU3BoCWTGutBuSN+SyDCKPTVGsYBvjyGxrzO6HN3ZLmlfKR1j TNmh+bfQL/nvtU1hVbSw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfL-0008J5-NF; Sat, 19 Jan 2019 13:28:03 +0000 Received: from esa1.hgst.iphmx.com ([68.232.141.245]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfJ-0008Hd-Bo for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:28:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904481; x=1579440481; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=bfGgcKFovQlx1ySUtIbNJcOCKArG8v4y5K1IW9wcmX8=; b=qcQ/0nuuHYkUuzT6OyZBDZj+/8nXdhnWxLmIXrj7yf6ulEgBjJpjg6wg 8ATRWcIg5oU3qLcMq6D1QXqomeJ7G6TB+SjxXRRUd8r4T2aCZQPP1Ua9N xDYkXNgPERSaf080r8iAIWwEGBsSzMC0RZ9ilxHKNOFeB4CeV2p907GPr jv4gNGKJY3UBnkkx14jX38Pxd9VsP68Tf/dF+debFRDjFJ061AhIsEv2R Nde92dWquUUcXTabuPNKog6Cnioa0KVkpVBr7vDVC5yfIf/8wKv/u6o3k zeU87jq31b6Wi0Le+w4g1QN0EuH8J9+E59rRu2AAdG9M2TXIyecquSusS w==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="204221742" Received: from mail-bl2nam02lp2057.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([104.47.38.57]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:27:59 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8FjW/hr5VB43w3Yfq2ljGtg1B108sexcO+M8lWi87JM=; b=BOltmh4fVbtIeXB5PSiCTnsKG9LHcaijJr80Z/yCZkWsa5zrfctI2jjgXdfDyhgNzoYwbH8v84fpi4VgdGvmiHSKTpeaMD9NkFou+OUI0u8PXjX1LGd4gdaGLr3XlY+r4FPc2s45MBB4lms/Um3rDq5piTBjNDbHjoaqvEcC6w8= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB6117.namprd04.prod.outlook.com (20.178.234.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Sat, 19 Jan 2019 13:27:58 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:27:58 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Topic: [PATCH v2 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Index: AQHUr/rLwFIQ0IoNdk2fJw9OHQEpQg== Date: Sat, 19 Jan 2019 13:27:58 +0000 Message-ID: <20190119132650.9978-2-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB6117; 6:PFp09F5I/3u3n6bKaebqgK7db3UkSc12Z3CvpXIByxPey/owtIhc8A+NJBrLPE71waPxUtd5QpT/g0EpSRaDrZGHzcnDU1kThW0lf5i+TN9T9SjLO8vU+DK97q/uB6BTbf4/yjT6gfK02KJ1TFEu+FCTB8BPDDxpwuGO0HjPQ709wnU7xDtbG+l8iUikanl+oqUQhZ0EEfpt9cg664X3YS+bPVBrlC+g7doZVyZK3qXEsYPRuFm41codSQUZGFzEfvmAxIgn+QNvlj+jTo0b8v0Uy6pZBTN3S2VTR8Vk6eDyEYIhhnnyUD4FWHEfpcacpDVcPY3Fa5I+1B3Gz4PFV2oj/Ur79Uzsba+348AZoVQXg/AGc7ciAmIHryT+7oeT0Mz+aruM3eIH0WQxuUWUS1f6cLCTkEg6hN9zk6ofJmJoRFRBIUzN34fqw/fzbcZQhhrUYimT3rWvSShko/PNIA==; 5:Jb4thOLFZWCbmy4bAuMhQ7g+Wt+BIodf8eMEyLGSC1ApBD5L0wH9TVFX6Qeqrne3KbBKIk31zuwQM9Ej4hZcAdYrVEmoZwCM3YQmL31sqVGX6iJ8sqPvKMuT76+UB67j0W5V7yHC3QDmGXw2v/ApZkGcBKVezorqgaO31js7Vx79doA5C5AUdvUI0P/es5X8+kHVbIIu9K1F/vm6dOaEMQ==; 7:4U8TtJQ6cqMi2/xlmOC3s614BuU5DJpT28HpZEU+ipnDEcEn+3oBfwVeZSlPV0IF7XYNO5DUNFQxuLn9seS5CrbFFsU5hacIqosj7BKkzukNMd0JelwOcUcsUWMSyElN67DRtRDYYh33uyKCyXnDdg== x-ms-office365-filtering-correlation-id: b4dbd326-cc97-4ab1-abe7-08d67e11ed59 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB6117; x-ms-traffictypediagnostic: BYAPR04MB6117: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(136003)(39860400002)(396003)(346002)(366004)(189003)(199004)(476003)(8936002)(52116002)(102836004)(55236004)(446003)(36756003)(6506007)(386003)(76176011)(2616005)(2171002)(50226002)(8676002)(6486002)(4326008)(81156014)(81166006)(25786009)(44832011)(105586002)(106356001)(53936002)(71200400001)(71190400001)(186003)(68736007)(99286004)(97736004)(6512007)(305945005)(3846002)(72206003)(478600001)(6116002)(256004)(86362001)(66066001)(5660300001)(7736002)(1076003)(316002)(2906002)(26005)(6436002)(11346002)(486006)(14454004)(54906003)(110136005); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB6117; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ebE4UYtxkvmezckm0VaB+37fB9K9p2gm7UlNjaG0lKgdeEZIc1q3+/i3HE7UcGNqCnoDKuOQi1/CF+SICFHuj1QeD/vTLQ2UMhsDBffYJmCT586yRwzChxbpYWRK51/DXU3zm8Xgjw3KXH7rQ0v8HWnds4o9JISthiLqxQT4Pn5kYzGfYwzNAvqO2HUWZueLKdy4Qg+phwSEj4YAsLlt0ZQJ+t0FSJKzq/F1dfS2q3ENRIyNCBBqAaKfHc7+f9Ieme8int1ItwB3r56Nhvy5a44uX2v9+D00r6CIg+WylkGnQOXXliDmRT7474YPOtxyqFxrqdkuMnw9JisDZzkwZwD4Tu6PU83MEhyqlZTbAEVF2om+27i5o9HG0BWTF+/GWRy1r6YwKv7DFZCtUblsQ5cFPt0PlvcKP23/U6aPW2g= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4dbd326-cc97-4ab1-abe7-08d67e11ed59 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:27:55.9248 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6117 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052801_569768_0C7B3CA0 X-CRM114-Status: GOOD ( 14.93 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We move free_initrd_mem() to kernel/setup.c so that all initrd related functions are in one place. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig --- arch/riscv/kernel/setup.c | 4 ++++ arch/riscv/mm/init.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 6e079e94b638..f270adcc678f 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -96,6 +96,10 @@ static void __init setup_initrd(void) initrd_start = 0; initrd_end = 0; } + +void free_initrd_mem(unsigned long start, unsigned long end) +{ +} #endif /* CONFIG_BLK_DEV_INITRD */ pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 1d9bfaff60bc..f354486f9b78 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -63,9 +62,3 @@ void free_initmem(void) { free_initmem_default(0); } - -#ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) -{ -} -#endif /* CONFIG_BLK_DEV_INITRD */ From patchwork Sat Jan 19 13:28:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9BCA746 for ; Sat, 19 Jan 2019 13:28:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7D742E2AB for ; Sat, 19 Jan 2019 13:28:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABF6D2E2CE; Sat, 19 Jan 2019 13:28:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 457402E2B7 for ; Sat, 19 Jan 2019 13:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OaTiE0m+brXGHrSISE2jhaTymaG/V4N5G1EEOZtUmzo=; b=pqcliZBnpPQ/Fo JTNOL/rJFK4c8cn9Fbd0ZYIt5XqQ/DlVoZ6QmCo1XkGiIZFIsjNhr3MMlLgj12jg6vQYGuiBeVklv DVGlemuXVM07T6+SBskPsxfTtd2UzCUTOccodz9K4RwBjKgrlOuowU51waTD5MtuwwA2qzY5XUxVI SEfaoIhfrQqwp5da3L+mMuBXLPN0gPC4k6seClX2Jo4XEDnew/eE1h86iUK2XIErnYmOghhA3pLxn Ni6vwNwNjiter1BX3pcFZ4qnfySSFoagZ75Nb2bVQYFJfKnboXk4JxO8gp8FnRTFhr/TAR79sMFmN 2MxZn2Qca6oNQMVv6epA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfV-0008OB-FX; Sat, 19 Jan 2019 13:28:13 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfS-0008NW-Ac for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:28:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904491; x=1579440491; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5clvEc+EFgdK4T/Iczm91gdzvaVtM8VoefDnldveq20=; b=Yz14lqqZ3jYOxUd7igfyAxt3wliJ1Q9pm2UgEM9OIb8qaSkKBhkPDIGo EINKsPASpKR66tFSXJaaHY7C3l15kYViJ3Zq4x94t8Bbnsdb1IXv2K638 JcpKnPv/X/v1gFKiGrYvCxYyzVzXrvGs8tJtU7p5IEEFB2SF/wvhLy1RZ oYK+awyOxlwrCUoNK27hqD3zfYoWQzAtvaGyPnfAHKoaeKBBIPGg1Qayu 0lq+tcOpQkraNXDnRO9jk8z4c7DuBBLTe1PUlxT8tr1jHam1s6crfynt7 qQh85K/oCjIeJ1sm9BG2pWqyV+n71+7VGC5NSaypSfl8eJonOdU1YWmum A==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="101011291" Received: from mail-sn1nam04lp2054.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.54]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:28:09 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zF6hu0fpdA9VC4UYtqAme+z5ny0ToEpBQrWwrYwzbq8=; b=dd4RsWsdrbFlgvSgkgzm/GKU/QNdkIilZal3nyANrBW1tPehwPcbDwR5UxUWFPAGv2J0yx4WubH6ac06mtL84Xbvhjq2+z/wxAHxX+nhsU7XUK3TifTUBDD1V3fgQcpKLo+Ekj8Uel8CJ1NicoDz/sr41lng5AicWDo9rv5vUPk= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB4678.namprd04.prod.outlook.com (52.135.240.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.28; Sat, 19 Jan 2019 13:28:07 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:28:07 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 2/6] RISC-V: Setup init_mm before parse_early_param() Thread-Topic: [PATCH v2 2/6] RISC-V: Setup init_mm before parse_early_param() Thread-Index: AQHUr/rQF1FzZ43LWUiaqt7t2ByYrQ== Date: Sat, 19 Jan 2019 13:28:07 +0000 Message-ID: <20190119132650.9978-3-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB4678; 6:wHARZ5lD5c78P0tGEplzDd+NM43s1EmXqW6x5ExToJ0uqpPKRI8/CkY9TqM5GIDUS7RsnEk+52IfUjM/6X6EeNqHXFv7o2yAnXzkxGLCUUcW1/CB8JSlTv4Tfd83s1e0tOI9oftj8/wvqkjs7z5HcaZvLhkhjbxD7k7O2TgVzzYQUVq018jh0E1qc9NVbLMRRhtVSra6o3myEOcZXIrB5CcJbcY5e8xAveWXIEHwYcB3LVz5syHsI/poY9SFZsCYuWcysygO4HwdmPEQaIJat5W1ufhfC9s/RgUxMb4Q+bhiDUwz9gikgUYAz9nswmubLN8KFaoTj9w0ZPQ6QYqzfELGU3CKq+e2owbZKMJPFefZzQrRRgI6RF5qO8iZYKkZWF+aBP24NZmZEh9rsjmLnhebaD20oFD8Xv8DnHR5l+PS+sYNIscnWPky96CoNq31WBlmZvHFzZ6aVI+42WhmVA==; 5:kCOkwqzlv4T1Jycv75g1URtWa1kHCTzODvV2bSwjIz0Sz/x3bQMEX8aPRPJqZYFWz+EZF8jR8RNyAY8VvC4g/eeFH01yYblkegjPYXcq6rjqRCyJFjTAwKdyLvLSQXppZ+4qPRxxHB5I7z1BRa63xqZNgnS/gjACbowPg5u1wmZsQQsV9iuZE6TDk//+ExX0ExV9jX1o2EcQZT9AX4W5kQ==; 7:VhCxm/smzWRUl6IQpPrUd5gFGL2o5Li9wQQHhnqtyZhYrGPBdXk+nM1rt13E7a0nPJNI4ttgdbCoMmjvbURV3kre/9OBSP06SmngIr/lDfLqu+SMFDIC0AJhzENHUDUnFBcGKfHV6JP4ZlPc/Tq9yg== x-ms-office365-filtering-correlation-id: 11324407-63c3-4103-1654-08d67e11f2ab x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4678; x-ms-traffictypediagnostic: BYAPR04MB4678: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(136003)(346002)(376002)(39860400002)(366004)(189003)(199004)(50226002)(7736002)(2906002)(6436002)(72206003)(5660300001)(106356001)(6486002)(478600001)(68736007)(8936002)(256004)(36756003)(44832011)(486006)(71200400001)(71190400001)(105586002)(97736004)(52116002)(66066001)(14454004)(54906003)(6116002)(3846002)(1076003)(110136005)(25786009)(446003)(99286004)(26005)(76176011)(8676002)(2616005)(476003)(4326008)(86362001)(81166006)(2171002)(305945005)(81156014)(11346002)(53936002)(55236004)(186003)(386003)(102836004)(6512007)(6506007)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4678; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: jL/tsS2PK4IbTSzQ3z0jIYNO4nO4wWxcZsLe5zFEo4CyDmjYih1AJEemOb7C5tuuBHrJCVTNDsWis1ooTVIa6jyJFtxcl7NMhhzxfdSQEo7iMu5tOo1wkOqw+5PBvFU79nIVhAKXgLIjrfXpOtxfssXw0SKC1OrwH8m39PAuFJwJYCqd6QsaUFyFFwd/yCvGP4lIBkIr7AGOH+pHVYLWzj9ONUkx/Cqpym9jV3q+UsNPPkYd+l2IWzVEABA35omEGgWHqT6ANqpL7ydDCuOKVxS1C69xMU9hiU1CRQRbUrhTXo5hths658UzvBPRGcry24+vAoU9V2qzfbFOq96wGywBor6moKoEwtkCQR2cRGneScY/9XBe171cxbn7L4D3JtyWa0n9B3JrK4U3W3KzQYHN/uJl9Y4vEzFpCAgc5DY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11324407-63c3-4103-1654-08d67e11f2ab X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:28:04.8470 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4678 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052810_410574_54CB264A X-CRM114-Status: GOOD ( 15.68 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We should setup init_mm before doing parse_early_param() in setup_arch() to be consistent with setup_arch() of other architectures such as x86, ARM, and ARM64. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig --- arch/riscv/kernel/setup.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index f270adcc678f..577d8460d141 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -208,15 +208,15 @@ static void __init setup_bootmem(void) void __init setup_arch(char **cmdline_p) { - *cmdline_p = boot_command_line; - - parse_early_param(); - init_mm.start_code = (unsigned long) _stext; init_mm.end_code = (unsigned long) _etext; init_mm.end_data = (unsigned long) _edata; init_mm.brk = (unsigned long) _end; + *cmdline_p = boot_command_line; + + parse_early_param(); + setup_bootmem(); paging_init(); unflatten_device_tree(); @@ -235,4 +235,3 @@ void __init setup_arch(char **cmdline_p) riscv_fill_hwcap(); } - From patchwork Sat Jan 19 13:28:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64904746 for ; Sat, 19 Jan 2019 13:28:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E72F2E2AB for ; Sat, 19 Jan 2019 13:28:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D22E2E2B8; Sat, 19 Jan 2019 13:28:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E67002E2AB for ; Sat, 19 Jan 2019 13:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6xJ6++dHPtcXpHt9kEsdHJ+NFBjuSToCaZOFwje3paU=; b=WTHAqjkyK9DEZT qvj3tM/NlPygUvF5NpKJZWnpKvtx5qHnmGh1Ipe4Yk029+ZxYivBbBO22fYOEwJvWSAz0rff5IYpd gujf7JGA/9WWFuB3g+2f7uNcjkxOmFcGYprhm3ygW8nZKyl3IN/TIlzILzDFizh3b0auSnudtadsG VKT1IR9HcPln8CBxVDOE8DzkmAkjH0OzkMPtDCJQFTDNG910QER2jRDvlohOnhlmalXpcKICY4kqk 0eLHQBY+yeKpqrn2iUSjFVQYb1Rg+tkRvnS34VWmD5T9+nIpjStMVG+hwMZtCspruAge1CBWNVbSj Uk0y3U4E6NuP3LHIsJiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfk-0008Rh-BE; Sat, 19 Jan 2019 13:28:28 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfh-0008RB-7E for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:28:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904506; x=1579440506; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=kJ+W3Rudkf26ljRN4XY46EsHl7VO+cABUmloHSZ1tuc=; b=iXXoLcWeaDGRIhJmNtsEakjri6WIgtnRd7j15/6uGi3n2woDMeUzPaIQ CYhv7LR+5aOKwllYwSKpEh6PC6DP6zgtyDMsg7Z3VFsHYdDDPH3S4y/BU ce8rPyeg372qOjn3WEVQVi6u98JglWN8drcGeXg1qwx7BTjrWppnQi+6q JZST798TVv4TrFlPTGASVf+QLzCB9l22qLZla9jj2uPwvEaBMT10y+qYz /GyNOHezOIs3/yqqnvD5MeWj6sqPsEUq9Jn/2NaerWRoTg79GA6VLFMmO CWSWxDRv+ZV0Avoj2gp/zXxWvFHaqZtOGO1JazLkvq7Caug45UcUPynd6 w==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="101011296" Received: from mail-sn1nam04lp2053.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.53]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:28:25 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FkZk3Z2NRgYb/c2U2H09g/YoaPj2CBRt5VGMQ34k8p4=; b=MnTWajihbDFOXAXY9ranMxotA72KzRdqXJYwef+cd8UUx9i0FC7wMUQkwLvYwW82FxI3zgQw8l77LWTHh2dx0hKzn/ZpbEFWlqQERUZPabVyfObNncHf2ugho0MiUhjDCGzvg9DAFnPOwRRGqsBzNtYWlisPJjXtUwZp/c+BNeI= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB4678.namprd04.prod.outlook.com (52.135.240.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.28; Sat, 19 Jan 2019 13:28:23 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:28:23 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 3/6] RISC-V: Move setup_bootmem() to mm/init.c Thread-Topic: [PATCH v2 3/6] RISC-V: Move setup_bootmem() to mm/init.c Thread-Index: AQHUr/rZbdFQqnRdaUSqSTYx5eJjPQ== Date: Sat, 19 Jan 2019 13:28:23 +0000 Message-ID: <20190119132650.9978-4-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB4678; 6:Kn6M0tXIt84puqCTET9sA3+nmu7lEVONoOyvKTlltBgjfgMQTVp/CFOa2+tsAb+7VKQOvAGPCRMsikHDtJYgrhX/w27DxtsP5uwcd2x/6bXc4LRYFTAoH2jj8y/0addgQ8JjJbO8G4kHR9rAY6RyjjMiw7W+OaLD8NLcFKQcIDNjnPGC9EYxjj2whkL2e0qDw3cbKIDIGUSkuTHqittacMNrJFGKvsegVrdWSywzwGRTt6/bTmWFoZdc4n84QSQ2mPzR6Rz8olvVGpK78VjCSNaCqkEprDQBOCPQqXCjAo1h65NyIJA1V5AZIwwIExIv8nLMaYo9+OtnbU7FnwyTZ1UF7cdSQQkUxHTyeUbVOCiMovTrpBRZH/wzyLDZGPdQKAOPgJv4ozaYnmM5ZsnfrmUxXZZ0j7TxHFsY0fXpX88LRHgrJ/MNpiJPPKuaQz5dUvD3l1sehmxcMKb9+kD2pg==; 5:PNCb6J5QcxaVt1SP6f5dfLiM5LtLHvwk5CVwzwtW4887IRY7746plu1m+xLZbTPx6W6+IkBGRNUdQq2WKPNRzCqyL0kasfgIVHgMIPlo1NwQCoT8kweozwG+jZeHjTTjXLUahTV9Xxt1ZGKAxRBgq6pmvmyAeQ4jetktmSbPVpqn3YHC+t5HNSUjA+eGAw9sLBazxkfi4gCFhzGZe1I9Yg==; 7:w4Fk6JzJOc3NXHj45p7NBuwCPDn9ombuaFbTXy3eHA2lbOi57sPrHGo5AeiYmf+AEYBkp2ECwOkF9R2WLTG+QqOL3gFwpY3i0hbPGmuWMTi8rkyKzAaDRlc5H3RHAN3k5FrbRHalp2Ydgv57gCX55w== x-ms-office365-filtering-correlation-id: c2fa4096-3cbf-4643-43d4-08d67e11fc45 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4678; x-ms-traffictypediagnostic: BYAPR04MB4678: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(136003)(346002)(376002)(39860400002)(366004)(189003)(199004)(50226002)(7736002)(2906002)(6436002)(72206003)(5660300001)(106356001)(6486002)(478600001)(68736007)(8936002)(256004)(36756003)(44832011)(486006)(71200400001)(71190400001)(105586002)(97736004)(52116002)(66066001)(14454004)(54906003)(6116002)(3846002)(1076003)(110136005)(25786009)(446003)(99286004)(26005)(76176011)(8676002)(2616005)(476003)(4326008)(86362001)(81166006)(2171002)(305945005)(81156014)(11346002)(53936002)(55236004)(186003)(386003)(102836004)(6512007)(6506007)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4678; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: KobITc8QUiHqItfy7kE6r76WXwzfC7oKTKQ5cYSuE/5c4G84ns0VqtfKbVTDzQYTylUdOXGcLnra5usWj1e5PUBQpBsQVJpUhpmshAQF6x13DUmUOF8QVUSvyfTlNo7kfbSUyt9Xq1GyKf9Xkjm2pf7dp+KkoPDYl6pIJkPSNDc4goXmBcPlgl9rVNSCmeCPjBQAQtLeXIF/nEfhbpy7nirEKpVqNL41zzOl2FCWXaG1QBwxXmriEVQPuhd2rdyA8nOZtEaQ/BmHVkmJDWxmYKU6ONar/F6f+M3XNSkw6Bi6OKb8fvSEC9yd7UJBMm7PQ/OPIh5/bT2kRu9BmVlJf8rPd95X27K+RphPiuHFOgIj9kGOr7chiyY3ySbCIJugXU4q2R1bCk5KXeQ2wNpnUUMiBFjmEnnDA7yYai6j2Ik= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2fa4096-3cbf-4643-43d4-08d67e11fc45 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:28:20.9569 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4678 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052825_297570_F5721A37 X-CRM114-Status: GOOD ( 20.45 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The setup_bootmem() mainly populates memblocks and does early memory reservations. The right location for this function is mm/init.c. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig --- arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/setup.c | 48 ++++---------------------------- arch/riscv/mm/init.c | 40 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 16301966d65b..35893810cba3 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -404,6 +404,7 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma, #define kern_addr_valid(addr) (1) /* FIXME */ #endif +extern void setup_bootmem(void); extern void paging_init(void); static inline void pgtable_cache_init(void) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 577d8460d141..ab29a66a17fc 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -163,49 +163,6 @@ void __init parse_dtb(unsigned int hartid, void *dtb) #endif } -static void __init setup_bootmem(void) -{ - struct memblock_region *reg; - phys_addr_t mem_size = 0; - - /* Find the memory region containing the kernel */ - for_each_memblock(memory, reg) { - phys_addr_t vmlinux_end = __pa(_end); - phys_addr_t end = reg->base + reg->size; - - if (reg->base <= vmlinux_end && vmlinux_end <= end) { - /* - * Reserve from the start of the region to the end of - * the kernel - */ - memblock_reserve(reg->base, vmlinux_end - reg->base); - mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET); - } - } - BUG_ON(mem_size == 0); - - set_max_mapnr(PFN_DOWN(mem_size)); - max_low_pfn = memblock_end_of_DRAM(); - -#ifdef CONFIG_BLK_DEV_INITRD - setup_initrd(); -#endif /* CONFIG_BLK_DEV_INITRD */ - - early_init_fdt_reserve_self(); - early_init_fdt_scan_reserved_mem(); - memblock_allow_resize(); - memblock_dump_all(); - - for_each_memblock(memory, reg) { - unsigned long start_pfn = memblock_region_memory_base_pfn(reg); - unsigned long end_pfn = memblock_region_memory_end_pfn(reg); - - memblock_set_node(PFN_PHYS(start_pfn), - PFN_PHYS(end_pfn - start_pfn), - &memblock.memory, 0); - } -} - void __init setup_arch(char **cmdline_p) { init_mm.start_code = (unsigned long) _stext; @@ -218,6 +175,11 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); setup_bootmem(); + +#ifdef CONFIG_BLK_DEV_INITRD + setup_initrd(); +#endif /* CONFIG_BLK_DEV_INITRD */ + paging_init(); unflatten_device_tree(); diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index f354486f9b78..d0965979ee70 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -62,3 +63,42 @@ void free_initmem(void) { free_initmem_default(0); } + +void __init setup_bootmem(void) +{ + struct memblock_region *reg; + phys_addr_t mem_size = 0; + + /* Find the memory region containing the kernel */ + for_each_memblock(memory, reg) { + phys_addr_t vmlinux_end = __pa(_end); + phys_addr_t end = reg->base + reg->size; + + if (reg->base <= vmlinux_end && vmlinux_end <= end) { + /* + * Reserve from the start of the region to the end of + * the kernel + */ + memblock_reserve(reg->base, vmlinux_end - reg->base); + mem_size = min(reg->size, (phys_addr_t)-PAGE_OFFSET); + } + } + BUG_ON(mem_size == 0); + + set_max_mapnr(PFN_DOWN(mem_size)); + max_low_pfn = memblock_end_of_DRAM(); + + early_init_fdt_reserve_self(); + early_init_fdt_scan_reserved_mem(); + memblock_allow_resize(); + memblock_dump_all(); + + for_each_memblock(memory, reg) { + unsigned long start_pfn = memblock_region_memory_base_pfn(reg); + unsigned long end_pfn = memblock_region_memory_end_pfn(reg); + + memblock_set_node(PFN_PHYS(start_pfn), + PFN_PHYS(end_pfn - start_pfn), + &memblock.memory, 0); + } +} From patchwork Sat Jan 19 13:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD42314E5 for ; Sat, 19 Jan 2019 13:28:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B4692E2AB for ; Sat, 19 Jan 2019 13:28:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F97F2E2B8; Sat, 19 Jan 2019 13:28:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CC83D2E2AB for ; Sat, 19 Jan 2019 13:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O3xVvwTzAZqgEMFb67J0IApHNQY3RPe38AGN+Gf0aOc=; b=uS+TD2wqTAd1D/ 0nvzZzf5HRMaKaWJ42tTUlI/tR2+YXrhVAT3jV9QbzPFdz27LkMPcM6Oi4q21TFGTyTmNhIMmJFKd UK9DVNPE/Svucj4/w5sjRkvSkwflD/cDioykb3PQ89dFUHhoRL3pfqXzVxQDGDRTHLgx7/ubMKJ5M XG77nT/5ziVw0kZj3RxsRBJV38cWFPqWlDhwovW8qlN6SEIdSNB0xSrd8baMR7qmv1PcbQQLADMTQ t2yuHxI9qV6ERrzkPY2EQ9POSRnzH3aHwjs24Iv13Bvb0DTqb4VzvsbOkWorOto9+sJqjvzviKDW9 OiPbQFD/p1tzH20V3hvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfo-0008UL-5Y; Sat, 19 Jan 2019 13:28:32 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqfl-0008RB-OF for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:28:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904510; x=1579440510; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ErtookT/WUlzoMYFO9uINopCIBQkAbzJ3kPcEWxBi/A=; b=aQ74baj+y/g2qsYSBdxuApjTQ+9cWAGBXSGZe8e3wCbgelWUmiMQphj5 sBef3LJTTGxWIYl5aIXteYdr8wwGmg7pq5DdHrdm/q+EuiFFJ/NW1cgMt 8+PAYWLsvo8hvVEZL9IKTO6q3BpKtzHpMX3J3SExcQudlO6ZMRDxG9Zcu PnEUjuNd9s0EtzXQfxBFC8dxGZ9uLynCX2KsBYNRDkL2OAvqrjiiLnERp ACiuo+HWsG9iIgVOMASR1DLogO7cJ8tiGex6zaBFWVhXA3H/IK3kZ/9IB DLRfugjIo95hKUzMpEUy7humSqUiXpd94VZZt/rO1uDNDPF7XywdjNVIH g==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="101011301" Received: from mail-sn1nam04lp2059.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.59]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:28:29 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pweH6QhO7Wrmh3erRPcCTJ1f8UZTm7PpWbx9Ijged9Y=; b=NEMSRt9vG2US4aZ9tHQUtLLAp6WG4aR4hH9K4PFlNdwIifYWm1dBlcwZgTMeQ6CPii820OiO4N7A0K1fgQJH4I6Z0Wy7n9aZiAlRGRqb65xPPyE2lxo31Gk2iv6KDCueX+BRtWnYeMZajg9aiiBWKByy++idqR3kml4muNN7IeM= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB4678.namprd04.prod.outlook.com (52.135.240.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.28; Sat, 19 Jan 2019 13:28:28 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:28:28 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 4/6] RISC-V: Move setup_vm() to mm/init.c Thread-Topic: [PATCH v2 4/6] RISC-V: Move setup_vm() to mm/init.c Thread-Index: AQHUr/rch08vY8x9lUmLhlHn6x7tGg== Date: Sat, 19 Jan 2019 13:28:28 +0000 Message-ID: <20190119132650.9978-5-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB4678; 6:eHc44GMaZ+oQYfzm7xhC1y2E2yon2Gfv24cqH6DYBZojurY/z+p5lMh5i/yb6bWPG/JQiyvpai2KA/W2aqOT7jGkYxQrAADZvTeFChz+GCRQAsAp3N2h0amQ3fClSkFBa9iB1D1JFnpIg3w07lfUuMWeIMTMad+62G1n2fn79brqqICeVlBnN9PLtL0aTguIxkk0Dw7ofQscJLfePcbo9dEDDmF1sytVuJocRxcmHtKU0TWo2X6NTpU22yR7YmSNeMN+xSM/A1+yY2UftWkx8bodCJqBXcD9xmm1keUTDwJxeymVN0eqUP5S+ZU5KI8zbx7bGs3H6U2tTxlL9RMvMFWyGmnso2zRn97lnJHfZgdTrgKyIsbJYoFrUChIt4HTUBh6P5Dn4nldjfsQ+BDwxeOdMQGG5EI/Fnw7UpmOZFmfKtxUQ3mfvXk32txMrQjNLDwVU3TgiLExLdiov4iqYw==; 5:cy8BSpRrUIzIJF80za93ZLiCSn/Jcdyzulf9lTkQHjOfKAwvE4YusMXTvaB65h4PLsj5i6/lLxeaBhsr8bNZTj79CBvN/EL0D1OmHArXwpjztzmvOJUR0SiQ1Hyk5kYtrjcZVgvLTLPRxOIbnDMoytqLw1q/Y40FYRjoSIim8a07DIJA13OZS8P9QSn7XdMZgYYmiuY6xbqED1Cqy4eMjg==; 7:GiC2PiYRWAaHaTYGoZCUdW+RLf4KmSrBi0QVeFfrwpdoYQ9AhyPwmvE4no7w0ZE5F84GSjO0mTy4++TfFBZL1rT9TJalKLwq2yydXGNHHShiPQBbiVfuw46Tsy9t06fAcM5TXAJYyOAEBmHyFyLwuA== x-ms-office365-filtering-correlation-id: 58c94990-1f48-4279-6451-08d67e11ff09 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4678; x-ms-traffictypediagnostic: BYAPR04MB4678: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(136003)(346002)(376002)(39860400002)(366004)(189003)(199004)(50226002)(7736002)(2906002)(6436002)(72206003)(5660300001)(106356001)(6486002)(478600001)(68736007)(8936002)(256004)(36756003)(44832011)(486006)(71200400001)(71190400001)(105586002)(97736004)(52116002)(66066001)(14454004)(54906003)(6116002)(3846002)(1076003)(110136005)(25786009)(446003)(99286004)(26005)(76176011)(8676002)(2616005)(476003)(4326008)(86362001)(81166006)(2171002)(305945005)(81156014)(11346002)(53936002)(55236004)(186003)(386003)(102836004)(6512007)(6506007)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4678; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 8Khp+LLegIsNXBm1pfiBSWajaBwi4xImgbczkuqWGPKelg7FEFlinVi3+bipCHxN3dZqWzr7Qw9LlXK9F9glWx8mbGEJcQ608rlH+LpsiGdal2rMYKgIdeAF/gLmzUZWkwcLsoE5EfJ/uk8vcHyceg0fVy5vxEec/Mf/tgIr0ZO7Dd4bO1YEHmxZw+KOLBTIzB0w6Q/DaRHMkbFmcgbEgYSOEUdtpSIogV31sE79IrtafHDpf46sjrBip4C0/4SeZ1KQTRv7+3f09LxB859dh+y0LnrWI4xyzQzD5t4tSPXoYgA7toiu7sBnurR2L8XyvIAspTtfmokpn+OrH7JB0eMudHuNh1YOSfI0EW9y2ixTWtcvQ0oC0WaazKVWAO3Hh7CkYeb4EHNCkrjoXRj0Qg+RiUczDOhHFUJ7EPyBGc4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58c94990-1f48-4279-6451-08d67e11ff09 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:28:25.6133 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4678 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052829_861832_FE374039 X-CRM114-Status: GOOD ( 17.19 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The setup_vm() is responsible for setting up initial page table hence should be placed in mm/init.c. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig --- arch/riscv/kernel/setup.c | 49 --------------------------------------- arch/riscv/mm/init.c | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index ab29a66a17fc..9cd583b6d1cd 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -102,55 +102,6 @@ void free_initrd_mem(unsigned long start, unsigned long end) } #endif /* CONFIG_BLK_DEV_INITRD */ -pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; -pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); - -#ifndef __PAGETABLE_PMD_FOLDED -#define NUM_SWAPPER_PMDS ((uintptr_t)-PAGE_OFFSET >> PGDIR_SHIFT) -pmd_t swapper_pmd[PTRS_PER_PMD*((-PAGE_OFFSET)/PGDIR_SIZE)] __page_aligned_bss; -pmd_t trampoline_pmd[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); -#endif - -asmlinkage void __init setup_vm(void) -{ - extern char _start; - uintptr_t i; - uintptr_t pa = (uintptr_t) &_start; - pgprot_t prot = __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_EXEC); - - va_pa_offset = PAGE_OFFSET - pa; - pfn_base = PFN_DOWN(pa); - - /* Sanity check alignment and size */ - BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0); - BUG_ON((pa % (PAGE_SIZE * PTRS_PER_PTE)) != 0); - -#ifndef __PAGETABLE_PMD_FOLDED - trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] = - pfn_pgd(PFN_DOWN((uintptr_t)trampoline_pmd), - __pgprot(_PAGE_TABLE)); - trampoline_pmd[0] = pfn_pmd(PFN_DOWN(pa), prot); - - for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { - size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; - swapper_pg_dir[o] = - pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i, - __pgprot(_PAGE_TABLE)); - } - for (i = 0; i < ARRAY_SIZE(swapper_pmd); i++) - swapper_pmd[i] = pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot); -#else - trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] = - pfn_pgd(PFN_DOWN(pa), prot); - - for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { - size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; - swapper_pg_dir[o] = - pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot); - } -#endif -} - void __init parse_dtb(unsigned int hartid, void *dtb) { if (!early_init_dt_scan(__va(dtb))) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index d0965979ee70..f8e396dc80a4 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -102,3 +102,52 @@ void __init setup_bootmem(void) &memblock.memory, 0); } } + +pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; +pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); + +#ifndef __PAGETABLE_PMD_FOLDED +#define NUM_SWAPPER_PMDS ((uintptr_t)-PAGE_OFFSET >> PGDIR_SHIFT) +pmd_t swapper_pmd[PTRS_PER_PMD*((-PAGE_OFFSET)/PGDIR_SIZE)] __page_aligned_bss; +pmd_t trampoline_pmd[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); +#endif + +asmlinkage void __init setup_vm(void) +{ + extern char _start; + uintptr_t i; + uintptr_t pa = (uintptr_t) &_start; + pgprot_t prot = __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_EXEC); + + va_pa_offset = PAGE_OFFSET - pa; + pfn_base = PFN_DOWN(pa); + + /* Sanity check alignment and size */ + BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0); + BUG_ON((pa % (PAGE_SIZE * PTRS_PER_PTE)) != 0); + +#ifndef __PAGETABLE_PMD_FOLDED + trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] = + pfn_pgd(PFN_DOWN((uintptr_t)trampoline_pmd), + __pgprot(_PAGE_TABLE)); + trampoline_pmd[0] = pfn_pmd(PFN_DOWN(pa), prot); + + for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { + size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] = + pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i, + __pgprot(_PAGE_TABLE)); + } + for (i = 0; i < ARRAY_SIZE(swapper_pmd); i++) + swapper_pmd[i] = pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot); +#else + trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] = + pfn_pgd(PFN_DOWN(pa), prot); + + for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { + size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] = + pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot); + } +#endif +} From patchwork Sat Jan 19 13:28:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E39214E5 for ; Sat, 19 Jan 2019 13:28:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58BA32D902 for ; Sat, 19 Jan 2019 13:28:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 474712D916; Sat, 19 Jan 2019 13:28:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B47DB2D902 for ; Sat, 19 Jan 2019 13:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Emu9MIpzEqCpAhVqHcGv2hf4W8AXv6ect63XawQkXME=; b=K7HCQPHVZRrtwC KmjQcNKQJKyPihEbFlJGFoNxNVkyvPxQiTSnOVSdk4KxjseBpnh87ZBBMcjSqWsbfeG7dq3+LJ9kf 0KYVICRLkDOZFgtlmQ7Mq1WV33u11T8u6ITvz57PVUc8q6N6Gx3gAg8QkrD4tDfZraLlBNq7EPnFD ogPNufZ3GmMDEom+Js5wbq/Vi1VJYti52PaIamFTRYxM/ZiaZH8ljTIC7a0braJv/4JgBWZ5eOKyH GrupEkv1htwxf1cuMDm8ZlGy8s6+4DRJxCVJM3A6O+QIPRF465Hno+Hd4208EYyOtJ2oMD5xV+GA3 ijAHn4zh774GNPcxTmUg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqgC-00006u-UQ; Sat, 19 Jan 2019 13:28:56 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqg9-00006Z-WC for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:28:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904534; x=1579440534; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=bGPlGg8EE3H4XUDQMXXPKEwt2W12jtDqim6zbzgAvJM=; b=hHPpJqndVGl0SpGw5/F/ixFrd074tpV+aYubSuaAft+nH0LLMjlajQT/ AWl9M8XK+l7L1PufGdRi3UQgfMMulyPDb5d3pZmYrpnAXIc41iJ7HFyti JzuJQn4PwZRK4icLIngBjY1tcB0yQ8h51PL7Lg1q9JiME9b5arp0cwPR1 sPg+gQUEy7OsP7QgP++R9Rna+OIL1lvNL+u0YYVxTxbfqhvhdsI0hCe38 eKco1NTbHzUqxPyKOmSphF2Mhtf89VZyjXKciOh0+SwzeSwtjzi3H0EBO J+B/0Nj+bDgPXRbsrB4HJB4MhNR/VLw/VjNPjxJtGv2GCqK5wUIpGJIX/ g==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="104187208" Received: from mail-sn1nam02lp2057.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.57]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:28:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wgdNNWdPnXdH9THUJg9iQNdnvoZEA2SBeGHYVByoDwY=; b=eIfgBp00G9Ef4BJIeDRLlTSq6Z/50injE6uISpdciBhHUaD26u5/Y9RAAYsld9MVo04Ngi+Ysa/6dPjLOYxrbUZg2GZqOH88bUqcrQ2xcLlFn1Ptfdtiv9bTRoiW09gOwtufkhnLzQYgc6zAlGe66yllkuRo00DEuEbvwwIHXzo= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB6117.namprd04.prod.outlook.com (20.178.234.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Sat, 19 Jan 2019 13:28:51 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:28:51 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 5/6] RISC-V: Implement compile-time fixed mappings Thread-Topic: [PATCH v2 5/6] RISC-V: Implement compile-time fixed mappings Thread-Index: AQHUr/rq5jJd1glB7k+R6lJy0++NFQ== Date: Sat, 19 Jan 2019 13:28:51 +0000 Message-ID: <20190119132650.9978-6-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB6117; 6:3SQQTa77+t9VZX2o/w/gu2dIe4Dnp+5u7w0psdzVFNFSppM0boH39zicQEZ6URVW7e9Jq6eRbLD0RQ0gHAFCS27SkGhtvyipPdeR+WwPZLsC9FKiIdXvbEcgkgfu7OUsEm9KaxyAKFWhN+J49v+IH6bJ1v0rxgQ3GEKNt4zNbx5ZgPiC3pzHQ4fppGANRqm3fq+jiVagFGineAlgOPihr/daakTBvVJgRVMCZZgQSrV5oZRns/aSuK061XUX0kXAhS04/iv7QS7JTjphk/3HQWv0DSFVB+rplFiYpabjHbmG6bRDJZ4iduplAH57xVeS+e6Dgh1caLZBRffOmUIlO4AlMo5FaC7o5TC672FNQN7tTSh1yV6aAKnjZNldFA2u8LQt03IO+OX5b5PscF/wFpVpU9PQfjVnV/h5H3PkEBgKSSusvOV/n3Toq5WmtofXCa7O2FPH01Of2fPLk30o6A==; 5:4EVFdVI9tpCmf4Jn9CioiiyjOsjRmv7cNSGU0CfXByXoRR0Wjt5V5LBqqCJTMf+b23UTvYvxzbWi9qkDhufVmFpO8Oo4C0erFMhTTEZAC3BSQwfkbAWL+ilWBM64ZQsdFxAy8xl0pZnAz+KMDZixLO2EYJ8nnRvtP143LQNt1VjM3fUH6MRjjEYS6fOc8LNEB+KzFwaQ4l0EhlfmDP3PGA==; 7:U07bX/vV+xSL60fkqdwdUXSphfOSxXKXe71DBq4o6JFW9wRbk3LdK8ZgFGwnJEBe5VYJz90ZJp3t/4PFgeDBLNuqhVSrAPxfkn/O7fPDBfeDlZ+5+pS1MtIUUowiUYNcaUhzFhD4EVRV/KsOz8DuSw== x-ms-office365-filtering-correlation-id: b0914f4c-d5b3-4ad5-9162-08d67e120cc8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB6117; x-ms-traffictypediagnostic: BYAPR04MB6117: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(136003)(39860400002)(396003)(346002)(366004)(189003)(199004)(476003)(8936002)(52116002)(102836004)(55236004)(446003)(36756003)(6506007)(386003)(76176011)(2616005)(2171002)(50226002)(8676002)(6486002)(4326008)(81156014)(81166006)(25786009)(44832011)(105586002)(106356001)(53936002)(71200400001)(71190400001)(186003)(68736007)(99286004)(97736004)(6512007)(305945005)(3846002)(72206003)(478600001)(6116002)(256004)(86362001)(66066001)(5660300001)(7736002)(1076003)(316002)(2906002)(26005)(6436002)(11346002)(486006)(14454004)(54906003)(110136005); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB6117; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: p1mmbdGyitIUD+gxssOy+cMpNPnSzFw52rTpF+u8hCwsmIG52PuYzvpeDZKxHlLtrWFXv9ghtngHkvca6BSZi9Dg5RlAm8b125WhFFxTfxy0q0nRIbF7rZVH2dJsxfvYESH2Qk3lPDlUhbmBRKd0mnDmhSW7B8MWlKLLdPiZP1/TpxM0Lh1bzAuAl9IXHCNJAxFQ1Ght/XzckZ8Mh9zrU8d95qms2/VyTArzuTP9RWduejIGefrJOnN47bo8sQ5ILxTXRITEipM1779/y2Z4FbeSgN2S03tm6QrdqVrkiabqDAKr8q4WD/+NykLott6CD4Jn6br9JPslVVWYkTr8EFNvouKHcsFHU7os6jtJmI84FlkG9Eok+VePqieAKwleAY4IVBBvj6VQvNGCoryuAal6pQdhc6OSeJ9UvjIdw24= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0914f4c-d5b3-4ad5-9162-08d67e120cc8 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:28:48.6766 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6117 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052854_149477_594480F8 X-CRM114-Status: GOOD ( 20.49 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements compile-time virtual to physical mappings. These compile-time fixed mappings can be used by earlycon, ACPI, and early ioremap for creating fixed mappings when FIX_EARLYCON_MEM=y. To start with, we have enabled compile-time fixed mappings for earlycon. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig --- arch/riscv/Kconfig | 3 +++ arch/riscv/include/asm/fixmap.h | 44 +++++++++++++++++++++++++++++++++ arch/riscv/mm/init.c | 34 +++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 arch/riscv/include/asm/fixmap.h diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index feeeaa60697c..c18bba5d0e32 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -89,6 +89,9 @@ config GENERIC_CSUM config GENERIC_HWEIGHT def_bool y +config FIX_EARLYCON_MEM + def_bool y + config PGTABLE_LEVELS int default 3 if 64BIT diff --git a/arch/riscv/include/asm/fixmap.h b/arch/riscv/include/asm/fixmap.h new file mode 100644 index 000000000000..57afe604b495 --- /dev/null +++ b/arch/riscv/include/asm/fixmap.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2019 Western Digital Corporation or its affiliates. + */ + +#ifndef _ASM_RISCV_FIXMAP_H +#define _ASM_RISCV_FIXMAP_H + +#include +#include +#include +#include + +/* + * Here we define all the compile-time 'special' virtual addresses. + * The point is to have a constant address at compile time, but to + * set the physical address only in the boot process. + * + * These 'compile-time allocated' memory buffers are page-sized. Use + * set_fixmap(idx,phys) to associate physical memory with fixmap indices. + */ +enum fixed_addresses { + FIX_HOLE, + FIX_EARLYCON_MEM_BASE, + __end_of_fixed_addresses +}; + +#define FIXADDR_SIZE (__end_of_fixed_addresses * PAGE_SIZE) +#define FIXADDR_TOP (PAGE_OFFSET) +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) + +#define FIXMAP_PAGE_IO PAGE_KERNEL + +#define __early_set_fixmap __set_fixmap + +#define __late_set_fixmap __set_fixmap +#define __late_clear_fixmap(idx) __set_fixmap((idx), 0, FIXMAP_PAGE_CLEAR) + +extern void __set_fixmap(enum fixed_addresses idx, + phys_addr_t phys, pgprot_t prot); + +#include + +#endif /* _ASM_RISCV_FIXMAP_H */ diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index f8e396dc80a4..4c627b8d53c7 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -110,8 +111,28 @@ pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); #define NUM_SWAPPER_PMDS ((uintptr_t)-PAGE_OFFSET >> PGDIR_SHIFT) pmd_t swapper_pmd[PTRS_PER_PMD*((-PAGE_OFFSET)/PGDIR_SIZE)] __page_aligned_bss; pmd_t trampoline_pmd[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); +pmd_t fixmap_pmd[PTRS_PER_PMD] __page_aligned_bss; #endif +pte_t fixmap_pte[PTRS_PER_PTE] __page_aligned_bss; + +void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot) +{ + unsigned long addr = __fix_to_virt(idx); + pte_t *ptep; + + BUG_ON(idx <= FIX_HOLE || idx >= __end_of_fixed_addresses); + + ptep = &fixmap_pte[pte_index(addr)]; + + if (pgprot_val(prot)) { + set_pte(ptep, pfn_pte(phys >> PAGE_SHIFT, prot)); + } else { + pte_clear(&init_mm, addr, ptep); + local_flush_tlb_page(addr); + } +} + asmlinkage void __init setup_vm(void) { extern char _start; @@ -134,20 +155,33 @@ asmlinkage void __init setup_vm(void) for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] = pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i, __pgprot(_PAGE_TABLE)); } for (i = 0; i < ARRAY_SIZE(swapper_pmd); i++) swapper_pmd[i] = pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot); + + swapper_pg_dir[(FIXADDR_START >> PGDIR_SHIFT) % PTRS_PER_PGD] = + pfn_pgd(PFN_DOWN((uintptr_t)fixmap_pmd), + __pgprot(_PAGE_TABLE)); + fixmap_pmd[(FIXADDR_START >> PMD_SHIFT) % PTRS_PER_PMD] = + pfn_pmd(PFN_DOWN((uintptr_t)fixmap_pte), + __pgprot(_PAGE_TABLE)); #else trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] = pfn_pgd(PFN_DOWN(pa), prot); for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] = pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot); } + + swapper_pg_dir[(FIXADDR_START >> PGDIR_SHIFT) % PTRS_PER_PGD] = + pfn_pgd(PFN_DOWN((uintptr_t)fixmap_pte), + __pgprot(_PAGE_TABLE)); #endif } From patchwork Sat Jan 19 13:28:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10772041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B55F0746 for ; Sat, 19 Jan 2019 13:29:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E0E12D902 for ; Sat, 19 Jan 2019 13:29:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CFE72D916; Sat, 19 Jan 2019 13:29:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 22F6C2D902 for ; Sat, 19 Jan 2019 13:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7xB0Ui66IPQpusxc1SBcCzrD4PwlJ086g93RQg+CYNM=; b=jEKh+J88+3MGWj T0hz9opZBtWDhg90S9661H902lu8ItD3hXt+05Q5LaXPtSSCiQ2ZF1U1MV3Wb0gXmWPARuxTivjJp ihEKVxQpgIyllRTFChjlHU9h6PJVnNvui3Yja1x7CiYhxJlpmJawSFB11bTAxDaXSUTKlYq1Z5oYR qPrIic1Jr1xIClMMQNzpjT0soCLVDHOlm6lfc7pi4YZ2icEDnIgI/LLA0wI8mr5Bynk3coHzVw/Ie TgLHrdmlV0VFB76sNgiRnt/aJ9LR/iY6/d3+QNpraEV8W6XVsJCHS0SmYRfVLCZ0f14XGPvKzzNSN mk7IYrd1kvEbY4r7atng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqgO-0000AH-Lx; Sat, 19 Jan 2019 13:29:08 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gkqgL-00009p-5K for linux-riscv@lists.infradead.org; Sat, 19 Jan 2019 13:29:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547904545; x=1579440545; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=RkBTH8lbPokRi3AbbPZC7LaTnjprJMzCRLruXMKSeEc=; b=aFbFS4H6YzyThIATQ7bs1zo77TH8N2LESt0/NS9Usm1qWaDLh4rrFRtl 1O7IZcwQXa8he52VHmWFUMUZ8Ofy2w96gt0KBKfJXjxR18YOdd3UDarod WfjWvaWh5gRGAPibFEY+2Ft+QDHFIbHWULJkoC1LDjmxcrYrMjmaFwQqr gam1x/AFimoVJhj0z/nACXl5sCsra82zduUFaOyAp0+LDZ9yl8QT9MF2w S0osrrLAv2ldn0IvwaDZI6LPgyEOGAtc3bf+qQYsXGbUsdcyWZ/XLICGL EsO481+ZznI5+80qkCy7IFd1HKGLaptAChjqdnpNFar7bJJgWQAjPR59h w==; X-IronPort-AV: E=Sophos;i="5.56,495,1539619200"; d="scan'208";a="104187216" Received: from mail-by2nam03lp2055.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.55]) by ob1.hgst.iphmx.com with ESMTP; 19 Jan 2019 21:29:04 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jUGRwrEhvO7GNr+kDod846Bm8yelHx5kYWNQyVfOwr8=; b=BhGS45YXBnp2J3WLa48/kgoEVPYsmTES8PfzrhT5b+JeWPpRejgewfWCBOhVO398iiwzsJdbDk2enaa8Y0YK66mujBQjmQQYYQE3PVx1/+fCRZ4HVtv9ujgxdRGXU0hqrCrPXoFqlo54QmBXV/1V48T7vYB8Z3IGULijfnxWpxA= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB5397.namprd04.prod.outlook.com (20.178.50.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.19; Sat, 19 Jan 2019 13:28:59 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.028; Sat, 19 Jan 2019 13:28:59 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v2 6/6] RISC-V: Implement keepinitrd kernel parameter Thread-Topic: [PATCH v2 6/6] RISC-V: Implement keepinitrd kernel parameter Thread-Index: AQHUr/rvNlD18fFOHEuGvgVx64rC4Q== Date: Sat, 19 Jan 2019 13:28:59 +0000 Message-ID: <20190119132650.9978-7-anup.patel@wdc.com> References: <20190119132650.9978-1-anup.patel@wdc.com> In-Reply-To: <20190119132650.9978-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:1::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.52.191] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB5397; 6:I95jqhLKkE1aouccQGNmrUJuyPeFo8xAKYDLBMv6FDC9PGFh9eeZreaO8es4hOcGm05MeXkvqYr4iHg7DJSbPI1J94BMHD+f36O7bDeHM6pFpjtSGfLx7E8hyHHmL/Yr51u0OkzHlev1igx4EVX6V+M/1CZS3V+CN9hnysp9tZVECpE4Zw+TwJ/sEeba7aELnNm3K8zapkBVdXjvoDk47PIqdudiFex7SlkxG9APN22Jb8M3c0ZQvuUBMtO0MDXYxDh+7uAvF5kwqRGg+0ztEMDrxunUBK0sy8liKAXEgGWWCdCO0OrSN7/GAJntWxAHAdYLPJWgZJ73OEA/7hrE4UHOGMi9pIymJLRyKHjv8DY0q5/Lg/bW1k7M8ap8c8joYOfPvuQdjJSPA1plgpFvKxaTGQEzJkUM4thzZs9RFUet+ik0NK5Pud3K44EiYHEZnYbv8Roux6cK7K/5RqL0ZA==; 5:0n3K4Zfvs3yCLpfW26AcBWJy9qJj79F3ua8ZmUF+D/MdHam+GPmZ+3mr3ocJFAGG3IrBmW118GA3IlotpULqrQSNfLJzB8iYoAxoT2t4rCi51XHDUOCGGIpn+oiwUuI5kKvRmFIHPICAsmIZ3zYPEusqFbJbn9Wo5dV3FelVItTwm9zkMCtUmpPEYSoNrwjMzzRPQt9EXUtPgJxF4jp0Xw==; 7:GiIYfOTA46KXGaqtZwZbB2cfdITqp7jpnZGP3UidcTPJPevci/18FFb4Bb2B5T9T97mKheEZaVY0dQT4OcyOAkeZt1pszRAXOnaaWlUukRJp9rirnhQ0HTDSnMKpEKqMwtEP4VRPhr5+JsLgDyEtbA== x-ms-office365-filtering-correlation-id: 36b63613-5f19-480a-eac7-08d67e1211c8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5397; x-ms-traffictypediagnostic: BYAPR04MB5397: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 09222B39F5 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(136003)(366004)(376002)(396003)(199004)(189003)(6116002)(99286004)(14444005)(25786009)(72206003)(8936002)(4326008)(102836004)(50226002)(81166006)(14454004)(68736007)(105586002)(305945005)(7736002)(66066001)(478600001)(2171002)(8676002)(1076003)(81156014)(256004)(53936002)(106356001)(3846002)(26005)(86362001)(386003)(55236004)(6506007)(71190400001)(2906002)(71200400001)(97736004)(6436002)(6486002)(476003)(2616005)(186003)(44832011)(76176011)(6512007)(316002)(5660300001)(446003)(11346002)(52116002)(486006)(110136005)(54906003)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5397; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Ii1hjsBLKm//soG1BH1Fq2NOppTFNn5vN0wOyDlB1CTkxwsUOFaHubdpgB5uQTQxhI2DPXQYKBe2N5aqPYF494nLcsNkQg4XTQFv3BoP/oItvULrPO+8vkGAiu5jn/9gbVqJGy2Bj1sDy5R+lHZToJDzST+RGszJ8cGTjxiG96/q6G/zg7TVE/SE/D0vUqIkJ9MijGAWfeDkv0fBNm6RfQ+IVFsnpZHm8L5RiIk2S2dCRQqg0CO5QVHzbm/D5shup3o/2Pp0qsRGaNZuSppeRYnIPPPn4i+JTNabiTWZ8n3SCO0a5u+8HO2E/nQHx6GjHHwgZvCR64sdCCupHi2S1e6pT79AXksF8eTUZB6JSpjk/TjeE67YqdQj42rZtf89KwjYnawzTPjKxB3sLaf+GndB9Y4e74bo8nHzzqb9Rwo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36b63613-5f19-480a-eac7-08d67e1211c8 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2019 13:28:57.0831 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB5397 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190119_052905_320732_37504891 X-CRM114-Status: GOOD ( 15.71 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch implements keepinitrd kernel parameter. By default, keepinitrd=1 but users can pass "keepinitrd=0" to free-up initrd memory at boot-time in free_initrd_mem() function. The keepinitrd kernel parameter is already implemented by unicore32, arm, and arm64 architectures and it is documented at: Documentation/admin-guide/kernel-parameters.txt Signed-off-by: Anup Patel --- arch/riscv/kernel/setup.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 9cd583b6d1cd..46e547dd8245 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -97,8 +97,20 @@ static void __init setup_initrd(void) initrd_end = 0; } -void free_initrd_mem(unsigned long start, unsigned long end) +static int keep_initrd __initdata; + +static int __init keepinitrd_setup(char *__unused) +{ + keep_initrd = 1; + return 1; +} + +__setup("keepinitrd", keepinitrd_setup); + +void __init free_initrd_mem(unsigned long start, unsigned long end) { + if (!keep_initrd) + memblock_free(__pa(start), end - start); } #endif /* CONFIG_BLK_DEV_INITRD */