Re: [PATCH v5 05/26] cxl/core/regs: Add @dev to cxl_register_map

[Terry Bowman <Terry.Bowman@amd.com>]

Thanks Dan. I'll make the changes you mention below.

Regards,
Terry

On 6/8/23 14:29, Dan Williams wrote:
> Terry Bowman wrote:
>> From: Robert Richter <rrichter@amd.com>
>>
>> The corresponding device of a register mapping is used for devm
>> operations and logging. For operations with struct cxl_register_map
>> the device needs to be kept track separately. To simpify the involved
>> function interfaces, add @dev to cxl_register_map.
>>
>> While at it also reorder function arguments of cxl_map_device_regs()
>> and cxl_map_component_regs() to have the object @cxl_register_map
>> first.
>>
>> In a result a bunch of functions are available to be used with a
>> @cxl_register_map object.
>>
>> This patch is in preparation of reworking the component register setup
>> code.
> 
> Looks good to me some small formatting requests below:
> 
>>
>> Signed-off-by: Robert Richter <rrichter@amd.com>
>> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
>> ---
>>  drivers/cxl/core/hdm.c  |  4 ++--
>>  drivers/cxl/core/regs.c | 16 +++++++++++-----
>>  drivers/cxl/cxl.h       | 10 ++++++----
>>  drivers/cxl/pci.c       | 24 ++++++++++++------------
>>  4 files changed, 31 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
>> index 7889ff203a34..5abfa9276dac 100644
>> --- a/drivers/cxl/core/hdm.c
>> +++ b/drivers/cxl/core/hdm.c
>> @@ -85,6 +85,7 @@ static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb,
>>  				struct cxl_component_regs *regs)
>>  {
>>  	struct cxl_register_map map = {
>> +		.dev = &port->dev,
>>  		.resource = port->component_reg_phys,
>>  		.base = crb,
>>  		.max_size = CXL_COMPONENT_REG_BLOCK_SIZE,
>> @@ -97,8 +98,7 @@ static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb,
>>  		return -ENODEV;
>>  	}
>>  
>> -	return cxl_map_component_regs(&port->dev, regs, &map,
>> -				      BIT(CXL_CM_CAP_CAP_ID_HDM));
>> +	return cxl_map_component_regs(&map, regs, BIT(CXL_CM_CAP_CAP_ID_HDM));
>>  }
>>  
>>  static bool should_emulate_decoders(struct cxl_endpoint_dvsec_info *info)
>> diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c
>> index c2e6ec6e716d..3b4e56fb36a8 100644
>> --- a/drivers/cxl/core/regs.c
>> +++ b/drivers/cxl/core/regs.c
>> @@ -199,9 +199,11 @@ void __iomem *devm_cxl_iomap_block(struct device *dev, resource_size_t addr,
>>  	return ret_val;
>>  }
>>  
>> -int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
>> -			   struct cxl_register_map *map, unsigned long map_mask)
>> +int cxl_map_component_regs(struct cxl_register_map *map,
>> +			   struct cxl_component_regs *regs,
>> +			   unsigned long map_mask)
>>  {
>> +	struct device *dev = map->dev;
>>  	struct mapinfo {
>>  		struct cxl_reg_map *rmap;
>>  		void __iomem **addr;
>> @@ -231,10 +233,10 @@ int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
>>  }
>>  EXPORT_SYMBOL_NS_GPL(cxl_map_component_regs, CXL);
>>  
>> -int cxl_map_device_regs(struct device *dev,
>> -			struct cxl_device_regs *regs,
>> -			struct cxl_register_map *map)
>> +int cxl_map_device_regs(struct cxl_register_map *map,
>> +			struct cxl_device_regs *regs)
>>  {
>> +	struct device *dev = map->dev;
>>  	resource_size_t phys_addr = map->resource;
>>  	struct mapinfo {
>>  		struct cxl_reg_map *rmap;
>> @@ -302,7 +304,10 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>>  	u32 regloc_size, regblocks;
>>  	int regloc, i;
>>  
>> +	memset(map, 0, sizeof(*map));
>> +	map->dev = &pdev->dev;
>>  	map->resource = CXL_RESOURCE_NONE;
> 
> Use a designated initializer here like other locations:
> 
> diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c
> index 9230b419988e..bd955fae65cd 100644
> --- a/drivers/cxl/core/regs.c
> +++ b/drivers/cxl/core/regs.c
> @@ -304,9 +304,10 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>         u32 regloc_size, regblocks;
>         int regloc, i;
>  
> -       memset(map, 0, sizeof(*map));
> -       map->dev = &pdev->dev;
> -       map->resource = CXL_RESOURCE_NONE;
> +       *map = (struct cxl_register_map) {
> +               .dev = &pdev->dev,
> +               .resource = CXL_RESOURCE_NONE,
> +       };
>  
>         regloc = pci_find_dvsec_capability(pdev, PCI_DVSEC_VENDOR_ID_CXL,
>                                            CXL_DVSEC_REG_LOCATOR);
> 
>> +
> 
> Remove this unrelated whitespace change.
> 
>>  	regloc = pci_find_dvsec_capability(pdev, PCI_DVSEC_VENDOR_ID_CXL,
>>  					   CXL_DVSEC_REG_LOCATOR);
>>  	if (!regloc)
>> @@ -328,6 +333,7 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>>  	}
>>  
>>  	map->resource = CXL_RESOURCE_NONE;
>> +
> 
> ...and this one too, before Jonathan notices.
> 
>>  	return -ENODEV;
>>  }
>>  EXPORT_SYMBOL_NS_GPL(cxl_find_regblock, CXL);
>> diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
>> index a8bda2c74a85..095b767c21e9 100644
>> --- a/drivers/cxl/cxl.h
>> +++ b/drivers/cxl/cxl.h
>> @@ -231,6 +231,7 @@ struct cxl_device_reg_map {
>>  
>>  /**
>>   * struct cxl_register_map - DVSEC harvested register block mapping parameters
>> + * @dev: device for devm operations and logging
>>   * @base: virtual base of the register-block-BAR + @block_offset
>>   * @resource: physical resource base of the register block
>>   * @max_size: maximum mapping size to perform register search
>> @@ -239,6 +240,7 @@ struct cxl_device_reg_map {
>>   * @device_map: cxl_reg_maps for device registers
>>   */
>>  struct cxl_register_map {
>> +	struct device *dev;
>>  	void __iomem *base;
>>  	resource_size_t resource;
>>  	resource_size_t max_size;
>> @@ -253,11 +255,11 @@ void cxl_probe_component_regs(struct device *dev, void __iomem *base,
>>  			      struct cxl_component_reg_map *map);
>>  void cxl_probe_device_regs(struct device *dev, void __iomem *base,
>>  			   struct cxl_device_reg_map *map);
>> -int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
>> -			   struct cxl_register_map *map,
>> +int cxl_map_component_regs(struct cxl_register_map *map,
>> +			   struct cxl_component_regs *regs,
>>  			   unsigned long map_mask);
>> -int cxl_map_device_regs(struct device *dev, struct cxl_device_regs *regs,
>> -			struct cxl_register_map *map);
>> +int cxl_map_device_regs(struct cxl_register_map *map,
>> +			struct cxl_device_regs *regs);
>>  
>>  enum cxl_regloc_type;
>>  int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
>> diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
>> index 0872f2233ed0..9c1b44f42e49 100644
>> --- a/drivers/cxl/pci.c
>> +++ b/drivers/cxl/pci.c
>> @@ -274,9 +274,9 @@ static int cxl_pci_setup_mailbox(struct cxl_dev_state *cxlds)
>>  	return 0;
>>  }
>>  
>> -static int cxl_map_regblock(struct pci_dev *pdev, struct cxl_register_map *map)
>> +static int cxl_map_regblock(struct cxl_register_map *map)
>>  {
>> -	struct device *dev = &pdev->dev;
>> +	struct device *dev = map->dev;
>>  
>>  	map->base = ioremap(map->resource, map->max_size);
>>  	if (!map->base) {
>> @@ -285,21 +285,21 @@ static int cxl_map_regblock(struct pci_dev *pdev, struct cxl_register_map *map)
>>  	}
>>  
>>  	dev_dbg(dev, "Mapped CXL Memory Device resource %pa\n", &map->resource);
>> +
> 
> Ditto.
> 
>>  	return 0;
>>  }
>>  
>> -static void cxl_unmap_regblock(struct pci_dev *pdev,
>> -			       struct cxl_register_map *map)
>> +static void cxl_unmap_regblock(struct cxl_register_map *map)
>>  {
>>  	iounmap(map->base);
>>  	map->base = NULL;
>>  }
>>  
>> -static int cxl_probe_regs(struct pci_dev *pdev, struct cxl_register_map *map)
>> +static int cxl_probe_regs(struct cxl_register_map *map)
>>  {
>>  	struct cxl_component_reg_map *comp_map;
>>  	struct cxl_device_reg_map *dev_map;
>> -	struct device *dev = &pdev->dev;
>> +	struct device *dev = map->dev;
>>  	void __iomem *base = map->base;
>>  
>>  	switch (map->reg_type) {
>> @@ -346,12 +346,12 @@ static int cxl_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type,
>>  	if (rc)
>>  		return rc;
>>  
>> -	rc = cxl_map_regblock(pdev, map);
>> +	rc = cxl_map_regblock(map);
>>  	if (rc)
>>  		return rc;
>>  
>> -	rc = cxl_probe_regs(pdev, map);
>> -	cxl_unmap_regblock(pdev, map);
>> +	rc = cxl_probe_regs(map);
>> +	cxl_unmap_regblock(map);
>>  
>>  	return rc;
>>  }
>> @@ -688,7 +688,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>>  	if (rc)
>>  		return rc;
>>  
>> -	rc = cxl_map_device_regs(&pdev->dev, &cxlds->regs.device_regs, &map);
>> +	rc = cxl_map_device_regs(&map, &cxlds->regs.device_regs);
>>  	if (rc)
>>  		return rc;
>>  
>> @@ -703,8 +703,8 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>>  
>>  	cxlds->component_reg_phys = map.resource;
>>  
>> -	rc = cxl_map_component_regs(&pdev->dev, &cxlds->regs.component,
>> -				    &map, BIT(CXL_CM_CAP_CAP_ID_RAS));
>> +	rc = cxl_map_component_regs(&map, &cxlds->regs.component,
>> +				    BIT(CXL_CM_CAP_CAP_ID_RAS));
>>  	if (rc)
>>  		dev_dbg(&pdev->dev, "Failed to map RAS capability.\n");
>>  
>> -- 
>> 2.34.1
>>
> 
> 
>