14092 imc(7D) should not be under i86pc

Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>

15 files changed, 35 insertions, 34 deletions

diff --git a/usr/src/cmd/fm/mcdecode/Makefile b/usr/src/cmd/fm/mcdecode/Makefile
index 6cfbde5556..841725e4f7 100644
--- a/usr/src/cmd/fm/mcdecode/Makefile
+++ b/usr/src/cmd/fm/mcdecode/Makefile
@@ -26,7 +26,7 @@ ROOTLIBFMD = $(ROOT)/usr/lib/fm/fmd
 ROOTPROG = $(ROOTLIBFMD)/$(PROG)
 
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
-CPPFLAGS += -I$(SRC)/uts/i86pc/io/imc
+CPPFLAGS += -I$(SRC)/uts/intel/io/imc
 LDLIBS += -lnvpair
 
 CSTD = $(CSTD_GNU99)
diff --git a/usr/src/pkg/manifests/driver-cpu-mc.p5m b/usr/src/pkg/manifests/driver-cpu-mc.p5m
index d8e6016674..9e7f7f8e3b 100644
--- a/usr/src/pkg/manifests/driver-cpu-mc.p5m
+++ b/usr/src/pkg/manifests/driver-cpu-mc.p5m
@@ -19,15 +19,12 @@ set name=pkg.summary value="CPU Memory Controller Drivers"
 set name=pkg.description value="CPU Memory Controller Drivers"
 set name=info.classification value=org.opensolaris.category.2008:System/Hardware
 set name=variant.arch value=i386
-dir  path=platform group=sys
-dir  path=platform/i86pc group=sys
-dir  path=platform/i86pc/$(ARCH64) group=sys
-dir  path=platform/i86pc/kernel group=sys
-dir  path=platform/i86pc/kernel/drv group=sys
-dir  path=platform/i86pc/kernel/drv/$(ARCH64) group=sys
-file path=platform/i86pc/kernel/drv/$(ARCH64)/imc group=sys
-file path=platform/i86pc/kernel/drv/$(ARCH64)/imcstub group=sys
-file path=platform/i86pc/kernel/drv/imc.conf group=sys
+dir  path=kernel group=sys
+dir  path=kernel/drv group=sys
+dir  path=kernel/drv/$(ARCH64) group=sys
+file path=kernel/drv/$(ARCH64)/imc group=sys
+file path=kernel/drv/$(ARCH64)/imcstub group=sys
+file path=kernel/drv/imc.conf group=sys
 dir  path=usr/share/man
 dir  path=usr/share/man/man7d
 file path=usr/share/man/man7d/imc.7d
diff --git a/usr/src/test/os-tests/tests/imc/Makefile b/usr/src/test/os-tests/tests/imc/Makefile
index d62c8048f1..cbf3d81654 100644
--- a/usr/src/test/os-tests/tests/imc/Makefile
+++ b/usr/src/test/os-tests/tests/imc/Makefile
@@ -39,7 +39,7 @@ include $(SRC)/cmd/Makefile.cmd
 include $(SRC)/test/Makefile.com
 include $(SRC)/cmd/Makefile.ctf
 
-CPPFLAGS += -I$(SRC)/uts/i86pc/io/imc
+CPPFLAGS += -I$(SRC)/uts/intel/io/imc
 
 CMDS = $(PROG:%=$(TESTDIR)/%)
 $(CMDS) := FILEMODE = 0555
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files
index 9b83a780a5..3f387f508c 100644
--- a/usr/src/uts/i86pc/Makefile.files
+++ b/usr/src/uts/i86pc/Makefile.files
@@ -321,10 +321,3 @@ ASSYM_DEPS      +=		\
 CPR_IMPL_OBJS	= cpr_impl.o	cpr_wakecode.o
 
 $(KDI_ASSYM_DEPS:%=$(OBJS_DIR)/%):	$(DSF_DIR)/$(OBJS_DIR)/kdi_assym.h
-
-#
-# Intel Integrated Memory Controller
-# (Sandy Bridge - Cascade Lake)
-#
-IMC_OBJS =	imc.o imc_decode.o imc_dump.o
-IMCSTUB_OBJS =	imcstub.o
diff --git a/usr/src/uts/i86pc/Makefile.i86pc b/usr/src/uts/i86pc/Makefile.i86pc
index 2ce11ac8f6..e803d33801 100644
--- a/usr/src/uts/i86pc/Makefile.i86pc
+++ b/usr/src/uts/i86pc/Makefile.i86pc
@@ -245,7 +245,6 @@ DRV_KMODS	+= amd_iommu
 DRV_KMODS	+= dr
 DRV_KMODS	+= ioat
 DRV_KMODS	+= fipe
-DRV_KMODS	+= imc imcstub
 DRV_KMODS	+= vmm
 DRV_KMODS	+= viona
 DRV_KMODS	+= ppt
diff --git a/usr/src/uts/i86pc/Makefile.rules b/usr/src/uts/i86pc/Makefile.rules
index f07b4b866b..9610e075fa 100644
--- a/usr/src/uts/i86pc/Makefile.rules
+++ b/usr/src/uts/i86pc/Makefile.rules
@@ -121,14 +121,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/io/ioat/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/io/imc/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-$(OBJS_DIR)/%.o:		$(SRC)/common/mc/imc/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/i86pc/io/pci/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files
index 336c25d739..2e7455a93a 100644
--- a/usr/src/uts/intel/Makefile.files
+++ b/usr/src/uts/intel/Makefile.files
@@ -351,3 +351,10 @@ AMDZEN_STUB_OBJS = amdzen_stub.o
 SMNTEMP_OBJS = smntemp.o
 USMN_OBJS = usmn.o
 ZEN_UDF_OBJS = zen_udf.o
+
+#
+# Intel Integrated Memory Controller
+# (Sandy Bridge - Cascade Lake)
+#
+IMC_OBJS =	imc.o imc_decode.o imc_dump.o
+IMCSTUB_OBJS =	imcstub.o
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel
index 4d1d2664c3..3fafc22c66 100644
--- a/usr/src/uts/intel/Makefile.intel
+++ b/usr/src/uts/intel/Makefile.intel
@@ -738,3 +738,8 @@ DRV_KMODS	+= smntemp
 DRV_KMODS	+= amdzen
 DRV_KMODS	+= amdzen_stub
 DRV_KMODS	+= usmn zen_udf
+
+#
+#	Intel Integrated Memory Controller
+#
+DRV_KMODS	+= imc imcstub
diff --git a/usr/src/uts/intel/Makefile.rules b/usr/src/uts/intel/Makefile.rules
index 1c6786c283..84ecfad278 100644
--- a/usr/src/uts/intel/Makefile.rules
+++ b/usr/src/uts/intel/Makefile.rules
@@ -157,6 +157,14 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/intel/io/hotplug/pcicfg/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/intel/io/imc/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
+$(OBJS_DIR)/%.o:		$(SRC)/common/mc/imc/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 $(OBJS_DIR)/%.o:		$(UTSBASE)/intel/io/ipmi/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
diff --git a/usr/src/uts/i86pc/imc/Makefile b/usr/src/uts/intel/imc/Makefile
index 32f24db809..752b7b8544 100644
--- a/usr/src/uts/i86pc/imc/Makefile
+++ b/usr/src/uts/intel/imc/Makefile
@@ -17,10 +17,10 @@ UTSBASE = ../..
 
 MODULE		= imc
 OBJECTS		= $(IMC_OBJS:%=$(OBJS_DIR)/%)
-ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
-CONF_SRCDIR	= $(UTSBASE)/i86pc/io/imc
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/intel/io/imc
 
-include $(UTSBASE)/i86pc/Makefile.i86pc
+include $(UTSBASE)/intel/Makefile.intel
 
 ALL_TARGET	= $(BINARY) $(CONFMOD)
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
@@ -40,4 +40,4 @@ clobber:	$(CLOBBER_DEPS)
 
 install:	$(INSTALL_DEPS)
 
-include $(UTSBASE)/i86pc/Makefile.targ
+include $(UTSBASE)/intel/Makefile.targ
diff --git a/usr/src/uts/i86pc/imcstub/Makefile b/usr/src/uts/intel/imcstub/Makefile
index 6c0026ef51..f7e38ce1e7 100644
--- a/usr/src/uts/i86pc/imcstub/Makefile
+++ b/usr/src/uts/intel/imcstub/Makefile
@@ -17,9 +17,9 @@ UTSBASE = ../..
 
 MODULE		= imcstub
 OBJECTS		= $(IMCSTUB_OBJS:%=$(OBJS_DIR)/%)
-ROOTMODULE	= $(ROOT_PSM_DRV_DIR)/$(MODULE)
+ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
 
-include $(UTSBASE)/i86pc/Makefile.i86pc
+include $(UTSBASE)/intel/Makefile.intel
 
 ALL_TARGET	= $(BINARY)
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
@@ -38,4 +38,4 @@ clobber:	$(CLOBBER_DEPS)
 
 install:	$(INSTALL_DEPS)
 
-include $(UTSBASE)/i86pc/Makefile.targ
+include $(UTSBASE)/intel/Makefile.targ
diff --git a/usr/src/uts/i86pc/io/imc/imc.c b/usr/src/uts/intel/io/imc/imc.c
index e1dbfbfc2e..e1dbfbfc2e 100644
--- a/usr/src/uts/i86pc/io/imc/imc.c
+++ b/usr/src/uts/intel/io/imc/imc.c
diff --git a/usr/src/uts/i86pc/io/imc/imc.conf b/usr/src/uts/intel/io/imc/imc.conf
index 7f55dc2cae..7f55dc2cae 100644
--- a/usr/src/uts/i86pc/io/imc/imc.conf
+++ b/usr/src/uts/intel/io/imc/imc.conf
diff --git a/usr/src/uts/i86pc/io/imc/imc.h b/usr/src/uts/intel/io/imc/imc.h
index 5f3def4930..5f3def4930 100644
--- a/usr/src/uts/i86pc/io/imc/imc.h
+++ b/usr/src/uts/intel/io/imc/imc.h
diff --git a/usr/src/uts/i86pc/io/imc/imcstub.c b/usr/src/uts/intel/io/imc/imcstub.c
index ee020dd5c4..ee020dd5c4 100644
--- a/usr/src/uts/i86pc/io/imc/imcstub.c
+++ b/usr/src/uts/intel/io/imc/imcstub.c