Re: [v3 2/4] cxl/pci: Remove duplicated implementation of waiting for memory_info_valid

[Yanfei Xu <yanfei.xu@intel.com>]

On 8/28/2024 12:16 AM, Jonathan Cameron wrote:
> On Tue, 13 Aug 2024 19:05:30 +0800
> Yanfei Xu <yanfei.xu@intel.com> wrote:
> 
>> commit ce17ad0d5498 ("cxl: Wait Memory_Info_Valid before access memory
>> related info") added another implementation of waiting for
>> memory_info_valid without realizing it duplicated wait_for_valid()
> Mention here the name of the other duplicate function
> 
> Also good to call out why you picked this duplicate to remove
> over the other one.
> 
> Otherwise looks good to me.
> So with that info added.
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Thanks! will improve it in next version.

> 
>>
>> Suggested-by: Dan Williams <dan.j.williams@intel.com>
>> Signed-off-by: Yanfei Xu <yanfei.xu@intel.com>
>> ---
>>   drivers/cxl/core/pci.c        | 41 +++++------------------------------
>>   drivers/cxl/cxl.h             |  2 +-
>>   drivers/cxl/port.c            |  2 +-
>>   tools/testing/cxl/test/mock.c |  4 ++--
>>   4 files changed, 9 insertions(+), 40 deletions(-)
>>
>> diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
>> index 2d69340134da..38c567727dbb 100644
>> --- a/drivers/cxl/core/pci.c
>> +++ b/drivers/cxl/core/pci.c
>> @@ -211,37 +211,6 @@ int cxl_await_media_ready(struct cxl_dev_state *cxlds)
>>   }
>>   EXPORT_SYMBOL_NS_GPL(cxl_await_media_ready, CXL);
>>   
>> -static int wait_for_valid(struct pci_dev *pdev, int d)
>> -{
>> -	u32 val;
>> -	int rc;
>> -
>> -	/*
>> -	 * Memory_Info_Valid: When set, indicates that the CXL Range 1 Size high
>> -	 * and Size Low registers are valid. Must be set within 1 second of
>> -	 * deassertion of reset to CXL device. Likely it is already set by the
>> -	 * time this runs, but otherwise give a 1.5 second timeout in case of
>> -	 * clock skew.
>> -	 */
>> -	rc = pci_read_config_dword(pdev, d + CXL_DVSEC_RANGE_SIZE_LOW(0), &val);
>> -	if (rc)
>> -		return rc;
>> -
>> -	if (val & CXL_DVSEC_MEM_INFO_VALID)
>> -		return 0;
>> -
>> -	msleep(1500);
>> -
>> -	rc = pci_read_config_dword(pdev, d + CXL_DVSEC_RANGE_SIZE_LOW(0), &val);
>> -	if (rc)
>> -		return rc;
>> -
>> -	if (val & CXL_DVSEC_MEM_INFO_VALID)
>> -		return 0;
>> -
>> -	return -ETIMEDOUT;
>> -}
>> -
> 
>