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;
Date:   Thu, 8 Jun 2023 12:29:32 -0700
From:   Dan Williams <dan.j.williams@intel.com>
To:     Terry Bowman <terry.bowman@amd.com>, <alison.schofield@intel.com>,
        <vishal.l.verma@intel.com>, <ira.weiny@intel.com>,
        <bwidawsk@kernel.org>, <dan.j.williams@intel.com>,
        <dave.jiang@intel.com>, <Jonathan.Cameron@huawei.com>,
        <linux-cxl@vger.kernel.org>
CC:     <terry.bowman@amd.com>, <rrichter@amd.com>,
        <linux-kernel@vger.kernel.org>, <bhelgaas@google.com>
Subject: RE: [PATCH v5 05/26] cxl/core/regs: Add @dev to cxl_register_map
Message-ID: <64822c1c56568_1433ac294db@dwillia2-xfh.jf.intel.com.notmuch>
References: <20230607221651.2454764-1-terry.bowman@amd.com>
 <20230607221651.2454764-6-terry.bowman@amd.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230607221651.2454764-6-terry.bowman@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9GCgFIoarypGEG6C74qkGpgHL4nMWppKUqKeGnxj+aVpqV4mQlMm5PyrGQ87?=
 =?us-ascii?Q?kumN78qSff7eSU0YdwF9Wo0l9HFcUz/+MnRWNXLvXfYJz2Unta4vFP0kvyUR?=
 =?us-ascii?Q?E0A0dHdtEpQ6Zot81gGanbuJZmDqt/tdvlPFWfYPpTEYZINLqF2YL49abhU3?=
 =?us-ascii?Q?OLaKj5kBpLO+Jz6zlftLQL5A5KLp6+dn/yWfw1chIbqXqKi/Q/5VluqFR/Mk?=
 =?us-ascii?Q?EVEGM3YC3USoBYeGnrIUku3SaWbM4Ff1uskWFGckylh43j9LiUdyl/mvnTCw?=
 =?us-ascii?Q?YU7th86AWRbQXJ/0YyIilq35m1dPRW7xxjGx3u+4UmmYPAce33VI9M5X57Af?=
 =?us-ascii?Q?ltByx27WL8v4lfR0f8619Vmep4t97TvcM/H7ha66OQNh/eAwqgAFEyEoLijs?=
 =?us-ascii?Q?1HCNkE4r1hxSTi1KZ/CFZwKXg/b5hnvLNRAI0WI0Iofl9TUSxYMbiNBMPMZM?=
 =?us-ascii?Q?LIa+AS3ocBYGiWRxOZo+dv5VyAjUcT3b6+o41J+W2c4D6N/XV7kOkOjx8Jb6?=
 =?us-ascii?Q?BqZXa8Qxq5omxmULSFtbYXY6DENZ9nkyuLS5kBM6N7NGVSwBH86Udu0nDL0T?=
 =?us-ascii?Q?Fz7oBQHsLgCjEYxEEe604ETk5TyCQt1p5K40DlOUt2pBOluLShWyu5M0ZKBC?=
 =?us-ascii?Q?BPyvpOrrFy9EG+Z89AxlF0HQ/jtwCOO161DFdNhIo3GGGQhdukUSV8IXGRsp?=
 =?us-ascii?Q?vtvP9OjaHsXc/N9eNmbCj31ss/Ay4mpZtcHx8eaJgQhNkXyjwrSt24Nr1cia?=
 =?us-ascii?Q?beBiLAZ31CasD6oVV9C/+H6jxof+eaQ6yJHMLMnWMzGP625AwVJxuBTTxxQv?=
 =?us-ascii?Q?ONCHmb6KbHIzhV4Ye0NynHtqLhnwO75uYrqky8wrL6lM8g46mafbzYUFd3iN?=
 =?us-ascii?Q?gB66PAXLJmSDpKlOHgcw8X0IUsUZebtefo/Nm13e7/Xwj/0IwO+oiJB57510?=
 =?us-ascii?Q?FZo58xkfXQSheU1WEyYUqEyKSYnd9WGP74DgAXDvPhtg9EhtFFf+9ZhY3QTT?=
 =?us-ascii?Q?/TSwOz4Ayot+K26di8h8YmCtZDN2mjdR9z9OzXcqnQP03gKJWfRymOAJJ02E?=
 =?us-ascii?Q?VDxwjiihfO5mkoEv2JP5t8W+9CD0x5yxOq4ocmNMIkuWxdP1UfRnLLdyq+hE?=
 =?us-ascii?Q?77WfHZ7a/1jtFJd4LzFXGuTRgioDXRe5Xff83AmRBULDaOcXMhLqzp9EHESn?=
 =?us-ascii?Q?kra40+L1EMt1C0k1nklBrznUdWecpw4GsAhM2anfdmikj3I3jzTjT0vuixXG?=
 =?us-ascii?Q?7MB+q9oQ+K6yuMB7Kyn41dWY+vp1Wrke6+ldvft1D9m/f3+Nu/fLAhxXtDQR?=
 =?us-ascii?Q?E523NbfM0q+RvSkYKOdBQF4ulE8l+pvwX1r9hkg5cfHowYaURtXrnXxo1qr7?=
 =?us-ascii?Q?rYdtUXlDCw4NJH/ebJRtX6I08T79GfFnVHvVdkRpIUxWAJ90N/jveUn7XafR?=
 =?us-ascii?Q?eTiPAqnlHMGsu3gSxfkR9kfGSEgQGElrlvSEowS+KY6/PlYmOP3mLe72ndmJ?=
 =?us-ascii?Q?xwIvlQKeT4VR3TYzfmwdiZsaws+U1Gb0Zciszo1X2XUuoIaU3ICSd7jgVhI7?=
 =?us-ascii?Q?kK0Cy9rzD2mGEMovcm6/sGloTIB5Lb6s/1Qp2Vhj2FVwUjdTycnWEYtuqRvw?=
 =?us-ascii?Q?KQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7bdfb478-c172-4db1-e876-08db6856b195
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2023 19:29:36.1749
 (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: allGK4ITnI5Yg1xBVJJ9N29wUGfwz9DIQXI+GthA2+2v1AgSBTDBLHVig/42UL19SKBFg8jxBFEOrPQomumm/Es/mcxLYvaznImsfX556Cw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8210
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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

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
>