On Fri, 5 Nov 2021 16:50:56 -0700
<ira.weiny@xxxxxxxxx> wrote:
> From: Ira Weiny <ira.weiny@xxxxxxxxx>
>
> Parse and cache the DSMAS data from the CDAT table. Store this data in
> Unmarshaled data structures for use later.
>
> Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
More fun from clashing patch sets below.
I think this is wrong rather than the other patch, but I'm prepared to
be persuaded otherwise!
Ben, this is related to your mega RFC for regions etc.
Jonathan
> +static int parse_dsmas(struct cxl_memdev *cxlmd)
> +{
> + struct cxl_dsmas *dsmas_ary = NULL;
> + u32 *data = cxlmd->cdat_table;
> + int bytes_left = cxlmd->cdat_length;
> + int nr_dsmas = 0;
> + size_t dsmas_byte_size;
> + int rc = 0;
> +
> + if (!data || !cdat_hdr_valid(cxlmd))
> + return -ENXIO;
> +
> + /* Skip header */
> + data += CDAT_HEADER_LENGTH_DW;
> + bytes_left -= CDAT_HEADER_LENGTH_BYTES;
> +
> + while (bytes_left > 0) {
> + u32 *cur_rec = data;
> + u8 type = FIELD_GET(CDAT_STRUCTURE_DW0_TYPE, cur_rec[0]);
> + u16 length = FIELD_GET(CDAT_STRUCTURE_DW0_LENGTH, cur_rec[0]);
> +
> + if (type == CDAT_STRUCTURE_DW0_TYPE_DSMAS) {
> + struct cxl_dsmas *new_ary;
> + u8 flags;
> +
> + new_ary = krealloc(dsmas_ary,
> + sizeof(*dsmas_ary) * (nr_dsmas+1),
> + GFP_KERNEL);
> + if (!new_ary) {
> + dev_err(&cxlmd->dev,
> + "Failed to allocate memory for DSMAS data\n");
> + rc = -ENOMEM;
> + goto free_dsmas;
> + }
> + dsmas_ary = new_ary;
> +
> + flags = FIELD_GET(CDAT_DSMAS_DW1_FLAGS, cur_rec[1]);
> +
> + dsmas_ary[nr_dsmas].dpa_base = CDAT_DSMAS_DPA_OFFSET(cur_rec);
> + dsmas_ary[nr_dsmas].dpa_length = CDAT_DSMAS_DPA_LEN(cur_rec);
> + dsmas_ary[nr_dsmas].non_volatile = CDAT_DSMAS_NON_VOLATILE(flags);
> +
> + dev_dbg(&cxlmd->dev, "DSMAS %d: %llx:%llx %s\n",
> + nr_dsmas,
> + dsmas_ary[nr_dsmas].dpa_base,
> + dsmas_ary[nr_dsmas].dpa_base +
> + dsmas_ary[nr_dsmas].dpa_length,
> + (dsmas_ary[nr_dsmas].non_volatile ?
> + "Persistent" : "Volatile")
> + );
> +
> + nr_dsmas++;
> + }
> +
> + data += (length/sizeof(u32));
> + bytes_left -= length;
> + }
> +
> + if (nr_dsmas == 0) {
> + rc = -ENXIO;
> + goto free_dsmas;
> + }
> +
> + dev_dbg(&cxlmd->dev, "Found %d DSMAS entries\n", nr_dsmas);
> +
> + dsmas_byte_size = sizeof(*dsmas_ary) * nr_dsmas;
> + cxlmd->dsmas_ary = devm_kzalloc(&cxlmd->dev, dsmas_byte_size, GFP_KERNEL);
Here is another place where we need to hang this off cxlds->dev rather than this
one to avoid breaking Ben's code.
> + if (!cxlmd->dsmas_ary) {
> + rc = -ENOMEM;
> + goto free_dsmas;
> + }
> +
> + memcpy(cxlmd->dsmas_ary, dsmas_ary, dsmas_byte_size);
> + cxlmd->nr_dsmas = nr_dsmas;
> +
> +free_dsmas:
> + kfree(dsmas_ary);
> + return rc;
> +}
> +
