ionic: remove support for mgmt device (77f972a7) · Commits · 戴 / test

drivers/net/ethernet/pensando/ionic/ionic.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ struct ionic_lif;

		#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002
		#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003
		#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT 0x1004

		#define DEVCMD_TIMEOUT 10

		@@ -42,7 +41,6 @@ struct ionic {
		struct dentry *dentry;
		struct ionic_dev_bar bars[IONIC_BARS_MAX];
		unsigned int num_bars;
		bool is_mgmt_nic;
		struct ionic_identity ident;
		struct list_head lifs;
		struct ionic_lif *master_lif;

+0 −6

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		static const struct pci_device_id ionic_id_table[] = {
		{ PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF) },
		{ PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF) },
		{ PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT) },
		{ 0, } /* end of table */
		};
		MODULE_DEVICE_TABLE(pci, ionic_id_table);
		@@ -225,9 +224,6 @@ static int ionic_probe(struct pci_dev pdev, const struct pci_device_id ent)
		pci_set_drvdata(pdev, ionic);
		mutex_init(&ionic->dev_cmd_lock);

		ionic->is_mgmt_nic =
		ent->device == PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT;

		/* Query system for DMA addressing limitation for the device. */
		err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(IONIC_ADDR_LEN));
		if (err) {
		@@ -252,8 +248,6 @@ static int ionic_probe(struct pci_dev pdev, const struct pci_device_id ent)
		}

		pci_set_master(pdev);
		if (!ionic->is_mgmt_nic)
		pcie_print_link_status(pdev);

		err = ionic_map_bars(ionic);
		if (err)

+0 −4

Original line number	Diff line number	Diff line
		@@ -77,10 +77,6 @@ int ionic_devlink_register(struct ionic *ionic)
		return err;
		}

		/* don't register the mgmt_nic as a port */
		if (ionic->is_mgmt_nic)
		return 0;

		devlink_port_attrs_set(&ionic->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
		0, false, 0, NULL, 0);
		err = devlink_port_register(dl, &ionic->dl_port, 0);

+0 −13

Original line number	Diff line number	Diff line
		@@ -99,9 +99,6 @@ static void ionic_link_status_check(struct ionic_lif *lif)
		if (!test_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state))
		return;

		if (lif->ionic->is_mgmt_nic)
		return;

		link_status = le16_to_cpu(lif->info->status.link_status);
		link_up = link_status == IONIC_PORT_OPER_STATUS_UP;

		@@ -1193,10 +1190,6 @@ static int ionic_init_nic_features(struct ionic_lif *lif)
		netdev_features_t features;
		int err;

		/* no netdev features on the management device */
		if (lif->ionic->is_mgmt_nic)
		return 0;

		/* set up what we expect to support by default */
		features = NETIF_F_HW_VLAN_CTAG_TX \|
		NETIF_F_HW_VLAN_CTAG_RX \|
		@@ -2594,12 +2587,6 @@ int ionic_lifs_register(struct ionic *ionic)
		{
		int err;

		/* the netdev is not registered on the management device, it is
		* only used as a vehicle for napi operations on the adminq
		*/
		if (ionic->is_mgmt_nic)
		return 0;

		INIT_WORK(&ionic->nb_work, ionic_lif_notify_work);

		ionic->nb.notifier_call = ionic_lif_notify;