Commit 0162a583 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-next' 



Yuval Mintz says:

====================
qed*: Driver updates

This contains various minor changes to driver - changing memory allocation,
fixing a small theoretical bug, as well as some mostly-semantic changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ea5b2f44 d4ee5289

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "qed_hsi.h"



extern const struct qed_common_ops qed_common_ops_pass;

#define DRV_MODULE_VERSION "8.4.0.0"

#define DRV_MODULE_VERSION "8.7.0.0"



#define MAX_HWFNS_PER_DEVICE    (4)

#define NAME_SIZE 16

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

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int qed_cxt_mngr_alloc(struct qed_hwfn *p_hwfn) 
	struct qed_cxt_mngr *p_mngr;

	u32 i;



	p_mngr = kzalloc(sizeof(*p_mngr), GFP_ATOMIC);

	p_mngr = kzalloc(sizeof(*p_mngr), GFP_KERNEL);

	if (!p_mngr) {

		DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_cxt_mngr'\n");

		return -ENOMEM;

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

+3 −3
Original line number Diff line number Diff line
@@ -134,17 +134,17 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn) 
	/* PQs will be arranged as follows: First per-TC PQ then pure-LB quete.

	 */

	qm_info->qm_pq_params = kzalloc(sizeof(*qm_info->qm_pq_params) *

					num_pqs, GFP_ATOMIC);

					num_pqs, GFP_KERNEL);

	if (!qm_info->qm_pq_params)

		goto alloc_err;



	qm_info->qm_vport_params = kzalloc(sizeof(*qm_info->qm_vport_params) *

					   num_vports, GFP_ATOMIC);

					   num_vports, GFP_KERNEL);

	if (!qm_info->qm_vport_params)

		goto alloc_err;



	qm_info->qm_port_params = kzalloc(sizeof(*qm_info->qm_port_params) *

					  MAX_NUM_PORTS, GFP_ATOMIC);

					  MAX_NUM_PORTS, GFP_KERNEL);

	if (!qm_info->qm_port_params)

		goto alloc_err;

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct qed_ptt_pool { 
int qed_ptt_pool_alloc(struct qed_hwfn *p_hwfn)

{

	struct qed_ptt_pool *p_pool = kmalloc(sizeof(*p_pool),

					      GFP_ATOMIC);

					      GFP_KERNEL);

	int i;



	if (!p_pool)

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

+13 −13
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int qed_int_sb_attn_alloc(struct qed_hwfn *p_hwfn, 
	dma_addr_t p_phys = 0;



	/* SB struct */

	p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);

	p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);

	if (!p_sb) {

		DP_NOTICE(cdev, "Failed to allocate `struct qed_sb_attn_info'\n");

		return -ENOMEM;
@@ -473,20 +473,20 @@ void qed_int_cau_conf_sb(struct qed_hwfn *p_hwfn, 
			 u8 vf_valid)

{

	struct cau_sb_entry sb_entry;

	u32 val;



	qed_init_cau_sb_entry(p_hwfn, &sb_entry, p_hwfn->rel_pf_id,

			      vf_number, vf_valid);



	if (p_hwfn->hw_init_done) {

		val = CAU_REG_SB_ADDR_MEMORY + igu_sb_id * sizeof(u64);

		qed_wr(p_hwfn, p_ptt, val, lower_32_bits(sb_phys));

		qed_wr(p_hwfn, p_ptt, val + sizeof(u32),

		       upper_32_bits(sb_phys));



		val = CAU_REG_SB_VAR_MEMORY + igu_sb_id * sizeof(u64);

		qed_wr(p_hwfn, p_ptt, val, sb_entry.data);

		qed_wr(p_hwfn, p_ptt, val + sizeof(u32), sb_entry.params);

		/* Wide-bus, initialize via DMAE */

		u64 phys_addr = (u64)sb_phys;



		qed_dmae_host2grc(p_hwfn, p_ptt, (u64)(uintptr_t)&phys_addr,

				  CAU_REG_SB_ADDR_MEMORY +

				  igu_sb_id * sizeof(u64), 2, 0);

		qed_dmae_host2grc(p_hwfn, p_ptt, (u64)(uintptr_t)&sb_entry,

				  CAU_REG_SB_VAR_MEMORY +

				  igu_sb_id * sizeof(u64), 2, 0);

	} else {

		/* Initialize Status Block Address */

		STORE_RT_REG_AGG(p_hwfn,
@@ -666,7 +666,7 @@ static int qed_int_sp_sb_alloc(struct qed_hwfn *p_hwfn, 
	void *p_virt;



	/* SB struct */

	p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);

	p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);

	if (!p_sb) {

		DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_sb_info'\n");

		return -ENOMEM;
@@ -946,7 +946,7 @@ int qed_int_igu_read_cam(struct qed_hwfn *p_hwfn, 
	u16 sb_id;

	u16 prev_sb_id = 0xFF;



	p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_ATOMIC);

	p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_KERNEL);



	if (!p_hwfn->hw_info.p_igu_info)

		return -ENOMEM;
@@ -1072,7 +1072,7 @@ static void qed_int_sp_dpc_setup(struct qed_hwfn *p_hwfn) 


static int qed_int_sp_dpc_alloc(struct qed_hwfn *p_hwfn)

{

	p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_ATOMIC);

	p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_KERNEL);

	if (!p_hwfn->sp_dpc)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE