Commit 24d43332 authored by Veerasenareddy Burru's avatar Veerasenareddy Burru Committed by David S. Miller
Browse files

octeon_ep: poll for control messages 



Poll for control messages until interrupts are enabled.
All the interrupts are enabled in ndo_open().
Add ability to listen for notifications from firmware before ndo_open().
Once interrupts are enabled, this polling is disabled and all the
messages are processed by bottom half of interrupt handler.

Signed-off-by: default avatarVeerasenareddy Burru <vburru@marvell.com>
Signed-off-by: default avatarAbhijit Ayarekar <aayarekar@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10c073e4

drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c

+21 −26
Original line number Diff line number Diff line
@@ -352,19 +352,28 @@ static void octep_setup_mbox_regs_cn93_pf(struct octep_device *oct, int q_no) 
	mbox->mbox_read_reg = oct->mmio[0].hw_addr + CN93_SDP_R_MBOX_VF_PF_DATA(q_no);

}



/* Mailbox Interrupt handler */

static void cn93_handle_pf_mbox_intr(struct octep_device *oct)

/* Process non-ioq interrupts required to keep pf interface running.

 * OEI_RINT is needed for control mailbox

 */

static bool octep_poll_non_ioq_interrupts_cn93_pf(struct octep_device *oct)

{

	u64 mbox_int_val = 0ULL, val = 0ULL, qno = 0ULL;

	bool handled = false;

	u64 reg0;



	/* Check for OEI INTR */

	reg0 = octep_read_csr64(oct, CN93_SDP_EPF_OEI_RINT);

	if (reg0) {

		dev_info(&oct->pdev->dev,

			 "Received OEI_RINT intr: 0x%llx\n",

			 reg0);

		octep_write_csr64(oct, CN93_SDP_EPF_OEI_RINT, reg0);

		if (reg0 & CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX)

			queue_work(octep_wq, &oct->ctrl_mbox_task);



	mbox_int_val = readq(oct->mbox[0]->mbox_int_reg);

	for (qno = 0; qno < OCTEP_MAX_VF; qno++) {

		val = readq(oct->mbox[qno]->mbox_read_reg);

		dev_dbg(&oct->pdev->dev,

			"PF MBOX READ: val:%llx from VF:%llx\n", val, qno);

		handled = true;

	}



	writeq(mbox_int_val, oct->mbox[0]->mbox_int_reg);

	return handled;

}



/* Interrupts handler for all non-queue generic interrupts. */
@@ -434,24 +443,9 @@ static irqreturn_t octep_non_ioq_intr_handler_cn93_pf(void *dev) 
		goto irq_handled;

	}



	/* Check for MBOX INTR */

	reg_val = octep_read_csr64(oct, CN93_SDP_EPF_MBOX_RINT(0));

	if (reg_val) {

		dev_info(&pdev->dev,

			 "Received MBOX_RINT intr: 0x%llx\n", reg_val);

		cn93_handle_pf_mbox_intr(oct);

	/* Check for MBOX INTR and OEI INTR */

	if (octep_poll_non_ioq_interrupts_cn93_pf(oct))

		goto irq_handled;

	}



	/* Check for OEI INTR */

	reg_val = octep_read_csr64(oct, CN93_SDP_EPF_OEI_RINT);

	if (reg_val) {

		dev_info(&pdev->dev,

			 "Received OEI_EINT intr: 0x%llx\n", reg_val);

		octep_write_csr64(oct, CN93_SDP_EPF_OEI_RINT, reg_val);

		queue_work(octep_wq, &oct->ctrl_mbox_task);

		goto irq_handled;

	}



	/* Check for DMA INTR */

	reg_val = octep_read_csr64(oct, CN93_SDP_EPF_DMA_RINT);
@@ -712,6 +706,7 @@ void octep_device_setup_cn93_pf(struct octep_device *oct) 


	oct->hw_ops.enable_interrupts = octep_enable_interrupts_cn93_pf;

	oct->hw_ops.disable_interrupts = octep_disable_interrupts_cn93_pf;

	oct->hw_ops.poll_non_ioq_interrupts = octep_poll_non_ioq_interrupts_cn93_pf;



	oct->hw_ops.update_iq_read_idx = octep_update_iq_read_index_cn93_pf;

drivers/net/ethernet/marvell/octeon_ep/octep_main.c

+35 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "octep_main.h"

#include "octep_ctrl_net.h"



#define OCTEP_INTR_POLL_TIME_MSECS    100

struct workqueue_struct *octep_wq;



/* Supported Devices */
@@ -511,6 +512,7 @@ static int octep_open(struct net_device *netdev) 
	ret = octep_get_link_status(oct);

	if (!ret)

		octep_set_link_status(oct, true);

	oct->poll_non_ioq_intr = false;



	/* Enable the input and output queues for this Octeon device */

	oct->hw_ops.enable_io_queues(oct);
@@ -572,6 +574,11 @@ static int octep_stop(struct net_device *netdev) 
	oct->hw_ops.reset_io_queues(oct);

	octep_free_oqs(oct);

	octep_free_iqs(oct);



	oct->poll_non_ioq_intr = true;

	queue_delayed_work(octep_wq, &oct->intr_poll_task,

			   msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS));



	netdev_info(netdev, "Device stopped !!\n");

	return 0;

}
@@ -864,6 +871,28 @@ static const struct net_device_ops octep_netdev_ops = { 
	.ndo_change_mtu          = octep_change_mtu,

};



/**

 * octep_intr_poll_task - work queue task to process non-ioq interrupts.

 *

 * @work: pointer to mbox work_struct

 *

 * Process non-ioq interrupts to handle control mailbox, pfvf mailbox.

 **/

static void octep_intr_poll_task(struct work_struct *work)

{

	struct octep_device *oct = container_of(work, struct octep_device,

						intr_poll_task.work);



	if (!oct->poll_non_ioq_intr) {

		dev_info(&oct->pdev->dev, "Interrupt poll task stopped.\n");

		return;

	}



	oct->hw_ops.poll_non_ioq_interrupts(oct);

	queue_delayed_work(octep_wq, &oct->intr_poll_task,

			   msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS));

}



/**

 * octep_ctrl_mbox_task - work queue task to handle ctrl mbox messages.

 *
@@ -1099,6 +1128,10 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	INIT_WORK(&octep_dev->tx_timeout_task, octep_tx_timeout_task);

	INIT_WORK(&octep_dev->ctrl_mbox_task, octep_ctrl_mbox_task);

	INIT_DELAYED_WORK(&octep_dev->intr_poll_task, octep_intr_poll_task);

	octep_dev->poll_non_ioq_intr = true;

	queue_delayed_work(octep_wq, &octep_dev->intr_poll_task,

			   msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS));



	netdev->netdev_ops = &octep_netdev_ops;

	octep_set_ethtool_ops(netdev);
@@ -1159,6 +1192,8 @@ static void octep_remove(struct pci_dev *pdev) 
	if (netdev->reg_state == NETREG_REGISTERED)

		unregister_netdev(netdev);



	oct->poll_non_ioq_intr = false;

	cancel_delayed_work_sync(&oct->intr_poll_task);

	octep_device_cleanup(oct);

	pci_release_mem_regions(pdev);

	free_netdev(netdev);

drivers/net/ethernet/marvell/octeon_ep/octep_main.h

+10 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct octep_hw_ops { 


	void (*enable_interrupts)(struct octep_device *oct);

	void (*disable_interrupts)(struct octep_device *oct);

	bool (*poll_non_ioq_interrupts)(struct octep_device *oct);



	void (*enable_io_queues)(struct octep_device *oct);

	void (*disable_io_queues)(struct octep_device *oct);
@@ -270,7 +271,15 @@ struct octep_device { 


	/* Work entry to handle ctrl mbox interrupt */

	struct work_struct ctrl_mbox_task;



	/* Wait queue for host to firmware requests */

	wait_queue_head_t ctrl_req_wait_q;

	/* List of objects waiting for h2f response */

	struct list_head ctrl_req_wait_list;



	/* Enable non-ioq interrupt polling */

	bool poll_non_ioq_intr;

	/* Work entry to poll non-ioq interrupts */

	struct delayed_work intr_poll_task;

};



static inline u16 OCTEP_MAJOR_REV(struct octep_device *oct)

drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h

+4 −0
Original line number Diff line number Diff line
@@ -364,4 +364,8 @@ 


/* Number of non-queue interrupts in CN93xx */

#define    CN93_NUM_NON_IOQ_INTR    16



/* bit 0 for control mbox interrupt */

#define CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX	BIT_ULL(0)



#endif /* _OCTEP_REGS_CN9K_PF_H_ */