From patchwork Wed Sep 27 17:00:12 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: 145590 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2896636vqu; Wed, 27 Sep 2023 14:00:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFeUy+R4Dn6OvLXN8tu6ZI3jUIbT5Dw0zSNf8KExOr+5qgeAp3eZLXVLz4RLB3x+k+iP0tN X-Received: by 2002:a17:902:aa8e:b0:1c5:e5de:dec5 with SMTP id d14-20020a170902aa8e00b001c5e5dedec5mr2318539plr.62.1695848410887; Wed, 27 Sep 2023 14:00:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695848410; cv=none; d=google.com; s=arc-20160816; b=nTpCE3xAqUHnVfCZURSbu+38LGPzmNiOgu+J8bTWt4Lc0AXmxORvQkR059toJN8LSK Hxz+Dx2Veh2pKS/ZspHTx6OYzRXAz52EajF5KqmliSmgn2woNkLuFpIcCkXY2IBM/MnL XAGGxdJHplzKPJAGA9vtK5x3TPxvWhRAtH4xIjV4NzR7jrw+AFB+kWw8MwAM6Bmux0O9 HTdMxuKpfLTX6+200LWqCb/eOFTGg26OOoi6GbXkrtVlzQBrju/Sq3T+CatvPvbE0/++ NAeT7Y1IgdMf2xDIq4Ww1YOiNl53J2V1IeObaJULfQ8Yd7pKFEkHOCHVZkvb7VNAHFKa Rhwg== 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=+DmNFRxVXj8V3ocvjWMiRzGtl0URBCJyLqRyOWHwpdo=; fh=sfgdT0UZ8CYMELEEedGcAjPKookfa29m+O/tEazxSkQ=; b=QeDuW/DZ5rjyFc2dtSVE1GZCQWskYKFcy4m8/8LvqfTCU6/Tw3MhCXYEAN7dUwVEcU 0mSI04YU2STZJvdN/P1R21Ax29h6EaRvmvhWTFx57uT/kkF2i9cfmaf3J7xU4qXRWuwH 8Fd4VAn+4z47Hjwm/rnjFjb/yUVLUXlJKPy0A1ARB9u4ntDM6qXgG+K96wxn3DZ3iF2F 0aDhVBRk4BiJ7J12t6vL25jLq8/RNxtNb5HrRu75UkvNwIDxtZnRrExnG4jfMwxBqRG3 kot4xCjBm/6hILA2mRb+1BwLqr3th9iRRj6cUy4nulsmkMj/rhzZVsRx7Yf3f4h7EQRZ YCig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=niJ9TK3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id u15-20020a170902e5cf00b001bf0916b665si17631175plf.393.2023.09.27.14.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 14:00:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=niJ9TK3u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 2D09D8065C9F; Wed, 27 Sep 2023 10:00:39 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbjI0RAe (ORCPT + 19 others); Wed, 27 Sep 2023 13:00:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjI0RAc (ORCPT ); Wed, 27 Sep 2023 13:00:32 -0400 Received: from mail-ua1-x92f.google.com (mail-ua1-x92f.google.com [IPv6:2607:f8b0:4864:20::92f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FCB8DE for ; Wed, 27 Sep 2023 10:00:30 -0700 (PDT) Received: by mail-ua1-x92f.google.com with SMTP id a1e0cc1a2514c-7a803afa8c5so4210515241.0 for ; Wed, 27 Sep 2023 10:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695834029; x=1696438829; 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=+DmNFRxVXj8V3ocvjWMiRzGtl0URBCJyLqRyOWHwpdo=; b=niJ9TK3uHDTUJRdvlpKeb3J6E/u8VUuejYA4zVl6fdbZ14/GtVkfjfZrbqXKXPgKWB r0Zfh6MhJBIUv+FTFtqwUPjV2XK6J0vvFz0fPLtAHJTKRxSro5Bua7Yv4mRNq5x3pM84 8TQwCtPbaHHpQhyyCaUyjKWILwzvj2sKcH6dPBYpZhwgJQuvfKwmwXtduUviKNckhqfy jC9ic3wQF15av0ptoptrTRPaldBKvIN6sJp7BzCebmXqAy4wElQcWTNZh1c0ZFtpteoA vpNy1p86b/LOZX9b4ZTGc0ffr78SDR0LFuaW+v5fpl59sT/f4WU7kHHp4oPAiGB9I0xy wamQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695834029; x=1696438829; 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=+DmNFRxVXj8V3ocvjWMiRzGtl0URBCJyLqRyOWHwpdo=; b=CzENp1vCtrtvXmqzcXVvCIpOc4kZDS/j8BXzFAs0pw5uMAP7nhRtxMK+q4vmvzRhI6 gTa/UyF8pCgCWrBnhPjJV3xdu3b7JqAXqI/uXoix40Qhjmpnf35QQ0mRAoyYbDaJoeap IQYfdjXuiFiPzVicJsKx6Hdx6DPdJlHXsRNMxDbzzuB3pjhC4Trb38JS7WGN8iX+IFMS a3DsNUUfVUCtqK6h8kff2bJNuoiCfm1+6G/UN3vRHuAddANVL6HoagdJFDcyWFntrhkb F44GBuDcGiC74ZsZSjXZD58ij1YcYyNaND2C/75GEJa9zjhl57XK0pSNF1DN5P8A+CEC /3Rg== X-Gm-Message-State: AOJu0Yywn0ty7muO4AEF08npjbyXmQOn6r2u9z9rvcZs5uQ1Y65r3TKR OauU8eTww8Ng9Sk+znlU6ODngQ== X-Received: by 2002:a67:f98f:0:b0:452:81c4:3b56 with SMTP id b15-20020a67f98f000000b0045281c43b56mr2534411vsq.18.1695834028193; Wed, 27 Sep 2023 10:00:28 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.190.42]) by smtp.gmail.com with ESMTPSA id u7-20020a637907000000b00584b293d157sm3279396pgc.80.2023.09.27.10.00.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:00:27 -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 , Daniel Lezcano , Thomas Gleixner , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Alexandre Ghiti , Andy Shevchenko , Atish Kumar Patra , Sunil V L Subject: [PATCH v2 -next 1/4] RISC-V: ACPI: Enhance acpi_os_ioremap with MMIO remapping Date: Wed, 27 Sep 2023 22:30:12 +0530 Message-Id: <20230927170015.295232-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927170015.295232-1-sunilvl@ventanamicro.com> References: <20230927170015.295232-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 27 Sep 2023 10:00:39 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778225943241198769 X-GMAIL-MSGID: 1778225943241198769 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 Acked-by: Conor Dooley Reviewed-by: Alexandre Ghiti --- 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..ac039cf8af7a 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 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 From patchwork Wed Sep 27 17:00:13 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: 145550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2849916vqu; Wed, 27 Sep 2023 12:21:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGG6L4XOvl7KjWghHRVUrHmgKcwxRhQVXRpmQ3wqCPd434LFwP04JtEDihdgnA5hFUZN50y X-Received: by 2002:a17:903:22d1:b0:1c7:1eb7:82cd with SMTP id y17-20020a17090322d100b001c71eb782cdmr3300832plg.60.1695842487263; Wed, 27 Sep 2023 12:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695842487; cv=none; d=google.com; s=arc-20160816; b=lU0fOwx/zkSM6kVOzxSzAHhY5cAmqlfFTt3pVivM9YAxa7d3a2POhQIXaWRBORPCO3 4prC0zCZQWWcKJ62DbzjK/X9LQO/2aW7NDS1u1mUrXoRtNjAYxdiCzvcyNxoeRcHh32R hb5wkqa9V6rruJJ1WNlN/p9yP9m/QQ6T6h2mNYNHH7rvV/SHMNXtumH73fgVMJFbnJlZ JcIZprprcyYUBENFJBvRAnLSh+Vk0dExnQx2BJOk4yD9Xd1yySTh5pv8ujYL97nEiJBg IvTqy/73bpL4uI8s1KqiBDdaS26OXO5uDtZl1xkOzyTGKAQ5nq//8pGQo3St/wOcI7dK i7Dw== 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=g9sLv+V8gGTdOjGyr5tjbv9gRJE2ViFoNFxWNgg6Hz8=; fh=sfgdT0UZ8CYMELEEedGcAjPKookfa29m+O/tEazxSkQ=; b=M/Vh9ecm7IFLiCVnHKqGcKJV5HLYL34a1UmX3Ykf6UT6gBMH5iQsCSB1+CF+7UViEP uyu2uKNF6fygUq27/1Plqdntyk0xerLw7VJ6rWm9FHL+6xlFqaMJDcm9ZzZTlF3sMbIq MerwLUONfoBdiSqBFUHh09vwjxtwifo6K81MjrfvL+EaofzDSaTqwJPIU82bH489sWNF RAGTiQjRfANNVAGxNOk/WaQO7sZ38Hxn3ZbWIsdM5dcuhWgaUuMW4TsbrUmi07tVIAFq pG0XgkXkSj1lSv8dyRiC1y78BTmMxe4y1rr/f/VitZ6OAq+CV6vsl0De23sYbUv4F8r4 qgiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ImEM1Z7q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id c4-20020a170902d48400b001b9ffda162csi17586520plg.441.2023.09.27.12.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 12:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ImEM1Z7q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 04C47832C36C; Wed, 27 Sep 2023 10:01:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbjI0RAi (ORCPT + 19 others); Wed, 27 Sep 2023 13:00:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229570AbjI0RAf (ORCPT ); Wed, 27 Sep 2023 13:00:35 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6AF3F5 for ; Wed, 27 Sep 2023 10:00:33 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-578d0d94986so8323809a12.2 for ; Wed, 27 Sep 2023 10:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695834033; x=1696438833; 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=g9sLv+V8gGTdOjGyr5tjbv9gRJE2ViFoNFxWNgg6Hz8=; b=ImEM1Z7qQWJ9pWvjGfmPTZ6MedwTOlrrGPtiX5vsmQ3sUZ7MJxNJfy0baVKQiTMuZl n/sixhJG7Bna30gD0zlbk4h+NX5oTGDQedW9KHdC+WhNtxs9q0WlpdMBXlkFGbAl8zUU jEaelMhEX430FdiP0oWUkku+aI4HWNpzlt9xfMRC3Ck5/e1yPtPbbTyo6PDpn66S04KG 2xfbey3SI0sMFsVbY7xEyQCz75FwnVeIL05esfhexrsbdU9pdpfu5A8V33YkVVfUF/vY bRdnxr0SYls53DcWGj/ghuNSKzPmgkuCaw9bA0vna1E6gttCE/gvsAkoj/B7HLtwufqt qy2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695834033; x=1696438833; 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=g9sLv+V8gGTdOjGyr5tjbv9gRJE2ViFoNFxWNgg6Hz8=; b=jTdo79s/3W1d4yNP/uZ42LvvM5DdxrSNnGjiAP5MO0C1NISGyZDge3n8YUHiXyVbhu iTq+dlqt0z3RQEv9QUncPE2lWUwN8IDYZ2ajwEOoWrCIeS8kklPGvNkPPK65TKiX+92I /Pc/2MSMW+pB5o6tTgaqYdZEZmre89sqRxqnvUzQn3ci21d9IjXR24f0/nwZXam0HIFY hKAL95K5Hpe5d4J5J5zrF4TQMgmvYQzWxIl/+qJXkk6pR1I8q1M3CbvKukRWYNyL6OMN vQsFPWUNxJ+cSvYc1eijFrgHitAXkEARaIP1+eSu8BUCGHISXpEYQNyMX5t8h5sNkQZE QVfg== X-Gm-Message-State: AOJu0YyQnRdNhFwUQrlYn+T7sxmd/R7NGbNQVgjSPwYl5iaaUmoc+zHl 0b1k2Kgb4r1ql45Q+u+CEGRQyQ== X-Received: by 2002:a05:6a20:7d95:b0:14c:daa9:5e22 with SMTP id v21-20020a056a207d9500b0014cdaa95e22mr2978244pzj.45.1695834033151; Wed, 27 Sep 2023 10:00:33 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.190.42]) by smtp.gmail.com with ESMTPSA id u7-20020a637907000000b00584b293d157sm3279396pgc.80.2023.09.27.10.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:00:32 -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 , Daniel Lezcano , Thomas Gleixner , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Alexandre Ghiti , Andy Shevchenko , Atish Kumar Patra , Sunil V L Subject: [PATCH v2 -next 2/4] RISC-V: ACPI: RHCT: Add function to get CBO block sizes Date: Wed, 27 Sep 2023 22:30:13 +0530 Message-Id: <20230927170015.295232-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927170015.295232-1-sunilvl@ventanamicro.com> References: <20230927170015.295232-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Wed, 27 Sep 2023 10:01:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778219731606721192 X-GMAIL-MSGID: 1778219731606721192 Cache Block Operation (CBO) related block size in ACPI is provided by RHCT. Add support to read the CMO node in RHCT to get this information. Signed-off-by: Sunil V L --- arch/riscv/include/asm/acpi.h | 9 +++++ drivers/acpi/riscv/rhct.c | 72 ++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index d5604d2073bc..0c4e8b35103e 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -66,6 +66,8 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa); static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } +int acpi_get_cbo_block_size(struct acpi_table_header *table, unsigned int cpu, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size); #else static inline void acpi_init_rintc_map(void) { } static inline struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu) @@ -79,6 +81,13 @@ static inline int acpi_get_riscv_isa(struct acpi_table_header *table, return -EINVAL; } +static inline int acpi_get_cbo_block_size(struct acpi_table_header *table, + unsigned int cpu, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size) +{ + return -EINVAL; +} + #endif /* CONFIG_ACPI */ #endif /*_ASM_ACPI_H*/ diff --git a/drivers/acpi/riscv/rhct.c b/drivers/acpi/riscv/rhct.c index b280b3e9c7d9..9042949277f8 100644 --- a/drivers/acpi/riscv/rhct.c +++ b/drivers/acpi/riscv/rhct.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "ACPI: RHCT: " fmt #include +#include static struct acpi_table_header *acpi_get_rhct(void) { @@ -56,7 +57,6 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const } end = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->header.length); - for (node = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->node_offset); node < end; node = ACPI_ADD_PTR(struct acpi_rhct_node_header, node, node->length)) { @@ -81,3 +81,73 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const return -1; } + +/* + * During early boot, the caller should call acpi_get_table() and pass its pointer to + * these functions(and free up later). At run time, since this table can be used + * multiple times, pass NULL so that the table remains in memory + */ +int acpi_get_cbo_block_size(struct acpi_table_header *table, unsigned int cpu, + u32 *cbom_size, u32 *cboz_size, u32 *cbop_size) +{ + struct acpi_rhct_node_header *node, *ref_node, *end; + u32 size_hdr = sizeof(struct acpi_rhct_node_header); + u32 size_hartinfo = sizeof(struct acpi_rhct_hart_info); + struct acpi_rhct_hart_info *hart_info; + struct acpi_rhct_cmo_node *cmo_node; + struct acpi_table_rhct *rhct; + u32 *hart_info_node_offset; + u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu); + + BUG_ON(acpi_disabled); + + if (table) { + rhct = (struct acpi_table_rhct *)table; + } else { + rhct = (struct acpi_table_rhct *)acpi_get_rhct(); + if (!rhct) + return -ENOENT; + } + + end = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->header.length); + for (node = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->node_offset); + node < end; + node = ACPI_ADD_PTR(struct acpi_rhct_node_header, node, node->length)) { + if (node->type == ACPI_RHCT_NODE_TYPE_HART_INFO) { + hart_info = ACPI_ADD_PTR(struct acpi_rhct_hart_info, node, size_hdr); + hart_info_node_offset = ACPI_ADD_PTR(u32, hart_info, size_hartinfo); + if (acpi_cpu_id != hart_info->uid) + continue; + + for (int i = 0; i < hart_info->num_offsets; i++) { + ref_node = ACPI_ADD_PTR(struct acpi_rhct_node_header, + rhct, hart_info_node_offset[i]); + if (ref_node->type == ACPI_RHCT_NODE_TYPE_CMO) { + cmo_node = ACPI_ADD_PTR(struct acpi_rhct_cmo_node, + ref_node, size_hdr); + if (cbom_size && cmo_node->cbom_size <= 30) + *cbom_size = BIT(cmo_node->cbom_size); + + if (cboz_size && cmo_node->cboz_size <= 30) + *cboz_size = BIT(cmo_node->cboz_size); + + if (cbop_size && cmo_node->cbop_size <= 30) + *cbop_size = BIT(cmo_node->cbop_size); + + return 0; + } + } + } + } + + if (cbom_size) + *cbom_size = 0; + + if (cboz_size) + *cboz_size = 0; + + if (cbop_size) + *cbop_size = 0; + + return -ENOENT; +} From patchwork Wed Sep 27 17:00:14 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: 145521 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2824853vqu; Wed, 27 Sep 2023 11:38:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPzUxqUpVn0zMT1y7LBJVYyW3UcyrfN+6EkwJxfmYiYCao28h4VDLhL4YylVOTqwUNZmMx X-Received: by 2002:a17:90a:c790:b0:278:f907:719d with SMTP id gn16-20020a17090ac79000b00278f907719dmr2121574pjb.48.1695839909319; Wed, 27 Sep 2023 11:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695839909; cv=none; d=google.com; s=arc-20160816; b=gU3C1GtDFZ/x4TtlZJeKAgDAyhBk+r00wrluPJF82kZ6a6RRlO0pnyTQTjam1iaUE5 psFREo0n/5dLK0LrWa7/HzwxKHiFeD9GvVjElw6Lx8ypX2vkH3gzU8XICJ6ITuSn2tjQ fN3aueUuTbvPwX73UEtaalZacjZMVvj4w6ATtZ1cpz4ZuO+KQspDXqG6Yo0z4K1uYjEl eH0nVkKmaMFq6FsVOy66jDO8wx5CPe2J5rVM0HubFYh1sBRVXzPqkYU6o6OWmsLdZPlz eOdN6jnwPfBeYsDkOcZQUsW8u54xrPvMm9C+yc0O1ISE5bt6iQlhnLlyYELw9shfAgfn kk2g== 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=EMRAaYbpAL9AMr/u9386eJc3P6IZIKKW5n+xTVSQNsU=; fh=sfgdT0UZ8CYMELEEedGcAjPKookfa29m+O/tEazxSkQ=; b=r0QywTwCDXlRCE2OCOqg6l+xXjZsZTGBvbnr6mtCmh6kzKr7uNFM1fhwAu5KWEXUHe rXCL8f89/0J5GGDnEqHk4pGVjqB/UNbMDZA7g878WsdEg0NkdDS2asUYGzzdyYHuvP9V qoUpOVyeBZkyN7C6vKBFMX0b3h8pP7YujZ+2mEznDttkoztauezLI7ph9ZKwqU0CCo0q Vm6dTImbmytxn5jCekhCVoHnMtQNrRzA1v7IBPjGtUkYnkPIvS8qTOzH7EBAOvUDLVpZ FErRBzV7scr4t3nq4dluCngihpqTR7TiCuzx5pJyvOtDKjWnYq2ZryTNGuM2TbK+N0QH QVUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Mh7SszRt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w9-20020a17090aaf8900b0026f3395cd7fsi17333225pjq.184.2023.09.27.11.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Mh7SszRt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 5FAAA8213F0C; Wed, 27 Sep 2023 10:01:47 -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 S229629AbjI0RAq (ORCPT + 19 others); Wed, 27 Sep 2023 13:00:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbjI0RAk (ORCPT ); Wed, 27 Sep 2023 13:00:40 -0400 Received: from mail-yb1-xb33.google.com (mail-yb1-xb33.google.com [IPv6:2607:f8b0:4864:20::b33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1374B136 for ; Wed, 27 Sep 2023 10:00:39 -0700 (PDT) Received: by mail-yb1-xb33.google.com with SMTP id 3f1490d57ef6-d8198ca891fso12986713276.1 for ; Wed, 27 Sep 2023 10:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695834038; x=1696438838; 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=EMRAaYbpAL9AMr/u9386eJc3P6IZIKKW5n+xTVSQNsU=; b=Mh7SszRtl5oB5ZhDY6oUv6VoramUgJr2e6VFqqApdiB7mY3jrbUk0r5giPalv0LK1X BhtZGFJGBG6U8IrVy1k6A0XyGeBFuNK72SnWSZVHcVWac+UwW08PqcN4vXXMhX24MDoC uZU56FE6kvWc7c4GWGhKlpfY9RdY1S+2g4tDmOPiJ50zpGzZQ7siUvK82YvN+vUBjGM+ ZnRjDPH8w6ZFx1yUEDKOLq4wUOmmhGaWBQmG4+8Gvd4eJ0646t4ZVEhR7EFoUFTJ/yf8 naQPTgTe6+fUsYrtmdoxCPsYu4gAIuIFoMhpepV4AsmZKvoYRjxNI4+XBEvlVzTXJ/VZ vYDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695834038; x=1696438838; 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=EMRAaYbpAL9AMr/u9386eJc3P6IZIKKW5n+xTVSQNsU=; b=odeT8SOIekmjZJzylw9IuQQZPeVkF/7xYhAitiTkDNwzRCq9xOPgnvmeSLvTQwJQBT F7KKgk9u2yNFXwPq5PemLZGJP+HDoCjV1uvCxfNyeiN42bM41jdTfJhCgjZ/mPeyWkXO kdW/29iZyV74OgtHfGT2ErBU85XhbGYT9fgLdzC12NC611AMy7vQu8+f6GxD2mjN7CBj NdKeYOmxsKVUsDw3fqC9NqQO21jwM95WpYnXbNXICOgWprNrKAcxdAPOYTgDA2MCBfAV ahgtKpT9wK1s4gXxeJnwu/rJCdGZu2fOm6G49M2/ZYcvPwGjG08u75/AlQMu52c489nR izig== X-Gm-Message-State: AOJu0YzQUTYLNnPc2t1w0hbv5qBXn+1+PLdUZ+BIqhNx2MnerppRudvZ esHRMfW5F8M35oyz5zp2vrZcKQ== X-Received: by 2002:a25:6b4e:0:b0:d86:a964:a47e with SMTP id o14-20020a256b4e000000b00d86a964a47emr2382069ybm.63.1695834038194; Wed, 27 Sep 2023 10:00:38 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.190.42]) by smtp.gmail.com with ESMTPSA id u7-20020a637907000000b00584b293d157sm3279396pgc.80.2023.09.27.10.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:00:37 -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 , Daniel Lezcano , Thomas Gleixner , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Alexandre Ghiti , Andy Shevchenko , Atish Kumar Patra , Sunil V L Subject: [PATCH v2 -next 3/4] RISC-V: cacheflush: Initialize CBO variables on ACPI systems Date: Wed, 27 Sep 2023 22:30:14 +0530 Message-Id: <20230927170015.295232-4-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927170015.295232-1-sunilvl@ventanamicro.com> References: <20230927170015.295232-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 27 Sep 2023 10:01:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778217028563321592 X-GMAIL-MSGID: 1778217028563321592 Using new interface to get the CBO block size information in RHCT, initialize the variables on ACPI platforms. Signed-off-by: Sunil V L Reviewed-by: Conor Dooley --- arch/riscv/mm/cacheflush.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index f1387272a551..8e59644e473c 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -3,7 +3,9 @@ * Copyright (C) 2017 SiFive */ +#include #include +#include #include #ifdef CONFIG_SMP @@ -124,15 +126,38 @@ void __init riscv_init_cbo_blocksizes(void) unsigned long cbom_hartid, cboz_hartid; u32 cbom_block_size = 0, cboz_block_size = 0; struct device_node *node; + struct acpi_table_header *rhct; + acpi_status status; + unsigned int cpu; + + if (!acpi_disabled) { + status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct); + if (ACPI_FAILURE(status)) + return; + } - for_each_of_cpu_node(node) { - /* set block-size for cbom and/or cboz extension if available */ - cbo_get_block_size(node, "riscv,cbom-block-size", - &cbom_block_size, &cbom_hartid); - cbo_get_block_size(node, "riscv,cboz-block-size", - &cboz_block_size, &cboz_hartid); + for_each_possible_cpu(cpu) { + if (acpi_disabled) { + node = of_cpu_device_node_get(cpu); + if (!node) { + pr_warn("Unable to find cpu node\n"); + continue; + } + + /* set block-size for cbom and/or cboz extension if available */ + cbo_get_block_size(node, "riscv,cbom-block-size", + &cbom_block_size, &cbom_hartid); + cbo_get_block_size(node, "riscv,cboz-block-size", + &cboz_block_size, &cboz_hartid); + } else { + acpi_get_cbo_block_size(rhct, cpu, &cbom_block_size, + &cboz_block_size, NULL); + } } + if (!acpi_disabled && rhct) + acpi_put_table((struct acpi_table_header *)rhct); + if (cbom_block_size) riscv_cbom_block_size = cbom_block_size; From patchwork Wed Sep 27 17:00:15 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: 145491 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2782035vqu; Wed, 27 Sep 2023 10:23:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGqnKCEARRFxjl/G8B1vPbu3tLDWG/iKsEIBeZo/PVFHjyfyUjYr+krQ8lYAKp8vh0BkMnM X-Received: by 2002:a17:902:f54c:b0:1bc:2d43:c747 with SMTP id h12-20020a170902f54c00b001bc2d43c747mr2697037plf.38.1695835417260; Wed, 27 Sep 2023 10:23:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695835417; cv=none; d=google.com; s=arc-20160816; b=jr/bUT0NmSTkRI0hCcjGmNgsyVQR+LCUDM54IWVaRuVtnFnhg5Pq6q24t8TkxXoXFB FcklD7QpQxgrhttQcw4GeN+APreMjuPam64wjxIXEJXXHGZF0GEUVyOyzLyKhqYSlpPi rGsLshQOll/HCKxXwhFPyPsz9Xgb3zeMjHrRMH4sArbUaN3aUpj0iB2Tff9heyfKtFnU KWXN8KyD0aOF2I1FmIAq75rFHf5c77m4e1LGae6PlH1nOIGBr+OAedJK9TmO4tHHz45c ovsxqMvsYvdAPDMSaYrCKfWc1CBouky7QTfZDH8ZfRXla0Ga9vc9QHnem4eeJKECsaHB kw9A== 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=pG1tzQTVssTuSgiTai6pnkMjirZbD31EyyHGMhy1at0=; fh=sfgdT0UZ8CYMELEEedGcAjPKookfa29m+O/tEazxSkQ=; b=t7srSfEwE7vuPnD8WsEqGBD63+nOYoEKsmgK2oXgcfk5kYeyisCbRH+izPkWjROUOg v2xRtF3mOIsk6Z8ATdY1zCJP0USX6LcZuYbAa/ZtEVMpsxcpGm7aUAjixbjB0SijdsfK /gvKNTE3Bs9ThmvXCwD1clOWchDICRf12oMdgCQIq+f0XylUm7xfUZSE52LoSymp451V UM8crFaybBSd91LmkqXGBlfv436ov+fHzNuPq7W39Kiw9pj1bCKmIJJPwhvma0aRPz5W xprJqXq3pd2hkNgKvDX+SBnTAEFJuhS5/VIlxG5RDObWDGexrYGFupm4PCNMEF4j/hbK woRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=oz8YwNkX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id f3-20020a170902ce8300b001c610ae885bsi10450421plg.59.2023.09.27.10.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:23:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=oz8YwNkX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id C778D832DA63; Wed, 27 Sep 2023 10:01:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229684AbjI0RAz (ORCPT + 19 others); Wed, 27 Sep 2023 13:00:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbjI0RAq (ORCPT ); Wed, 27 Sep 2023 13:00:46 -0400 Received: from mail-oo1-xc34.google.com (mail-oo1-xc34.google.com [IPv6:2607:f8b0:4864:20::c34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C4D11D for ; Wed, 27 Sep 2023 10:00:44 -0700 (PDT) Received: by mail-oo1-xc34.google.com with SMTP id 006d021491bc7-573912a7b14so5885113eaf.1 for ; Wed, 27 Sep 2023 10:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695834043; x=1696438843; 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=pG1tzQTVssTuSgiTai6pnkMjirZbD31EyyHGMhy1at0=; b=oz8YwNkXzxa/AUErObOaWGyGXiDiswFNYN7Fwl9q0a7MfldAH9jO+WT96ROcPmvn6s efXi40i9PnfRhzmjv3P/q53voqkGwj+o6qgCBEPIAs3eLFrfz+XqrTvsPaD+mHQ36iBz 8LTMRVWs6xbi3s0No1yJlJPhR9ORfDZ4G9TMoiolkqMiXZeigkdZrukz+XYkuTqAjklt /po9aampApisNVfsIqu9r84988GEy4GFbvrHzsJDce+9SBMTn1/zV+Y5kUL8S0RW6W0H 8iWUfhYS/8xrrAwLv3kJMQFA7vx6PgQzBn9w6NkcWZdjTBM9erO0utKDmns/pBWZMnzd gchw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695834043; x=1696438843; 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=pG1tzQTVssTuSgiTai6pnkMjirZbD31EyyHGMhy1at0=; b=cx6If4VRU6mPQd01LXVf1bDWT0N1jEyv2HfV+1tKnX2U1n1cBpepU3xc6sRvPf7Ohc 2Z4v/3J43zCqSc408Z+ofBNkU3hrcvmIX3Gr8SWK7riYgScCelioH7zaDJ/hNnMSLkW6 kv6TwhZIjyLMmyOnOAnIH893UXJCYQdBiOZylhlZZ6hpnpgRpWzTW+lcbvx8uOrYphK7 BhBQXlef0AM8E6yVMO6jxzvgLibozpvNKD/ymh9p+wPB8TyULKjL82EFSoG9rGS9pZFQ xk72NIb1+GIedwYnWeQyhaRzYGdZsfxcx8H25vUphAYIZjwb1NuH70OqIqDC+ikudG6n aaog== X-Gm-Message-State: AOJu0YxGCbQOcplzvh0JutcxkYDw5XU07lpvjhffJOqrxpseOGwY3GA0 Xl9u7eNaxr83ZqTB0p73W95qeA== X-Received: by 2002:a05:6358:7e84:b0:135:47e8:76e2 with SMTP id o4-20020a0563587e8400b0013547e876e2mr2445601rwn.4.1695834043334; Wed, 27 Sep 2023 10:00:43 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.190.42]) by smtp.gmail.com with ESMTPSA id u7-20020a637907000000b00584b293d157sm3279396pgc.80.2023.09.27.10.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 10:00:42 -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 , Daniel Lezcano , Thomas Gleixner , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Alexandre Ghiti , Andy Shevchenko , Atish Kumar Patra , Sunil V L Subject: [PATCH v2 -next 4/4] clocksource/timer-riscv: ACPI: Add timer_cannot_wakeup_cpu Date: Wed, 27 Sep 2023 22:30:15 +0530 Message-Id: <20230927170015.295232-5-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230927170015.295232-1-sunilvl@ventanamicro.com> References: <20230927170015.295232-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Wed, 27 Sep 2023 10:01:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778212318342025248 X-GMAIL-MSGID: 1778212318342025248 The timer capability to wakeup the cpu irrespective of its idle state is provided by the flag in RHCT. Update the timer code to set this flag. Signed-off-by: Sunil V L Reviewed-by: Samuel Holland Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- drivers/clocksource/timer-riscv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index 9c8f3e2decc2..06f5bad3c3e0 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -225,6 +225,10 @@ TIMER_OF_DECLARE(riscv_timer, "riscv", riscv_timer_init_dt); #ifdef CONFIG_ACPI static int __init riscv_timer_acpi_init(struct acpi_table_header *table) { + struct acpi_table_rhct *rhct = (struct acpi_table_rhct *)table; + + riscv_timer_cannot_wake_cpu = rhct->flags & ACPI_RHCT_TIMER_CANNOT_WAKEUP_CPU; + return riscv_timer_init_common(); }