These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / mic / card / mic_x100.c

diff --git a/kernel/drivers/misc/mic/card/mic_x100.c b/kernel/drivers/misc/mic/card/mic_x100.c
index e98e537..b2958ce 100644 (file)
--- a/kernel/drivers/misc/mic/card/mic_x100.c
+++ b/kernel/drivers/misc/mic/card/mic_x100.c
@@ -70,6 +70,41 @@ void mic_send_intr(struct mic_device *mdev, int doorbell)
                       (MIC_X100_SBOX_SDBIC0 + (4 * doorbell)));
 }
 
+/*
+ * mic_x100_send_sbox_intr - Send an MIC_X100_SBOX interrupt to MIC.
+ */
+static void mic_x100_send_sbox_intr(struct mic_mw *mw, int doorbell)
+{
+       u64 apic_icr_offset = MIC_X100_SBOX_APICICR0 + doorbell * 8;
+       u32 apicicr_low = mic_mmio_read(mw, MIC_X100_SBOX_BASE_ADDRESS +
+                                       apic_icr_offset);
+
+       /* for MIC we need to make sure we "hit" the send_icr bit (13) */
+       apicicr_low = (apicicr_low | (1 << 13));
+       /*
+        * Ensure that the interrupt is ordered w.r.t. previous stores
+        * to main memory. Fence instructions are not implemented in X100
+        * since execution is in order but a compiler barrier is still
+        * required.
+        */
+       wmb();
+       mic_mmio_write(mw, apicicr_low,
+                      MIC_X100_SBOX_BASE_ADDRESS + apic_icr_offset);
+}
+
+static void mic_x100_send_rdmasr_intr(struct mic_mw *mw, int doorbell)
+{
+       int rdmasr_offset = MIC_X100_SBOX_RDMASR0 + (doorbell << 2);
+       /*
+        * Ensure that the interrupt is ordered w.r.t. previous stores
+        * to main memory. Fence instructions are not implemented in X100
+        * since execution is in order but a compiler barrier is still
+        * required.
+        */
+       wmb();
+       mic_mmio_write(mw, 0, MIC_X100_SBOX_BASE_ADDRESS + rdmasr_offset);
+}
+
 /**
  * mic_ack_interrupt - Device specific interrupt handling.
  * @mdev: pointer to mic_device instance
@@ -91,6 +126,18 @@ static inline int mic_get_rdmasr_irq(int index)
        return  MIC_X100_RDMASR_IRQ_BASE + index;
 }
 
+void mic_send_p2p_intr(int db, struct mic_mw *mw)
+{
+       int rdmasr_index;
+
+       if (db < MIC_X100_NUM_SBOX_IRQ) {
+               mic_x100_send_sbox_intr(mw, db);
+       } else {
+               rdmasr_index = db - MIC_X100_NUM_SBOX_IRQ;
+               mic_x100_send_rdmasr_intr(mw, rdmasr_index);
+       }
+}
+
 /**
  * mic_hw_intr_init - Initialize h/w specific interrupt
  * information.
@@ -113,11 +160,15 @@ void mic_hw_intr_init(struct mic_driver *mdrv)
 int mic_db_to_irq(struct mic_driver *mdrv, int db)
 {
        int rdmasr_index;
+
+       /*
+        * The total number of doorbell interrupts on the card are 16. Indices
+        * 0-8 falls in the SBOX category and 8-15 fall in the RDMASR category.
+        */
        if (db < MIC_X100_NUM_SBOX_IRQ) {
                return mic_get_sbox_irq(db);
        } else {
-               rdmasr_index = db - MIC_X100_NUM_SBOX_IRQ +
-                       MIC_X100_RDMASR_IRQ_BASE;
+               rdmasr_index = db - MIC_X100_NUM_SBOX_IRQ;
                return mic_get_rdmasr_irq(rdmasr_index);
        }
 }
@@ -210,7 +261,7 @@ static int __init mic_probe(struct platform_device *pdev)
        mic_hw_intr_init(mdrv);
        platform_set_drvdata(pdev, mdrv);
        mdrv->dma_mbdev = mbus_register_device(mdrv->dev, MBUS_DEV_DMA_MIC,
-                                              NULL, &mbus_hw_ops,
+                                              NULL, &mbus_hw_ops, 0,
                                               mdrv->mdev.mmio.va);
        if (IS_ERR(mdrv->dma_mbdev)) {
                rc = PTR_ERR(mdrv->dma_mbdev);
@@ -243,10 +294,16 @@ static void mic_platform_shutdown(struct platform_device *pdev)
        mic_remove(pdev);
 }
 
+static u64 mic_dma_mask = DMA_BIT_MASK(64);
+
 static struct platform_device mic_platform_dev = {
        .name = mic_driver_name,
        .id   = 0,
        .num_resources = 0,
+       .dev = {
+               .dma_mask = &mic_dma_mask,
+               .coherent_dma_mask = DMA_BIT_MASK(64),
+       },
 };
 
 static struct platform_driver __refdata mic_platform_driver = {