From patchwork Wed Oct 18 12:40:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 154868 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4759129vqb; Wed, 18 Oct 2023 05:40:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvGfKb3heQRM9ZBWNR61MZ6kGoyCU4VHFEC6yJfeBzSqh65YS8tx6cSBf6hmhPTK5lQch7 X-Received: by 2002:a05:6a00:330c:b0:68e:2fd4:288a with SMTP id cq12-20020a056a00330c00b0068e2fd4288amr4907169pfb.3.1697632830200; Wed, 18 Oct 2023 05:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697632830; cv=none; d=google.com; s=arc-20160816; b=ptxesUsD+jIkDqOlMIQoEOIbfKedoIVk4rwS6VcunQ5RtZLgE96+M/8cxAZV96I09v VmppC5kigtIWa3HRKqSjxNSOs1cuyI/rftpUbzWdE2rAWxDC2X29EfKJjmjC92AfBe3+ BZ7NJO6dtfV+hEGzAQpFx7mTiy+dXMuLI48nOnLWiJKBuqJrI/dhpee7IPtpUmGRKZRH JsqDAPp+HT6kOGoVfEyQpOt0Wze/A+PIHnrrtXeFDcFgTNyNeguHU4qPzKJr/anRAgUi bMzOt9W14wtYV4NalmffYsHnYOhspfs64zJhPdDD5MkAjVk7m7KDZWE4J9LmwSdspjEC x4Zg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; fh=7yLnyWQA9CtxAVdlQ7sQRgEzG3/B9ICVoVrHOq+HEmE=; b=i1hsW0heC2qpKgbbqC0Ln+xTTBW5MJTFXXTETbceY5AKH4F0fe4QKIL5ag99dX/ayJ wtXyfWoBPLbBPToQ2zsog8K+FKmQQkZccO9OmHdmXblTL/tDEiaStw976b/Yo8gNGkwt darNHoVKWPRSZDL3cLeNidEJhQDgVteD18jOCHJnk/fanVaijbU/3fc/GO46JMvhzadp ALa+syoVKM0gKG6EDOs/s/yiVyhOmv4CjE/AZSsflJPGqfiPWsIA2jQGCYxhOYJHFxVr DewzyjwKd6qqw1VauftTEPOQrsJ+foRcroEkOcjM7ArCTv7osEjToEeaH815TBpVAuCF 01Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=QqE5TFO9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bw18-20020a056a02049200b005a019d60ffbsi2289765pgb.78.2023.10.18.05.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 05:40:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=QqE5TFO9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 60053813CD9F; Wed, 18 Oct 2023 05:40:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230359AbjJRMkY (ORCPT + 23 others); Wed, 18 Oct 2023 08:40:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230296AbjJRMkU (ORCPT ); Wed, 18 Oct 2023 08:40:20 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7060F106 for ; Wed, 18 Oct 2023 05:40:18 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6cd0155de52so842459a34.1 for ; Wed, 18 Oct 2023 05:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1697632818; x=1698237618; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; b=QqE5TFO96PC0WtHgAhFw2nO4si+ERzJkht630iFczGf+kZHLnwfPU7eLYtxYmsEbDs rFeKX1Ok91eNysNNfTlMG4Hjk4UNSwOOXJZXwkPQ6T7Z4itFXIw5RF86DOHyBUA5m19E SRo9MbROL6EJ9NC/Yboqcxgq43hYqnM9jKaF+07xyMMLJJxmkAweI8MHrQ6Fjjb7+FA/ lMsNTiPkgmx/NnUj347t+7Mckdn4+WkASPNii2uMX3YYP3R2lw4zKZE6H9uGl1IxKIYI edWbIbBQeT8yyhXqNvxf0UBLFIhXqXjDicJznsfQF7VyN3RYnhaufx1a2fGSQOZ8MnkX zm/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697632818; x=1698237618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; b=vgBnSO7iAwy4Kwye/DvDpkm4b/4KvY4ifGFxeQ1fYiP2n5zgLuAsFz1DpHdR/CXUPd 1Gw7WLVHLgju333uPwwOfQijUvNA0Q8HyiEadIb0ALb+n0ww8eGymKitiCdNbjRM1VBT /xUEaoeF2z/kUY0YHnrXTIWjl6lXtFWtvt6KjjpjFhwD63FeUJnrQT0AauueTbnkHT2M UOGgb+9ieY4PqfDTZIAXO3q6BeEay3ukXVIkr9p9n8N7EGHGnd2xKsrK//AY669DpVOF MkbcvcmHij1edSe5PicnwlIGH7FrkCfhgpuJvs0TqNpEPjBzgMaLZx8l3td4WnF3Vai/ nhig== X-Gm-Message-State: AOJu0Yxm+v/fjwqtr+3DGqF4jJS3rfw2+qceUpSML0zfjaVrigTsS4eP LYT+Go+QsSK4s2dXgNR0F7RveldNFKpDDa6eOD4= X-Received: by 2002:a9d:7394:0:b0:6bb:1c21:c52e with SMTP id j20-20020a9d7394000000b006bb1c21c52emr5017805otk.15.1697632817699; Wed, 18 Oct 2023 05:40:17 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id w190-20020a6382c7000000b005891f3af36asm1599267pgd.87.2023.10.18.05.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 05:40:17 -0700 (PDT) From: Sunil V L To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Andrew Jones , Conor Dooley , Anup Patel , Sunil V L , Alexandre Ghiti Subject: [PATCH v4 -next 1/4] RISC-V: ACPI: Enhance acpi_os_ioremap with MMIO remapping Date: Wed, 18 Oct 2023 18:10:04 +0530 Message-Id: <20231018124007.1306159-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018124007.1306159-1-sunilvl@ventanamicro.com> References: <20231018124007.1306159-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 18 Oct 2023 05:40:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780097042432015324 X-GMAIL-MSGID: 1780097042432015324 Enhance the acpi_os_ioremap() to support opregions in MMIO space. Also, have strict checks using EFI memory map to allow remapping the RAM similar to arm64. Signed-off-by: Sunil V L Reviewed-by: Andrew Jones Reviewed-by: Alexandre Ghiti Acked-by: Conor Dooley --- arch/riscv/Kconfig | 1 + arch/riscv/kernel/acpi.c | 87 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index d607ab0f7c6d..805c8ab7f23b 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -39,6 +39,7 @@ config RISCV select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAS_VDSO_DATA + select ARCH_KEEP_MEMBLOCK if ACPI select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT select ARCH_STACKWALK diff --git a/arch/riscv/kernel/acpi.c b/arch/riscv/kernel/acpi.c index 56cb2c986c48..e619edc8b0cc 100644 --- a/arch/riscv/kernel/acpi.c +++ b/arch/riscv/kernel/acpi.c @@ -14,9 +14,10 @@ */ #include +#include #include +#include #include -#include int acpi_noirq = 1; /* skip ACPI IRQ initialization */ int acpi_disabled = 1; @@ -217,7 +218,89 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size) void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) { - return (void __iomem *)memremap(phys, size, MEMREMAP_WB); + efi_memory_desc_t *md, *region = NULL; + pgprot_t prot; + + if (WARN_ON_ONCE(!efi_enabled(EFI_MEMMAP))) + return NULL; + + for_each_efi_memory_desc(md) { + u64 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); + + if (phys < md->phys_addr || phys >= end) + continue; + + if (phys + size > end) { + pr_warn(FW_BUG "requested region covers multiple EFI memory regions\n"); + return NULL; + } + region = md; + break; + } + + /* + * It is fine for AML to remap regions that are not represented in the + * EFI memory map at all, as it only describes normal memory, and MMIO + * regions that require a virtual mapping to make them accessible to + * the EFI runtime services. + */ + prot = PAGE_KERNEL_IO; + if (region) { + switch (region->type) { + case EFI_LOADER_CODE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: + case EFI_CONVENTIONAL_MEMORY: + case EFI_PERSISTENT_MEMORY: + if (memblock_is_map_memory(phys) || + !memblock_is_region_memory(phys, size)) { + pr_warn(FW_BUG "requested region covers kernel memory\n"); + return NULL; + } + + /* + * Mapping kernel memory is permitted if the region in + * question is covered by a single memblock with the + * NOMAP attribute set: this enables the use of ACPI + * table overrides passed via initramfs. + * This particular use case only requires read access. + */ + fallthrough; + + case EFI_RUNTIME_SERVICES_CODE: + /* + * This would be unusual, but not problematic per se, + * as long as we take care not to create a writable + * mapping for executable code. + */ + prot = PAGE_KERNEL_RO; + break; + + case EFI_ACPI_RECLAIM_MEMORY: + /* + * ACPI reclaim memory is used to pass firmware tables + * and other data that is intended for consumption by + * the OS only, which may decide it wants to reclaim + * that memory and use it for something else. We never + * do that, but we usually add it to the linear map + * anyway, in which case we should use the existing + * mapping. + */ + if (memblock_is_map_memory(phys)) + return (void __iomem *)__va(phys); + fallthrough; + + default: + if (region->attribute & EFI_MEMORY_WB) + prot = PAGE_KERNEL; + else if ((region->attribute & EFI_MEMORY_WC) || + (region->attribute & EFI_MEMORY_WT)) + prot = pgprot_writecombine(PAGE_KERNEL); + } + } + + return ioremap_prot(phys, size, pgprot_val(prot)); } #ifdef CONFIG_PCI