Commit a7d5a3dc authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio: Macro replacements 



This patch has minor replacements of ACCESS_ONCE macros with
WRITE_ONCE and replacement of BUG_ON with polite version WARN_ON.

Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01fb237a

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

+3 −13
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)

{
@@ -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/lio_ethtool.c

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

* Contact Cavium, Inc. for more information

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

#include <linux/version.h>

#include <linux/netdevice.h>

#include <linux/net_tstamp.h>

#include <linux/ethtool.h>

#include <linux/dma-mapping.h>

#include <linux/pci.h>

#include "octeon_config.h"

#include "liquidio_common.h"

#include "octeon_droq.h"

#include "octeon_iq.h"
@@ -36,9 +32,6 @@ 
#include "octeon_network.h"

#include "cn66xx_regs.h"

#include "cn66xx_device.h"

#include "cn68xx_regs.h"

#include "cn68xx_device.h"

#include "liquidio_image.h"



static int octnet_get_link_stats(struct net_device *netdev);
@@ -346,20 +339,18 @@ static void octnet_mdio_resp_callback(struct octeon_device *oct, 
				      u32 status,

				      void *buf)

{

	struct oct_mdio_cmd_resp *mdio_cmd_rsp;

	struct oct_mdio_cmd_context *mdio_cmd_ctx;

	struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;



	mdio_cmd_rsp = (struct oct_mdio_cmd_resp *)sc->virtrptr;

	mdio_cmd_ctx = (struct oct_mdio_cmd_context *)sc->ctxptr;



	oct = lio_get_device(mdio_cmd_ctx->octeon_id);

	if (status) {

		dev_err(&oct->pci_dev->dev, "MIDO instruction failed. Status: %llx\n",

			CVM_CAST64(status));

		ACCESS_ONCE(mdio_cmd_ctx->cond) = -1;

		WRITE_ONCE(mdio_cmd_ctx->cond, -1);

	} else {

		ACCESS_ONCE(mdio_cmd_ctx->cond) = 1;

		WRITE_ONCE(mdio_cmd_ctx->cond, 1);

	}

	wake_up_interruptible(&mdio_cmd_ctx->wc);

}
@@ -390,7 +381,7 @@ octnet_mdio45_access(struct lio *lio, int op, int loc, int *value) 
	mdio_cmd_rsp = (struct oct_mdio_cmd_resp *)sc->virtrptr;

	mdio_cmd = (struct oct_mdio_cmd *)sc->virtdptr;



	ACCESS_ONCE(mdio_cmd_ctx->cond) = 0;

	WRITE_ONCE(mdio_cmd_ctx->cond, 0);

	mdio_cmd_ctx->octeon_id = lio_get_device_id(oct_dev);

	mdio_cmd->op = op;

	mdio_cmd->mdio_addr = loc;
@@ -429,7 +420,7 @@ octnet_mdio45_access(struct lio *lio, int op, int loc, int *value) 
			octeon_swap_8B_data((u64 *)(&mdio_cmd_rsp->resp),

					    sizeof(struct oct_mdio_cmd) / 8);



			if (ACCESS_ONCE(mdio_cmd_ctx->cond) == 1) {

			if (READ_ONCE(mdio_cmd_ctx->cond) == 1) {

				if (!op)

					*value = mdio_cmd_rsp->resp.value1;

			} else {
@@ -623,7 +614,8 @@ lio_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) 


static void

lio_get_ethtool_stats(struct net_device *netdev,

		      struct ethtool_stats *stats, u64 *data)

		      struct ethtool_stats *stats  __attribute__((unused)),

		      u64 *data)

{

	struct lio *lio = GET_LIO(netdev);

	struct octeon_device *oct_dev = lio->oct_dev;
@@ -1067,7 +1059,7 @@ static int octnet_set_intrmod_cfg(struct lio *lio, 
	return 0;

}



void

static void

octnet_nic_stats_callback(struct octeon_device *oct_dev,

			  u32 status, void *ptr)

{
@@ -1552,7 +1544,7 @@ static int lio_nway_reset(struct net_device *netdev) 
}



/* Return register dump len. */

static int lio_get_regs_len(struct net_device *dev)

static int lio_get_regs_len(struct net_device *dev __attribute__((unused)))

{

	return OCT_ETHTOOL_REGDUMP_LEN;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE