diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 16:06:10 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 16:06:10 -0800 |
| commit | a5fcd228ca1db9810ba1ed461c90b6ee933b9daf (patch) | |
| tree | 814f208a81af8e90bff8619e2eed5d167b400dd2 /drivers/cxl/cxlpci.h | |
| parent | 5a6fe61facdb7f830895712b31fb39f544ffc165 (diff) | |
| parent | 6980daaa3ed5959bf4fe2719d96b1da437026b58 (diff) | |
Merge branch 'for-6.3/cxl-rr-emu' into cxl/next
Pick up the CXL DVSEC range register emulation for v6.3, and resolve
conflicts with the cxl_port_probe() split (from for-6.3/cxl-ram-region)
and event handling (from for-6.3/cxl-events).
Diffstat (limited to 'drivers/cxl/cxlpci.h')
| -rw-r--r-- | drivers/cxl/cxlpci.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cxl/cxlpci.h b/drivers/cxl/cxlpci.h index a8ea04f536ab..be6a2ef3cce3 100644 --- a/drivers/cxl/cxlpci.h +++ b/drivers/cxl/cxlpci.h @@ -70,7 +70,8 @@ enum cxl_regloc_type { int devm_cxl_port_enumerate_dports(struct cxl_port *port); struct cxl_dev_state; -int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm); +int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm, + struct cxl_endpoint_dvsec_info *info); void read_cdat_data(struct cxl_port *port); void cxl_cor_error_detected(struct pci_dev *pdev); pci_ers_result_t cxl_error_detected(struct pci_dev *pdev, |