Commit 34e244ea authored by Yu Xiao's avatar Yu Xiao Committed by Jakub Kicinski
Browse files

nfp: vendor neutral strings for chip and Corigne in strings for driver 



Historically the nfp driver has supported NFP chips with Netronome's
PCIE vendor ID. In preparation for extending the to also support NFP
chips that have Corigine's PCIE vendor ID (0x1da8) make printk statements
relating to the chip vendor neutral.

An alternate approach is to set the string based on the PCI vendor ID.
In our judgement this proved to cumbersome so we have taken this simpler
approach.

Update strings relating to the driver to use Corigine, who have taken
over maintenance of the driver.

Signed-off-by: default avatarYu Xiao <yu.xiao@corigine.com>
Signed-off-by: default avatarYinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5bcfeb6e

drivers/net/ethernet/netronome/nfp/nfp_main.c

+5 −3
Original line number Diff line number Diff line
@@ -865,7 +865,9 @@ static int __init nfp_main_init(void) 
{

	int err;



	pr_info("%s: NFP PCIe Driver, Copyright (C) 2014-2017 Netronome Systems\n",

	pr_info("%s: NFP PCIe Driver, Copyright (C) 2014-2020 Netronome Systems\n",

		nfp_driver_name);

	pr_info("%s: NFP PCIe Driver, Copyright (C) 2021-2022 Corigine Inc.\n",

		nfp_driver_name);



	nfp_net_debugfs_create();
@@ -909,6 +911,6 @@ MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x10.nffw"); 
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x25.nffw");

MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");



MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");

MODULE_AUTHOR("Corigine, Inc. <oss-drivers@corigine.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("The Netronome Flow Processor (NFP) driver.");
 
MODULE_DESCRIPTION("The Network Flow Processor (NFP) driver.");

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,7 @@ static const struct udp_tunnel_nic_info nfp_udp_tunnels = { 
 */

void nfp_net_info(struct nfp_net *nn)

{

	nn_info(nn, "Netronome NFP-6xxx %sNetdev: TxQs=%d/%d RxQs=%d/%d\n",

	nn_info(nn, "NFP-6xxx %sNetdev: TxQs=%d/%d RxQs=%d/%d\n",

		nn->dp.is_vf ? "VF " : "",

		nn->dp.num_tx_rings, nn->max_tx_rings,

		nn->dp.num_rx_rings, nn->max_rx_rings);

drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ nfp_cpp_from_nfp6000_pcie(struct pci_dev *pdev, const struct nfp_dev_info *dev_i 
	int err;



	/*  Finished with card initialization. */

	dev_info(&pdev->dev, "Netronome Flow Processor %s PCIe Card Probe\n",

	dev_info(&pdev->dev, "Network Flow Processor %s PCIe Card Probe\n",

		 dev_info->chip_names);

	pcie_print_link_status(pdev);