Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 27 Feb 2020 15:25:26 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r358390 - head/sys/dev/oce
Message-ID:  <202002271525.01RFPQgb086714@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: imp
Date: Thu Feb 27 15:25:26 2020
New Revision: 358390
URL: https://svnweb.freebsd.org/changeset/base/358390

Log:
  Remove FreeBSD 7-9 support from oce
  
  Use newer pci_find_cap API now that the need to remap the old API is gone.

Modified:
  head/sys/dev/oce/oce_hw.c
  head/sys/dev/oce/oce_if.c
  head/sys/dev/oce/oce_queue.c

Modified: head/sys/dev/oce/oce_hw.c
==============================================================================
--- head/sys/dev/oce/oce_hw.c	Thu Feb 27 15:25:21 2020	(r358389)
+++ head/sys/dev/oce/oce_hw.c	Thu Feb 27 15:25:26 2020	(r358390)
@@ -206,16 +206,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
 {
 	uint32_t val;
 
-#if __FreeBSD_version >= 1000000
-	#define pci_find_extcap pci_find_cap
-#endif
-
-	if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
 		if (val != 0) 
 			sc->flags |= OCE_FLAGS_PCIX;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
 		if (val != 0) {
 			uint16_t link_status =
 			    pci_read_config(sc->dev, val + 0x12, 2);
@@ -226,12 +222,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
 		}
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
 		if (val != 0)
 			sc->flags |= OCE_FLAGS_MSI_CAPABLE;
 	}
 
-	if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
+	if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
 		if (val != 0) {
 			val = pci_msix_count(sc->dev);
 			sc->flags |= OCE_FLAGS_MSIX_CAPABLE;

Modified: head/sys/dev/oce/oce_if.c
==============================================================================
--- head/sys/dev/oce/oce_if.c	Thu Feb 27 15:25:21 2020	(r358389)
+++ head/sys/dev/oce/oce_if.c	Thu Feb 27 15:25:26 2020	(r358390)
@@ -1291,11 +1291,7 @@ oce_tx_restart(POCE_SOFTC sc, struct oce_wq *wq)
 	if ((sc->ifp->if_drv_flags & IFF_DRV_RUNNING) != IFF_DRV_RUNNING)
 		return;
 
-#if __FreeBSD_version >= 800000
 	if (!drbr_empty(sc->ifp, wq->br))
-#else
-	if (!IFQ_DRV_IS_EMPTY(&sc->ifp->if_snd))
-#endif
 		taskqueue_enqueue(taskqueue_swi, &wq->txtask);
 
 }
@@ -1378,7 +1374,6 @@ oce_tx_task(void *arg, int npending)
 	struct ifnet *ifp = sc->ifp;
 	int rc = 0;
 
-#if __FreeBSD_version >= 800000
 	LOCK(&wq->tx_lock);
 	rc = oce_multiq_transmit(ifp, NULL, wq);
 	if (rc) {
@@ -1386,10 +1381,6 @@ oce_tx_task(void *arg, int npending)
 				"TX[%d] restart failed\n", wq->queue_index);
 	}
 	UNLOCK(&wq->tx_lock);
-#else
-	oce_start(ifp);
-#endif
-
 }
 
 
@@ -1676,13 +1667,12 @@ oce_rx_lro(struct oce_rq *rq, struct nic_hwlro_singlet
 		}
 
 		m->m_pkthdr.rcvif = sc->ifp;
-#if __FreeBSD_version >= 800000
 		if (rq->queue_index)
 			m->m_pkthdr.flowid = (rq->queue_index - 1);
 		else
 			m->m_pkthdr.flowid = rq->queue_index;
 		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
-#endif
+
 		/* This deternies if vlan tag is Valid */
 		if (cq_info.vtp) {
 			if (sc->function_mode & FNM_FLEX10_MODE) {
@@ -1754,13 +1744,12 @@ oce_rx(struct oce_rq *rq, struct oce_nic_rx_cqe *cqe)
 
 	if (m) {
 		m->m_pkthdr.rcvif = sc->ifp;
-#if __FreeBSD_version >= 800000
 		if (rq->queue_index)
 			m->m_pkthdr.flowid = (rq->queue_index - 1);
 		else
 			m->m_pkthdr.flowid = rq->queue_index;
 		M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE);
-#endif
+
 		/* This deternies if vlan tag is Valid */
 		if (oce_cqe_vtp_valid(sc, cqe)) { 
 			if (sc->function_mode & FNM_FLEX10_MODE) {
@@ -2182,10 +2171,8 @@ oce_attach_ifp(POCE_SOFTC sc)
 	sc->ifp->if_init = oce_init;
 	sc->ifp->if_mtu = ETHERMTU;
 	sc->ifp->if_softc = sc;
-#if __FreeBSD_version >= 800000
 	sc->ifp->if_transmit = oce_multiq_start;
 	sc->ifp->if_qflush = oce_multiq_flush;
-#endif
 
 	if_initname(sc->ifp,
 		    device_get_name(sc->dev), device_get_unit(sc->dev));
@@ -2211,11 +2198,9 @@ oce_attach_ifp(POCE_SOFTC sc)
 	sc->ifp->if_capenable = sc->ifp->if_capabilities;
 	sc->ifp->if_baudrate = IF_Gbps(10);
 
-#if __FreeBSD_version >= 1000000
 	sc->ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
 	sc->ifp->if_hw_tsomaxsegcount = OCE_MAX_TX_ELEMENTS;
 	sc->ifp->if_hw_tsomaxsegsize = 4096;
-#endif
 
 	ether_ifattach(sc->ifp, sc->macaddr.mac_addr);
 	

Modified: head/sys/dev/oce/oce_queue.c
==============================================================================
--- head/sys/dev/oce/oce_queue.c	Thu Feb 27 15:25:21 2020	(r358389)
+++ head/sys/dev/oce/oce_queue.c	Thu Feb 27 15:25:26 2020	(r358390)
@@ -263,13 +263,11 @@ oce_wq *oce_wq_init(POCE_SOFTC sc, uint32_t q_len, uin
 	LOCK_CREATE(&wq->tx_lock, "TX_lock");
 	LOCK_CREATE(&wq->tx_compl_lock, "WQ_HANDLER_LOCK");
 	
-#if __FreeBSD_version >= 800000
 	/* Allocate buf ring for multiqueue*/
 	wq->br = buf_ring_alloc(4096, M_DEVBUF,
 			M_WAITOK, &wq->tx_lock.mutex);
 	if (!wq->br)
 		goto free_wq;
-#endif
 	return wq;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002271525.01RFPQgb086714>