From patchwork Thu Apr 20 12:40:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 85893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp306003vqo; Thu, 20 Apr 2023 05:46:41 -0700 (PDT) X-Google-Smtp-Source: AKy350b/HAw7aN4DLoiiUrp3i7fDUcWNk5X0RS5S/arXLxQLOsJclN/y/Um93vbFHsNDFuLCbDx8 X-Received: by 2002:a17:90a:d90e:b0:247:8b5f:59ce with SMTP id c14-20020a17090ad90e00b002478b5f59cemr1630212pjv.20.1681994800913; Thu, 20 Apr 2023 05:46:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681994800; cv=none; d=google.com; s=arc-20160816; b=EBBuJLdERLCbnsW/ZqFDfR/TpeBp8Mis+zsiQCeKIAoJ3fqdL/5fpQt18jdwmPd864 8QRKgc52EgCDXhJjCGZ60aXJLsA5Oi1hb36NPKkiOjNpc9SEBmJunS5KGGLfipUFrBnq chvbzzEDHxetoXTzCmVsXQ37Y1wNkqDpGtIXxtZimBNN/USs4mQd9KOBzyeviCBjy5b/ d3wbxsa8qnvShR0to+uVefbFn9L6S+xHnIsCTbqxieDhlxTQK6qaG0Fz/Brc1WE7JhuC 6LRisQZf/YlWi9FQyN4zyKNbn4+NJVjDJlJEplq4UkmlOU5DcQM8kEiHX0TYFg8ndPpO wJvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GPjx+lx77NsH4gytgMjHK7xmOFYbUpDxRCvxfVSlgfo=; b=hLB6tvFVrGATsOpzUhiMW7L2QGNjD9h8si0nIhWsRkKBoLstaDPbo0JltcAXuVi4x2 WdWZSBs8c+uzusBL6tyBPmVAtoQiCiSDADryUAFmuB1TIhN60EGL+A+wTxPqa5w5ojWW LuaGlrt88IBqq11E77KfTOqlUX7z9SnHqZ/t/JWqAi9F9tK50VnHrqDY68dYM8RUNPKt e0FNDZ9il6D3NqpCkhgaJZpoNs6+zA9nprFEqBrvNH4Rb0nV592ShDap1U5SGsTd079u BzKieHbNkblWAS4kdtIXcppY+LDRqo1JmcQ9trZOM0sefJTSvOZWJhBdq5+XJT0D7rl9 MTjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kyTv2Hp4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y8-20020a655a08000000b0051b5fef546fsi1599151pgs.600.2023.04.20.05.46.26; Thu, 20 Apr 2023 05:46:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kyTv2Hp4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231933AbjDTMlb (ORCPT + 99 others); Thu, 20 Apr 2023 08:41:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230291AbjDTMl0 (ORCPT ); Thu, 20 Apr 2023 08:41:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECD7D5BA3; Thu, 20 Apr 2023 05:40:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 87B016492A; Thu, 20 Apr 2023 12:40:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76537C433D2; Thu, 20 Apr 2023 12:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681994455; bh=jYk7Zd9ctQtmoQ9oVpNoBw40AOamcXM7JQPw3Wg6BqA=; h=From:To:Cc:Subject:Date:From; b=kyTv2Hp4EPxCfJmhEgrX3y9dPJoiFV38Ms7OHMzP8zShPevpZAgjUEZLvWlEZBrz3 70QIWTOuWjfiH/bZZuqDvnff7eDIoh7kwk5Ty5a/Hz08qZJiz0TlkOGjmNCMYacToh DaA2Qx1vuFmHzHJFf/iPYcZSY49e5GqRUwP30WQI21frEy016+78eJS3f2dhdkyNc+ S2DPCcLA6wKQHLslYGqgNg0aKf7qsyS+pzCZMC+LuONzrh8be0lzVNuRoM90HzyDSD /K8AlqcoQr+on4PNNwhq/GvUK8iqTtcoSQtC/vbelOFcGGNmQAoQRhtJJCporWVjpK nfePBVcjY1Ijw== From: broonie@kernel.org To: Palmer Dabbelt , Paul Walmsley Cc: Alexandre Ghiti , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt Subject: linux-next: manual merge of the risc-v tree with the risc-v-fixes tree Date: Thu, 20 Apr 2023 13:40:48 +0100 Message-Id: <20230420124048.65232-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763699380302655032?= X-GMAIL-MSGID: =?utf-8?q?1763699380302655032?= Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/mm/init.c between commit: ef69d2559fe91 ("riscv: Move early dtb mapping into the fixmap region") from the risc-v-fixes tree and commits: 8589e346bbb67 ("riscv: Move the linear mapping creation in its own function") 3335068f87217 ("riscv: Use PUD/P4D/PGD pages for the linear mapping") from the risc-v tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. +++ b/arch/riscv/mm/init.c @@@ -1070,26 -1112,36 +1092,47 @@@ asmlinkage void __init setup_vm(uintptr pt_ops_set_fixmap(); } - static void __init setup_vm_final(void) + static void __init create_linear_mapping_range(phys_addr_t start, + phys_addr_t end) { + phys_addr_t pa; uintptr_t va, map_size; - phys_addr_t pa, start, end; - u64 i; - /* Setup swapper PGD for fixmap */ +#if !defined(CONFIG_64BIT) + /* + * In 32-bit, the device tree lies in a pgd entry, so it must be copied + * directly in swapper_pg_dir in addition to the pgd entry that points + * to fixmap_pte. + */ + unsigned long idx = pgd_index(__fix_to_virt(FIX_FDT)); + + set_pgd(&swapper_pg_dir[idx], early_pg_dir[idx]); +#endif - create_pgd_mapping(swapper_pg_dir, FIXADDR_START, - __pa_symbol(fixmap_pgd_next), - PGDIR_SIZE, PAGE_TABLE); ++ + for (pa = start; pa < end; pa += map_size) { + va = (uintptr_t)__va(pa); + map_size = best_map_size(pa, end - pa); + + create_pgd_mapping(swapper_pg_dir, va, pa, map_size, + pgprot_from_va(va)); + } + } + + static void __init create_linear_mapping_page_table(void) + { + phys_addr_t start, end; + u64 i; + + #ifdef CONFIG_STRICT_KERNEL_RWX + phys_addr_t ktext_start = __pa_symbol(_start); + phys_addr_t ktext_size = __init_data_begin - _start; + phys_addr_t krodata_start = __pa_symbol(__start_rodata); + phys_addr_t krodata_size = _data - __start_rodata; + + /* Isolate kernel text and rodata so they don't get mapped with a PUD */ + memblock_mark_nomap(ktext_start, ktext_size); + memblock_mark_nomap(krodata_start, krodata_size); + #endif /* Map all memory banks in the linear mapping */ for_each_mem_range(i, &start, &end) { diff --cc arch/riscv/mm/init.c index 0f14f4a8d179a,7bd66795165da..0000000000000 --- a/arch/riscv/mm/init.c