Skip to content

Commit a2fcb84

Browse files
Robert Richterdjbw
authored andcommitted
cxl/port: Remove Component Register base address from struct cxl_port
The Component Register base address @component_reg_phys is no longer used after the rework of the Component Register setup which now uses struct member @reg_map instead. Remove the base address. Signed-off-by: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Robert Richter <rrichter@amd.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/20231018171713.1883517-10-rrichter@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent f611d98 commit a2fcb84

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

drivers/cxl/core/port.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,6 @@ static int devm_cxl_link_parent_dport(struct device *host,
619619
static struct lock_class_key cxl_port_key;
620620

621621
static struct cxl_port *cxl_port_alloc(struct device *uport_dev,
622-
resource_size_t component_reg_phys,
623622
struct cxl_dport *parent_dport)
624623
{
625624
struct cxl_port *port;
@@ -670,7 +669,6 @@ static struct cxl_port *cxl_port_alloc(struct device *uport_dev,
670669
} else
671670
dev->parent = uport_dev;
672671

673-
port->component_reg_phys = component_reg_phys;
674672
ida_init(&port->decoder_ida);
675673
port->hdm_end = -1;
676674
port->commit_end = -1;
@@ -746,7 +744,7 @@ static struct cxl_port *__devm_cxl_add_port(struct device *host,
746744
struct device *dev;
747745
int rc;
748746

749-
port = cxl_port_alloc(uport_dev, component_reg_phys, parent_dport);
747+
port = cxl_port_alloc(uport_dev, parent_dport);
750748
if (IS_ERR(port))
751749
return port;
752750

drivers/cxl/cxl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,6 @@ struct cxl_dax_region {
576576
* @nr_dports: number of entries in @dports
577577
* @hdm_end: track last allocated HDM decoder instance for allocation ordering
578578
* @commit_end: cursor to track highest committed decoder for commit ordering
579-
* @component_reg_phys: component register capability base address (optional)
580579
* @dead: last ep has been removed, force port re-creation
581580
* @depth: How deep this port is relative to the root. depth 0 is the root.
582581
* @cdat: Cached CDAT data
@@ -596,7 +595,6 @@ struct cxl_port {
596595
int nr_dports;
597596
int hdm_end;
598597
int commit_end;
599-
resource_size_t component_reg_phys;
600598
bool dead;
601599
unsigned int depth;
602600
struct cxl_cdat {

0 commit comments

Comments
 (0)