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

Commit 101e63b4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cxgb4-next' 



Hariprasad Shenai says:

====================
cxgb4: minor fixes, decode msgs and code refactor for few functions

This patch series adds new routine to get adapter information and removes
some redundant messages logged in dmesg. Fixes race while freeing tx
descriptors. Decodes module type and link down reason codes obtained from
firmware. Refactor port initialization and FW_PORT_CMD handling. Pass
correct port id in DCB message handler to obtain netdev associated.

This patch series has been created against net-next tree and includes
patches on cxgb4 driver.

We have included all the maintainers of respective drivers. Kindly review
the change and let us know in case of any review comments.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c0b04793 ddc7740d

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

+8 −0
Original line number Diff line number Diff line
@@ -324,7 +324,9 @@ struct adapter_params { 
	unsigned int sf_fw_start;         /* start of FW image in flash */



	unsigned int fw_vers;

	unsigned int bs_vers;		/* bootstrap version */

	unsigned int tp_vers;

	unsigned int er_vers;		/* expansion ROM version */

	u8 api_vers[7];



	unsigned short mtus[NMTUS];
@@ -394,6 +396,7 @@ struct link_config { 
	unsigned char  fc;               /* actual link flow control */

	unsigned char  autoneg;          /* autonegotiating? */

	unsigned char  link_ok;          /* link up? */

	unsigned char  link_down_rc;     /* link down reason */

};



#define FW_LEN16(fw_struct) FW_CMD_LEN16_V(sizeof(fw_struct) / 16)
@@ -731,6 +734,7 @@ struct adapter { 
	u32 t4_bar0;

	struct pci_dev *pdev;

	struct device *pdev_dev;

	const char *name;

	unsigned int mbox;

	unsigned int pf;

	unsigned int flags;
@@ -1306,6 +1310,7 @@ int t4_fl_pkt_align(struct adapter *adap); 
unsigned int t4_flash_cfg_addr(struct adapter *adapter);

int t4_check_fw_version(struct adapter *adap);

int t4_get_fw_version(struct adapter *adapter, u32 *vers);

int t4_get_bs_version(struct adapter *adapter, u32 *vers);

int t4_get_tp_version(struct adapter *adapter, u32 *vers);

int t4_get_exprom_version(struct adapter *adapter, u32 *vers);

int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,
@@ -1329,6 +1334,8 @@ int t4_init_sge_params(struct adapter *adapter); 
int t4_init_tp_params(struct adapter *adap);

int t4_filter_field_shift(const struct adapter *adap, int filter_sel);

int t4_init_rss_mode(struct adapter *adap, int mbox);

int t4_init_portinfo(struct port_info *pi, int mbox,

		     int port, int pf, int vf, u8 mac[]);

int t4_port_init(struct adapter *adap, int mbox, int pf, int vf);

void t4_fatal_err(struct adapter *adapter);

int t4_config_rss_range(struct adapter *adapter, int mbox, unsigned int viid,
@@ -1464,6 +1471,7 @@ int t4_ctrl_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf, 
int t4_ofld_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,

		    unsigned int vf, unsigned int eqid);

int t4_sge_ctxt_flush(struct adapter *adap, unsigned int mbox);

void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl);

int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl);

void t4_db_full(struct adapter *adapter);

void t4_db_dropped(struct adapter *adapter);

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void cxgb4_dcb_handle_fw_update(struct adapter *adap, 
{

	const union fw_port_dcb *fwdcb = &pcmd->u.dcb;

	int port = FW_PORT_CMD_PORTID_G(be32_to_cpu(pcmd->op_to_portid));

	struct net_device *dev = adap->port[port];

	struct net_device *dev = adap->port[adap->chan_map[port]];

	struct port_info *pi = netdev_priv(dev);

	struct port_dcb_info *dcb = &pi->dcb;

	int dcb_type = pcmd->u.dcb.pgid.type;

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

+1 −0
Original line number Diff line number Diff line
@@ -1572,6 +1572,7 @@ static const struct file_operations flash_debugfs_fops = { 
	.owner   = THIS_MODULE,

	.open    = mem_open,

	.read    = flash_read,

	.llseek  = default_llseek,

};



static inline void tcamxy2valmask(u64 x, u64 y, u8 *addr, u64 *mask)

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

+84 −10
Original line number Diff line number Diff line
@@ -337,6 +337,17 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id) 
		netdev_info(dev, "port module unplugged\n");

	else if (pi->mod_type < ARRAY_SIZE(mod_str))

		netdev_info(dev, "%s module inserted\n", mod_str[pi->mod_type]);

	else if (pi->mod_type == FW_PORT_MOD_TYPE_NOTSUPPORTED)

		netdev_info(dev, "%s: unsupported port module inserted\n",

			    dev->name);

	else if (pi->mod_type == FW_PORT_MOD_TYPE_UNKNOWN)

		netdev_info(dev, "%s: unknown port module inserted\n",

			    dev->name);

	else if (pi->mod_type == FW_PORT_MOD_TYPE_ERROR)

		netdev_info(dev, "%s: transceiver module error\n", dev->name);

	else

		netdev_info(dev, "%s: unknown module type %d inserted\n",

			    dev->name, pi->mod_type);

}



int dbfifo_int_thresh = 10; /* 10 == 640 entry threshold */
@@ -504,7 +515,7 @@ EXPORT_SYMBOL(cxgb4_dcb_enabled); 
static void dcb_rpl(struct adapter *adap, const struct fw_port_cmd *pcmd)

{

	int port = FW_PORT_CMD_PORTID_G(ntohl(pcmd->op_to_portid));

	struct net_device *dev = adap->port[port];

	struct net_device *dev = adap->port[adap->chan_map[port]];

	int old_dcb_enabled = cxgb4_dcb_enabled(dev);

	int new_dcb_enabled;
@@ -634,7 +645,8 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp, 
		    action == FW_PORT_ACTION_GET_PORT_INFO) {

			int port = FW_PORT_CMD_PORTID_G(

					be32_to_cpu(pcmd->op_to_portid));

			struct net_device *dev = q->adap->port[port];

			struct net_device *dev =

				q->adap->port[q->adap->chan_map[port]];

			int state_input = ((pcmd->u.info.dcbxdis_pkd &

					    FW_PORT_CMD_DCBXDIS_F)

					   ? CXGB4_DCB_INPUT_FW_DISABLED
@@ -3738,7 +3750,10 @@ static int adap_init0(struct adapter *adap) 
	 * is excessively mismatched relative to the driver.)

	 */

	t4_get_fw_version(adap, &adap->params.fw_vers);

	t4_get_bs_version(adap, &adap->params.bs_vers);

	t4_get_tp_version(adap, &adap->params.tp_vers);

	t4_get_exprom_version(adap, &adap->params.er_vers);



	ret = t4_check_fw_version(adap);

	/* If firmware is too old (not supported by driver) force an update. */

	if (ret)
@@ -4652,6 +4667,68 @@ static void cxgb4_check_pcie_caps(struct adapter *adap) 
			 "suggested for optimal performance.\n");

}



/* Dump basic information about the adapter */

static void print_adapter_info(struct adapter *adapter)

{

	/* Device information */

	dev_info(adapter->pdev_dev, "Chelsio %s rev %d\n",

		 adapter->params.vpd.id,

		 CHELSIO_CHIP_RELEASE(adapter->params.chip));

	dev_info(adapter->pdev_dev, "S/N: %s, P/N: %s\n",

		 adapter->params.vpd.sn, adapter->params.vpd.pn);



	/* Firmware Version */

	if (!adapter->params.fw_vers)

		dev_warn(adapter->pdev_dev, "No firmware loaded\n");

	else

		dev_info(adapter->pdev_dev, "Firmware version: %u.%u.%u.%u\n",

			 FW_HDR_FW_VER_MAJOR_G(adapter->params.fw_vers),

			 FW_HDR_FW_VER_MINOR_G(adapter->params.fw_vers),

			 FW_HDR_FW_VER_MICRO_G(adapter->params.fw_vers),

			 FW_HDR_FW_VER_BUILD_G(adapter->params.fw_vers));



	/* Bootstrap Firmware Version. (Some adapters don't have Bootstrap

	 * Firmware, so dev_info() is more appropriate here.)

	 */

	if (!adapter->params.bs_vers)

		dev_info(adapter->pdev_dev, "No bootstrap loaded\n");

	else

		dev_info(adapter->pdev_dev, "Bootstrap version: %u.%u.%u.%u\n",

			 FW_HDR_FW_VER_MAJOR_G(adapter->params.bs_vers),

			 FW_HDR_FW_VER_MINOR_G(adapter->params.bs_vers),

			 FW_HDR_FW_VER_MICRO_G(adapter->params.bs_vers),

			 FW_HDR_FW_VER_BUILD_G(adapter->params.bs_vers));



	/* TP Microcode Version */

	if (!adapter->params.tp_vers)

		dev_warn(adapter->pdev_dev, "No TP Microcode loaded\n");

	else

		dev_info(adapter->pdev_dev,

			 "TP Microcode version: %u.%u.%u.%u\n",

			 FW_HDR_FW_VER_MAJOR_G(adapter->params.tp_vers),

			 FW_HDR_FW_VER_MINOR_G(adapter->params.tp_vers),

			 FW_HDR_FW_VER_MICRO_G(adapter->params.tp_vers),

			 FW_HDR_FW_VER_BUILD_G(adapter->params.tp_vers));



	/* Expansion ROM version */

	if (!adapter->params.er_vers)

		dev_info(adapter->pdev_dev, "No Expansion ROM loaded\n");

	else

		dev_info(adapter->pdev_dev,

			 "Expansion ROM version: %u.%u.%u.%u\n",

			 FW_HDR_FW_VER_MAJOR_G(adapter->params.er_vers),

			 FW_HDR_FW_VER_MINOR_G(adapter->params.er_vers),

			 FW_HDR_FW_VER_MICRO_G(adapter->params.er_vers),

			 FW_HDR_FW_VER_BUILD_G(adapter->params.er_vers));



	/* Software/Hardware configuration */

	dev_info(adapter->pdev_dev, "Configuration: %sNIC %s, %s capable\n",

		 is_offload(adapter) ? "R" : "",

		 ((adapter->flags & USING_MSIX) ? "MSI-X" :

		  (adapter->flags & USING_MSI) ? "MSI" : ""),

		 is_offload(adapter) ? "Offload" : "non-Offload");

}



static void print_port_info(const struct net_device *dev)

{

	char buf[80];
@@ -4679,14 +4756,8 @@ static void print_port_info(const struct net_device *dev) 
		--bufp;

	sprintf(bufp, "BASE-%s", t4_get_port_type_description(pi->port_type));



	netdev_info(dev, "Chelsio %s rev %d %s %sNIC %s\n",

		    adap->params.vpd.id,

		    CHELSIO_CHIP_RELEASE(adap->params.chip), buf,

		    is_offload(adap) ? "R" : "",

		    (adap->flags & USING_MSIX) ? " MSI-X" :

		    (adap->flags & USING_MSI) ? " MSI" : "");

	netdev_info(dev, "S/N: %s, P/N: %s\n",

		    adap->params.vpd.sn, adap->params.vpd.pn);

	netdev_info(dev, "%s: Chelsio %s (%s) %s\n",

		    dev->name, adap->params.vpd.id, adap->name, buf);

}



static void enable_pcie_relaxed_ordering(struct pci_dev *dev)
@@ -4844,6 +4915,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	adapter->regs = regs;

	adapter->pdev = pdev;

	adapter->pdev_dev = &pdev->dev;

	adapter->name = pci_name(pdev);

	adapter->mbox = func;

	adapter->pf = func;

	adapter->msg_enable = dflt_msg_enable;
@@ -5074,6 +5146,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (is_offload(adapter))

		attach_ulds(adapter);



	print_adapter_info(adapter);



sriov:

#ifdef CONFIG_PCI_IOV

	if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0)

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

+2 −0
Original line number Diff line number Diff line
@@ -3006,7 +3006,9 @@ void t4_free_sge_resources(struct adapter *adap) 
		if (etq->q.desc) {

			t4_eth_eq_free(adap, adap->mbox, adap->pf, 0,

				       etq->q.cntxt_id);

			__netif_tx_lock_bh(etq->txq);

			free_tx_desc(adap, &etq->q, etq->q.in_use, true);

			__netif_tx_unlock_bh(etq->txq);

			kfree(etq->q.sdesc);

			free_txq(adap, &etq->q);

		}