Commit df2798bc authored by Dan Williams's avatar Dan Williams

dax/hmem: Move HMAT and Soft reservation probe initcall level

In preparation for moving more filtering of "hmem" ranges into the
dax_hmem.ko module, update the initcall levels. HMAT range registration
moves to subsys_initcall() to be done before Soft Reservation probing,
and Soft Reservation probing is moved to device_initcall() to be done
before dax_hmem.ko initialization if it is built-in.
Tested-by: default avatarFan Ni <fan.ni@samsung.com>
Reviewed-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/167602001107.1924368.11562316181038595611.stgit@dwillia2-xfh.jf.intel.comSigned-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 3d8f7cca
...@@ -869,4 +869,4 @@ static __init int hmat_init(void) ...@@ -869,4 +869,4 @@ static __init int hmat_init(void)
acpi_put_table(tbl); acpi_put_table(tbl);
return 0; return 0;
} }
device_initcall(hmat_init); subsys_initcall(hmat_init);
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_DEV_DAX_HMEM) += dax_hmem.o # device_hmem.o deliberately precedes dax_hmem.o for initcall ordering
obj-$(CONFIG_DEV_DAX_HMEM_DEVICES) += device_hmem.o obj-$(CONFIG_DEV_DAX_HMEM_DEVICES) += device_hmem.o
obj-$(CONFIG_DEV_DAX_HMEM) += dax_hmem.o
device_hmem-y := device.o device_hmem-y := device.o
dax_hmem-y := hmem.o dax_hmem-y := hmem.o
...@@ -104,4 +104,4 @@ static __init int hmem_init(void) ...@@ -104,4 +104,4 @@ static __init int hmem_init(void)
* As this is a fallback for address ranges unclaimed by the ACPI HMAT * As this is a fallback for address ranges unclaimed by the ACPI HMAT
* parsing it must be at an initcall level greater than hmat_init(). * parsing it must be at an initcall level greater than hmat_init().
*/ */
late_initcall(hmem_init); device_initcall(hmem_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment