aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c53
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h39
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h39
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn66xx_device.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn66xx_device.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn68xx_device.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn68xx_device.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/lio_core.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/lio_ethtool.c42
-rw-r--r--drivers/net/ethernet/cavium/liquidio/lio_main.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/liquidio_common.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/liquidio_image.h36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_config.h37
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_console.c43
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_device.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_device.h45
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_droq.c36
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_droq.h17
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_iq.h21
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_main.h19
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_network.h5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_nic.c5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/octeon_nic.h5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/request_manager.c5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/response_manager.c5
-rw-r--r--drivers/net/ethernet/cavium/liquidio/response_manager.h5
30 files changed, 352 insertions, 480 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
index d01b00b40967..962dcbcef8b5 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c
@@ -1,27 +1,21 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23#include <linux/pci.h> 18#include <linux/pci.h>
24#include <linux/netdevice.h>
25#include <linux/vmalloc.h> 19#include <linux/vmalloc.h>
26#include <linux/etherdevice.h> 20#include <linux/etherdevice.h>
27#include "liquidio_common.h" 21#include "liquidio_common.h"
@@ -421,10 +415,10 @@ static int cn23xx_pf_setup_global_input_regs(struct octeon_device *oct)
421 return -1; 415 return -1;
422 416
423 /** Set the MAC_NUM and PVF_NUM in IQ_PKT_CONTROL reg 417 /** Set the MAC_NUM and PVF_NUM in IQ_PKT_CONTROL reg
424 * for all queues.Only PF can set these bits. 418 * for all queues.Only PF can set these bits.
425 * bits 29:30 indicate the MAC num. 419 * bits 29:30 indicate the MAC num.
426 * bits 32:47 indicate the PVF num. 420 * bits 32:47 indicate the PVF num.
427 */ 421 */
428 for (q_no = 0; q_no < ern; q_no++) { 422 for (q_no = 0; q_no < ern; q_no++) {
429 reg_val = oct->pcie_port << CN23XX_PKT_INPUT_CTL_MAC_NUM_POS; 423 reg_val = oct->pcie_port << CN23XX_PKT_INPUT_CTL_MAC_NUM_POS;
430 424
@@ -547,8 +541,8 @@ static void cn23xx_pf_setup_global_output_regs(struct octeon_device *oct)
547 writeq(0x40, (u8 *)oct->mmio[0].hw_addr + CN23XX_SLI_OQ_WMARK); 541 writeq(0x40, (u8 *)oct->mmio[0].hw_addr + CN23XX_SLI_OQ_WMARK);
548 542
549 /** Disabling setting OQs in reset when ring has no dorebells 543 /** Disabling setting OQs in reset when ring has no dorebells
550 * enabling this will cause of head of line blocking 544 * enabling this will cause of head of line blocking
551 */ 545 */
552 /* Do it only for pass1.1. and pass1.2 */ 546 /* Do it only for pass1.1. and pass1.2 */
553 if ((oct->rev_id == OCTEON_CN23XX_REV_1_0) || 547 if ((oct->rev_id == OCTEON_CN23XX_REV_1_0) ||
554 (oct->rev_id == OCTEON_CN23XX_REV_1_1)) 548 (oct->rev_id == OCTEON_CN23XX_REV_1_1))
@@ -1391,8 +1385,7 @@ void cn23xx_dump_iq_regs(struct octeon_device *oct)
1391 dev_dbg(&oct->pci_dev->dev, "SLI_PKT[%d]_INPUT_CTL [0x%x]: 0x%016llx\n", 1385 dev_dbg(&oct->pci_dev->dev, "SLI_PKT[%d]_INPUT_CTL [0x%x]: 0x%016llx\n",
1392 q_no, CN23XX_SLI_IQ_PKT_CONTROL64(q_no), 1386 q_no, CN23XX_SLI_IQ_PKT_CONTROL64(q_no),
1393 CVM_CAST64(octeon_read_csr64 1387 CVM_CAST64(octeon_read_csr64
1394 (oct, 1388 (oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no))));
1395 CN23XX_SLI_IQ_PKT_CONTROL64(q_no))));
1396 } 1389 }
1397 1390
1398 pci_read_config_dword(oct->pci_dev, CN23XX_CONFIG_PCIE_DEVCTL, &regval); 1391 pci_read_config_dword(oct->pci_dev, CN23XX_CONFIG_PCIE_DEVCTL, &regval);
diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
index cee346a2e57d..2fedd91f3df8 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h
@@ -1,28 +1,23 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn23xx_device.h 18/*! \file cn23xx_device.h
24 * \brief Host Driver: Routines that perform CN23XX specific operations. 19 * \brief Host Driver: Routines that perform CN23XX specific operations.
25*/ 20 */
26 21
27#ifndef __CN23XX_PF_DEVICE_H__ 22#ifndef __CN23XX_PF_DEVICE_H__
28#define __CN23XX_PF_DEVICE_H__ 23#define __CN23XX_PF_DEVICE_H__
diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
index 03d79d95ab75..680a4050b8fb 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h
@@ -1,29 +1,24 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn23xx_regs.h 18/*! \file cn23xx_regs.h
24 * \brief Host Driver: Register Address and Register Mask values for 19 * \brief Host Driver: Register Address and Register Mask values for
25 * Octeon CN23XX devices. 20 * Octeon CN23XX devices.
26*/ 21 */
27 22
28#ifndef __CN23XX_PF_REGS_H__ 23#ifndef __CN23XX_PF_REGS_H__
29#define __CN23XX_PF_REGS_H__ 24#define __CN23XX_PF_REGS_H__
diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c
index 1ebc22550e07..bdec051107a6 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/netdevice.h> 19#include <linux/netdevice.h>
24#include "liquidio_common.h" 20#include "liquidio_common.h"
diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h
index 32fbbb2fc593..8ed57134ee0c 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn66xx_device.h 18/*! \file cn66xx_device.h
24 * \brief Host Driver: Routines that perform CN66XX specific operations. 19 * \brief Host Driver: Routines that perform CN66XX specific operations.
25 */ 20 */
diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h b/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
index 5e3aff242ad3..23152c0fb877 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn66xx_regs.h 18/*! \file cn66xx_regs.h
24 * \brief Host Driver: Register Address and Register Mask values for 19 * \brief Host Driver: Register Address and Register Mask values for
25 * Octeon CN66XX devices. 20 * Octeon CN66XX devices.
diff --git a/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c b/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c
index dbf3566ead53..1e40f1ad8719 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/netdevice.h> 19#include <linux/netdevice.h>
24#include "liquidio_common.h" 20#include "liquidio_common.h"
diff --git a/drivers/net/ethernet/cavium/liquidio/cn68xx_device.h b/drivers/net/ethernet/cavium/liquidio/cn68xx_device.h
index ea7bdcce6044..66b8d6bf5ec4 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn68xx_device.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn68xx_device.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn68xx_device.h 18/*! \file cn68xx_device.h
24 * \brief Host Driver: Routines that perform CN68XX specific operations. 19 * \brief Host Driver: Routines that perform CN68XX specific operations.
25 */ 20 */
diff --git a/drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h b/drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h
index d45a0f4aaf1f..0b742f09e49d 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file cn68xx_regs.h 18/*! \file cn68xx_regs.h
24 * \brief Host Driver: Register Address and Register Mask values for 19 * \brief Host Driver: Register Address and Register Mask values for
25 * Octeon CN68XX devices. The register map for CN66XX is the same 20 * Octeon CN68XX devices. The register map for CN66XX is the same
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
index 4997ec24ff36..403bcaafa774 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/if_vlan.h> 19#include <linux/if_vlan.h>
24#include "liquidio_common.h" 20#include "liquidio_common.h"
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 16745229087c..c7c39a0f1fe3 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/netdevice.h> 18#include <linux/netdevice.h>
23#include <linux/net_tstamp.h> 19#include <linux/net_tstamp.h>
24#include <linux/pci.h> 20#include <linux/pci.h>
@@ -87,9 +83,9 @@ static const char oct_stats_strings[][ETH_GSTRING_LEN] = {
87 "tx_bytes", 83 "tx_bytes",
88 "rx_errors", /*jabber_err+l2_err+frame_err */ 84 "rx_errors", /*jabber_err+l2_err+frame_err */
89 "tx_errors", /*fw_err_pko+fw_err_link+fw_err_drop */ 85 "tx_errors", /*fw_err_pko+fw_err_link+fw_err_drop */
90 "rx_dropped", /*st->fromwire.total_rcvd - st->fromwire.fw_total_rcvd 86 "rx_dropped", /*st->fromwire.total_rcvd - st->fromwire.fw_total_rcvd +
91 *+st->fromwire.dmac_drop + st->fromwire.fw_err_drop 87 *st->fromwire.dmac_drop + st->fromwire.fw_err_drop
92 */ 88 */
93 "tx_dropped", 89 "tx_dropped",
94 90
95 "tx_total_sent", 91 "tx_total_sent",
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index e20632360a06..0d4c58461b59 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/firmware.h> 19#include <linux/firmware.h>
24#include <net/vxlan.h> 20#include <net/vxlan.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
index 1d2eba757071..82a4eed2afcf 100644
--- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
+++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file liquidio_common.h 18/*! \file liquidio_common.h
24 * \brief Common: Structures and macros used in PCI-NIC package by core and 19 * \brief Common: Structures and macros used in PCI-NIC package by core and
25 * host driver. 20 * host driver.
diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_image.h b/drivers/net/ethernet/cavium/liquidio/liquidio_image.h
index 93819bd8602b..78a3685f6fe0 100644
--- a/drivers/net/ethernet/cavium/liquidio/liquidio_image.h
+++ b/drivers/net/ethernet/cavium/liquidio/liquidio_image.h
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#ifndef _LIQUIDIO_IMAGE_H_ 18#ifndef _LIQUIDIO_IMAGE_H_
23#define _LIQUIDIO_IMAGE_H_ 19#define _LIQUIDIO_IMAGE_H_
24 20
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_config.h b/drivers/net/ethernet/cavium/liquidio/octeon_config.h
index 71daf82914c4..1cb3514fc949 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_config.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_config.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file octeon_config.h 18/*! \file octeon_config.h
24 * \brief Host Driver: Configuration data structures for the host driver. 19 * \brief Host Driver: Configuration data structures for the host driver.
25 */ 20 */
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
index 01a50f3b0c8e..c0089ed366c9 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/** 18/**
24 * @file octeon_console.c 19 * @file octeon_console.c
25 */ 20 */
@@ -76,9 +71,9 @@ MODULE_PARM_DESC(console_bitmask,
76#define OCTEON_CONSOLE_POLL_INTERVAL_MS 100 /* 10 times per second */ 71#define OCTEON_CONSOLE_POLL_INTERVAL_MS 100 /* 10 times per second */
77 72
78/* First three members of cvmx_bootmem_desc are left in original 73/* First three members of cvmx_bootmem_desc are left in original
79** positions for backwards compatibility. 74 * positions for backwards compatibility.
80** Assumes big endian target 75 * Assumes big endian target
81*/ 76 */
82struct cvmx_bootmem_desc { 77struct cvmx_bootmem_desc {
83 /** spinlock to control access to list */ 78 /** spinlock to control access to list */
84 u32 lock; 79 u32 lock;
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index 278c880e1b4d..4a30d7c13f9c 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/netdevice.h> 19#include <linux/netdevice.h>
24#include <linux/vmalloc.h> 20#include <linux/vmalloc.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h
index 6c18baa8c306..c59b77e0dbef 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.h
@@ -1,25 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22
23/*! \file octeon_device.h 18/*! \file octeon_device.h
24 * \brief Host Driver: This file defines the octeon device structure. 19 * \brief Host Driver: This file defines the octeon device structure.
25 */ 20 */
@@ -93,9 +88,9 @@ enum octeon_pci_swap_mode {
93#define OCT_DEV_STATES OCT_DEV_STATE_INVALID 88#define OCT_DEV_STATES OCT_DEV_STATE_INVALID
94 89
95/** Octeon Device interrupts 90/** Octeon Device interrupts
96 * These interrupt bits are set in int_status filed of 91 * These interrupt bits are set in int_status filed of
97 * octeon_device structure 92 * octeon_device structure
98 */ 93 */
99#define OCT_DEV_INTR_DMA0_FORCE 0x01 94#define OCT_DEV_INTR_DMA0_FORCE 0x01
100#define OCT_DEV_INTR_DMA1_FORCE 0x02 95#define OCT_DEV_INTR_DMA1_FORCE 0x02
101#define OCT_DEV_INTR_PKT_DATA 0x04 96#define OCT_DEV_INTR_PKT_DATA 0x04
@@ -548,7 +543,7 @@ struct oct_intrmod_cmd {
548void octeon_init_device_list(int conf_type); 543void octeon_init_device_list(int conf_type);
549 544
550/** Free memory for Input and Output queue structures for a octeon device */ 545/** Free memory for Input and Output queue structures for a octeon device */
551void octeon_free_device_mem(struct octeon_device *); 546void octeon_free_device_mem(struct octeon_device *oct);
552 547
553/* Look up a free entry in the octeon_device table and allocate resources 548/* Look up a free entry in the octeon_device table and allocate resources
554 * for the octeon_device structure for an octeon device. Called at init 549 * for the octeon_device structure for an octeon device. Called at init
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
index 8f6fc959b646..d7ba00092988 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
@@ -1,24 +1,20 @@
1/********************************************************************** 1/**********************************************************************
2* Author: Cavium, Inc. 2 * Author: Cavium, Inc.
3* 3 *
4* Contact: support@cavium.com 4 * Contact: support@cavium.com
5* Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6* 6 *
7* Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8* 8 *
9* This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10* it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
11* published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12* 12 *
13* This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16* NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17* details. 17 ***********************************************************************/
18*
19* This file may also be available under a different license from Cavium.
20* Contact Cavium, Inc. for more information
21**********************************************************************/
22#include <linux/pci.h> 18#include <linux/pci.h>
23#include <linux/netdevice.h> 19#include <linux/netdevice.h>
24#include <linux/vmalloc.h> 20#include <linux/vmalloc.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.h b/drivers/net/ethernet/cavium/liquidio/octeon_droq.h
index d591f5faf765..e62074090681 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@
13 * This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17 * details. 17 ***********************************************************************/
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/
22
23/*! \file octeon_droq.h 18/*! \file octeon_droq.h
24 * \brief Implementation of Octeon Output queues. "Output" is with 19 * \brief Implementation of Octeon Output queues. "Output" is with
25 * respect to the Octeon device on the NIC. From this driver's point of 20 * respect to the Octeon device on the NIC. From this driver's point of
@@ -81,7 +76,7 @@ struct octeon_skb_page_info {
81 * the Octeon device. Since the descriptor ring keeps physical (bus) 76 * the Octeon device. Since the descriptor ring keeps physical (bus)
82 * addresses, this field is required for the driver to keep track of 77 * addresses, this field is required for the driver to keep track of
83 * the virtual address pointers. 78 * the virtual address pointers.
84*/ 79 */
85struct octeon_recv_buffer { 80struct octeon_recv_buffer {
86 /** Packet buffer, including metadata. */ 81 /** Packet buffer, including metadata. */
87 void *buffer; 82 void *buffer;
@@ -358,7 +353,7 @@ struct octeon_droq {
358 * @param q_no - droq no. ranges from 0 - 3. 353 * @param q_no - droq no. ranges from 0 - 3.
359 * @param app_ctx - pointer to application context 354 * @param app_ctx - pointer to application context
360 * @return Success: 0 Failure: 1 355 * @return Success: 0 Failure: 1
361*/ 356 */
362int octeon_init_droq(struct octeon_device *oct_dev, 357int octeon_init_droq(struct octeon_device *oct_dev,
363 u32 q_no, 358 u32 q_no,
364 u32 num_descs, 359 u32 num_descs,
@@ -371,7 +366,7 @@ int octeon_init_droq(struct octeon_device *oct_dev,
371 * @param oct_dev - pointer to the octeon device structure 366 * @param oct_dev - pointer to the octeon device structure
372 * @param q_no - droq no. ranges from 0 - 3. 367 * @param q_no - droq no. ranges from 0 - 3.
373 * @return: Success: 0 Failure: 1 368 * @return: Success: 0 Failure: 1
374*/ 369 */
375int octeon_delete_droq(struct octeon_device *oct_dev, u32 q_no); 370int octeon_delete_droq(struct octeon_device *oct_dev, u32 q_no);
376 371
377/** Register a change in droq operations. The ops field has a pointer to a 372/** Register a change in droq operations. The ops field has a pointer to a
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_iq.h b/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
index b493e672a338..c67152ae6bdc 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@
13 * This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17 * details. 17 ***********************************************************************/
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/
22
23/*! \file octeon_iq.h 18/*! \file octeon_iq.h
24 * \brief Host Driver: Implementation of Octeon input queues. "Input" is 19 * \brief Host Driver: Implementation of Octeon input queues. "Input" is
25 * with respect to the Octeon device on the NIC. From this driver's 20 * with respect to the Octeon device on the NIC. From this driver's
@@ -77,7 +72,7 @@ struct oct_iq_stats {
77 * The input queue is used to post raw (instruction) mode data or packet 72 * The input queue is used to post raw (instruction) mode data or packet
78 * data to Octeon device from the host. Each input queue (upto 4) for 73 * data to Octeon device from the host. Each input queue (upto 4) for
79 * a Octeon device has one such structure to represent it. 74 * a Octeon device has one such structure to represent it.
80*/ 75 */
81struct octeon_instr_queue { 76struct octeon_instr_queue {
82 struct octeon_device *oct_dev; 77 struct octeon_device *oct_dev;
83 78
@@ -117,8 +112,8 @@ struct octeon_instr_queue {
117 u32 octeon_read_index; 112 u32 octeon_read_index;
118 113
119 /** This index aids in finding the window in the queue where Octeon 114 /** This index aids in finding the window in the queue where Octeon
120 * has read the commands. 115 * has read the commands.
121 */ 116 */
122 u32 flush_index; 117 u32 flush_index;
123 118
124 /** This field keeps track of the instructions pending in this queue. */ 119 /** This field keeps track of the instructions pending in this queue. */
@@ -149,8 +144,8 @@ struct octeon_instr_queue {
149 u64 last_db_time; 144 u64 last_db_time;
150 145
151 /** The doorbell timeout. If the doorbell was not rung for this time and 146 /** The doorbell timeout. If the doorbell was not rung for this time and
152 * fill_cnt is non-zero, ring the doorbell again. 147 * fill_cnt is non-zero, ring the doorbell again.
153 */ 148 */
154 u32 db_timeout; 149 u32 db_timeout;
155 150
156 /** Statistics for this input queue. */ 151 /** Statistics for this input queue. */
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_main.h b/drivers/net/ethernet/cavium/liquidio/octeon_main.h
index db86c6368963..8cd389148166 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_main.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_main.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -13,13 +13,8 @@
13 * This file is distributed in the hope that it will be useful, but 13 * This file is distributed in the hope that it will be useful, but
14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty 14 * AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more details.
17 * details. 17 ***********************************************************************/
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/
22
23/*! \file octeon_main.h 18/*! \file octeon_main.h
24 * \brief Host Driver: This file is included by all host driver source files 19 * \brief Host Driver: This file is included by all host driver source files
25 * to include common definitions. 20 * to include common definitions.
@@ -78,10 +73,10 @@ static inline void octeon_swap_8B_data(u64 *data, u32 blocks)
78} 73}
79 74
80/** 75/**
81 * \brief unmaps a PCI BAR 76 * \brief unmaps a PCI BAR
82 * @param oct Pointer to Octeon device 77 * @param oct Pointer to Octeon device
83 * @param baridx bar index 78 * @param baridx bar index
84 */ 79 */
85static inline void octeon_unmap_pci_barx(struct octeon_device *oct, int baridx) 80static inline void octeon_unmap_pci_barx(struct octeon_device *oct, int baridx)
86{ 81{
87 dev_dbg(&oct->pci_dev->dev, "Freeing PCI mapped regions for Bar%d\n", 82 dev_dbg(&oct->pci_dev->dev, "Freeing PCI mapped regions for Bar%d\n",
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
index 0dc081a99b30..98d8066d9a7a 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22#include <linux/netdevice.h> 19#include <linux/netdevice.h>
23#include "liquidio_common.h" 20#include "liquidio_common.h"
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
index 11b183377b44..bae2fdd89503 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22 19
23/*! \file octeon_mem_ops.h 20/*! \file octeon_mem_ops.h
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index 54b966596323..172b70e1cc24 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22 19
23/*! \file octeon_network.h 20/*! \file octeon_network.h
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
index 40ac1fe88956..c3d6a8228362 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22#include <linux/pci.h> 19#include <linux/pci.h>
23#include <linux/netdevice.h> 20#include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
index 4b8da67b995f..b059979c8f7f 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22 19
23/*! \file octeon_nic.h 20/*! \file octeon_nic.h
diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
index f6e16162f307..0cc1583b16b7 100644
--- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22#include <linux/pci.h> 19#include <linux/pci.h>
23#include <linux/netdevice.h> 20#include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.c b/drivers/net/ethernet/cavium/liquidio/response_manager.c
index 9e496c1c0365..fdaf742a59cb 100644
--- a/drivers/net/ethernet/cavium/liquidio/response_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/response_manager.c
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22#include <linux/pci.h> 19#include <linux/pci.h>
23#include <linux/netdevice.h> 20#include <linux/netdevice.h>
diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.h b/drivers/net/ethernet/cavium/liquidio/response_manager.h
index d377faf76c5c..cbb2d84e8932 100644
--- a/drivers/net/ethernet/cavium/liquidio/response_manager.h
+++ b/drivers/net/ethernet/cavium/liquidio/response_manager.h
@@ -4,7 +4,7 @@
4 * Contact: support@cavium.com 4 * Contact: support@cavium.com
5 * Please include "LiquidIO" in the subject. 5 * Please include "LiquidIO" in the subject.
6 * 6 *
7 * Copyright (c) 2003-2015 Cavium, Inc. 7 * Copyright (c) 2003-2016 Cavium, Inc.
8 * 8 *
9 * This file is free software; you can redistribute it and/or modify 9 * This file is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License, Version 2, as 10 * it under the terms of the GNU General Public License, Version 2, as
@@ -15,9 +15,6 @@
15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or 15 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
16 * NONINFRINGEMENT. See the GNU General Public License for more 16 * NONINFRINGEMENT. See the GNU General Public License for more
17 * details. 17 * details.
18 *
19 * This file may also be available under a different license from Cavium.
20 * Contact Cavium, Inc. for more information
21 **********************************************************************/ 18 **********************************************************************/
22 19
23/*! \file response_manager.h 20/*! \file response_manager.h
generated by cgit v1.2.2 (git 2.25.0) at 2025-10-11 20:18:27 -0400