diff --git a/arch/arc/soc/quark_se_c1000_ss/soc.h b/arch/arc/soc/quark_se_c1000_ss/soc.h
index 890f9c05bf5..463ab56a0e8 100644
--- a/arch/arc/soc/quark_se_c1000_ss/soc.h
+++ b/arch/arc/soc/quark_se_c1000_ss/soc.h
@@ -48,6 +48,15 @@
 
 /* IRQs */
 
+/* The CPU-visible IRQ numbers change between the ARC and IA cores,
+ * and QMSI itself has no easy way to pick the correct one, though it
+ * does have the necessary information to do it ourselves (in the meantime).
+ * This macro will be used by the shim drivers to get the IRQ number to
+ * use, and it should always be called using the QM_IRQ_*_INT macro
+ * provided by QMSI.
+ */
+#define IRQ_GET_NUMBER(_irq) _irq##_VECTOR
+
 #define IRQ_TIMER0 16
 #define IRQ_TIMER1 17
 #define IRQ_I2C0_RX_AVAIL 18
diff --git a/arch/x86/soc/intel_quark/quark_d2000/soc.h b/arch/x86/soc/intel_quark/quark_d2000/soc.h
index 584d412c1a7..120ec45b975 100644
--- a/arch/x86/soc/intel_quark/quark_d2000/soc.h
+++ b/arch/x86/soc/intel_quark/quark_d2000/soc.h
@@ -39,6 +39,15 @@
 
 #define INT_UNMASK_IA			(~0x00000001)
 
+/* The CPU-visible IRQ numbers change between the ARC and IA cores,
+ * and QMSI itself has no easy way to pick the correct one, though it
+ * does have the necessary information to do it ourselves (in the meantime).
+ * This macro will be used by the shim drivers to get the IRQ number to
+ * use, and it should always be called using the QM_IRQ_*_INT macro
+ * provided by QMSI.
+ */
+#define IRQ_GET_NUMBER(_irq) _irq
+
 /*
  * PINMUX configuration settings
  */
diff --git a/arch/x86/soc/intel_quark/quark_se/soc.h b/arch/x86/soc/intel_quark/quark_se/soc.h
index 91ec91f9923..0152adaf85a 100644
--- a/arch/x86/soc/intel_quark/quark_se/soc.h
+++ b/arch/x86/soc/intel_quark/quark_se/soc.h
@@ -56,6 +56,15 @@
 #define ARC_RUN				(ARC_HALT_INT_REDIR | ARC_RUN_REQ_A)
 #define ARC_HALT			(ARC_HALT_INT_REDIR | ARC_HALT_REQ_A)
 
+/* The CPU-visible IRQ numbers change between the ARC and IA cores,
+ * and QMSI itself has no easy way to pick the correct one, though it
+ * does have the necessary information to do it ourselves (in the meantime).
+ * This macro will be used by the shim drivers to get the IRQ number to
+ * use, and it should always be called using the QM_IRQ_*_INT macro
+ * provided by QMSI.
+ */
+#define IRQ_GET_NUMBER(_irq) _irq
+
 /*
  * PINMUX configuration settings
  */