Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp130074iob; Tue, 17 May 2022 21:14:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzF3r1yvPOBgI5lwqDzcYWipoF2i9i2bKNNO1HTDmQvc+lErN6yvqs8geg/ETr066Hhc3j9 X-Received: by 2002:a63:5d10:0:b0:3c5:e836:ffd2 with SMTP id r16-20020a635d10000000b003c5e836ffd2mr22535408pgb.32.1652847268344; Tue, 17 May 2022 21:14:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652847268; cv=none; d=google.com; s=arc-20160816; b=0flk+8C9gV7bqcdCA9yUlRnIJGEX74FNG2KgVXb29UYvGeHvJ6/Qi/G6WFjLyZ5wjG NZhccCKs4qd2DKvpciPiTyRP+SznoWrEw2nFZWJ0ZwQtJiIggfkyEIw58pu7xeVyilcf gbRpxHFHAWA+KagDq17JvilE0PkydVGZb5uUaX8Qpk/R7Y7lvC9tsWufV9/o74gKpasX JfIUHsMa9sHcgwyShUlxHbByzin2pj9REOAAjR1omNx58zSWvNXtYxGEY0K9rNQKuyt3 6gs7m5iASqt0N1ZZfPFQRIKzPQHN2m+cTgEoUjvzl2EBA+x2OCIV94INy1CrTksyU9bJ uw3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=Iqi0VauqqYQ9hmVUbiBCKEAF8p0ReVAl+pbrt7wEh2U=; b=OYHThEP+V2Uq1QS128sxvuqvqYcfVvZeHSUsNbBuPJKnWEZv10CiCePmZ0xSMCqGUP q1qfeShSHZF0xyvDT3loBu7FyU4RhksS8QM3IejcUPcQL/6NkDKpwut3EiPPahgHhdXo wmBkS/8Rl6kNfCvKev6AZC/Dkv6BkT9qumSkQyAeJ50z20zmS9+/QlK48tgaZi4biSwv CtBN/zvn6ZS9UP0OS6FqbHhOnOUZ49YxWM54cVLhm1/gehTEYdMYxpXVQvGvRY+3dGOd 2B8LxIlFCFfcKIyupjf/cc0ygjmrx/JGMIjucJvq111Y18w4mIU7sfO51lwyokRyxwmc E8UA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c9-20020a170903234900b00156a80ba52esi1532335plh.274.2022.05.17.21.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 May 2022 21:14:28 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2A8906CABB; Tue, 17 May 2022 20:44:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233644AbiERBel (ORCPT + 99 others); Tue, 17 May 2022 21:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230153AbiERBei (ORCPT ); Tue, 17 May 2022 21:34:38 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D545738BD7 for ; Tue, 17 May 2022 18:34:36 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VDYa6oI_1652837670; Received: from localhost(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VDYa6oI_1652837670) by smtp.aliyun-inc.com(127.0.0.1); Wed, 18 May 2022 09:34:31 +0800 From: Xianting Tian To: mick@ics.forth.gr, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, anup@brainfault.org, akpm@linux-foundation.org, wangkefeng.wang@huawei.com, rppt@kernel.org, david@redhat.com, wangborong@cdjrlc.com, twd2.me@gmail.com, seanjc@google.com, alex@ghiti.fr, petr.pavlu@suse.com, atishp@rivosinc.com Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, jianghuaming.jhm@alibaba-inc.com, guoren@kernel.org, heiko@sntech.de, Xianting Tian Subject: [PATCH v3] RISC-V: Mark IORESOURCE_EXCLUSIVE for reserved mem instead of IORESOURCE_BUSY Date: Wed, 18 May 2022 09:34:28 +0800 Message-Id: <20220518013428.1338983-1-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=no 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 Commit 00ab027a3b82 ("RISC-V: Add kernel image sections to the resource tree") marked IORESOURCE_BUSY for reserved memory, which caused resource map failed in subsequent operations of related driver, so remove the IORESOURCE_BUSY flag. In order to prohibit userland mapping reserved memory, mark IORESOURCE_EXCLUSIVE for it. The code to reproduce the issue, dts: mem0: memory@a0000000 { reg = <0x0 0xa0000000 0 0x1000000>; no-map; }; &test { status = "okay"; memory-region = <&mem0>; }; code: np = of_parse_phandle(pdev->dev.of_node, "memory-region", 0); ret = of_address_to_resource(np, 0, &r); base = devm_ioremap_resource(&pdev->dev, &r); // base = -EBUSY Fixes: 00ab027a3b82 ("RISC-V: Add kernel image sections to the resource tree") Reported-by: Huaming Jiang Reviewed-by: Guo Ren Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner Co-developed-by: Nick Kossifidis Signed-off-by: Xianting Tian --- Changes from v2: - Fix typo in commit message: casued -> caused - Remove Reviewed-by of Nick Kossifidis, who didn't give Reviewed-by actually - Add Co-developed-by of Nick Changes from v1: - Mark reserved memory as IORESOURCE_EXCLUSIVE, suggested by Nick --- arch/riscv/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 834eb652a7b9..e0a00739bd13 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -189,7 +189,7 @@ static void __init init_resources(void) res = &mem_res[res_idx--]; res->name = "Reserved"; - res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; + res->flags = IORESOURCE_MEM | IORESOURCE_EXCLUSIVE; res->start = __pfn_to_phys(memblock_region_reserved_base_pfn(region)); res->end = __pfn_to_phys(memblock_region_reserved_end_pfn(region)) - 1; @@ -214,7 +214,7 @@ static void __init init_resources(void) if (unlikely(memblock_is_nomap(region))) { res->name = "Reserved"; - res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; + res->flags = IORESOURCE_MEM | IORESOURCE_EXCLUSIVE; } else { res->name = "System RAM"; res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; -- 2.17.1