12 files changed, 28 insertions, 1 deletions

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index a09e9ab0bbdf..bf8d065dd977 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -351,6 +351,14 @@ struct apic {
         /* apic ops */
         u32 (*read)(u32 reg);
         void (*write)(u32 reg, u32 v);
+        /*
+         * ->eoi_write() has the same signature as ->write().
+         *
+         * Drivers can support both ->eoi_write() and ->write() by passing the same
+         * callback value. Kernel can override ->eoi_write() and fall back
+         * on write for EOI.
+         */
+        void (*eoi_write)(u32 reg, u32 v);
         u64 (*icr_read)(void);
         void (*icr_write)(u32 low, u32 high);
         void (*wait_icr_idle)(void);
@@ -426,6 +434,11 @@ static inline void apic_write(u32 reg, u32 val)
         apic->write(reg, val);
 }
 
+static inline void apic_eoi(void)
+{
+        apic->eoi_write(APIC_EOI, APIC_EOI_ACK);
+}
+
 static inline u64 apic_icr_read(void)
 {
         return apic->icr_read();
@@ -450,6 +463,7 @@ static inline u32 safe_apic_wait_icr_idle(void)
 
 static inline u32 apic_read(u32 reg) { return 0; }
 static inline void apic_write(u32 reg, u32 val) { }
+static inline void apic_eoi(void) { }
 static inline u64 apic_icr_read(void) { return 0; }
 static inline void apic_icr_write(u32 low, u32 high) { }
 static inline void apic_wait_icr_idle(void) { }
@@ -463,7 +477,7 @@ static inline void ack_APIC_irq(void)
          * ack_APIC_irq() actually gets compiled as a single instruction
          * ... yummie.
          */
-        apic_write(APIC_EOI, APIC_EOI_ACK);
+        apic_eoi();
 }
 
 static inline unsigned default_get_apic_id(unsigned long x)
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 359b6899a36c..0e881c46e8c8 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -227,6 +227,7 @@ static struct apic apic_flat =  {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
@@ -386,6 +387,7 @@ static struct apic apic_physflat =  {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 634ae6cdd5c9..a6e4c6e06c08 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -181,6 +181,7 @@ struct apic apic_noop = {
 
         .read                           = noop_apic_read,
         .write                          = noop_apic_write,
+        .eoi_write                      = noop_apic_write,
         .icr_read                       = noop_apic_icr_read,
         .icr_write                      = noop_apic_icr_write,
         .wait_icr_idle                  = noop_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 23e75422e013..6ec6d5d297c3 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -295,6 +295,7 @@ static struct apic apic_numachip __refconst = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 0cdec7065aff..31fbdbfbf960 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -248,6 +248,7 @@ static struct apic apic_bigsmp = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index e42d1d3b9134..db4ab1be3c79 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -678,6 +678,7 @@ static struct apic __refdata apic_es7000_cluster = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
@@ -742,6 +743,7 @@ static struct apic __refdata apic_es7000 = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 00d2422ca7c9..f00a68cca37a 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -530,6 +530,7 @@ static struct apic __refdata apic_numaq = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index ff2c1b9aac4d..1b291da09e60 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -142,6 +142,7 @@ static struct apic apic_default = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index fea000b27f07..659897c00755 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -546,6 +546,7 @@ static struct apic apic_summit = {
 
         .read                           = native_apic_mem_read,
         .write                          = native_apic_mem_write,
+        .eoi_write                      = native_apic_mem_write,
         .icr_read                       = native_apic_icr_read,
         .icr_write                      = native_apic_icr_write,
         .wait_icr_idle                  = native_apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 48f3103b3c93..a5baa785a251 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -260,6 +260,7 @@ static struct apic apic_x2apic_cluster = {
 
         .read                           = native_apic_msr_read,
         .write                          = native_apic_msr_write,
+        .eoi_write                      = native_apic_msr_write,
         .icr_read                       = native_x2apic_icr_read,
         .icr_write                      = native_x2apic_icr_write,
         .wait_icr_idle                  = native_x2apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 991e315f4227..834035666b8d 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -172,6 +172,7 @@ static struct apic apic_x2apic_phys = {
 
         .read                           = native_apic_msr_read,
         .write                          = native_apic_msr_write,
+        .eoi_write                      = native_apic_msr_write,
         .icr_read                       = native_x2apic_icr_read,
         .icr_write                      = native_x2apic_icr_write,
         .wait_icr_idle                  = native_x2apic_wait_icr_idle,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 87bfa69e216e..5b0e3d0a3d2d 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -404,6 +404,7 @@ static struct apic __refdata apic_x2apic_uv_x = {
 
         .read                           = native_apic_msr_read,
         .write                          = native_apic_msr_write,
+        .eoi_write                      = native_apic_msr_write,
         .icr_read                       = native_x2apic_icr_read,
         .icr_write                      = native_x2apic_icr_write,
         .wait_icr_idle                  = native_x2apic_wait_icr_idle,