cxgb4: Refactor t4_port_init function (c3e324e3) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1333,6 +1333,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,

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

+53 −40

Original line number	Diff line number	Diff line
		@@ -7668,61 +7668,74 @@ int t4_init_rss_mode(struct adapter *adap, int mbox)
		return 0;
		}

		int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
		/**
		* t4_init_portinfo - allocate a virtual interface amd initialize port_info
		* @pi: the port_info
		* @mbox: mailbox to use for the FW command
		* @port: physical port associated with the VI
		* @pf: the PF owning the VI
		* @vf: the VF owning the VI
		* @mac: the MAC address of the VI
		*
		* Allocates a virtual interface for the given physical port. If @mac is
		* not %NULL it contains the MAC address of the VI as assigned by FW.
		* @mac should be large enough to hold an Ethernet address.
		* Returns < 0 on error.
		*/
		int t4_init_portinfo(struct port_info *pi, int mbox,
		int port, int pf, int vf, u8 mac[])
		{
		u8 addr[6];
		int ret, i, j = 0;
		int ret;
		struct fw_port_cmd c;
		struct fw_rss_vi_config_cmd rvc;

		memset(&c, 0, sizeof(c));
		memset(&rvc, 0, sizeof(rvc));

		for_each_port(adap, i) {
		unsigned int rss_size;
		struct port_info *p = adap2pinfo(adap, i);

		while ((adap->params.portvec & (1 << j)) == 0)
		j++;

		memset(&c, 0, sizeof(c));
		c.op_to_portid = cpu_to_be32(FW_CMD_OP_V(FW_PORT_CMD) \|
		FW_CMD_REQUEST_F \| FW_CMD_READ_F \|
		FW_PORT_CMD_PORTID_V(j));
		FW_PORT_CMD_PORTID_V(port));
		c.action_to_len16 = cpu_to_be32(
		FW_PORT_CMD_ACTION_V(FW_PORT_ACTION_GET_PORT_INFO) \|
		FW_LEN16(c));
		ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
		ret = t4_wr_mbox(pi->adapter, mbox, &c, sizeof(c), &c);
		if (ret)
		return ret;

		ret = t4_alloc_vi(adap, mbox, j, pf, vf, 1, addr, &rss_size);
		ret = t4_alloc_vi(pi->adapter, mbox, port, pf, vf, 1, mac, &rss_size);
		if (ret < 0)
		return ret;

		p->viid = ret;
		p->tx_chan = j;
		p->lport = j;
		p->rss_size = rss_size;
		memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
		adap->port[i]->dev_port = j;
		pi->viid = ret;
		pi->tx_chan = port;
		pi->lport = port;
		pi->rss_size = rss_size;

		ret = be32_to_cpu(c.u.info.lstatus_to_modtype);
		p->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP_F) ?
		pi->mdio_addr = (ret & FW_PORT_CMD_MDIOCAP_F) ?
		FW_PORT_CMD_MDIOADDR_G(ret) : -1;
		p->port_type = FW_PORT_CMD_PTYPE_G(ret);
		p->mod_type = FW_PORT_MOD_TYPE_NA;
		pi->port_type = FW_PORT_CMD_PTYPE_G(ret);
		pi->mod_type = FW_PORT_MOD_TYPE_NA;

		rvc.op_to_viid =
		cpu_to_be32(FW_CMD_OP_V(FW_RSS_VI_CONFIG_CMD) \|
		FW_CMD_REQUEST_F \| FW_CMD_READ_F \|
		FW_RSS_VI_CONFIG_CMD_VIID(p->viid));
		rvc.retval_len16 = cpu_to_be32(FW_LEN16(rvc));
		ret = t4_wr_mbox(adap, mbox, &rvc, sizeof(rvc), &rvc);
		init_link_config(&pi->link_cfg, be16_to_cpu(c.u.info.pcap));
		return 0;
		}

		int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
		{
		u8 addr[6];
		int ret, i, j = 0;

		for_each_port(adap, i) {
		struct port_info *pi = adap2pinfo(adap, i);

		while ((adap->params.portvec & (1 << j)) == 0)
		j++;

		ret = t4_init_portinfo(pi, mbox, j, pf, vf, addr);
		if (ret)
		return ret;
		p->rss_mode = be32_to_cpu(rvc.u.basicvirtual.defaultq_to_udpen);

		init_link_config(&p->link_cfg, be16_to_cpu(c.u.info.pcap));
		memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
		adap->port[i]->dev_port = j;
		j++;
		}
		return 0;

Admin message