Commit 994ff079 authored by Jens Axboe's avatar Jens Axboe

mtip32xx: cleanup internal tag assumptions

We don't decode the internal tag to the proper group or tag
indx. This works fine because we have hard wired it as 0 for now,
but could break if we get rid of that.
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 7a148c2f
...@@ -847,16 +847,15 @@ static inline void mtip_process_legacy(struct driver_data *dd, u32 port_stat) ...@@ -847,16 +847,15 @@ static inline void mtip_process_legacy(struct driver_data *dd, u32 port_stat)
struct mtip_port *port = dd->port; struct mtip_port *port = dd->port;
struct mtip_cmd *cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL); struct mtip_cmd *cmd = mtip_cmd_from_tag(dd, MTIP_TAG_INTERNAL);
if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) && if (test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags) && cmd) {
(cmd != NULL) && !(readl(port->cmd_issue[MTIP_TAG_INTERNAL]) int group = MTIP_TAG_INDEX(MTIP_TAG_INTERNAL);
& (1 << MTIP_TAG_INTERNAL))) { int status = readl(port->cmd_issue[group]);
if (cmd->comp_func) {
cmd->comp_func(port, MTIP_TAG_INTERNAL, cmd, 0); if (!(status & (1 << MTIP_TAG_BIT(MTIP_TAG_INTERNAL)))) {
return; if (cmd->comp_func)
cmd->comp_func(port, MTIP_TAG_INTERNAL, cmd, 0);
} }
} }
return;
} }
/* /*
...@@ -1213,8 +1212,8 @@ static int mtip_exec_internal_command(struct mtip_port *port, ...@@ -1213,8 +1212,8 @@ static int mtip_exec_internal_command(struct mtip_port *port,
goto exec_ic_exit; goto exec_ic_exit;
} }
if (readl(port->cmd_issue[MTIP_TAG_INTERNAL]) if (readl(port->cmd_issue[MTIP_TAG_INDEX(MTIP_TAG_INTERNAL)])
& (1 << MTIP_TAG_INTERNAL)) { & (1 << MTIP_TAG_BIT(MTIP_TAG_INTERNAL))) {
rv = -ENXIO; rv = -ENXIO;
if (!test_bit(MTIP_DDF_REMOVE_PENDING_BIT, &dd->dd_flag)) { if (!test_bit(MTIP_DDF_REMOVE_PENDING_BIT, &dd->dd_flag)) {
mtip_device_reset(dd); mtip_device_reset(dd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment