summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cavium/liquidio/response_manager.c
diff options
context:
space:
mode:
authorRaghu Vatsavayi2016-06-15 01:54:51 +0200
committerDavid S. Miller2016-06-16 06:44:32 +0200
commit6a885b60dad25bb687fe779fafe90a24886022f8 (patch)
tree41b098da826ba5f929e956e4f0d4f01133aff036 /drivers/net/ethernet/cavium/liquidio/response_manager.c
parentliquidio: Replace ifidx for FW commands (diff)
downloadkernel-qcow2-linux-6a885b60dad25bb687fe779fafe90a24886022f8.tar.gz
kernel-qcow2-linux-6a885b60dad25bb687fe779fafe90a24886022f8.tar.xz
kernel-qcow2-linux-6a885b60dad25bb687fe779fafe90a24886022f8.zip
liquidio: Introduce new octeon2/3 header
Added support for new instruction header for octeon2/octeon3(ih) and corresponding changes. Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com> Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com> Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com> Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/response_manager.c')
-rw-r--r--drivers/net/ethernet/cavium/liquidio/response_manager.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.c b/drivers/net/ethernet/cavium/liquidio/response_manager.c
index 6287a7c72b9e..e2e9103e6ebd 100644
--- a/drivers/net/ethernet/cavium/liquidio/response_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/response_manager.c
@@ -85,6 +85,7 @@ int lio_process_ordered_list(struct octeon_device *octeon_dev,
u32 status;
u64 status64;
struct octeon_instr_rdp *rdp;
+ u64 rptr;
ordered_sc_list = &octeon_dev->response_list[OCTEON_ORDERED_SC_LIST];
@@ -102,7 +103,8 @@ int lio_process_ordered_list(struct octeon_device *octeon_dev,
sc = (struct octeon_soft_command *)ordered_sc_list->
head.next;
- rdp = (struct octeon_instr_rdp *)&sc->cmd.rdp;
+ rdp = (struct octeon_instr_rdp *)&sc->cmd.cmd2.rdp;
+ rptr = sc->cmd.cmd2.rptr;
status = OCTEON_REQUEST_PENDING;
@@ -110,7 +112,7 @@ int lio_process_ordered_list(struct octeon_device *octeon_dev,
* to where rptr is pointing to
*/
dma_sync_single_for_cpu(&octeon_dev->pci_dev->dev,
- sc->cmd.rptr, rdp->rlen,
+ rptr, rdp->rlen,
DMA_FROM_DEVICE);
status64 = *sc->status_word;