diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:43:54 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:43:54 -0400 |
| commit | 378566b9488564f69aca363a15d1a6f7bc8f6ccd (patch) | |
| tree | 51fde5f6c1d03b113004d863b8fcffc26fc17ad7 | |
| parent | c0bf5ad0c444dedb42d08c0e1e334f35b657c96f (diff) | |
| download | longterm-queue-4.12-378566b9488564f69aca363a15d1a6f7bc8f6ccd.tar.gz | |
octeon: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/liquidio-fix-kernel-panic-in-VF-driver.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch index 0b19dc1..a69858a 100644 --- a/queue/liquidio-fix-kernel-panic-in-VF-driver.patch +++ b/queue/liquidio-fix-kernel-panic-in-VF-driver.patch @@ -1,4 +1,4 @@ -From aa28667cfbe4ff6f14454dda210b1f2e485f99b5 Mon Sep 17 00:00:00 2001 +From 878615679c5597c8c5fb1afb540ff5e552575711 Mon Sep 17 00:00:00 2001 From: Felix Manlunas <felix.manlunas@cavium.com> Date: Thu, 26 Oct 2017 16:46:36 -0700 Subject: [PATCH] liquidio: fix kernel panic in VF driver @@ -53,22 +53,23 @@ late. Fix it by moving that step to the beginning. Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com> Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@cavium.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c -index 00c19306ecee..fd70a4844e2d 100644 +index 34c77821fad9..d071d1cc77dd 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c -@@ -1288,6 +1288,9 @@ static int liquidio_stop(struct net_device *netdev) +@@ -1766,6 +1766,9 @@ static int liquidio_open(struct net_device *netdev) struct octeon_device *oct = lio->oct_dev; struct napi_struct *napi, *n; + /* tell Octeon to stop forwarding packets to host */ + send_rx_ctrl_cmd(lio, 0); + - if (oct->props[lio->ifidx].napi_enabled) { + if (!oct->props[lio->ifidx].napi_enabled) { list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) - napi_disable(napi); -@@ -1305,9 +1308,6 @@ static int liquidio_stop(struct net_device *netdev) + napi_enable(napi); +@@ -1808,9 +1811,6 @@ static int liquidio_stop(struct net_device *netdev) netif_carrier_off(netdev); lio->link_changes++; |