target/linux/layerscape/patches-5.4/809-jailhouse-0005-ivshmem-net-Enable-INTx.patch

   1 From 3734c2c9ac0fd763deceb686efc93b293acca4c6 Mon Sep 17 00:00:00 2001
   2 From: Jan Kiszka <jan.kiszka@siemens.com>
   3 Date: Sun, 27 Nov 2016 15:15:51 +0100
   4 Subject: [PATCH] ivshmem-net: Enable INTx
   5
   6 Activate INTx notification when it has to be used instead of MSI-X,
   7 disable it after use.
   8
   9 Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
  10 (cherry picked from commit 8790717bdca6ea58f18baac1749ac347b23b7263)
  11 ---
  12  drivers/net/ivshmem-net.c | 7 ++++++-
  13  1 file changed, 6 insertions(+), 1 deletion(-)
  14
  15 --- a/drivers/net/ivshmem-net.c
  16 +++ b/drivers/net/ivshmem-net.c
  17 @@ -31,6 +31,8 @@
  18  #define JAILHOUSE_CFG_SHMEM_PTR        0x40
  19  #define JAILHOUSE_CFG_SHMEM_SZ 0x48
  20
  21 +#define IVSHMEM_INTX_ENABLE    0x1
  22 +
  23  #define IVSHM_NET_STATE_RESET  0
  24  #define IVSHM_NET_STATE_INIT   1
  25  #define IVSHM_NET_STATE_READY  2
  26 @@ -47,7 +49,7 @@
  27  #define IVSHM_NET_VQ_ALIGN 64
  28
  29  struct ivshmem_regs {
  30 -       u32 imask;
  31 +       u32 intxctrl;
  32         u32 istat;
  33         u32 ivpos;
  34         u32 doorbell;
  35 @@ -869,6 +871,8 @@ static int ivshm_net_probe(struct pci_de
  36                 goto err_int;
  37
  38         pci_set_master(pdev);
  39 +       if (!in->using_msix)
  40 +               writel(IVSHMEM_INTX_ENABLE, &in->ivshm_regs->intxctrl);
  41
  42         writel(IVSHM_NET_STATE_RESET, &in->ivshm_regs->lstate);
  43
  44 @@ -895,6 +899,7 @@ static void ivshm_net_remove(struct pci_
  45                 free_irq(in->msix.vector, ndev);
  46                 pci_disable_msix(pdev);
  47         } else {
  48 +               writel(0, &in->ivshm_regs->intxctrl);
  49                 free_irq(pdev->irq, ndev);
  50         }
  51