Merge branch 'ionic-fixes' (d6718ccb) · Commits · 戴 / test

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+12 −7

Original line number	Diff line number	Diff line
		@@ -2118,6 +2118,7 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif)
		dev_info(ionic->dev, "FW Up: restarting LIFs\n");

		ionic_init_devinfo(ionic);
		ionic_port_init(ionic);
		err = ionic_qcqs_alloc(lif);
		if (err)
		goto err_out;
		@@ -2348,7 +2349,17 @@ static int ionic_station_set(struct ionic_lif *lif)
		if (is_zero_ether_addr(ctx.comp.lif_getattr.mac))
		return 0;

		if (!ether_addr_equal(ctx.comp.lif_getattr.mac, netdev->dev_addr)) {
		if (!is_zero_ether_addr(netdev->dev_addr)) {
		/* If the netdev mac is non-zero and doesn't match the default
		* device address, it was set by something earlier and we're
		* likely here again after a fw-upgrade reset. We need to be
		* sure the netdev mac is in our filter list.
		*/
		if (!ether_addr_equal(ctx.comp.lif_getattr.mac,
		netdev->dev_addr))
		ionic_lif_addr(lif, netdev->dev_addr, true);
		} else {
		/* Update the netdev mac with the device's mac */
		memcpy(addr.sa_data, ctx.comp.lif_getattr.mac, netdev->addr_len);
		addr.sa_family = AF_INET;
		err = eth_prepare_mac_addr_change(netdev, &addr);
		@@ -2358,12 +2369,6 @@ static int ionic_station_set(struct ionic_lif *lif)
		return 0;
		}

		if (!is_zero_ether_addr(netdev->dev_addr)) {
		netdev_dbg(lif->netdev, "deleting station MAC addr %pM\n",
		netdev->dev_addr);
		ionic_lif_addr(lif, netdev->dev_addr, false);
		}

		eth_commit_mac_addr_change(netdev, &addr);
		}

+9 −9

Original line number	Diff line number	Diff line
		@@ -509,17 +509,17 @@ int ionic_port_init(struct ionic *ionic)
		size_t sz;
		int err;

		if (idev->port_info)
		return 0;

		if (!idev->port_info) {
		idev->port_info_sz = ALIGN(sizeof(*idev->port_info), PAGE_SIZE);
		idev->port_info = dma_alloc_coherent(ionic->dev, idev->port_info_sz,
		idev->port_info = dma_alloc_coherent(ionic->dev,
		idev->port_info_sz,
		&idev->port_info_pa,
		GFP_KERNEL);
		if (!idev->port_info) {
		dev_err(ionic->dev, "Failed to allocate port info, aborting\n");
		dev_err(ionic->dev, "Failed to allocate port info\n");
		return -ENOMEM;
		}
		}

		sz = min(sizeof(ident->port.config), sizeof(idev->dev_cmd_regs->data));