Skip to content

Commit

Permalink
hw/fsp: Do not queue SP and SPCN class messages during reset/reload
Browse files Browse the repository at this point in the history
During FSP R/R, the FSP is inaccessible and will lose state. Messages to the
FSP are generally queued for sending later.

It does seem like the FSP fails to process any subseuqent messages of certain
classes (SP info -- ipmi) if it receives queued mbox messages it isn't expecting.

In certain other cases (sensors), the FSP driver returns a default code (async
completion) even though there is no known bound from the time of this error
return to the actual data being available. The kernel driver keeps waiting
leading to soft-lockup on the host side.

Mitigate both these (known) cases by returning OPAL_BUSY so the host driver
knows to retry later.

With this change, the sensors command works fine when the FSP comes back.

This version also resolves the remaining IPMI issues

Signed-off-by: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Tested-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
  • Loading branch information
Ananth N Mavinakayanahalli authored and stewartsmith committed Mar 16, 2017
1 parent 1998d7f commit 4940b81
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 0 deletions.
9 changes: 9 additions & 0 deletions hw/fsp/fsp-ipmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ static int fsp_ipmi_send_request(void)
struct fsp_msg *msg;
int rc;

if (fsp_in_rr())
return OPAL_BUSY;

lock(&fsp_ipmi.lock);
/* An outstanding request is still pending */
if (fsp_ipmi.cur_msg) {
Expand Down Expand Up @@ -208,6 +211,9 @@ static int fsp_ipmi_queue_msg(struct ipmi_msg *ipmi_msg)
struct fsp_ipmi_msg *fsp_ipmi_msg = container_of(ipmi_msg,
struct fsp_ipmi_msg, ipmi_msg);

if (fsp_in_rr())
return OPAL_BUSY;

lock(&fsp_ipmi.lock);
list_add_tail(&fsp_ipmi.msg_queue, &fsp_ipmi_msg->link);
unlock(&fsp_ipmi.lock);
Expand All @@ -220,6 +226,9 @@ static int fsp_ipmi_queue_msg_head(struct ipmi_msg *ipmi_msg)
struct fsp_ipmi_msg *fsp_ipmi_msg = container_of(ipmi_msg,
struct fsp_ipmi_msg, ipmi_msg);

if (fsp_in_rr())
return OPAL_BUSY;

lock(&fsp_ipmi.lock);
list_add(&fsp_ipmi.msg_queue, &fsp_ipmi_msg->link);
unlock(&fsp_ipmi.lock);
Expand Down
6 changes: 6 additions & 0 deletions hw/fsp/fsp-sensor.c
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ static int64_t fsp_sensor_send_read_request(struct opal_sensor_data *attr)
uint32_t align;
uint32_t cmd_header;

if (fsp_in_rr())
return OPAL_BUSY;

prlog(PR_INSANE, "Get the data for modifier [%x]\n",
spcn_mod_data[attr->mod_index].mod);

Expand Down Expand Up @@ -516,6 +519,9 @@ int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,

prlog(PR_INSANE, "fsp_opal_read_sensor [%08x]\n", sensor_hndl);

if (fsp_in_rr())
return OPAL_BUSY;

if (sensor_state == SENSOR_PERMANENT_ERROR) {
rc = OPAL_HARDWARE;
goto out;
Expand Down
16 changes: 16 additions & 0 deletions hw/fsp/fsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,22 @@ static bool fsp_in_reset(struct fsp *fsp)
}
}

bool fsp_in_rr(void)
{
struct fsp *fsp = fsp_get_active();
struct fsp_iopath *iop;

if (fsp->active_iopath < 0)
return true;

iop = &fsp->iopath[fsp->active_iopath];

if (fsp_in_reset(fsp) || fsp_in_hir(fsp) || !(psi_check_link_active(iop->psi)))
return true;

return false;
}

static bool fsp_hir_state_timeout(void)
{
u64 now = mftb();
Expand Down
1 change: 1 addition & 0 deletions include/fsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ extern void fsp_ipmi_init(void);
extern void fsp_reinit_fsp(void);
extern void fsp_trigger_reset(void);
extern void fsp_reset_links(void);
extern bool fsp_in_rr(void);

/* FSP memory errors */
extern void fsp_memory_err_init(void);
Expand Down

0 comments on commit 4940b81

Please sign in to comment.