From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3353AC282C2 for ; Wed, 13 Feb 2019 08:07:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4360222B5 for ; Wed, 13 Feb 2019 08:07:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="W9AaLMz3"; dkim=pass (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="IfCn9oRP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390465AbfBMIHu (ORCPT ); Wed, 13 Feb 2019 03:07:50 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26128 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390269AbfBMIHs (ORCPT ); Wed, 13 Feb 2019 03:07:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1550045269; x=1581581269; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ubekwtYIPFFf005R5Hzs4jmv+czpJXwjEd3zgesqrRw=; b=W9AaLMz3gb1nXofm+UbobGgFsUI7vFHNcJULasn+vRwNL4n/yKfKTiTt UXEIBV2jPQ329zIDd9BlnKeIr4cLuA5DfzzRWLsN518C6EcVcq8gtDVsV qqoXQei/5R70sOLbb6s3ecB4yFfLF2qkdkK32IbJukRUM0uk5MvTKTvKE IiirVIHkuHvtKEutFeYEdTuV3u48bUfT2uTwFCBVcdESxVlxKIDzdXJCl c55w83jqiDM9186q7Gvw6so0OmQrNDS2XLOdzdmPT4DmvsQ4WGUxURBlP 6DIHMATaJZ4LATdDKSaTww3IV8qSYiBijwzaFltPxjO0bhbD+2AgjJBl+ g==; X-IronPort-AV: E=Sophos;i="5.58,365,1544457600"; d="scan'208";a="102402336" Received: from mail-co1nam05lp2053.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([104.47.48.53]) by ob1.hgst.iphmx.com with ESMTP; 13 Feb 2019 16:07:48 +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=DcBwDJJXFu1PqOJGPFzp6HBUM2mAFRKjvzARIRyaD18=; b=IfCn9oRP5T+5ap8AdWq4CKvoKX3+fxVuJFG3VX2m5ffB1S8TzAUy1RgSz49pFV2EeSz9lp1eK49mC+KZ0+5RCusCLN7qCRbNOOeFor5Bg1Flwrfd0tiujUP3bN5Qm5Srg3yeCV1d3lD2aI3tHuUOj5hkq4bY6lOct3OXI7xqAII= Received: from DM6PR04MB6059.namprd04.prod.outlook.com (20.178.226.89) by DM6PR04MB5993.namprd04.prod.outlook.com (20.178.225.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Wed, 13 Feb 2019 08:07:46 +0000 Received: from DM6PR04MB6059.namprd04.prod.outlook.com ([fe80::d006:5be7:c3f:ba6c]) by DM6PR04MB6059.namprd04.prod.outlook.com ([fe80::d006:5be7:c3f:ba6c%2]) with mapi id 15.20.1601.023; Wed, 13 Feb 2019 08:07:46 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou CC: Atish Patra , Paul Walmsley , Christoph Hellwig , Mike Rapoport , "linux-riscv@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anup Patel Subject: [PATCH v5 5/6] RISC-V: Implement compile-time fixed mappings Thread-Topic: [PATCH v5 5/6] RISC-V: Implement compile-time fixed mappings Thread-Index: AQHUw3M0J56JXC4eo0qhxf/X/5rwMg== Date: Wed, 13 Feb 2019 08:07:46 +0000 Message-ID: <20190213080647.68204-6-anup.patel@wdc.com> References: <20190213080647.68204-1-anup.patel@wdc.com> In-Reply-To: <20190213080647.68204-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0140.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::34) To DM6PR04MB6059.namprd04.prod.outlook.com (2603:10b6:5:129::25) 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: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 6c528b62-2eee-411c-5c95-08d6918a5665 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM6PR04MB5993; x-ms-traffictypediagnostic: DM6PR04MB5993: wdcipoutbound: EOP-TRUE x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;DM6PR04MB5993;23:PSOleOI5esjNHoqT3A0d9OG6mkob56iG9tg+ldj?= =?iso-8859-1?Q?SHEoRY1yH9cAiDUAWmo3brjSAaCYXDKmVCTOjkm7qaASFCDxhKk/NFSm+z?= =?iso-8859-1?Q?eTJNTgBFtyRQYaTqWdnWY/R6vOU9QZAGJ9ryWldfV53E2Ex6HD07ONml1l?= =?iso-8859-1?Q?FTfHlSTO2qtAKhfb+gmTgiIgganFFzYS6hwVxWfs1c1Khjq2CJat20nKGz?= =?iso-8859-1?Q?4TJu+WEoX/yIF0dfq5gYiZtdXJ2X0H6MVcHKvqkJiKCXxOfCPvFPmqNon6?= =?iso-8859-1?Q?l/W4Gw3YT9PG9G4FNzR42QuCSPQpiyi9JMpT5j/Oa3kwMGipF1NzNqW7OX?= =?iso-8859-1?Q?rZ2R8Z7OUJNS2RTnfjiaZLRrIEEqPF062cZD7x32BmivGplAZ6JPhzApFm?= =?iso-8859-1?Q?rbSk5aTvzpJYXEWCD6DHkbcWccaQatC7xPKzi3aZH+3KQotaygBn6t+m5k?= =?iso-8859-1?Q?Z4OweSDObNtaNrfzEsTaiJDOW/6KOyvWQVDOfBdRV1GvBuEDMTeC+VjrF1?= =?iso-8859-1?Q?jNLHU64qFPJ4zY5RIkdXBYRRPKFWoRQiCrUFTJEVk1TYZm90VgRRa1PuQY?= =?iso-8859-1?Q?SeXt3vQiWROo3BEdw7fOYtoV3b+4mYqJup2HbEpSDW+evuMwQwR1TfU0el?= =?iso-8859-1?Q?T3wzu6pJSYjczSsGpJd67u9uETN3T1tQY6zVfCZPqBCvca5dpvT+GrhHhg?= =?iso-8859-1?Q?VYVvV49trpGoJrnqIePg9FjMmzGsNrrYK1Nd3oBJsbM1knLRPCQctasTR2?= =?iso-8859-1?Q?1iG0bgOUp73XaUkgqDyjXwDhkhrSrWzAqKA36Uw1un4NodRTutvaFK33e1?= =?iso-8859-1?Q?rlkz3UjTTrEOARkO3l9aEn7PZDre0TBCmVnJSevqLmHvFKJ5r4xcyVok9w?= =?iso-8859-1?Q?HmeVK+F3CqVCbJgjjyWKBGEHFCYNrULQepQjVM2z3auS8d4huUbP+G7KXP?= =?iso-8859-1?Q?NDexqLHI/rJXW5TRn2K3jYBT4oKLqrhsChKXZw6JDe5xEy5+SBsdcSeNMn?= =?iso-8859-1?Q?7Dftv7adch5HhMRTtN5E9b/6sQ37+zoCCvt6nknR58X5/Vqfz0Hjhx9AUc?= =?iso-8859-1?Q?W1JQ1MCHaYnDGJvnK07/Viqi9ggXkJQh/WiDnCfDuDHFqrfzif8YM1u/TK?= =?iso-8859-1?Q?s5UrJPDkZj2atmy8R3SCiXQ9eBEeTZIej3vBxgEgXjnsa9fKivo7CM5NNk?= =?iso-8859-1?Q?7fufXp9YLDOuRYUeLWuP4uQrY2laWtgT568wUzLI5+eNowT6WwtBiJSfkn?= =?iso-8859-1?Q?Zrg+Ab/ULKbq5j2rGbLhxXrarFvlKWldQdNpcLrHomQ/gjxz7HC3NqDfnt?= =?iso-8859-1?Q?Cs=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(396003)(376002)(346002)(136003)(366004)(199004)(189003)(6512007)(99286004)(53936002)(50226002)(386003)(6116002)(52116002)(105586002)(3846002)(106356001)(76176011)(110136005)(6506007)(25786009)(256004)(54906003)(86362001)(6436002)(316002)(2171002)(36756003)(6486002)(97736004)(4326008)(81166006)(66066001)(8676002)(68736007)(102836004)(72206003)(476003)(2906002)(11346002)(446003)(81156014)(1076003)(14454004)(71200400001)(71190400001)(8936002)(7736002)(305945005)(26005)(186003)(486006)(2616005)(478600001)(44832011);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR04MB5993;H:DM6PR04MB6059.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: eFvAcLBoExK/fOo4ZxexM+Ru3nFrKLM8LPgaiqlzsbGa+lzQ4Xf6afpxWRYgif+Uw/XhH9b7wjFBbN7Q3ajWs6NGcsg9NVbs5B0B/C/koFiQaddavP8IPhm0LG4nLIlMhvGQd7iyMbs1pkkyv5xhaGnXcxXaq5FOnUwCp5gdVKm4pgsl5GP8L97jotlZh4dPTi4yysQN8pwhkfdixCuIEf6IwvUBxfaPI5DqHxWENMO75mZm78QLpI5zGoI05B+r8HJvw2LJlzErBX8x9MW05Y+PWdjaygu+FNgj5yJmCkaCL5L6QE6T18xDBowYgkDLzilsR9yM283Ud+EsleQQvohs9SiJ10A1ziE8LtnOyayTniO++GHdQ6wrs/q0UUqxCewyL5ZgWRU0gFGo0gZQqTF6VXJAqqiCPG4VRZpx1sA= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c528b62-2eee-411c-5c95-08d6918a5665 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2019 08:07:42.9779 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5993 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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=3Dy. To start with, we have enabled compile-time fixed mappings for earlycon. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig Reviewed-by: Palmer Dabbelt --- 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 515fc3cc9687..3cfd10d35a28 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -89,6 +89,9 @@ config GENERIC_CSUM config GENERIC_HWEIGHT def_bool y =20 +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/fixma= p.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 7ed6ae90cf6b..efcbdb9b3da3 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -18,6 +18,7 @@ #include #include =20 +#include #include #include #include @@ -111,8 +112,28 @@ pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __ali= gned(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 =20 +pte_t fixmap_pte[PTRS_PER_PTE] __page_aligned_bss; + +void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t pro= t) +{ + unsigned long addr =3D __fix_to_virt(idx); + pte_t *ptep; + + BUG_ON(idx <=3D FIX_HOLE || idx >=3D __end_of_fixed_addresses); + + ptep =3D &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; @@ -135,20 +156,33 @@ asmlinkage void __init setup_vm(void) =20 for (i =3D 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { size_t o =3D (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] =3D pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i, __pgprot(_PAGE_TABLE)); } for (i =3D 0; i < ARRAY_SIZE(swapper_pmd); i++) swapper_pmd[i] =3D pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot); + + swapper_pg_dir[(FIXADDR_START >> PGDIR_SHIFT) % PTRS_PER_PGD] =3D + pfn_pgd(PFN_DOWN((uintptr_t)fixmap_pmd), + __pgprot(_PAGE_TABLE)); + fixmap_pmd[(FIXADDR_START >> PMD_SHIFT) % PTRS_PER_PMD] =3D + pfn_pmd(PFN_DOWN((uintptr_t)fixmap_pte), + __pgprot(_PAGE_TABLE)); #else trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] =3D pfn_pgd(PFN_DOWN(pa), prot); =20 for (i =3D 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) { size_t o =3D (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i; + swapper_pg_dir[o] =3D pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot); } + + swapper_pg_dir[(FIXADDR_START >> PGDIR_SHIFT) % PTRS_PER_PGD] =3D + pfn_pgd(PFN_DOWN((uintptr_t)fixmap_pte), + __pgprot(_PAGE_TABLE)); #endif } --=20 2.17.1