| Message ID | 20211022183709.1199701-7-ben.widawsky@intel.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | CXL Region Creation / HDM decoder programming | expand |
On Fri, Oct 22, 2021 at 11:37 AM Ben Widawsky <ben.widawsky@intel.com> wrote: > > Endpoints have decoders too. It is useful to share the same > infrastructure from cxl_core. Endpoints do not have dports (downstream > targets), only the underlying physical medium. As a result, some special > casing is needed. > > There is no functional change introduced yet as endpoints don't actually > enumerate decoders yet. The nr_targets type change either needs to be commented on here, or moved to its own patch. Otherwise, this looks good. > > Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> > --- > drivers/cxl/core/bus.c | 40 ++++++++++++++++++++++++++++++++-------- > drivers/cxl/cxl.h | 3 ++- > 2 files changed, 34 insertions(+), 9 deletions(-) > > diff --git a/drivers/cxl/core/bus.c b/drivers/cxl/core/bus.c > index 454d4d846eb2..5564a71773e2 100644 > --- a/drivers/cxl/core/bus.c > +++ b/drivers/cxl/core/bus.c > @@ -175,6 +175,12 @@ static const struct attribute_group *cxl_decoder_switch_attribute_groups[] = { > NULL, > }; > > +static const struct attribute_group *cxl_decoder_endpoint_attribute_groups[] = { > + &cxl_decoder_base_attribute_group, > + &cxl_base_attribute_group, > + NULL, > +}; > + > static void cxl_decoder_release(struct device *dev) > { > struct cxl_decoder *cxld = to_cxl_decoder(dev); > @@ -184,6 +190,12 @@ static void cxl_decoder_release(struct device *dev) > kfree(cxld); > } > > +static const struct device_type cxl_decoder_endpoint_type = { > + .name = "cxl_decoder_endpoint", > + .release = cxl_decoder_release, > + .groups = cxl_decoder_endpoint_attribute_groups, > +}; > + > static const struct device_type cxl_decoder_switch_type = { > .name = "cxl_decoder_switch", > .release = cxl_decoder_release, > @@ -196,6 +208,11 @@ static const struct device_type cxl_decoder_root_type = { > .groups = cxl_decoder_root_attribute_groups, > }; > > +static bool is_endpoint_decoder(struct device *dev) > +{ > + return dev->type == &cxl_decoder_endpoint_type; > +} > + > bool is_root_decoder(struct device *dev) > { > return dev->type == &cxl_decoder_root_type; > @@ -483,7 +500,8 @@ static int decoder_populate_targets(struct cxl_decoder *cxld, > return rc; > } > > -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, > + unsigned int nr_targets) > { > struct cxl_decoder *cxld, cxld_const_init = { > .nr_targets = nr_targets, > @@ -491,7 +509,7 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > struct device *dev; > int rc = 0; > > - if (nr_targets > CXL_DECODER_MAX_INTERLEAVE || nr_targets < 1) > + if (nr_targets > CXL_DECODER_MAX_INTERLEAVE) > return ERR_PTR(-EINVAL); > > cxld = kzalloc(struct_size(cxld, target, nr_targets), GFP_KERNEL); > @@ -510,8 +528,11 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > dev->parent = &port->dev; > dev->bus = &cxl_bus_type; > > + /* Endpoints don't have a target list */ > + if (nr_targets == 0) > + dev->type = &cxl_decoder_endpoint_type; > /* root ports do not have a cxl_port_type parent */ > - if (port->dev.parent->type == &cxl_port_type) > + else if (port->dev.parent->type == &cxl_port_type) > dev->type = &cxl_decoder_switch_type; > else > dev->type = &cxl_decoder_root_type; > @@ -538,12 +559,15 @@ int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map) > if (cxld->interleave_ways < 1) > return -EINVAL; > > - port = to_cxl_port(cxld->dev.parent); > - rc = decoder_populate_targets(cxld, port, target_map); > - if (rc) > - return rc; > - > dev = &cxld->dev; > + > + port = to_cxl_port(cxld->dev.parent); > + if (!is_endpoint_decoder(dev)) { > + rc = decoder_populate_targets(cxld, port, target_map); > + if (rc) > + return rc; > + } > + > rc = dev_set_name(dev, "decoder%d.%d", port->id, cxld->id); > if (rc) > return rc; > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 7f2e2bdc7883..91b8fd54bc93 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -293,7 +293,8 @@ int cxl_add_dport(struct cxl_port *port, struct device *dport, int port_id, > > struct cxl_decoder *to_cxl_decoder(struct device *dev); > bool is_root_decoder(struct device *dev); > -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets); > +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, > + unsigned int nr_targets); > int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); > int cxl_decoder_autoremove(struct device *host, struct cxl_decoder *cxld); > > -- > 2.33.1 >
On 21-10-29 14:00:21, Dan Williams wrote: > On Fri, Oct 22, 2021 at 11:37 AM Ben Widawsky <ben.widawsky@intel.com> wrote: > > > > Endpoints have decoders too. It is useful to share the same > > infrastructure from cxl_core. Endpoints do not have dports (downstream > > targets), only the underlying physical medium. As a result, some special > > casing is needed. > > > > There is no functional change introduced yet as endpoints don't actually > > enumerate decoders yet. > > The nr_targets type change either needs to be commented on here, or > moved to its own patch. Do you have a preference? > > Otherwise, this looks good. > > > > > Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> > > --- > > drivers/cxl/core/bus.c | 40 ++++++++++++++++++++++++++++++++-------- > > drivers/cxl/cxl.h | 3 ++- > > 2 files changed, 34 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/cxl/core/bus.c b/drivers/cxl/core/bus.c > > index 454d4d846eb2..5564a71773e2 100644 > > --- a/drivers/cxl/core/bus.c > > +++ b/drivers/cxl/core/bus.c > > @@ -175,6 +175,12 @@ static const struct attribute_group *cxl_decoder_switch_attribute_groups[] = { > > NULL, > > }; > > > > +static const struct attribute_group *cxl_decoder_endpoint_attribute_groups[] = { > > + &cxl_decoder_base_attribute_group, > > + &cxl_base_attribute_group, > > + NULL, > > +}; > > + > > static void cxl_decoder_release(struct device *dev) > > { > > struct cxl_decoder *cxld = to_cxl_decoder(dev); > > @@ -184,6 +190,12 @@ static void cxl_decoder_release(struct device *dev) > > kfree(cxld); > > } > > > > +static const struct device_type cxl_decoder_endpoint_type = { > > + .name = "cxl_decoder_endpoint", > > + .release = cxl_decoder_release, > > + .groups = cxl_decoder_endpoint_attribute_groups, > > +}; > > + > > static const struct device_type cxl_decoder_switch_type = { > > .name = "cxl_decoder_switch", > > .release = cxl_decoder_release, > > @@ -196,6 +208,11 @@ static const struct device_type cxl_decoder_root_type = { > > .groups = cxl_decoder_root_attribute_groups, > > }; > > > > +static bool is_endpoint_decoder(struct device *dev) > > +{ > > + return dev->type == &cxl_decoder_endpoint_type; > > +} > > + > > bool is_root_decoder(struct device *dev) > > { > > return dev->type == &cxl_decoder_root_type; > > @@ -483,7 +500,8 @@ static int decoder_populate_targets(struct cxl_decoder *cxld, > > return rc; > > } > > > > -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > > +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, > > + unsigned int nr_targets) > > { > > struct cxl_decoder *cxld, cxld_const_init = { > > .nr_targets = nr_targets, > > @@ -491,7 +509,7 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > > struct device *dev; > > int rc = 0; > > > > - if (nr_targets > CXL_DECODER_MAX_INTERLEAVE || nr_targets < 1) > > + if (nr_targets > CXL_DECODER_MAX_INTERLEAVE) > > return ERR_PTR(-EINVAL); > > > > cxld = kzalloc(struct_size(cxld, target, nr_targets), GFP_KERNEL); > > @@ -510,8 +528,11 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) > > dev->parent = &port->dev; > > dev->bus = &cxl_bus_type; > > > > + /* Endpoints don't have a target list */ > > + if (nr_targets == 0) > > + dev->type = &cxl_decoder_endpoint_type; > > /* root ports do not have a cxl_port_type parent */ > > - if (port->dev.parent->type == &cxl_port_type) > > + else if (port->dev.parent->type == &cxl_port_type) > > dev->type = &cxl_decoder_switch_type; > > else > > dev->type = &cxl_decoder_root_type; > > @@ -538,12 +559,15 @@ int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map) > > if (cxld->interleave_ways < 1) > > return -EINVAL; > > > > - port = to_cxl_port(cxld->dev.parent); > > - rc = decoder_populate_targets(cxld, port, target_map); > > - if (rc) > > - return rc; > > - > > dev = &cxld->dev; > > + > > + port = to_cxl_port(cxld->dev.parent); > > + if (!is_endpoint_decoder(dev)) { > > + rc = decoder_populate_targets(cxld, port, target_map); > > + if (rc) > > + return rc; > > + } > > + > > rc = dev_set_name(dev, "decoder%d.%d", port->id, cxld->id); > > if (rc) > > return rc; > > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > > index 7f2e2bdc7883..91b8fd54bc93 100644 > > --- a/drivers/cxl/cxl.h > > +++ b/drivers/cxl/cxl.h > > @@ -293,7 +293,8 @@ int cxl_add_dport(struct cxl_port *port, struct device *dport, int port_id, > > > > struct cxl_decoder *to_cxl_decoder(struct device *dev); > > bool is_root_decoder(struct device *dev); > > -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets); > > +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, > > + unsigned int nr_targets); > > int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); > > int cxl_decoder_autoremove(struct device *host, struct cxl_decoder *cxld); > > > > -- > > 2.33.1 > >
On Fri, Oct 29, 2021 at 3:03 PM Ben Widawsky <ben.widawsky@intel.com> wrote: > > On 21-10-29 14:00:21, Dan Williams wrote: > > On Fri, Oct 22, 2021 at 11:37 AM Ben Widawsky <ben.widawsky@intel.com> wrote: > > > > > > Endpoints have decoders too. It is useful to share the same > > > infrastructure from cxl_core. Endpoints do not have dports (downstream > > > targets), only the underlying physical medium. As a result, some special > > > casing is needed. > > > > > > There is no functional change introduced yet as endpoints don't actually > > > enumerate decoders yet. > > > > The nr_targets type change either needs to be commented on here, or > > moved to its own patch. > > Do you have a preference? Slight preference for separate patch.
diff --git a/drivers/cxl/core/bus.c b/drivers/cxl/core/bus.c index 454d4d846eb2..5564a71773e2 100644 --- a/drivers/cxl/core/bus.c +++ b/drivers/cxl/core/bus.c @@ -175,6 +175,12 @@ static const struct attribute_group *cxl_decoder_switch_attribute_groups[] = { NULL, }; +static const struct attribute_group *cxl_decoder_endpoint_attribute_groups[] = { + &cxl_decoder_base_attribute_group, + &cxl_base_attribute_group, + NULL, +}; + static void cxl_decoder_release(struct device *dev) { struct cxl_decoder *cxld = to_cxl_decoder(dev); @@ -184,6 +190,12 @@ static void cxl_decoder_release(struct device *dev) kfree(cxld); } +static const struct device_type cxl_decoder_endpoint_type = { + .name = "cxl_decoder_endpoint", + .release = cxl_decoder_release, + .groups = cxl_decoder_endpoint_attribute_groups, +}; + static const struct device_type cxl_decoder_switch_type = { .name = "cxl_decoder_switch", .release = cxl_decoder_release, @@ -196,6 +208,11 @@ static const struct device_type cxl_decoder_root_type = { .groups = cxl_decoder_root_attribute_groups, }; +static bool is_endpoint_decoder(struct device *dev) +{ + return dev->type == &cxl_decoder_endpoint_type; +} + bool is_root_decoder(struct device *dev) { return dev->type == &cxl_decoder_root_type; @@ -483,7 +500,8 @@ static int decoder_populate_targets(struct cxl_decoder *cxld, return rc; } -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets) { struct cxl_decoder *cxld, cxld_const_init = { .nr_targets = nr_targets, @@ -491,7 +509,7 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) struct device *dev; int rc = 0; - if (nr_targets > CXL_DECODER_MAX_INTERLEAVE || nr_targets < 1) + if (nr_targets > CXL_DECODER_MAX_INTERLEAVE) return ERR_PTR(-EINVAL); cxld = kzalloc(struct_size(cxld, target, nr_targets), GFP_KERNEL); @@ -510,8 +528,11 @@ struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets) dev->parent = &port->dev; dev->bus = &cxl_bus_type; + /* Endpoints don't have a target list */ + if (nr_targets == 0) + dev->type = &cxl_decoder_endpoint_type; /* root ports do not have a cxl_port_type parent */ - if (port->dev.parent->type == &cxl_port_type) + else if (port->dev.parent->type == &cxl_port_type) dev->type = &cxl_decoder_switch_type; else dev->type = &cxl_decoder_root_type; @@ -538,12 +559,15 @@ int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map) if (cxld->interleave_ways < 1) return -EINVAL; - port = to_cxl_port(cxld->dev.parent); - rc = decoder_populate_targets(cxld, port, target_map); - if (rc) - return rc; - dev = &cxld->dev; + + port = to_cxl_port(cxld->dev.parent); + if (!is_endpoint_decoder(dev)) { + rc = decoder_populate_targets(cxld, port, target_map); + if (rc) + return rc; + } + rc = dev_set_name(dev, "decoder%d.%d", port->id, cxld->id); if (rc) return rc; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 7f2e2bdc7883..91b8fd54bc93 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -293,7 +293,8 @@ int cxl_add_dport(struct cxl_port *port, struct device *dport, int port_id, struct cxl_decoder *to_cxl_decoder(struct device *dev); bool is_root_decoder(struct device *dev); -struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, int nr_targets); +struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets); int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); int cxl_decoder_autoremove(struct device *host, struct cxl_decoder *cxld);
Endpoints have decoders too. It is useful to share the same infrastructure from cxl_core. Endpoints do not have dports (downstream targets), only the underlying physical medium. As a result, some special casing is needed. There is no functional change introduced yet as endpoints don't actually enumerate decoders yet. Signed-off-by: Ben Widawsky <ben.widawsky@intel.com> --- drivers/cxl/core/bus.c | 40 ++++++++++++++++++++++++++++++++-------- drivers/cxl/cxl.h | 3 ++- 2 files changed, 34 insertions(+), 9 deletions(-)