cxgb4: Implement ndo_get_phys_port_id for mgmt dev (96fe11f2) · Commits · e / devices / android_kernel_xiaomi_sm6125

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

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2583,6 +2583,19 @@ static int cxgb_get_vf_config(struct net_device *dev,
	ether_addr_copy(ivi->mac, adap->vfinfo[vf].vf_mac_addr);		ether_addr_copy(ivi->mac, adap->vfinfo[vf].vf_mac_addr);
	return 0;		return 0;
	}		}

			static int cxgb_get_phys_port_id(struct net_device *dev,
			struct netdev_phys_item_id *ppid)
			{
			struct port_info *pi = netdev_priv(dev);
			unsigned int phy_port_id;

			phy_port_id = pi->adapter->adap_idx * 10 + pi->port_id;
			ppid->id_len = sizeof(phy_port_id);
			memcpy(ppid->id, &phy_port_id, ppid->id_len);
			return 0;
			}

	#endif		#endif

	static int cxgb_set_mac_addr(struct net_device dev, void p)		static int cxgb_set_mac_addr(struct net_device dev, void p)
	@@ -2762,6 +2775,7 @@ static const struct net_device_ops cxgb4_mgmt_netdev_ops = {
	.ndo_open = dummy_open,		.ndo_open = dummy_open,
	.ndo_set_vf_mac = cxgb_set_vf_mac,		.ndo_set_vf_mac = cxgb_set_vf_mac,
	.ndo_get_vf_config = cxgb_get_vf_config,		.ndo_get_vf_config = cxgb_get_vf_config,
			.ndo_get_phys_port_id = cxgb_get_phys_port_id,
	};		};
	#endif		#endif

	@@ -4539,6 +4553,7 @@ static int config_mgmt_dev(struct pci_dev *pdev)

	pi = netdev_priv(netdev);		pi = netdev_priv(netdev);
	pi->adapter = adap;		pi->adapter = adap;
			pi->port_id = adap->pf % adap->params.nports;
	SET_NETDEV_DEV(netdev, &pdev->dev);		SET_NETDEV_DEV(netdev, &pdev->dev);

	adap->port[0] = netdev;		adap->port[0] = netdev;
	@@ -4628,6 +4643,7 @@ static int init_one(struct pci_dev pdev, const struct pci_device_id ent)
	u32 whoami, pl_rev;		u32 whoami, pl_rev;
	enum chip_type chip;		enum chip_type chip;
	static int adap_idx = 1;		static int adap_idx = 1;
			u32 v, port_vec;

	printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);		printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);

	@@ -5009,6 +5025,17 @@ static int init_one(struct pci_dev pdev, const struct pci_device_id ent)
	}		}
	spin_lock_init(&adapter->mbox_lock);		spin_lock_init(&adapter->mbox_lock);
	INIT_LIST_HEAD(&adapter->mlist.list);		INIT_LIST_HEAD(&adapter->mlist.list);

			v = FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) \|
			FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_PORTVEC);
			err = t4_query_params(adapter, adapter->mbox, adapter->pf, 0, 1,
			&v, &port_vec);
			if (err < 0) {
			dev_err(adapter->pdev_dev, "Could not fetch port params\n");
			goto free_adapter;
			}

			adapter->params.nports = hweight32(port_vec);
	pci_set_drvdata(pdev, adapter);		pci_set_drvdata(pdev, adapter);
	return 0;		return 0;