qed: Add basic L2 interface (25c089d7) · Commits · 戴 / test

drivers/net/ethernet/qlogic/qed/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_QED) := qed.o

		qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \
		qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o
		qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o

drivers/net/ethernet/qlogic/qed/qed.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <linux/qed/qed_if.h>
		#include "qed_hsi.h"

		extern const struct qed_common_ops qed_common_ops_pass;
		#define DRV_MODULE_VERSION "8.4.0.0"

		#define MAX_HWFNS_PER_DEVICE (4)
		@@ -91,13 +92,22 @@ struct qed_qm_iids {

		enum QED_RESOURCES {
		QED_SB,
		QED_L2_QUEUE,
		QED_VPORT,
		QED_RSS_ENG,
		QED_PQ,
		QED_RL,
		QED_MAC,
		QED_VLAN,
		QED_ILT,
		QED_MAX_RESC,
		};

		enum QED_FEATURE {
		QED_PF_L2_QUE,
		QED_MAX_FEATURES,
		};

		struct qed_hw_info {
		/* PCI personality */
		enum qed_pci_personality personality;
		@@ -105,6 +115,7 @@ struct qed_hw_info {
		/* Resource Allocation scheme results */
		u32 resc_start[QED_MAX_RESC];
		u32 resc_num[QED_MAX_RESC];
		u32 feat_num[QED_MAX_FEATURES];

		#define RESC_START(_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_start[resc])
		#define RESC_NUM(_p_hwfn, resc) ((_p_hwfn)->hw_info.resc_num[resc])
		@@ -266,6 +277,9 @@ struct qed_hwfn {

		struct qed_mcp_info *mcp_info;

		struct qed_hw_cid_data *p_tx_cids;
		struct qed_hw_cid_data *p_rx_cids;

		struct qed_dmae_info dmae_info;

		/* QM init */

drivers/net/ethernet/qlogic/qed/qed_dev.c

+62 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,15 @@ void qed_resc_free(struct qed_dev *cdev)

		kfree(cdev->reset_stats);

		for_each_hwfn(cdev, i) {
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];

		kfree(p_hwfn->p_tx_cids);
		p_hwfn->p_tx_cids = NULL;
		kfree(p_hwfn->p_rx_cids);
		p_hwfn->p_rx_cids = NULL;
		}

		for_each_hwfn(cdev, i) {
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];

		@@ -202,6 +211,29 @@ int qed_resc_alloc(struct qed_dev *cdev)
		if (!cdev->fw_data)
		return -ENOMEM;

		/* Allocate Memory for the Queue->CID mapping */
		for_each_hwfn(cdev, i) {
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
		int tx_size = sizeof(struct qed_hw_cid_data) *
		RESC_NUM(p_hwfn, QED_L2_QUEUE);
		int rx_size = sizeof(struct qed_hw_cid_data) *
		RESC_NUM(p_hwfn, QED_L2_QUEUE);

		p_hwfn->p_tx_cids = kzalloc(tx_size, GFP_KERNEL);
		if (!p_hwfn->p_tx_cids) {
		DP_NOTICE(p_hwfn,
		"Failed to allocate memory for Tx Cids\n");
		goto alloc_err;
		}

		p_hwfn->p_rx_cids = kzalloc(rx_size, GFP_KERNEL);
		if (!p_hwfn->p_rx_cids) {
		DP_NOTICE(p_hwfn,
		"Failed to allocate memory for Rx Cids\n");
		goto alloc_err;
		}
		}

		for_each_hwfn(cdev, i) {
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];

		@@ -881,6 +913,20 @@ static void get_function_id(struct qed_hwfn *p_hwfn)
		PXP_CONCRETE_FID_PORT);
		}

		static void qed_hw_set_feat(struct qed_hwfn *p_hwfn)
		{
		u32 *feat_num = p_hwfn->hw_info.feat_num;
		int num_features = 1;

		feat_num[QED_PF_L2_QUE] = min_t(u32, RESC_NUM(p_hwfn, QED_SB) /
		num_features,
		RESC_NUM(p_hwfn, QED_L2_QUEUE));
		DP_VERBOSE(p_hwfn, NETIF_MSG_PROBE,
		"#PF_L2_QUEUES=%d #SBS=%d num_features=%d\n",
		feat_num[QED_PF_L2_QUE], RESC_NUM(p_hwfn, QED_SB),
		num_features);
		}

		static void qed_hw_get_resc(struct qed_hwfn *p_hwfn)
		{
		u32 *resc_start = p_hwfn->hw_info.resc_start;
		@@ -893,29 +939,45 @@ static void qed_hw_get_resc(struct qed_hwfn *p_hwfn)
		resc_num[QED_SB] = min_t(u32,
		(MAX_SB_PER_PATH_BB / num_funcs),
		qed_int_get_num_sbs(p_hwfn, NULL));
		resc_num[QED_L2_QUEUE] = MAX_NUM_L2_QUEUES_BB / num_funcs;
		resc_num[QED_VPORT] = MAX_NUM_VPORTS_BB / num_funcs;
		resc_num[QED_RSS_ENG] = ETH_RSS_ENGINE_NUM_BB / num_funcs;
		resc_num[QED_PQ] = MAX_QM_TX_QUEUES_BB / num_funcs;
		resc_num[QED_RL] = 8;
		resc_num[QED_MAC] = ETH_NUM_MAC_FILTERS / num_funcs;
		resc_num[QED_VLAN] = (ETH_NUM_VLAN_FILTERS - 1 /For vlan0/) /
		num_funcs;
		resc_num[QED_ILT] = 950;

		for (i = 0; i < QED_MAX_RESC; i++)
		resc_start[i] = resc_num[i] * p_hwfn->rel_pf_id;

		qed_hw_set_feat(p_hwfn);

		DP_VERBOSE(p_hwfn, NETIF_MSG_PROBE,
		"The numbers for each resource are:\n"
		"SB = %d start = %d\n"
		"L2_QUEUE = %d start = %d\n"
		"VPORT = %d start = %d\n"
		"PQ = %d start = %d\n"
		"RL = %d start = %d\n"
		"MAC = %d start = %d\n"
		"VLAN = %d start = %d\n"
		"ILT = %d start = %d\n",
		p_hwfn->hw_info.resc_num[QED_SB],
		p_hwfn->hw_info.resc_start[QED_SB],
		p_hwfn->hw_info.resc_num[QED_L2_QUEUE],
		p_hwfn->hw_info.resc_start[QED_L2_QUEUE],
		p_hwfn->hw_info.resc_num[QED_VPORT],
		p_hwfn->hw_info.resc_start[QED_VPORT],
		p_hwfn->hw_info.resc_num[QED_PQ],
		p_hwfn->hw_info.resc_start[QED_PQ],
		p_hwfn->hw_info.resc_num[QED_RL],
		p_hwfn->hw_info.resc_start[QED_RL],
		p_hwfn->hw_info.resc_num[QED_MAC],
		p_hwfn->hw_info.resc_start[QED_MAC],
		p_hwfn->hw_info.resc_num[QED_VLAN],
		p_hwfn->hw_info.resc_start[QED_VLAN],
		p_hwfn->hw_info.resc_num[QED_ILT],
		p_hwfn->hw_info.resc_start[QED_ILT]);
		}

drivers/net/ethernet/qlogic/qed/qed_hsi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/list.h>
		#include <linux/slab.h>
		#include <linux/qed/common_hsi.h>
		#include <linux/qed/eth_common.h>

		struct qed_hwfn;
		struct qed_ptt;

drivers/net/ethernet/qlogic/qed/qed_l2.c

0 → 100644

+87 −0

Original line number	Diff line number	Diff line
		/* QLogic qed NIC Driver
		* Copyright (c) 2015 QLogic Corporation
		*
		* This software is available under the terms of the GNU General Public License
		* (GPL) Version 2, available from the file COPYING in the main directory of
		* this source tree.
		*/

		#include <linux/types.h>
		#include <asm/byteorder.h>
		#include <asm/param.h>
		#include <linux/delay.h>
		#include <linux/dma-mapping.h>
		#include <linux/etherdevice.h>
		#include <linux/interrupt.h>
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/pci.h>
		#include <linux/slab.h>
		#include <linux/stddef.h>
		#include <linux/string.h>
		#include <linux/version.h>
		#include <linux/workqueue.h>
		#include <linux/bitops.h>
		#include <linux/bug.h>
		#include "qed.h"
		#include <linux/qed/qed_chain.h>
		#include "qed_cxt.h"
		#include "qed_dev_api.h"
		#include <linux/qed/qed_eth_if.h>
		#include "qed_hsi.h"
		#include "qed_hw.h"
		#include "qed_int.h"
		#include "qed_reg_addr.h"
		#include "qed_sp.h"

		static int qed_fill_eth_dev_info(struct qed_dev *cdev,
		struct qed_dev_eth_info *info)
		{
		int i;

		memset(info, 0, sizeof(*info));

		info->num_tc = 1;

		if (cdev->int_params.out.int_mode == QED_INT_MODE_MSIX) {
		for_each_hwfn(cdev, i)
		info->num_queues += FEAT_NUM(&cdev->hwfns[i],
		QED_PF_L2_QUE);
		if (cdev->int_params.fp_msix_cnt)
		info->num_queues = min_t(u8, info->num_queues,
		cdev->int_params.fp_msix_cnt);
		} else {
		info->num_queues = cdev->num_hwfns;
		}

		info->num_vlan_filters = RESC_NUM(&cdev->hwfns[0], QED_VLAN);
		ether_addr_copy(info->port_mac,
		cdev->hwfns[0].hw_info.hw_mac_addr);

		qed_fill_dev_info(cdev, &info->common);

		return 0;
		}

		static const struct qed_eth_ops qed_eth_ops_pass = {
		.common = &qed_common_ops_pass,
		.fill_dev_info = &qed_fill_eth_dev_info,
		};

		const struct qed_eth_ops *qed_get_eth_ops(u32 version)
		{
		if (version != QED_ETH_INTERFACE_VERSION) {
		pr_notice("Cannot supply ethtool operations [%08x != %08x]\n",
		version, QED_ETH_INTERFACE_VERSION);
		return NULL;
		}

		return &qed_eth_ops_pass;
		}
		EXPORT_SYMBOL(qed_get_eth_ops);

		void qed_put_eth_ops(void)
		{
		/* TODO - reference count for module? */
		}
		EXPORT_SYMBOL(qed_put_eth_ops);

Admin message