Skip to contentSkip to conversation

liquidio VF: fix incorrect struct being used

PATCH Applied Felix Manlunas 2 participants 2 messages Jan 4, 2017 – Jan 6, 2017

Subsystems (3)
Networking Network drivers Cavium liquidio network driver
lore
Share & tools
lore

Felix Manlunas

author
#0 lore raw

PATCH 1/1 liquidio VF: fix incorrect struct being used

From: Prasad Kanneganti <[email protected]>

The VF driver is using the wrong struct when sending commands to the NIC firmware, sometimes causing adverse effects in the firmware. The right struct is the one that the PF is using, so make the VF use that as well.

Signed-off-by Prasad Kanneganti <[email protected]>
Signed-off-by Felix Manlunas <[email protected]>
Signed-off-by Derek Chickles <[email protected]>
Signed-off-by Satanand Burla <[email protected]>
---
 drivers/net/ethernet/cavium/liquidio/octeon_nic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cavium/liquidio/octeon_nic.c +2 -2
index c3d6a82..0243be8 100644
@@ -49,7 +49,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,
 	/* Add in the response related fields. Opcode and Param are already
 	 * there.
 	 */
-	if (OCTEON_CN23XX_PF(oct)) {
+	if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct)) {
 		ih3      = (struct octeon_instr_ih3 *)&sc->cmd.cmd3.ih3;
 		rdp     = (struct octeon_instr_rdp *)&sc->cmd.cmd3.rdp;
 		irh     = (struct octeon_instr_irh *)&sc->cmd.cmd3.irh;

@@ -70,7 +70,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,
 
 	*sc->status_word = COMPLETION_WORD_INIT;
 
-	if (OCTEON_CN23XX_PF(oct))
+	if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct))
 		sc->cmd.cmd3.rptr =  sc->dmarptr;
 	else
 		sc->cmd.cmd2.rptr =  sc->dmarptr;
maintainer Applied
#1 lore raw

From: Felix Manlunas <[email protected]>
Date: Wed, 4 Jan 2017 11:31:55 -0800

Quoted 10 lines

From: Prasad Kanneganti <[email protected]>

The VF driver is using the wrong struct when sending commands to the NIC firmware, sometimes causing adverse effects in the firmware. The right struct is the one that the PF is using, so make the VF use that as well.

Signed-off-by Prasad Kanneganti <[email protected]>
Signed-off-by Felix Manlunas <[email protected]>
Signed-off-by Derek Chickles <[email protected]>
Signed-off-by Satanand Burla <[email protected]>

Applied.