Commit 0444596f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'cxgb4-deadcode-removal' 

Dr. David Alan Gilbert says:

====================
cxgb4: Deadcode removal

This is a bunch of deadcode removal in cxgb4.

It's all complete function removal rather than any actual change to
logic.

Build and boot tested, but I don't have the hardware to test
the actual card.
====================

Link: https://patch.msgid.link/20241013203831.88051-1-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6d858708 73929750

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+0 −23
Original line number Diff line number Diff line
@@ -1608,7 +1608,6 @@ void t4_os_portmod_changed(struct adapter *adap, int port_id); 
void t4_os_link_changed(struct adapter *adap, int port_id, int link_stat);



void t4_free_sge_resources(struct adapter *adap);

void t4_free_ofld_rxqs(struct adapter *adap, int n, struct sge_ofld_rxq *q);

irq_handler_t t4_intr_handler(struct adapter *adap);

netdev_tx_t t4_start_xmit(struct sk_buff *skb, struct net_device *dev);

int cxgb4_selftest_lb_pkt(struct net_device *netdev);
@@ -2141,28 +2140,6 @@ int cxgb4_free_mac_filt(struct adapter *adap, unsigned int viid, 
			unsigned int naddr, const u8 **addr, bool sleep_ok);

int cxgb4_init_mps_ref_entries(struct adapter *adap);

void cxgb4_free_mps_ref_entries(struct adapter *adap);

int cxgb4_alloc_encap_mac_filt(struct adapter *adap, unsigned int viid,

			       const u8 *addr, const u8 *mask,

			       unsigned int vni, unsigned int vni_mask,

			       u8 dip_hit, u8 lookup_type, bool sleep_ok);

int cxgb4_free_encap_mac_filt(struct adapter *adap, unsigned int viid,

			      int idx, bool sleep_ok);

int cxgb4_free_raw_mac_filt(struct adapter *adap,

			    unsigned int viid,

			    const u8 *addr,

			    const u8 *mask,

			    unsigned int idx,

			    u8 lookup_type,

			    u8 port_id,

			    bool sleep_ok);

int cxgb4_alloc_raw_mac_filt(struct adapter *adap,

			     unsigned int viid,

			     const u8 *addr,

			     const u8 *mask,

			     unsigned int idx,

			     u8 lookup_type,

			     u8 port_id,

			     bool sleep_ok);

int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,

			  int *tcam_idx, const u8 *addr,

			  bool persistent, u8 *smt_idx);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+0 −12
Original line number Diff line number Diff line
@@ -2188,18 +2188,6 @@ void cxgb4_get_tcp_stats(struct pci_dev *pdev, struct tp_tcp_stats *v4, 
}

EXPORT_SYMBOL(cxgb4_get_tcp_stats);



void cxgb4_iscsi_init(struct net_device *dev, unsigned int tag_mask,

		      const unsigned int *pgsz_order)

{

	struct adapter *adap = netdev2adap(dev);



	t4_write_reg(adap, ULP_RX_ISCSI_TAGMASK_A, tag_mask);

	t4_write_reg(adap, ULP_RX_ISCSI_PSZ_A, HPZ0_V(pgsz_order[0]) |

		     HPZ1_V(pgsz_order[1]) | HPZ2_V(pgsz_order[2]) |

		     HPZ3_V(pgsz_order[3]));

}

EXPORT_SYMBOL(cxgb4_iscsi_init);



int cxgb4_flush_eq_cache(struct net_device *dev)

{

	struct adapter *adap = netdev2adap(dev);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c

+0 −98
Original line number Diff line number Diff line
@@ -28,28 +28,6 @@ static int cxgb4_mps_ref_dec_by_mac(struct adapter *adap, 
	return ret;

}



static int cxgb4_mps_ref_dec(struct adapter *adap, u16 idx)

{

	struct mps_entries_ref *mps_entry, *tmp;

	int ret = -EINVAL;



	spin_lock(&adap->mps_ref_lock);

	list_for_each_entry_safe(mps_entry, tmp, &adap->mps_ref, list) {

		if (mps_entry->idx == idx) {

			if (!refcount_dec_and_test(&mps_entry->refcnt)) {

				spin_unlock(&adap->mps_ref_lock);

				return -EBUSY;

			}

			list_del(&mps_entry->list);

			kfree(mps_entry);

			ret = 0;

			break;

		}

	}

	spin_unlock(&adap->mps_ref_lock);

	return ret;

}



static int cxgb4_mps_ref_inc(struct adapter *adap, const u8 *mac_addr,

			     u16 idx, const u8 *mask)

{
@@ -141,82 +119,6 @@ int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid, 
	return ret;

}



int cxgb4_free_raw_mac_filt(struct adapter *adap,

			    unsigned int viid,

			    const u8 *addr,

			    const u8 *mask,

			    unsigned int idx,

			    u8 lookup_type,

			    u8 port_id,

			    bool sleep_ok)

{

	int ret = 0;



	if (!cxgb4_mps_ref_dec(adap, idx))

		ret = t4_free_raw_mac_filt(adap, viid, addr,

					   mask, idx, lookup_type,

					   port_id, sleep_ok);



	return ret;

}



int cxgb4_alloc_raw_mac_filt(struct adapter *adap,

			     unsigned int viid,

			     const u8 *addr,

			     const u8 *mask,

			     unsigned int idx,

			     u8 lookup_type,

			     u8 port_id,

			     bool sleep_ok)

{

	int ret;



	ret = t4_alloc_raw_mac_filt(adap, viid, addr,

				    mask, idx, lookup_type,

				    port_id, sleep_ok);

	if (ret < 0)

		return ret;



	if (cxgb4_mps_ref_inc(adap, addr, ret, mask)) {

		ret = -ENOMEM;

		t4_free_raw_mac_filt(adap, viid, addr,

				     mask, idx, lookup_type,

				     port_id, sleep_ok);

	}



	return ret;

}



int cxgb4_free_encap_mac_filt(struct adapter *adap, unsigned int viid,

			      int idx, bool sleep_ok)

{

	int ret = 0;



	if (!cxgb4_mps_ref_dec(adap, idx))

		ret = t4_free_encap_mac_filt(adap, viid, idx, sleep_ok);



	return ret;

}



int cxgb4_alloc_encap_mac_filt(struct adapter *adap, unsigned int viid,

			       const u8 *addr, const u8 *mask,

			       unsigned int vni, unsigned int vni_mask,

			       u8 dip_hit, u8 lookup_type, bool sleep_ok)

{

	int ret;



	ret = t4_alloc_encap_mac_filt(adap, viid, addr, mask, vni, vni_mask,

				      dip_hit, lookup_type, sleep_ok);

	if (ret < 0)

		return ret;



	if (cxgb4_mps_ref_inc(adap, addr, ret, mask)) {

		ret = -ENOMEM;

		t4_free_encap_mac_filt(adap, viid, ret, sleep_ok);

	}

	return ret;

}



int cxgb4_init_mps_ref_entries(struct adapter *adap)

{

	spin_lock_init(&adap->mps_ref_lock);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h

+0 −2
Original line number Diff line number Diff line
@@ -518,8 +518,6 @@ unsigned int cxgb4_best_aligned_mtu(const unsigned short *mtus, 
				    unsigned int *mtu_idxp);

void cxgb4_get_tcp_stats(struct pci_dev *pdev, struct tp_tcp_stats *v4,

			 struct tp_tcp_stats *v6);

void cxgb4_iscsi_init(struct net_device *dev, unsigned int tag_mask,

		      const unsigned int *pgsz_order);

struct sk_buff *cxgb4_pktgl_to_skb(const struct pkt_gl *gl,

				   unsigned int skb_len, unsigned int pull_len);

int cxgb4_sync_txq_pidx(struct net_device *dev, u16 qid, u16 pidx, u16 size);

drivers/net/ethernet/chelsio/cxgb4/l2t.c

+0 −19
Original line number Diff line number Diff line
@@ -608,25 +608,6 @@ struct l2t_entry *t4_l2t_alloc_switching(struct adapter *adap, u16 vlan, 
	return e;

}



/**

 * cxgb4_l2t_alloc_switching - Allocates an L2T entry for switch filters

 * @dev: net_device pointer

 * @vlan: VLAN Id

 * @port: Associated port

 * @dmac: Destination MAC address to add to L2T

 * Returns pointer to the allocated l2t entry

 *

 * Allocates an L2T entry for use by switching rule of a filter

 */

struct l2t_entry *cxgb4_l2t_alloc_switching(struct net_device *dev, u16 vlan,

					    u8 port, u8 *dmac)

{

	struct adapter *adap = netdev2adap(dev);



	return t4_l2t_alloc_switching(adap, vlan, port, dmac);

}

EXPORT_SYMBOL(cxgb4_l2t_alloc_switching);



struct l2t_data *t4_init_l2t(unsigned int l2t_start, unsigned int l2t_end)

{

	unsigned int l2t_size;