Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f87883 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'liquidio-next' 



Raghu Vatsavayi says:

====================
liquidio updates and bug fixes

Following V2 patchset contains updates and bug fixes for
liquidio driver. This patchset also has changes that you
suggested in vxlan code. Please apply the patches in following
order as some of the patches depend on earlier patches in the
series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 13c5c240 9fbc48f6

drivers/net/ethernet/cavium/liquidio/cn66xx_device.c

+6 −16
Original line number Diff line number Diff line
@@ -19,26 +19,16 @@ 
* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/

#include <linux/version.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/kthread.h>

#include <linux/netdevice.h>

#include "octeon_config.h"

#include "liquidio_common.h"

#include "octeon_droq.h"

#include "octeon_iq.h"

#include "response_manager.h"

#include "octeon_device.h"

#include "octeon_nic.h"

#include "octeon_main.h"

#include "octeon_network.h"

#include "cn66xx_regs.h"

#include "cn66xx_device.h"

#include "liquidio_image.h"

#include "octeon_mem_ops.h"



int lio_cn6xxx_soft_reset(struct octeon_device *oct)

{
@@ -74,9 +64,9 @@ void lio_cn6xxx_enable_error_reporting(struct octeon_device *oct) 
	u32 val;



	pci_read_config_dword(oct->pci_dev, CN6XXX_PCIE_DEVCTL, &val);

	if (val & 0x000f0000) {

	if (val & 0x000c0000) {

		dev_err(&oct->pci_dev->dev, "PCI-E Link error detected: 0x%08x\n",

			val & 0x000f0000);

			val & 0x000c0000);

	}



	val |= 0xf;          /* Enable Link error reporting */
@@ -229,7 +219,7 @@ void lio_cn6xxx_setup_global_output_regs(struct octeon_device *oct) 
	/* / Select Packet count instead of bytes for SLI_PKTi_CNTS[CNT] */

	octeon_write_csr(oct, CN6XXX_SLI_PKT_OUT_BMODE, 0);



	/* / Select ES,RO,NS setting from register for Output Queue Packet

	/* Select ES, RO, NS setting from register for Output Queue Packet

	 * Address

	 */

	octeon_write_csr(oct, CN6XXX_SLI_PKT_DPADDR, 0xFFFFFFFF);
@@ -547,14 +537,14 @@ static void lio_cn6xxx_get_pcie_qlmport(struct octeon_device *oct) 
	dev_dbg(&oct->pci_dev->dev, "Using PCIE Port %d\n", oct->pcie_port);

}



void

static void

lio_cn6xxx_process_pcie_error_intr(struct octeon_device *oct, u64 intr64)

{

	dev_err(&oct->pci_dev->dev, "Error Intr: 0x%016llx\n",

		CVM_CAST64(intr64));

}



int lio_cn6xxx_process_droq_intr_regs(struct octeon_device *oct)

static int lio_cn6xxx_process_droq_intr_regs(struct octeon_device *oct)

{

	struct octeon_droq *droq;

	int oq_no;
@@ -579,7 +569,7 @@ int lio_cn6xxx_process_droq_intr_regs(struct octeon_device *oct) 
			continue;



		droq = oct->droq[oq_no];

		pkt_count = octeon_droq_check_hw_for_pkts(oct, droq);

		pkt_count = octeon_droq_check_hw_for_pkts(droq);

		if (pkt_count) {

			oct->droq_intr |= (1ULL << oq_no);

			if (droq->ops.poll_mode) {

drivers/net/ethernet/cavium/liquidio/cn66xx_device.h

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ void lio_cn6xxx_setup_iq_regs(struct octeon_device *oct, u32 iq_no); 
void lio_cn6xxx_setup_oq_regs(struct octeon_device *oct, u32 oq_no);

void lio_cn6xxx_enable_io_queues(struct octeon_device *oct);

void lio_cn6xxx_disable_io_queues(struct octeon_device *oct);

void lio_cn6xxx_process_pcie_error_intr(struct octeon_device *oct, u64 intr64);

int lio_cn6xxx_process_droq_intr_regs(struct octeon_device *oct);

irqreturn_t lio_cn6xxx_process_interrupt_regs(void *dev);

void lio_cn6xxx_reinit_regs(struct octeon_device *oct);

void lio_cn6xxx_bar1_idx_setup(struct octeon_device *oct, u64 core_addr,

drivers/net/ethernet/cavium/liquidio/cn68xx_device.c

+1 −12
Original line number Diff line number Diff line
@@ -19,28 +19,17 @@ 
* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/

#include <linux/version.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/kthread.h>

#include <linux/netdevice.h>

#include "octeon_config.h"

#include "liquidio_common.h"

#include "octeon_droq.h"

#include "octeon_iq.h"

#include "response_manager.h"

#include "octeon_device.h"

#include "octeon_nic.h"

#include "octeon_main.h"

#include "octeon_network.h"

#include "cn66xx_regs.h"

#include "cn66xx_device.h"

#include "cn68xx_regs.h"

#include "cn68xx_device.h"

#include "liquidio_image.h"

#include "octeon_mem_ops.h"



static void lio_cn68xx_set_dpi_regs(struct octeon_device *oct)

{
@@ -129,7 +118,7 @@ static inline void lio_cn68xx_vendor_message_fix(struct octeon_device *oct) 
	pci_write_config_dword(oct->pci_dev, CN6XXX_PCIE_FLTMSK, val);

}



int lio_is_210nv(struct octeon_device *oct)

static int lio_is_210nv(struct octeon_device *oct)

{

	u64 mio_qlm4_cfg = lio_pci_readq(oct, CN6XXX_MIO_QLM4_CFG);

drivers/net/ethernet/cavium/liquidio/cn68xx_device.h

+0 −1
Original line number Diff line number Diff line
@@ -28,6 +28,5 @@ 
#define  __CN68XX_DEVICE_H__



int lio_setup_cn68xx_octeon_device(struct octeon_device *oct);

int lio_is_210nv(struct octeon_device *oct);



#endif

drivers/net/ethernet/cavium/liquidio/cn68xx_regs.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#ifndef __CN68XX_REGS_H__

#define __CN68XX_REGS_H__

#include "cn66xx_regs.h"



/*###################### REQUEST QUEUE #########################*/