mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
cxgb4/csiostor: Don't use MASTER_MUST for fw_hello call
Remove use of calls into t4_fw_hello() with MASTER_MUST, which results in FW_HELLO_CMD_MASTERFORCE being set. The firmware doesn't support this and of course any existing PF Drivers will totally go for a toss. Signed-off-by: Hariprasad Shenai <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
52c9b12d38
commit
666224d4d5
3 changed files with 3 additions and 16 deletions
|
|
@ -47,7 +47,6 @@
|
|||
#include "csio_lnode.h"
|
||||
#include "csio_rnode.h"
|
||||
|
||||
int csio_force_master;
|
||||
int csio_dbg_level = 0xFEFF;
|
||||
unsigned int csio_port_mask = 0xf;
|
||||
|
||||
|
|
@ -889,7 +888,6 @@ csio_do_hello(struct csio_hw *hw, enum csio_dev_state *state)
|
|||
{
|
||||
struct csio_mb *mbp;
|
||||
int rv = 0;
|
||||
enum csio_dev_master master;
|
||||
enum fw_retval retval;
|
||||
uint8_t mpfn;
|
||||
char state_str[16];
|
||||
|
|
@ -904,11 +902,9 @@ csio_do_hello(struct csio_hw *hw, enum csio_dev_state *state)
|
|||
goto out;
|
||||
}
|
||||
|
||||
master = csio_force_master ? CSIO_MASTER_MUST : CSIO_MASTER_MAY;
|
||||
|
||||
retry:
|
||||
csio_mb_hello(hw, mbp, CSIO_MB_DEFAULT_TMO, hw->pfn,
|
||||
hw->pfn, master, NULL);
|
||||
hw->pfn, CSIO_MASTER_MAY, NULL);
|
||||
|
||||
rv = csio_mb_issue(hw, mbp);
|
||||
if (rv) {
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ struct csio_scsi_cpu_info {
|
|||
};
|
||||
|
||||
extern int csio_dbg_level;
|
||||
extern int csio_force_master;
|
||||
extern unsigned int csio_port_mask;
|
||||
extern int csio_msi;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue