Skip to content

Commit 5734080

Browse files
Robert Richterdjbw
Robert Richter
authored and
djbw
committed
cxl/core/regs: Add @dev to cxl_register_map
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. As 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. Signed-off-by: Robert Richter <rrichter@amd.com> Signed-off-by: Terry Bowman <terry.bowman@amd.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20230622205523.85375-7-terry.bowman@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 7481653 commit 5734080

4 files changed

Lines changed: 31 additions & 24 deletions

File tree

‎drivers/cxl/core/hdm.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb,
8585
struct cxl_component_regs *regs)
8686
{
8787
struct cxl_register_map map = {
88+
.dev = &port->dev,
8889
.resource = port->component_reg_phys,
8990
.base = crb,
9091
.max_size = CXL_COMPONENT_REG_BLOCK_SIZE,
@@ -97,8 +98,7 @@ static int map_hdm_decoder_regs(struct cxl_port *port, void __iomem *crb,
9798
return -ENODEV;
9899
}
99100

100-
return cxl_map_component_regs(&port->dev, regs, &map,
101-
BIT(CXL_CM_CAP_CAP_ID_HDM));
101+
return cxl_map_component_regs(&map, regs, BIT(CXL_CM_CAP_CAP_ID_HDM));
102102
}
103103

104104
static bool should_emulate_decoders(struct cxl_endpoint_dvsec_info *info)

‎drivers/cxl/core/regs.c‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,11 @@ void __iomem *devm_cxl_iomap_block(struct device *dev, resource_size_t addr,
199199
return ret_val;
200200
}
201201

202-
int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
203-
struct cxl_register_map *map, unsigned long map_mask)
202+
int cxl_map_component_regs(struct cxl_register_map *map,
203+
struct cxl_component_regs *regs,
204+
unsigned long map_mask)
204205
{
206+
struct device *dev = map->dev;
205207
struct mapinfo {
206208
struct cxl_reg_map *rmap;
207209
void __iomem **addr;
@@ -231,10 +233,10 @@ int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
231233
}
232234
EXPORT_SYMBOL_NS_GPL(cxl_map_component_regs, CXL);
233235

234-
int cxl_map_device_regs(struct device *dev,
235-
struct cxl_device_regs *regs,
236-
struct cxl_register_map *map)
236+
int cxl_map_device_regs(struct cxl_register_map *map,
237+
struct cxl_device_regs *regs)
237238
{
239+
struct device *dev = map->dev;
238240
resource_size_t phys_addr = map->resource;
239241
struct mapinfo {
240242
struct cxl_reg_map *rmap;
@@ -302,7 +304,11 @@ int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,
302304
u32 regloc_size, regblocks;
303305
int regloc, i;
304306

305-
map->resource = CXL_RESOURCE_NONE;
307+
*map = (struct cxl_register_map) {
308+
.dev = &pdev->dev,
309+
.resource = CXL_RESOURCE_NONE,
310+
};
311+
306312
regloc = pci_find_dvsec_capability(pdev, PCI_DVSEC_VENDOR_ID_CXL,
307313
CXL_DVSEC_REG_LOCATOR);
308314
if (!regloc)

‎drivers/cxl/cxl.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ struct cxl_device_reg_map {
231231

232232
/**
233233
* struct cxl_register_map - DVSEC harvested register block mapping parameters
234+
* @dev: device for devm operations and logging
234235
* @base: virtual base of the register-block-BAR + @block_offset
235236
* @resource: physical resource base of the register block
236237
* @max_size: maximum mapping size to perform register search
@@ -239,6 +240,7 @@ struct cxl_device_reg_map {
239240
* @device_map: cxl_reg_maps for device registers
240241
*/
241242
struct cxl_register_map {
243+
struct device *dev;
242244
void __iomem *base;
243245
resource_size_t resource;
244246
resource_size_t max_size;
@@ -253,11 +255,11 @@ void cxl_probe_component_regs(struct device *dev, void __iomem *base,
253255
struct cxl_component_reg_map *map);
254256
void cxl_probe_device_regs(struct device *dev, void __iomem *base,
255257
struct cxl_device_reg_map *map);
256-
int cxl_map_component_regs(struct device *dev, struct cxl_component_regs *regs,
257-
struct cxl_register_map *map,
258+
int cxl_map_component_regs(struct cxl_register_map *map,
259+
struct cxl_component_regs *regs,
258260
unsigned long map_mask);
259-
int cxl_map_device_regs(struct device *dev, struct cxl_device_regs *regs,
260-
struct cxl_register_map *map);
261+
int cxl_map_device_regs(struct cxl_register_map *map,
262+
struct cxl_device_regs *regs);
261263

262264
enum cxl_regloc_type;
263265
int cxl_find_regblock(struct pci_dev *pdev, enum cxl_regloc_type type,

‎drivers/cxl/pci.c‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ static int cxl_pci_setup_mailbox(struct cxl_dev_state *cxlds)
274274
return 0;
275275
}
276276

277-
static int cxl_map_regblock(struct pci_dev *pdev, struct cxl_register_map *map)
277+
static int cxl_map_regblock(struct cxl_register_map *map)
278278
{
279-
struct device *dev = &pdev->dev;
279+
struct device *dev = map->dev;
280280

281281
map->base = ioremap(map->resource, map->max_size);
282282
if (!map->base) {
@@ -288,18 +288,17 @@ static int cxl_map_regblock(struct pci_dev *pdev, struct cxl_register_map *map)
288288
return 0;
289289
}
290290

291-
static void cxl_unmap_regblock(struct pci_dev *pdev,
292-
struct cxl_register_map *map)
291+
static void cxl_unmap_regblock(struct cxl_register_map *map)
293292
{
294293
iounmap(map->base);
295294
map->base = NULL;
296295
}
297296

298-
static int cxl_probe_regs(struct pci_dev *pdev, struct cxl_register_map *map)
297+
static int cxl_probe_regs(struct cxl_register_map *map)
299298
{
300299
struct cxl_component_reg_map *comp_map;
301300
struct cxl_device_reg_map *dev_map;
302-
struct device *dev = &pdev->dev;
301+
struct device *dev = map->dev;
303302
void __iomem *base = map->base;
304303

305304
switch (map->reg_type) {
@@ -346,12 +345,12 @@ static int cxl_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type,
346345
if (rc)
347346
return rc;
348347

349-
rc = cxl_map_regblock(pdev, map);
348+
rc = cxl_map_regblock(map);
350349
if (rc)
351350
return rc;
352351

353-
rc = cxl_probe_regs(pdev, map);
354-
cxl_unmap_regblock(pdev, map);
352+
rc = cxl_probe_regs(map);
353+
cxl_unmap_regblock(map);
355354

356355
return rc;
357356
}
@@ -688,7 +687,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
688687
if (rc)
689688
return rc;
690689

691-
rc = cxl_map_device_regs(&pdev->dev, &cxlds->regs.device_regs, &map);
690+
rc = cxl_map_device_regs(&map, &cxlds->regs.device_regs);
692691
if (rc)
693692
return rc;
694693

@@ -703,8 +702,8 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
703702

704703
cxlds->component_reg_phys = map.resource;
705704

706-
rc = cxl_map_component_regs(&pdev->dev, &cxlds->regs.component,
707-
&map, BIT(CXL_CM_CAP_CAP_ID_RAS));
705+
rc = cxl_map_component_regs(&map, &cxlds->regs.component,
706+
BIT(CXL_CM_CAP_CAP_ID_RAS));
708707
if (rc)
709708
dev_dbg(&pdev->dev, "Failed to map RAS capability.\n");
710709

0 commit comments

Comments
 (0)