From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D24BC4338F for ; Wed, 11 Aug 2021 15:16:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E26360FDA for ; Wed, 11 Aug 2021 15:16:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232440AbhHKPRL (ORCPT ); Wed, 11 Aug 2021 11:17:11 -0400 Received: from foss.arm.com ([217.140.110.172]:52758 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233155AbhHKPQv (ORCPT ); Wed, 11 Aug 2021 11:16:51 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2045E1063; Wed, 11 Aug 2021 08:16:18 -0700 (PDT) Received: from [192.168.0.14] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E8E453F718; Wed, 11 Aug 2021 08:16:15 -0700 (PDT) Subject: Re: [PATCH v1 02/20] x86/resctrl: Merge mon_capable and mon_enabled To: Jamie Iles Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , lcherian@marvell.com, bobo.shaobowang@huawei.com References: <20210729223610.29373-1-james.morse@arm.com> <20210729223610.29373-3-james.morse@arm.com> From: James Morse Message-ID: Date: Wed, 11 Aug 2021 16:16:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jamie, On 11/08/2021 13:15, Jamie Iles wrote: > On Thu, Jul 29, 2021 at 10:35:52PM +0000, James Morse wrote: >> mon_enabled and mon_capable are always set as a pair by >> rdt_get_mon_l3_config(). >> >> There is no point having two values. >> >> Merge them together. >> diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h >> index ada0a02093a6..d715df9de37f 100644 >> --- a/include/linux/resctrl.h >> +++ b/include/linux/resctrl.h >> @@ -130,7 +130,7 @@ struct resctrl_schema; >> /** >> * struct rdt_resource - attributes of a resctrl resource >> * @rid: The index of the resource >> - * @mon_enabled: Is monitoring enabled for this feature >> + * @cdp_enabled Is CDP enabled for this resource >> * @alloc_capable: Is allocation available on this machine >> * @mon_capable: Is monitor feature available on this machine >> * @num_rmid: Number of RMIDs available >> @@ -149,7 +149,7 @@ struct resctrl_schema; >> */ >> struct rdt_resource { >> int rid; >> - bool mon_enabled; >> + bool cdp_enabled; > > Nothing is setting cdp_enabled in this patch, is this intended to be > here? Bother, that is the result of a merge conflict from changes from the previous series! Thanks, I've removed it. James