UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

be2net: Making die temperature ioctl call async 

Also changing it's frequency to once every 64s instead of existing 32s as
it was shown to affect performance

Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Somnath Kotur 2011-09-30 07:25:05 +00:00 committed by David S. Miller
parent 5a56eb10ba
commit 3de09455cf
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/emulex/benet/be.h
View File

@ -137,6 +137,11 @@ static inline void *queue_tail_node(struct be_queue_info *q)
return q->dma_mem.va + q->tail * q->entry_size; return q->dma_mem.va + q->tail * q->entry_size;
} }
static inline void *queue_index_node(struct be_queue_info *q, u16 index)
{
return q->dma_mem.va + index * q->entry_size;
}
static inline void queue_head_inc(struct be_queue_info *q) static inline void queue_head_inc(struct be_queue_info *q)
{ {
index_inc(&q->head, q->len); index_inc(&q->head, q->len);

40
drivers/net/ethernet/emulex/benet/be_cmds.c
View File

@ -19,7 +19,12 @@
#include "be_cmds.h" #include "be_cmds.h"
/* Must be a power of 2 or else MODULO will BUG_ON */ /* Must be a power of 2 or else MODULO will BUG_ON */
static int be_get_temp_freq = 32; static int be_get_temp_freq = 64;
static inline void *embedded_payload(struct be_mcc_wrb *wrb)
{
return wrb->payload.embedded_payload;
}
static void be_mcc_notify(struct be_adapter *adapter) static void be_mcc_notify(struct be_adapter *adapter)
{ {
@ -85,7 +90,20 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
be_parse_stats(adapter); be_parse_stats(adapter);
adapter->stats_cmd_sent = false; adapter->stats_cmd_sent = false;
} }
if (compl->tag0 ==
OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES) {
struct be_mcc_wrb *mcc_wrb =
queue_index_node(&adapter->mcc_obj.q,
compl->tag1);
struct be_cmd_resp_get_cntl_addnl_attribs *resp =
embedded_payload(mcc_wrb);
adapter->drv_stats.be_on_die_temperature =
resp->on_die_temperature;
}
} else { } else {
if (compl->tag0 == OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES)
be_get_temp_freq = 0;
if (compl_status == MCC_STATUS_NOT_SUPPORTED || if (compl_status == MCC_STATUS_NOT_SUPPORTED ||
compl_status == MCC_STATUS_ILLEGAL_REQUEST) compl_status == MCC_STATUS_ILLEGAL_REQUEST)
goto done; goto done;
@ -404,10 +422,6 @@ int be_cmd_POST(struct be_adapter *adapter)
return -1; return -1;
} }
static inline void *embedded_payload(struct be_mcc_wrb *wrb)
{
return wrb->payload.embedded_payload;
}
static inline struct be_sge *nonembedded_sgl(struct be_mcc_wrb *wrb) static inline struct be_sge *nonembedded_sgl(struct be_mcc_wrb *wrb)
{ {
@ -1301,10 +1315,13 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
{ {
struct be_mcc_wrb *wrb; struct be_mcc_wrb *wrb;
struct be_cmd_req_get_cntl_addnl_attribs *req; struct be_cmd_req_get_cntl_addnl_attribs *req;
u16 mccq_index;
int status; int status;
spin_lock_bh(&adapter->mcc_lock); spin_lock_bh(&adapter->mcc_lock);
mccq_index = adapter->mcc_obj.q.head;
wrb = wrb_from_mccq(adapter); wrb = wrb_from_mccq(adapter);
if (!wrb) { if (!wrb) {
status = -EBUSY; status = -EBUSY;
@ -1318,16 +1335,9 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)
be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON, be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req)); OPCODE_COMMON_GET_CNTL_ADDITIONAL_ATTRIBUTES, sizeof(*req));
status = be_mcc_notify_wait(adapter); wrb->tag1 = mccq_index;
if (!status) {
struct be_cmd_resp_get_cntl_addnl_attribs *resp = be_mcc_notify(adapter);
embedded_payload(wrb);
adapter->drv_stats.be_on_die_temperature =
resp->on_die_temperature;
}
/* If IOCTL fails once, do not bother issuing it again */
else
be_get_temp_freq = 0;
err: err:
spin_unlock_bh(&adapter->mcc_lock); spin_unlock_bh(&adapter->mcc_lock);