Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <670f8541-fbf2-8992-da88-78c3af925495@intel.com>
Date:   Tue, 30 May 2023 10:10:18 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Betterbird/102.11.0
Subject: Re: [PATCH v7 2/5] cxl: Add functions to get an instance of / count
 regblocks of a given type
To:     Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Liang Kan <kan.liang@linux.intel.com>,
        <linux-cxl@vger.kernel.org>, <peterz@infradead.org>,
        <mark.rutland@arm.com>, <will@kernel.org>,
        <dan.j.williams@intel.com>
CC:     <mingo@redhat.com>, <acme@kernel.org>, <linuxarm@huawei.com>,
        <linux-perf-users@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Namhyung Kim <namhyung@gmail.com>,
        Stephane Eranian <eranian@google.com>
References: <20230526095824.16336-1-Jonathan.Cameron@huawei.com>
 <20230526095824.16336-3-Jonathan.Cameron@huawei.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20230526095824.16336-3-Jonathan.Cameron@huawei.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aTljVEVTU0tYYUJ5QVU5ZnRMY0F0QXFMV2xhWk1uQTE3NndPNlp3Q0xXdWZD?=
 =?utf-8?B?a081ZWZHblVMbnJSSnZQcWJ2aEhXV3lHVjRyUjFGcjdwNVFNNU0yODZYWUNs?=
 =?utf-8?B?bmxzRnM0LytKdEJmTzZKSUw0eHJtK0tsVTFHeVh3REtLSWRWajFiNVc0eGVa?=
 =?utf-8?B?azY4REpxL0llSE5SNjNXUSsxQ3pOQlMwcXBiZlVyNVBHL3NIeWdpcStON05s?=
 =?utf-8?B?eGxrY3VieWpJOU1jb2g5QlZZNzNlNXlobGxkc1NRVTd5ODczVnNMWWpTaHBF?=
 =?utf-8?B?YjZvLytudnFlZnoyQXB1ZGxaVmRURWM2Ny8wNTZhYWZxRHkwRUVaWGQ1Rk9X?=
 =?utf-8?B?Z0EycEJtOUxOTkF3a1JmbGJ2TWtXdktyWDhUOUxwQktSNGU2TnlxNHo2YU9s?=
 =?utf-8?B?YTlhSnhzZFo3K3J5bGdrZkJWRWpwM0NPbWo4SjA3a2NhcDVpM0R2dStIS1Vh?=
 =?utf-8?B?YkU3U3VZeDc2cE9lQjIrcEhwdXNWaEtnbFBkaVdIcVpPYXFPS3pPSkpKOEFC?=
 =?utf-8?B?ZWwyZnhyeE8vNnk4T3lmSWJkMk1tTlJVN0VkcXFhbk9KTEh6eHVBMTV5blFC?=
 =?utf-8?B?MloxdUVmUWM0WFVibUtiSVh4ZzUyNFdkMy9JZktmc1NBYVNKY1JuWUxRd1pL?=
 =?utf-8?B?U3NtdllnK01kK21RYnpOOTMzN1BQRW4yTlcvU3k0eFRTYms0dXNYMWJaUWw0?=
 =?utf-8?B?dWpBREQ0YTRuZ1czak1KUEwwQnY4K0NwVlBYMC9HUEpub3AyOVZPTVBITlV0?=
 =?utf-8?B?T3RaNGdaK0hIUEZyOXhkaE43ZTdXSTd2Qk1ZOWFyQzR1cHc4ZnBWcWhCLzVK?=
 =?utf-8?B?NjQxbmpOSWM2VFAxK3RvL2I0MmJRR0Jjay9IdmN1dDFkVXVZYnBudlhsRWhC?=
 =?utf-8?B?bG9vbDMyc1dMQzdKZE9IN2JReUd1RVNmK2Q2MjNTeFF0SmFqdkJ3S2hON093?=
 =?utf-8?B?aGNYUnllZkg5bG5mS1BIYVliMFpQK0FaUTcyRGxnSjRFa2hjMnRoOGVKWDZN?=
 =?utf-8?B?eTMrUCtzUDhxTFhTdExmYStwZmNyN3UrNFp6SmRzeit1eWJjYlJkdlZNa25M?=
 =?utf-8?B?OGZjQjI3b3ZReVRKTnBMbi9aMnh4c3d4Mk9DR2VHNUJVVW1WRzhISUw3dnFN?=
 =?utf-8?B?Yi9MUGdBWTBySGJ5U09ESU1Yc0VNSEZWYXMrZUF6UWZxSFhSMDRab0tXQ0Fs?=
 =?utf-8?B?c3JjelE0azNTMC9JU1k5RzZ0RWg5dGYwdDQ1S2pkbnhJVmUwWWVZaUltSzZZ?=
 =?utf-8?B?alBZc2lWamd5ZnoyT3JVeUJoWG1nM1ExT0JiaCtidy9ETmI2VGdrOWthc1Mz?=
 =?utf-8?B?L2U0MHFkRFdyT1o5OTViaG56TUpCTWdSNFBhRlM3RzFlRm1VNWJwWjNlVVdV?=
 =?utf-8?B?dTg2Qk5jK3lYU052MFlMMG1HNnhGL2I1b1JIQ1RkamFYdGVFRlJOVTk1MWw0?=
 =?utf-8?B?cVNZV3pGaTByV2lGUUdZTjBWQzRrcXBxUHJtc0VaZmdHaXhYcDNsVGpWc2RH?=
 =?utf-8?B?Wk5xT3cvdFdJRHA2UjZJVW03bGhWRzA5TnpNVXF3NWt3akdlZkxMZmZpT1hk?=
 =?utf-8?B?RXdMeng3NDRsQzNjL2x0QVE4ZVVzNDZlN3pTNmU5aEtkYkt2b0pVaURlTGlh?=
 =?utf-8?B?OFovU1NLQUd0V25Ia1ZZd1lvS2ErdG9mVnhkRmFJYmgwcTVSb2c0QVFtOHRQ?=
 =?utf-8?B?RnJCejV3NkJhNERpZG5mUzE0U24wSGdjSy8yYjZpQU02cGJtelFMeCt4WE84?=
 =?utf-8?B?N1haS1JBZlkrT0s2ZHViaUxNYiswNk9nUTBkay93NWVBREFTMnFhRk43enNx?=
 =?utf-8?B?NHlwWEpXY0dQbjRxMkNEY2ZSQ09WSk8wNzZxYmpPR2JETWJZbGJ3UC9Lb1lM?=
 =?utf-8?B?cGFsQnBlZEFMZ1o5ZkZCRFRlTEZsZ290cnZDMEJIa2p0MXV1SSswYVQ5V2ZC?=
 =?utf-8?B?eUcrbllabnF1ZkhUMUQ3ZkhxQTIzTkhINk84bnpnQ0x0Nk90VDNaL1F5Qml0?=
 =?utf-8?B?TXFJOE5zZFQwZVA2Zm1XbWdaTTNzYktKSkhaNzcxR2xkSFZ4bTdWKzVkMVBj?=
 =?utf-8?B?K1lGcmloVlRzU0dkWGVabXl1Rm1MRG1Dd3pZbzRUb1E3d3lvK1hPcWV4bmpv?=
 =?utf-8?Q?MUwLIF36BWxl/bgHd5MDRRoMS?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 32c4c53c-10b4-45f0-6553-08db6130c127
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2023 17:10:23.2120
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UeUH64nMCZcBumF3WOIXJb4v8Nk4l9aQjSUHK+YhhCe3Xfq0jU8TPVkS/UMUUh8e29Lv3b6FKjXZyxRHGgrvPA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7894
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        autolearn=ham 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 5/26/23 02:58, Jonathan Cameron wrote:
> Until the recently release CXL 3.0 specification, there
> was only ever one instance of any given register block pointed
> to by the Register Block Locator DVSEC. Now, the specification allows
> for multiple CXL PMU instances, each with their own register block.
>
> To enable this add cxl_find_regblock_instance() that takes an index
> parameter and use that to implement cxl_count_regblock() and
> cxl_find_regblock().
>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>


> ---
>   drivers/cxl/core/regs.c | 59 ++++++++++++++++++++++++++++++++++++-----
>   drivers/cxl/cxl.h       |  3 +++
>   2 files changed, 56 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c
> index 1476a0299c9b..4b9672db867d 100644
> --- a/drivers/cxl/core/regs.c
> +++ b/drivers/cxl/core/regs.c
> @@ -286,20 +286,23 @@ static bool cxl_decode_regblock(struct pci_dev *pdev, u32 reg_lo, u32 reg_hi,
>   }
>   
>   /**
> - * cxl_find_regblock() - Locate register blocks by type
> + * cxl_find_regblock_instance() - Locate a register block by type / index
>    * @pdev: The CXL PCI device to enumerate.
>    * @type: Register Block Indicator id
>    * @map: Enumeration output, clobbered on error
> + * @index: Index into which particular instance of a regblock wanted in the
> + *	   order found in register locator DVSEC.
>    *
>    * Return: 0 if register block enumerated, negative error code otherwise
>    *
>    * A CXL DVSEC may point to one or more register blocks, search for them
> - * by @type.
> + * by @type and @index.
>    */
> -int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
> -		      struct cxl_register_map *map)
> +int cxl_find_regblock_instance(struct pci_dev *pdev, enum cxl_regloc_type type,
> +			       struct cxl_register_map *map, int index)
>   {
>   	u32 regloc_size, regblocks;
> +	int instance = 0;
>   	int regloc, i;
>   
>   	map->resource = CXL_RESOURCE_NONE;
> @@ -323,15 +326,59 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>   		if (!cxl_decode_regblock(pdev, reg_lo, reg_hi, map))
>   			continue;
>   
> -		if (map->reg_type == type)
> -			return 0;
> +		if (map->reg_type == type) {
> +			if (index == instance)
> +				return 0;
> +			instance++;
> +		}
>   	}
>   
>   	map->resource = CXL_RESOURCE_NONE;
>   	return -ENODEV;
>   }
> +EXPORT_SYMBOL_NS_GPL(cxl_find_regblock_instance, CXL);
> +
> +/**
> + * cxl_find_regblock() - Locate register blocks by type
> + * @pdev: The CXL PCI device to enumerate.
> + * @type: Register Block Indicator id
> + * @map: Enumeration output, clobbered on error
> + *
> + * Return: 0 if register block enumerated, negative error code otherwise
> + *
> + * A CXL DVSEC may point to one or more register blocks, search for them
> + * by @type.
> + */
> +int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
> +		      struct cxl_register_map *map)
> +{
> +	return cxl_find_regblock_instance(pdev, type, map, 0);
> +}
>   EXPORT_SYMBOL_NS_GPL(cxl_find_regblock, CXL);
>   
> +/**
> + * cxl_count_regblock() - Count instances of a given regblock type.
> + * @pdev: The CXL PCI device to enumerate.
> + * @type: Register Block Indicator id
> + *
> + * Some regblocks may be repeated. Count how many instances.
> + *
> + * Return: count of matching regblocks.
> + */
> +int cxl_count_regblock(struct pci_dev *pdev, enum cxl_regloc_type type)
> +{
> +	struct cxl_register_map map;
> +	int rc, count = 0;
> +
> +	while (1) {
> +		rc = cxl_find_regblock_instance(pdev, type, &map, count);
> +		if (rc)
> +			return count;
> +		count++;
> +	}
> +}
> +EXPORT_SYMBOL_NS_GPL(cxl_count_regblock, CXL);
> +
>   resource_size_t cxl_rcrb_to_component(struct device *dev,
>   				      resource_size_t rcrb,
>   				      enum cxl_rcrb which)
> diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
> index 044a92d9813e..f6e2a9ea5f41 100644
> --- a/drivers/cxl/cxl.h
> +++ b/drivers/cxl/cxl.h
> @@ -260,6 +260,9 @@ int cxl_map_device_regs(struct device *dev, struct cxl_device_regs *regs,
>   			struct cxl_register_map *map);
>   
>   enum cxl_regloc_type;
> +int cxl_count_regblock(struct pci_dev *pdev, enum cxl_regloc_type type);
> +int cxl_find_regblock_instance(struct pci_dev *pdev, enum cxl_regloc_type type,
> +			       struct cxl_register_map *map, int index);
>   int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>   		      struct cxl_register_map *map);
>