liquidio: Remove redundant code (a2c64b67) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,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);

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 #########################/

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

+7 −11

Original line number	Diff line number	Diff line
		@@ -464,16 +464,14 @@ static int lio_set_phys_id(struct net_device *netdev,

		/* Configure Beacon values */
		value = LIO68XX_LED_BEACON_CFGON;
		ret =
		octnet_mdio45_access(lio, 1,
		ret = octnet_mdio45_access(lio, 1,
		LIO68XX_LED_BEACON_ADDR,
		&value);
		if (ret)
		return ret;

		value = LIO68XX_LED_CTRL_CFGON;
		ret =
		octnet_mdio45_access(lio, 1,
		ret = octnet_mdio45_access(lio, 1,
		LIO68XX_LED_CTRL_ADDR,
		&value);
		if (ret)
		@@ -961,7 +959,6 @@ static int lio_get_intr_coalesce(struct net_device *netdev,
		intr_coal->rx_max_coalesced_frames =
		CFG_GET_OQ_INTR_PKT(cn6xxx->conf);
		}

		iq = oct->instr_queue[lio->linfo.txpciq[0].s.q_no];
		intr_coal->tx_max_coalesced_frames = iq->fill_threshold;
		break;
		@@ -1688,13 +1685,12 @@ static void lio_get_regs(struct net_device *dev,
		int len = 0;
		struct octeon_device *oct = lio->oct_dev;

		memset(regbuf, 0, OCT_ETHTOOL_REGDUMP_LEN);
		regs->version = OCT_ETHTOOL_REGSVER;

		switch (oct->chip_id) {
		/* case OCTEON_CN73XX: Todo */
		case OCTEON_CN68XX:
		case OCTEON_CN66XX:
		memset(regbuf, 0, OCT_ETHTOOL_REGDUMP_LEN);
		len += cn6xxx_read_csr_reg(regbuf + len, oct);
		len += cn6xxx_read_config_reg(regbuf + len, oct);
		break;

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -2125,7 +2125,7 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget)
		/**
		* \brief Setup input and output queues
		* @param octeon_dev octeon device
		* @param net_device Net device
		* @param ifidx Interface Index
		*
		* Note: Queues are with respect to the octeon device. Thus
		* an input queue is for egress packets, and output queues
		@@ -2336,7 +2336,6 @@ static int liquidio_stop(struct net_device *netdev)
		}

		dev_info(&oct->pci_dev->dev, "%s interface is stopped\n", netdev->name);
		module_put(THIS_MODULE);

		return 0;
		}
		@@ -2347,6 +2346,7 @@ void liquidio_link_ctrl_cmd_completion(void *nctrl_ptr)
		struct net_device netdev = (struct net_device )nctrl->netpndev;
		struct lio *lio = GET_LIO(netdev);
		struct octeon_device *oct = lio->oct_dev;
		u8 *mac;

		switch (nctrl->ncmd.s.cmd) {
		case OCTNET_CMD_CHANGE_DEVFLAGS:
		@@ -2354,12 +2354,11 @@ void liquidio_link_ctrl_cmd_completion(void *nctrl_ptr)
		break;

		case OCTNET_CMD_CHANGE_MACADDR:
		/* If command is successful, change the MACADDR. */
		netif_info(lio, probe, lio->netdev, " MACAddr changed to 0x%llx\n",
		CVM_CAST64(nctrl->udd[0]));
		dev_info(&oct->pci_dev->dev, "%s MACAddr changed to 0x%llx\n",
		netdev->name, CVM_CAST64(nctrl->udd[0]));
		memcpy(netdev->dev_addr, ((u8 *)&nctrl->udd[0]) + 2, ETH_ALEN);
		mac = ((u8 *)&nctrl->udd[0]) + 2;
		netif_info(lio, probe, lio->netdev,
		"%s %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
		"MACAddr changed to", mac[0], mac[1],
		mac[2], mac[3], mac[4], mac[5]);
		break;

		case OCTNET_CMD_CHANGE_MTU:
		@@ -2940,7 +2939,7 @@ static int liquidio_xmit(struct sk_buff skb, struct net_device netdev)
		/* defer sending if queue is full */
		stats->tx_iq_busy++;
		netif_info(lio, tx_err, lio->netdev, "Transmit failed iq:%d full\n",
		ndata.q_no);
		lio->txq);
		return NETDEV_TX_BUSY;
		}
		}
		@@ -2969,6 +2968,7 @@ static int liquidio_xmit(struct sk_buff skb, struct net_device netdev)
		if (skb_shinfo(skb)->nr_frags == 0) {
		cmdsetup.s.u.datasize = skb->len;
		octnet_prepare_pci_cmd(oct, &ndata.cmd, &cmdsetup, tag);

		/* Offload checksum calculation for TCP/UDP packets */
		dptr = dma_map_single(&oct->pci_dev->dev,
		skb->data,

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#define LIQUIDIO_MICRO_VERSION ".1"
		#define LIQUIDIO_PACKAGE ""
		#define LIQUIDIO_VERSION "1.4.1"

		#define CONTROL_IQ 0
		/** Tag types used by Octeon cores in its work. */
		enum octeon_tag_type {
		@@ -295,7 +296,7 @@ union octnet_cmd {

		#define OCTNET_CMD_SIZE (sizeof(union octnet_cmd))

		/* Instruction Header (DPI - CN23xx) - for OCTEON-III models */
		/* Instruction Header(DPI) - for OCTEON-III models */
		struct octeon_instr_ih3 {
		#ifdef __BIG_ENDIAN_BITFIELD

		@@ -345,7 +346,7 @@ struct octeon_instr_ih3 {
		#endif
		};

		/* Optional PKI Instruction Header(PKI IH) - for OCTEON CN23XX models */
		/* Optional PKI Instruction Header(PKI IH) - for OCTEON-III models */
		/** BIG ENDIAN format. */
		struct octeon_instr_pki_ih3 {
		#ifdef __BIG_ENDIAN_BITFIELD