Commit b34695a8 authored by Edwin Peer's avatar Edwin Peer Committed by David S. Miller
Browse files

bnxt_en: remove legacy HWRM interface 



There are no longer any callers relying on the old API.

Signed-off-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbf33d1d

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −17
Original line number Diff line number Diff line
@@ -3956,29 +3956,13 @@ static int bnxt_alloc_vnic_attributes(struct bnxt *bp) 


static void bnxt_free_hwrm_resources(struct bnxt *bp)

{

	struct pci_dev *pdev = bp->pdev;



	if (bp->hwrm_cmd_resp_addr) {

		dma_free_coherent(&pdev->dev, PAGE_SIZE, bp->hwrm_cmd_resp_addr,

				  bp->hwrm_cmd_resp_dma_addr);

		bp->hwrm_cmd_resp_addr = NULL;

	}



	dma_pool_destroy(bp->hwrm_dma_pool);

	bp->hwrm_dma_pool = NULL;

}



static int bnxt_alloc_hwrm_resources(struct bnxt *bp)

{

	struct pci_dev *pdev = bp->pdev;



	bp->hwrm_cmd_resp_addr = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,

						   &bp->hwrm_cmd_resp_dma_addr,

						   GFP_KERNEL);

	if (!bp->hwrm_cmd_resp_addr)

		return -ENOMEM;



	bp->hwrm_dma_pool = dma_pool_create("bnxt_hwrm", &pdev->dev,

	bp->hwrm_dma_pool = dma_pool_create("bnxt_hwrm", &bp->pdev->dev,

					    BNXT_HWRM_DMA_SIZE,

					    BNXT_HWRM_DMA_ALIGN, 0);

	if (!bp->hwrm_dma_pool)

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+0 −2
Original line number Diff line number Diff line
@@ -1881,8 +1881,6 @@ struct bnxt { 
	u16			hwrm_cmd_seq;

	u16                     hwrm_cmd_kong_seq;

	u16			hwrm_intr_seq_id;

	void			*hwrm_cmd_resp_addr;

	dma_addr_t		hwrm_cmd_resp_dma_addr;

	struct dma_pool		*hwrm_dma_pool;



	struct rtnl_link_stats64	net_stats_prev;

drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c

+0 −77
Original line number Diff line number Diff line
@@ -24,17 +24,6 @@ 
#include "bnxt.h"

#include "bnxt_hwrm.h"



void bnxt_hwrm_cmd_hdr_init(struct bnxt *bp, void *request, u16 req_type,

			    u16 cmpl_ring, u16 target_id)

{

	struct input *req = request;



	req->req_type = cpu_to_le16(req_type);

	req->cmpl_ring = cpu_to_le16(cmpl_ring);

	req->target_id = cpu_to_le16(target_id);

	req->resp_addr = cpu_to_le64(bp->hwrm_cmd_resp_dma_addr);

}



static u64 hwrm_calc_sentinel(struct bnxt_hwrm_ctx *ctx, u16 req_type)

{

	return (((uintptr_t)ctx) + req_type) ^ BNXT_HWRM_SENTINEL;
@@ -587,72 +576,6 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx) 
	return rc;

}



static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,

				 int timeout, bool silent)

{

	struct bnxt_hwrm_ctx default_ctx = {0};

	struct bnxt_hwrm_ctx *ctx = &default_ctx;

	struct input *req = msg;

	int rc;



	if ((bp->fw_cap & BNXT_FW_CAP_SHORT_CMD) ||

	    msg_len > BNXT_HWRM_MAX_REQ_LEN) {

		rc = __hwrm_req_init(bp, (void **)&req,

				     le16_to_cpu(req->req_type), msg_len);

		if (rc)

			return rc;

		memcpy(req, msg, msg_len); /* also copies resp_addr */

		ctx = __hwrm_ctx(bp, (u8 *)req);

		/* belts and brances, NULL ctx shouldn't be possible here */

		if (!ctx)

			return -ENOMEM;

	}



	ctx->req = req;

	ctx->req_len = msg_len;

	ctx->resp = bp->hwrm_cmd_resp_addr;

	/* global response is not reallocated __GFP_ZERO between requests */

	ctx->flags = BNXT_HWRM_INTERNAL_RESP_DIRTY;

	ctx->timeout = timeout ?: DFLT_HWRM_CMD_TIMEOUT;

	if (silent)

		ctx->flags |= BNXT_HWRM_CTX_SILENT;



	/* will consume req if allocated with __hwrm_req_init() */

	return __hwrm_send(bp, ctx);

}



int _hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)

{

	return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, false);

}



int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 msg_len,

			      int timeout)

{

	return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, true);

}



int hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)

{

	int rc;



	mutex_lock(&bp->hwrm_cmd_lock);

	rc = _hwrm_send_message(bp, msg, msg_len, timeout);

	mutex_unlock(&bp->hwrm_cmd_lock);

	return rc;

}



int hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 msg_len,

			     int timeout)

{

	int rc;



	mutex_lock(&bp->hwrm_cmd_lock);

	rc = bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, true);

	mutex_unlock(&bp->hwrm_cmd_lock);

	return rc;

}



/**

 * hwrm_req_send() - Execute an HWRM command.

 * @bp: The driver context.

drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h

+0 −10
Original line number Diff line number Diff line
@@ -114,11 +114,6 @@ static inline bool bnxt_kong_hwrm_message(struct bnxt *bp, struct input *req) 
		 le16_to_cpu(req->target_id) == HWRM_TARGET_ID_KONG));

}



static inline void *bnxt_get_hwrm_resp_addr(struct bnxt *bp, void *req)

{

	return bp->hwrm_cmd_resp_addr;

}



static inline u16 bnxt_get_hwrm_seq_id(struct bnxt *bp, u16 dst)

{

	u16 seq_id;
@@ -130,11 +125,6 @@ static inline u16 bnxt_get_hwrm_seq_id(struct bnxt *bp, u16 dst) 
	return seq_id;

}



void bnxt_hwrm_cmd_hdr_init(struct bnxt *, void *, u16, u16, u16);

int _hwrm_send_message(struct bnxt *bp, void *msg, u32 len, int timeout);

int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 len, int timeout);

int hwrm_send_message(struct bnxt *bp, void *msg, u32 len, int timeout);

int hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 len, int timeout);

int __hwrm_req_init(struct bnxt *bp, void **req, u16 req_type, u32 req_len);

#define hwrm_req_init(bp, req, req_type) \

	__hwrm_req_init((bp), (void **)&(req), (req_type), sizeof(*(req)))