| Message ID | b5469cbb8a3e138a1c709ed3eaab02d7ca8e84b2.1674468099.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | Collection of DOE material | expand |
Lukas Wunner wrote: > A synchronous API for DOE has just been introduced. Convert CXL CDAT > retrieval over to it. > > Tested-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Lukas Wunner <lukas@wunner.de> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com> > --- > drivers/cxl/core/pci.c | 62 ++++++++++++++---------------------------- > 1 file changed, 20 insertions(+), 42 deletions(-) > > diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c > index 57764e9cd19d..a02a2b005e6a 100644 > --- a/drivers/cxl/core/pci.c > +++ b/drivers/cxl/core/pci.c > @@ -487,51 +487,26 @@ static struct pci_doe_mb *find_cdat_doe(struct device *uport) > CXL_DOE_TABLE_ACCESS_TABLE_TYPE_CDATA) | \ > FIELD_PREP(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, (entry_handle))) > > -static void cxl_doe_task_complete(struct pci_doe_task *task) > -{ > - complete(task->private); > -} > - > -struct cdat_doe_task { > - u32 request_pl; > - u32 response_pl[32]; > - struct completion c; > - struct pci_doe_task task; > -}; > - > -#define DECLARE_CDAT_DOE_TASK(req, cdt) \ > -struct cdat_doe_task cdt = { \ > - .c = COMPLETION_INITIALIZER_ONSTACK(cdt.c), \ > - .request_pl = req, \ > - .task = { \ > - .prot.vid = PCI_DVSEC_VENDOR_ID_CXL, \ > - .prot.type = CXL_DOE_PROTOCOL_TABLE_ACCESS, \ > - .request_pl = &cdt.request_pl, \ > - .request_pl_sz = sizeof(cdt.request_pl), \ > - .response_pl = cdt.response_pl, \ > - .response_pl_sz = sizeof(cdt.response_pl), \ > - .complete = cxl_doe_task_complete, \ > - .private = &cdt.c, \ > - } \ > -} > - > static int cxl_cdat_get_length(struct device *dev, > struct pci_doe_mb *cdat_doe, > size_t *length) > { > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); > + u32 request = CDAT_DOE_REQ(0); > + u32 response[32]; > int rc; > > - rc = pci_doe_submit_task(cdat_doe, &t.task); > + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, > + CXL_DOE_PROTOCOL_TABLE_ACCESS, > + &request, sizeof(request), > + &response, sizeof(response)); > if (rc < 0) { > - dev_err(dev, "DOE submit failed: %d", rc); > + dev_err(dev, "DOE failed: %d", rc); > return rc; > } > - wait_for_completion(&t.c); > - if (t.task.rv < sizeof(u32)) > + if (rc < sizeof(u32)) > return -EIO; > > - *length = t.response_pl[1]; > + *length = response[1]; > dev_dbg(dev, "CDAT length %zu\n", *length); > > return 0; > @@ -546,26 +521,29 @@ static int cxl_cdat_read_table(struct device *dev, > int entry_handle = 0; > > do { > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); > + u32 request = CDAT_DOE_REQ(entry_handle); > + u32 response[32]; > size_t entry_dw; > u32 *entry; > int rc; > > - rc = pci_doe_submit_task(cdat_doe, &t.task); > + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, > + CXL_DOE_PROTOCOL_TABLE_ACCESS, > + &request, sizeof(request), > + &response, sizeof(response)); > if (rc < 0) { > - dev_err(dev, "DOE submit failed: %d", rc); > + dev_err(dev, "DOE failed: %d", rc); > return rc; > } > - wait_for_completion(&t.c); > /* 1 DW header + 1 DW data min */ > - if (t.task.rv < (2 * sizeof(u32))) > + if (rc < (2 * sizeof(u32))) > return -EIO; > > /* Get the CXL table access header entry handle */ > entry_handle = FIELD_GET(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, > - t.response_pl[0]); > - entry = t.response_pl + 1; > - entry_dw = t.task.rv / sizeof(u32); > + response[0]); > + entry = response + 1; > + entry_dw = rc / sizeof(u32); > /* Skip Header */ > entry_dw -= 1; > entry_dw = min(length / sizeof(u32), entry_dw); > -- > 2.39.1 >
On Mon, 23 Jan 2023 11:14:00 +0100 Lukas Wunner <lukas@wunner.de> wrote: > A synchronous API for DOE has just been introduced. Convert CXL CDAT > retrieval over to it. > > Tested-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Lukas Wunner <lukas@wunner.de> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com> The clean up here gives opportunities for 'right sizing' at least the response to reading the header. The others are harder was we don't know what each one is going to be. May make more sense as a follow on patch though. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/core/pci.c | 62 ++++++++++++++---------------------------- > 1 file changed, 20 insertions(+), 42 deletions(-) > > diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c > index 57764e9cd19d..a02a2b005e6a 100644 > --- a/drivers/cxl/core/pci.c > +++ b/drivers/cxl/core/pci.c > @@ -487,51 +487,26 @@ static struct pci_doe_mb *find_cdat_doe(struct device *uport) > CXL_DOE_TABLE_ACCESS_TABLE_TYPE_CDATA) | \ > FIELD_PREP(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, (entry_handle))) > > -static void cxl_doe_task_complete(struct pci_doe_task *task) > -{ > - complete(task->private); > -} > - > -struct cdat_doe_task { > - u32 request_pl; > - u32 response_pl[32]; > - struct completion c; > - struct pci_doe_task task; > -}; > - > -#define DECLARE_CDAT_DOE_TASK(req, cdt) \ > -struct cdat_doe_task cdt = { \ > - .c = COMPLETION_INITIALIZER_ONSTACK(cdt.c), \ > - .request_pl = req, \ > - .task = { \ > - .prot.vid = PCI_DVSEC_VENDOR_ID_CXL, \ > - .prot.type = CXL_DOE_PROTOCOL_TABLE_ACCESS, \ > - .request_pl = &cdt.request_pl, \ > - .request_pl_sz = sizeof(cdt.request_pl), \ > - .response_pl = cdt.response_pl, \ > - .response_pl_sz = sizeof(cdt.response_pl), \ > - .complete = cxl_doe_task_complete, \ > - .private = &cdt.c, \ > - } \ > -} > - > static int cxl_cdat_get_length(struct device *dev, > struct pci_doe_mb *cdat_doe, > size_t *length) > { > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); > + u32 request = CDAT_DOE_REQ(0); > + u32 response[32]; As we aren't now using a single structure for multiple purposes we should take the opportunity to cleanup the magic sizes (32 dword is just intended to be 'big enough' for anything we expect to read. Perhaps even declare a structure for the header case. struct cdat_header_resp { u8 resp_code; u8 table_type; /* 0 - CDAT */ u16 entry_handle; /* 0 - Header */ u32 cdat_length; u8 rev; u8 checksum; u8 resvd[6]; u32 sequence; }; A lot less than 32 dword. > int rc; > > - rc = pci_doe_submit_task(cdat_doe, &t.task); > + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, > + CXL_DOE_PROTOCOL_TABLE_ACCESS, > + &request, sizeof(request), > + &response, sizeof(response)); > if (rc < 0) { > - dev_err(dev, "DOE submit failed: %d", rc); > + dev_err(dev, "DOE failed: %d", rc); > return rc; > } > - wait_for_completion(&t.c); > - if (t.task.rv < sizeof(u32)) > + if (rc < sizeof(u32)) > return -EIO; > > - *length = t.response_pl[1]; > + *length = response[1]; > dev_dbg(dev, "CDAT length %zu\n", *length); > > return 0; > @@ -546,26 +521,29 @@ static int cxl_cdat_read_table(struct device *dev, > int entry_handle = 0; > > do { > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); > + u32 request = CDAT_DOE_REQ(entry_handle); > + u32 response[32]; As above, this is still a bit random. Things we might be reading. DSMAS: 6 dword DSLBIS: 6 dword DSIS: 2 dword DSEMTS: 6 dword SSLBIS: 4 dword + 2 * entires dwords. This can get huge - as can include p2p as well as the smaller usp / dsp set. Right now we aren't reading from switches though so we can fix that later (I posted an RFC for switches ages ago, but haven't gotten back to it since then) So for now probably leave this one at the 32 dwords. > size_t entry_dw; > u32 *entry; > int rc; > > - rc = pci_doe_submit_task(cdat_doe, &t.task); > + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, > + CXL_DOE_PROTOCOL_TABLE_ACCESS, > + &request, sizeof(request), > + &response, sizeof(response)); > if (rc < 0) { > - dev_err(dev, "DOE submit failed: %d", rc); > + dev_err(dev, "DOE failed: %d", rc); > return rc; > } > - wait_for_completion(&t.c); > /* 1 DW header + 1 DW data min */ > - if (t.task.rv < (2 * sizeof(u32))) > + if (rc < (2 * sizeof(u32))) > return -EIO; > > /* Get the CXL table access header entry handle */ > entry_handle = FIELD_GET(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, > - t.response_pl[0]); > - entry = t.response_pl + 1; > - entry_dw = t.task.rv / sizeof(u32); > + response[0]); > + entry = response + 1; > + entry_dw = rc / sizeof(u32); > /* Skip Header */ > entry_dw -= 1; > entry_dw = min(length / sizeof(u32), entry_dw);
On 1/24/2023 8:52 AM, Ira Weiny wrote: > Lukas Wunner wrote: >> A synchronous API for DOE has just been introduced. Convert CXL CDAT >> retrieval over to it. >> >> Tested-by: Ira Weiny <ira.weiny@intel.com> > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > >> Signed-off-by: Lukas Wunner <lukas@wunner.de> >> Cc: Dan Williams <dan.j.williams@intel.com> >> Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com> >> --- >> drivers/cxl/core/pci.c | 62 ++++++++++++++---------------------------- >> 1 file changed, 20 insertions(+), 42 deletions(-) >> ...... >> static int cxl_cdat_get_length(struct device *dev, >> struct pci_doe_mb *cdat_doe, >> size_t *length) >> { >> - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); >> + u32 request = CDAT_DOE_REQ(0); >> + u32 response[32]; >> int rc; >> >> - rc = pci_doe_submit_task(cdat_doe, &t.task); >> + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, >> + CXL_DOE_PROTOCOL_TABLE_ACCESS, >> + &request, sizeof(request), >> + &response, sizeof(response)); >> if (rc < 0) { >> - dev_err(dev, "DOE submit failed: %d", rc); >> + dev_err(dev, "DOE failed: %d", rc); >> return rc; >> } >> - wait_for_completion(&t.c); >> - if (t.task.rv < sizeof(u32)) >> + if (rc < sizeof(u32)) >> return -EIO; >> Sorry, I didn't find the original patchset email, only can reply here. Should this "if (rc < sizeof(u32))" be "if (rc < 2 * sizeof(u32))"? Because below code used response[1] directly, that means we need unless two u32 in response payload. Thanks Ming >> - *length = t.response_pl[1]; >> + *length = response[1]>> dev_dbg(dev, "CDAT length %zu\n", *length); >> >> return 0; >> @@ -546,26 +521,29 @@ static int cxl_cdat_read_table(struct device *dev, >> int entry_handle = 0; >> >> do { >> - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); >> + u32 request = CDAT_DOE_REQ(entry_handle); >> + u32 response[32]; >> size_t entry_dw; >> u32 *entry; >> int rc; >> >> - rc = pci_doe_submit_task(cdat_doe, &t.task); >> + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, >> + CXL_DOE_PROTOCOL_TABLE_ACCESS, >> + &request, sizeof(request), >> + &response, sizeof(response)); >> if (rc < 0) { >> - dev_err(dev, "DOE submit failed: %d", rc); >> + dev_err(dev, "DOE failed: %d", rc); >> return rc; >> } >> - wait_for_completion(&t.c); >> /* 1 DW header + 1 DW data min */ >> - if (t.task.rv < (2 * sizeof(u32))) >> + if (rc < (2 * sizeof(u32))) >> return -EIO; >> >> /* Get the CXL table access header entry handle */ >> entry_handle = FIELD_GET(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, >> - t.response_pl[0]); >> - entry = t.response_pl + 1; >> - entry_dw = t.task.rv / sizeof(u32); >> + response[0]); >> + entry = response + 1; >> + entry_dw = rc / sizeof(u32); >> /* Skip Header */ >> entry_dw -= 1; >> entry_dw = min(length / sizeof(u32), entry_dw); >> -- >> 2.39.1 >> > >
On 2/3/2023 4:53 PM, Li, Ming wrote: > On 1/24/2023 8:52 AM, Ira Weiny wrote: >> Lukas Wunner wrote: >>> A synchronous API for DOE has just been introduced. Convert CXL CDAT >>> retrieval over to it. >>> >>> Tested-by: Ira Weiny <ira.weiny@intel.com> >> >> Reviewed-by: Ira Weiny <ira.weiny@intel.com> >> >>> Signed-off-by: Lukas Wunner <lukas@wunner.de> >>> Cc: Dan Williams <dan.j.williams@intel.com> >>> Cc: Jonathan Cameron <Jonathan.Cameron@Huawei.com> >>> --- >>> drivers/cxl/core/pci.c | 62 ++++++++++++++---------------------------- >>> 1 file changed, 20 insertions(+), 42 deletions(-) >>> > > ...... > >>> static int cxl_cdat_get_length(struct device *dev, >>> struct pci_doe_mb *cdat_doe, >>> size_t *length) >>> { >>> - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); >>> + u32 request = CDAT_DOE_REQ(0); >>> + u32 response[32]; >>> int rc; >>> >>> - rc = pci_doe_submit_task(cdat_doe, &t.task); >>> + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, >>> + CXL_DOE_PROTOCOL_TABLE_ACCESS, >>> + &request, sizeof(request), >>> + &response, sizeof(response)); >>> if (rc < 0) { >>> - dev_err(dev, "DOE submit failed: %d", rc); >>> + dev_err(dev, "DOE failed: %d", rc); >>> return rc; >>> } >>> - wait_for_completion(&t.c); >>> - if (t.task.rv < sizeof(u32)) >>> + if (rc < sizeof(u32)) >>> return -EIO; >>> > > Sorry, I didn't find the original patchset email, only can reply here. > Should this "if (rc < sizeof(u32))" be "if (rc < 2 * sizeof(u32))"? > Because below code used response[1] directly, that means we need unless two u32 in response payload. Sorry, at least(not unless) two u32 in response payload. > Thanks > Ming > >>> - *length = t.response_pl[1]; >>> + *length = response[1]>> dev_dbg(dev, "CDAT length %zu\n", *length); >>> >>> return 0; >>> @@ -546,26 +521,29 @@ static int cxl_cdat_read_table(struct device *dev, >>> int entry_handle = 0; >>> >>> do { >>> - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); >>> + u32 request = CDAT_DOE_REQ(entry_handle); >>> + u32 response[32]; >>> size_t entry_dw; >>> u32 *entry; >>> int rc; >>> >>> - rc = pci_doe_submit_task(cdat_doe, &t.task); >>> + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, >>> + CXL_DOE_PROTOCOL_TABLE_ACCESS, >>> + &request, sizeof(request), >>> + &response, sizeof(response)); >>> if (rc < 0) { >>> - dev_err(dev, "DOE submit failed: %d", rc); >>> + dev_err(dev, "DOE failed: %d", rc); >>> return rc; >>> } >>> - wait_for_completion(&t.c); >>> /* 1 DW header + 1 DW data min */ >>> - if (t.task.rv < (2 * sizeof(u32))) >>> + if (rc < (2 * sizeof(u32))) >>> return -EIO; >>> >>> /* Get the CXL table access header entry handle */ >>> entry_handle = FIELD_GET(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, >>> - t.response_pl[0]); >>> - entry = t.response_pl + 1; >>> - entry_dw = t.task.rv / sizeof(u32); >>> + response[0]); >>> + entry = response + 1; >>> + entry_dw = rc / sizeof(u32); >>> /* Skip Header */ >>> entry_dw -= 1; >>> entry_dw = min(length / sizeof(u32), entry_dw); >>> -- >>> 2.39.1 >>> >> >> >
On Fri, Feb 03, 2023 at 04:53:34PM +0800, Li, Ming wrote: > On 1/24/2023 8:52 AM, Ira Weiny wrote: > > Lukas Wunner wrote: > > > static int cxl_cdat_get_length(struct device *dev, > > > struct pci_doe_mb *cdat_doe, > > > size_t *length) > > > { > > > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); > > > + u32 request = CDAT_DOE_REQ(0); > > > + u32 response[32]; > > > int rc; > > > > > > - rc = pci_doe_submit_task(cdat_doe, &t.task); > > > + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, > > > + CXL_DOE_PROTOCOL_TABLE_ACCESS, > > > + &request, sizeof(request), > > > + &response, sizeof(response)); > > > if (rc < 0) { > > > - dev_err(dev, "DOE submit failed: %d", rc); > > > + dev_err(dev, "DOE failed: %d", rc); > > > return rc; > > > } > > > - wait_for_completion(&t.c); > > > - if (t.task.rv < sizeof(u32)) > > > + if (rc < sizeof(u32)) > > > return -EIO; > > > > > Sorry, I didn't find the original patchset email, only can reply here. > Should this "if (rc < sizeof(u32))" be "if (rc < 2 * sizeof(u32))"? > Because below code used response[1] directly, that means we need unless > two u32 in response payload. Yes I spotted that as well, there's already a fixup on my development branch: https://github.com/l1k/linux/commits/doe It's in commit "cxl/pci: Handle truncated CDAT header" which is: https://github.com/l1k/linux/commit/208f256b319b ...but that URL may stop working as soon as I rebase the next time. Actually there's a lot more broken here, there are 3 other new fixup patches at the beginning of that development branch. Thanks, Lukas
On Tue, Jan 24, 2023 at 11:01:27AM +0000, Jonathan Cameron wrote: > On Mon, 23 Jan 2023 11:14:00 +0100 Lukas Wunner <lukas@wunner.de> wrote: > > A synchronous API for DOE has just been introduced. Convert CXL CDAT > > retrieval over to it. > > The clean up here gives opportunities for 'right sizing' at least > the response to reading the header. The others are harder was we > don't know what each one is going to be. > May make more sense as a follow on patch though. Thy will be done: https://lore.kernel.org/linux-pci/49c5299afc660ac33fee9a116ea37df0de938432.1676043318.git.lukas@wunner.de/ > > - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); > > + u32 request = CDAT_DOE_REQ(entry_handle); > > + u32 response[32]; > > As above, this is still a bit random. > Things we might be reading. > DSMAS: 6 dword > DSLBIS: 6 dword > DSIS: 2 dword > DSEMTS: 6 dword > SSLBIS: 4 dword + 2 * entires dwords. This can get huge - as > can include p2p as well as the smaller usp / dsp set. > > Right now we aren't reading from switches though so we can fix > that later (I posted an RFC for switches ages ago, but haven't > gotten back to it since then) > > So for now probably leave this one at the 32 dwords. I found a way to avoid a response buffer altogether. Thanks, Lukas
diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index 57764e9cd19d..a02a2b005e6a 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -487,51 +487,26 @@ static struct pci_doe_mb *find_cdat_doe(struct device *uport) CXL_DOE_TABLE_ACCESS_TABLE_TYPE_CDATA) | \ FIELD_PREP(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, (entry_handle))) -static void cxl_doe_task_complete(struct pci_doe_task *task) -{ - complete(task->private); -} - -struct cdat_doe_task { - u32 request_pl; - u32 response_pl[32]; - struct completion c; - struct pci_doe_task task; -}; - -#define DECLARE_CDAT_DOE_TASK(req, cdt) \ -struct cdat_doe_task cdt = { \ - .c = COMPLETION_INITIALIZER_ONSTACK(cdt.c), \ - .request_pl = req, \ - .task = { \ - .prot.vid = PCI_DVSEC_VENDOR_ID_CXL, \ - .prot.type = CXL_DOE_PROTOCOL_TABLE_ACCESS, \ - .request_pl = &cdt.request_pl, \ - .request_pl_sz = sizeof(cdt.request_pl), \ - .response_pl = cdt.response_pl, \ - .response_pl_sz = sizeof(cdt.response_pl), \ - .complete = cxl_doe_task_complete, \ - .private = &cdt.c, \ - } \ -} - static int cxl_cdat_get_length(struct device *dev, struct pci_doe_mb *cdat_doe, size_t *length) { - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(0), t); + u32 request = CDAT_DOE_REQ(0); + u32 response[32]; int rc; - rc = pci_doe_submit_task(cdat_doe, &t.task); + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, + CXL_DOE_PROTOCOL_TABLE_ACCESS, + &request, sizeof(request), + &response, sizeof(response)); if (rc < 0) { - dev_err(dev, "DOE submit failed: %d", rc); + dev_err(dev, "DOE failed: %d", rc); return rc; } - wait_for_completion(&t.c); - if (t.task.rv < sizeof(u32)) + if (rc < sizeof(u32)) return -EIO; - *length = t.response_pl[1]; + *length = response[1]; dev_dbg(dev, "CDAT length %zu\n", *length); return 0; @@ -546,26 +521,29 @@ static int cxl_cdat_read_table(struct device *dev, int entry_handle = 0; do { - DECLARE_CDAT_DOE_TASK(CDAT_DOE_REQ(entry_handle), t); + u32 request = CDAT_DOE_REQ(entry_handle); + u32 response[32]; size_t entry_dw; u32 *entry; int rc; - rc = pci_doe_submit_task(cdat_doe, &t.task); + rc = pci_doe(cdat_doe, PCI_DVSEC_VENDOR_ID_CXL, + CXL_DOE_PROTOCOL_TABLE_ACCESS, + &request, sizeof(request), + &response, sizeof(response)); if (rc < 0) { - dev_err(dev, "DOE submit failed: %d", rc); + dev_err(dev, "DOE failed: %d", rc); return rc; } - wait_for_completion(&t.c); /* 1 DW header + 1 DW data min */ - if (t.task.rv < (2 * sizeof(u32))) + if (rc < (2 * sizeof(u32))) return -EIO; /* Get the CXL table access header entry handle */ entry_handle = FIELD_GET(CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE, - t.response_pl[0]); - entry = t.response_pl + 1; - entry_dw = t.task.rv / sizeof(u32); + response[0]); + entry = response + 1; + entry_dw = rc / sizeof(u32); /* Skip Header */ entry_dw -= 1; entry_dw = min(length / sizeof(u32), entry_dw);