UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-6.3/cxl-ram-region' into cxl/next 

Pick up some fixes from exposure of for-6.3/cxl-ram-region in
linux-next.
This commit is contained in:
Dan Williams 2023-02-14 14:58:26 -08:00
parent f57aec443c 8a3d95ea42
commit ee817acaa0
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/Makefile
View File

@ -71,7 +71,7 @@ obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
obj-$(CONFIG_PARPORT) += parport/ obj-$(CONFIG_PARPORT) += parport/
obj-y += base/ block/ misc/ mfd/ nfc/ obj-y += base/ block/ misc/ mfd/ nfc/
obj-$(CONFIG_LIBNVDIMM) += nvdimm/ obj-$(CONFIG_LIBNVDIMM) += nvdimm/
obj-$(CONFIG_DAX) += dax/ obj-y += dax/
obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/
obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_NUBUS) += nubus/
obj-y += cxl/ obj-y += cxl/

5
drivers/cxl/core/region.c
View File

@ -2625,10 +2625,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled)
cxlr = to_cxl_region(region_dev); cxlr = to_cxl_region(region_dev);
mutex_unlock(&cxlrd->range_lock); mutex_unlock(&cxlrd->range_lock);
if (IS_ERR(cxlr)) { rc = PTR_ERR_OR_ZERO(cxlr);
rc = PTR_ERR(cxlr); if (rc)
goto out; goto out;
}
attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE); attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE);

2
drivers/dax/Kconfig
View File

@ -47,7 +47,7 @@ config DEV_DAX_HMEM
config DEV_DAX_CXL config DEV_DAX_CXL
tristate "CXL DAX: direct access to CXL RAM regions" tristate "CXL DAX: direct access to CXL RAM regions"
depends on CXL_REGION && DEV_DAX depends on CXL_BUS && CXL_REGION && DEV_DAX
default CXL_REGION && DEV_DAX default CXL_REGION && DEV_DAX
help help
CXL RAM regions are either mapped by platform-firmware CXL RAM regions are either mapped by platform-firmware