@@ -3558,7 +3558,8 @@ __construct_new_region(struct cxl_root_decoder *cxlrd,
* cxl_region driver.
*/
struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd,
- struct cxl_endpoint_decoder *cxled)
+ struct cxl_endpoint_decoder *cxled,
+ bool avoid_dax)
{
struct cxl_region *cxlr;
@@ -3574,6 +3575,10 @@ struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd,
drop_region(cxlr);
return ERR_PTR(-ENODEV);
}
+
+ if (avoid_dax)
+ set_bit(CXL_REGION_F_AVOID_DAX, &cxlr->flags);
+
return cxlr;
}
EXPORT_SYMBOL_NS_GPL(cxl_create_region, CXL);
@@ -3713,6 +3718,9 @@ static int cxl_region_probe(struct device *dev)
case CXL_DECODER_PMEM:
return devm_cxl_add_pmem_region(cxlr);
case CXL_DECODER_RAM:
+ if (test_bit(CXL_REGION_F_AVOID_DAX, &cxlr->flags))
+ return 0;
+
/*
* The region can not be manged by CXL if any portion of
* it is already online as 'System RAM'
@@ -512,6 +512,9 @@ struct cxl_region_params {
*/
#define CXL_REGION_F_NEEDS_RESET 1
+/* Allow Type2 drivers to specify if a dax region should not be created. */
+#define CXL_REGION_F_AVOID_DAX 2
+
/**
* struct cxl_region - CXL region
* @dev: This region's device
@@ -875,5 +875,6 @@ struct seq_file;
struct dentry *cxl_debugfs_create_dir(const char *dir);
void cxl_dpa_debug(struct seq_file *file, struct cxl_dev_state *cxlds);
struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd,
- struct cxl_endpoint_decoder *cxled);
+ struct cxl_endpoint_decoder *cxled,
+ bool avoid_dax);
#endif /* __CXL_MEM_H__ */
@@ -73,7 +73,8 @@ struct cxl_endpoint_decoder *cxl_request_dpa(struct cxl_memdev *cxlmd,
resource_size_t max);
int cxl_dpa_free(struct cxl_endpoint_decoder *cxled);
struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd,
- struct cxl_endpoint_decoder *cxled);
+ struct cxl_endpoint_decoder *cxled,
+ bool avoid_dax);
int cxl_accel_region_detach(struct cxl_endpoint_decoder *cxled);
#endif