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

Commit aa69ff9e authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller
Browse files

liquidio: moved ptp_enable to octeon_device structure 



ptp_enable was a global static variable.  Moved this global variable to
octeon_device structure and removed extra device id check.

Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 047dbb27

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

+10 −9
Original line number Original line Diff line number Diff line
@@ -78,8 +78,6 @@ int octeon_console_debug_enabled(u32 console) 
	return (console_bitmask >> (console)) & 0x1;

	return (console_bitmask >> (console)) & 0x1;

}

}





static int ptp_enable = 1;



/* Polling interval for determining when NIC application is alive */

/* Polling interval for determining when NIC application is alive */

#define LIQUIDIO_STARTER_POLL_INTERVAL_MS 100

#define LIQUIDIO_STARTER_POLL_INTERVAL_MS 100
@@ -1363,6 +1361,13 @@ liquidio_probe(struct pci_dev *pdev, 
	if (pdev->device == OCTEON_CN23XX_PF_VID)

	if (pdev->device == OCTEON_CN23XX_PF_VID)

		oct_dev->msix_on = LIO_FLAG_MSIX_ENABLED;

		oct_dev->msix_on = LIO_FLAG_MSIX_ENABLED;





	/* Enable PTP for 6XXX Device */

	if (((pdev->device == OCTEON_CN66XX) ||

	     (pdev->device == OCTEON_CN68XX)))

		oct_dev->ptp_enable = true;

	else

		oct_dev->ptp_enable = false;



	dev_info(&pdev->dev, "Initializing device %x:%x.\n",

	dev_info(&pdev->dev, "Initializing device %x:%x.\n",

		 (u32)pdev->vendor, (u32)pdev->device);

		 (u32)pdev->vendor, (u32)pdev->device);
@@ -2388,9 +2393,7 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)), 




		r_dh_off = (rh->r_dh.len - 1) * BYTES_PER_DHLEN_UNIT;

		r_dh_off = (rh->r_dh.len - 1) * BYTES_PER_DHLEN_UNIT;





		if (((oct->chip_id == OCTEON_CN66XX) ||

		if (oct->ptp_enable) {

		     (oct->chip_id == OCTEON_CN68XX)) &&

		    ptp_enable) {

			if (rh->r_dh.has_hwtstamp) {

			if (rh->r_dh.has_hwtstamp) {

				/* timestamp is included from the hardware at

				/* timestamp is included from the hardware at

				 * the beginning of the packet.

				 * the beginning of the packet.
@@ -2735,8 +2738,7 @@ static int liquidio_open(struct net_device *netdev) 
			oct->droq[0]->ops.poll_mode = 1;

			oct->droq[0]->ops.poll_mode = 1;

	}

	}





	if ((oct->chip_id == OCTEON_CN66XX || oct->chip_id == OCTEON_CN68XX) &&

	if (oct->ptp_enable)

	    ptp_enable)

		oct_ptp_open(netdev);

		oct_ptp_open(netdev);





	ifstate_set(lio, LIO_IFSTATE_RUNNING);

	ifstate_set(lio, LIO_IFSTATE_RUNNING);
@@ -3091,8 +3093,7 @@ static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 




	switch (cmd) {

	switch (cmd) {

	case SIOCSHWTSTAMP:

	case SIOCSHWTSTAMP:

		if ((lio->oct_dev->chip_id == OCTEON_CN66XX ||

		if (lio->oct_dev->ptp_enable)

		     lio->oct_dev->chip_id == OCTEON_CN68XX) && ptp_enable)

			return hwtstamp_ioctl(netdev, ifr);

			return hwtstamp_ioctl(netdev, ifr);

	default:

	default:

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -554,6 +554,7 @@ struct octeon_device { 
	} loc;

	} loc;





	atomic_t *adapter_refcount; /* reference count of adapter */

	atomic_t *adapter_refcount; /* reference count of adapter */

	bool ptp_enable;

};

};





#define  OCT_DRV_ONLINE 1

#define  OCT_DRV_ONLINE 1