Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp2499237rdb; Wed, 4 Oct 2023 03:13:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHf8+cwmihFYW8wKwrXQ93L9qoU6ILTCtK9jAdcZfX20NH/lPw0nvkpNxOjDyWyV3p8yY0Y X-Received: by 2002:a05:6e02:1c82:b0:34f:8039:a3b5 with SMTP id w2-20020a056e021c8200b0034f8039a3b5mr2008549ill.26.1696414421137; Wed, 04 Oct 2023 03:13:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696414421; cv=none; d=google.com; s=arc-20160816; b=sPjoh55bbqMODa2fzfE6wEU5izP4GiiCULpL+js2CD3BjdLgdzsRsZFNeSasPx0wf9 GoH66b/+5CiM1wcvGOVWF7xYCxxddQzOr2/CSXdEHzI7Yd3nL8n2+oXU0nQfUV54P+7D g+7wsLVT8DiH1QKeQVIJ25fU48C+ekFBUlV8k5+Hmn0y9qkWRmtL637Nc9WXgD7JLPTF 0wwSCds3IEt3TcCPYC9LrbV/dUuDHsVK3s62vB2x7KNP4nvy7KhOT1zwaUQGu85O+Mjr 1OhsEYZ+GpBFLC8plKlPR4zCyweyr9NR3CTr8DTEZ7TqdYe2V6QuOEDrX+iBJt4wA8UZ 127Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=naQ12yZY9bgpmnWgAWPGFuKak0Xrn0cHsB8SeG3i588=; fh=R4yvuB3ZqTUy7xUfoVdJUn4Q/65T1k8mw2ivxWGvGRs=; b=jBeiKuAHMbnrIdJOt6L86i1YeYn0000sHX7S6oAkXTq0ty7RVr6fE1yrlbj1kWXOj8 LY+d/FyVHOk4er/jmxp8H8+vyZUa+B+SeuNP4seBzGjWqR5EH31VshkrWNxl6Lb0qmAz nHkp5SqMNjMldLpVP8WW344l+tSPJmeWoyJ3PIJ5M9XPPyP3eyUnUwQ74GwE43T4SIVX 8au5iPXpmpv2onlDKc5qQNs7su+bhC1fUFpP+YGURAW9Q9RwZi1BiSnSqJj+0bR+muFP X3czswUOYRvCF87w4W5bIEzMoosbKJu6xNvd3zbwY6CqWu4YNjB5RpEyXE2yZ9tloaI3 xZgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Nyxc6dnU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id f20-20020a637554000000b00578b785d46csi3472082pgn.193.2023.10.04.03.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 03:13:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Nyxc6dnU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 4543481972ED; Wed, 4 Oct 2023 03:13:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241955AbjJDKN0 (ORCPT + 99 others); Wed, 4 Oct 2023 06:13:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232895AbjJDKNZ (ORCPT ); Wed, 4 Oct 2023 06:13:25 -0400 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C42989E for ; Wed, 4 Oct 2023 03:13:21 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-79f95cd15dfso72001439f.0 for ; Wed, 04 Oct 2023 03:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1696414401; x=1697019201; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=naQ12yZY9bgpmnWgAWPGFuKak0Xrn0cHsB8SeG3i588=; b=Nyxc6dnU3QMl/pHc5kV/9b5JF64rxD5/Z3dhLn30RJ0rpcSP8WSzbO6CIo2oczD/eI IQrVmqzOyoMQhX6pCB0Pz9Na+sezwT2BdT9nBBWT/HNoIShMMwkodoxjHbdAlC9hkl7I LZzKA9RQ1pMKCdop+5PErXsxDsMByZWK0lfZlMENhHmaTqPKRLso9g9JX4RCuDo5DV5S qba1CERsHjXp3FUwM6mpIO/M2i8VB44IpQIYAYpJoxJX1vSmuAmvR6wsoLs9tEIOpavB 1CCHey7DpG2Zy/524b9UiHTGA/PXIwdBh8av0lJF1RU3DL7avw0QjDX2uLSxybfyX7C2 UilA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696414401; x=1697019201; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=naQ12yZY9bgpmnWgAWPGFuKak0Xrn0cHsB8SeG3i588=; b=a5yvOEyB/er9Y2W+8zA7myX9V1Xca5sKNAbfrcaFUe3shbyxneadGeXqO8CTIz67LP cYkMMvLXFfI7xMoeKrFxqzdPvtFbsJ3u97tgAi7IHDuyTD/c6TGhiMvfrxRauEeg8DNK GriMAaVByXWdKCqQI8wvgY9YQy65x7Rs6yy3LKqy06wXKZxDer/e6H7iO/wxFdf20wq7 C2u16m0xMwhA0qBchp53R8tHa6OFt4VfL+acduQPsNeFeWvHW5VDQpZkDbcVEE9jSUp9 q2RKwYfCkxM+YlTSEHQIaew0ayVOYyl3E1ML0otuXJOo59aLoKFyxW2gbco8NRgIAf6/ PmLg== X-Gm-Message-State: AOJu0YwuTFDIQYk2VGo3f7ResywV12ZEokrto6D2YstT30YrKUywi9NH MuMrk5m/i8opGd/lP1Pv8ghezg== X-Received: by 2002:a6b:7b05:0:b0:791:280:839e with SMTP id l5-20020a6b7b05000000b007910280839emr1987378iop.16.1696414401162; Wed, 04 Oct 2023 03:13:21 -0700 (PDT) Received: from sunil-laptop ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id ep10-20020a0566384e0a00b0042b09bde126sm861366jab.165.2023.10.04.03.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 03:13:20 -0700 (PDT) Date: Wed, 4 Oct 2023 15:43:07 +0530 From: Sunil V L To: Andrew Jones Cc: Samuel Holland , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Anup Patel , Albert Ou , Alexandre Ghiti , "Rafael J . Wysocki" , Daniel Lezcano , Atish Kumar Patra , Andy Shevchenko , Conor Dooley , Palmer Dabbelt , Paul Walmsley , Thomas Gleixner , Ard Biesheuvel , Len Brown Subject: Re: [PATCH v2 -next 3/4] RISC-V: cacheflush: Initialize CBO variables on ACPI systems Message-ID: References: <20230927170015.295232-1-sunilvl@ventanamicro.com> <20230927170015.295232-4-sunilvl@ventanamicro.com> <20231004-58af76b11b3db2e64a93fd55@orel> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231004-58af76b11b3db2e64a93fd55@orel> X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Wed, 04 Oct 2023 03:13:36 -0700 (PDT) On Wed, Oct 04, 2023 at 10:33:31AM +0200, Andrew Jones wrote: > On Wed, Oct 04, 2023 at 09:52:23AM +0530, Sunil V L wrote: > > On Tue, Oct 03, 2023 at 02:50:02PM -0500, Samuel Holland wrote: > > > On 2023-09-27 12:00 PM, Sunil V L wrote: > > > > Using new interface to get the CBO block size information in RHCT, > > > > initialize the variables on ACPI platforms. > > > > > > > > Signed-off-by: Sunil V L > > > > --- > > > > 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); > > > > > > This leaks a reference to the device node. > > > > > Yep!. I missed of_node_put(). Let me add in next revision. Thanks! > > > > > > + } else { > > > > + acpi_get_cbo_block_size(rhct, cpu, &cbom_block_size, > > > > + &cboz_block_size, NULL); > > > > > > This function loops through the whole RHCT already. Why do we need to call it > > > for each CPU? Can't we just call it once, and have it do the same consistency > > > checks as cbo_get_block_size()? > > > > > > In that case, the DT path could keep the for_each_of_cpu_node() loop. > > > > > I kept the same logic as DT. Basically, by passing the cpu node, we > > will fetch the exact CPU's CBO property from RHCT. It is not clear to me > > why we overwrite the same variable with value from another cpu and > > whether we can return as soon as we get the CBO size for one CPU. > > > > Drew, can we exit the loop if we get the CBO size for one CPU? > > We want to compare the values for each CPU with the first one we find in > order to ensure they are consistent. I think Samuel is suggesting that > we leave the DT path here the same, i.e. keep the for_each_of_cpu_node() > loop, and then change acpi_get_cbo_block_size() to *not* take a cpu as > input, but rather follow the same pattern as DT, which is to loop over > all cpus doing a consistency check against the first cpu's CBO info. > Ahh OK. Thanks Drew and Samuel. Let me update as you suggested. Thanks! Sunil