Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef1b20f authored by Sedat Dilek's avatar Sedat Dilek Committed by Greg Kroah-Hartman
Browse files

scsi: fcoe: make use of fip_mode enum complete 

[ Upstream commit 8beb90aaf334a6efa3e924339926b5f93a234dbb ]

commit 1917d42d ("fcoe: use enum for fip_mode") introduces a separate
enum for the fip_mode that shall be used during initialisation handling
until it is passed to fcoe_ctrl_link_up to set the initial fip_state.  That
change was incomplete and gcc quietly converted in various places between
the fip_mode and the fip_state enum values with implicit enum conversions,
which fortunately cannot cause any issues in the actual code's execution.

clang however warns about these implicit enum conversions in the scsi
drivers. This commit consolidates the use of the two enums, guided by
clang's enum-conversion warnings.

This commit now completes the use of the fip_mode: It expects and uses
fip_mode in {bnx2fc,fcoe}_interface_create and fcoe_ctlr_init, and it calls
fcoe_ctrl_set_set() with the correct values in fcoe_ctlr_link_up().  It
also breaks the association between FIP_MODE_AUTO and FIP_ST_AUTO to
indicate these two enums are distinct.

Link: https://github.com/ClangBuiltLinux/linux/issues/151


Fixes: 1917d42d ("fcoe: use enum for fip_mode")
Reported-by: default avatarDmitry Golovin <dima@golovin.in>
Original-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
CC: Lukas Bulwahn <lukas.bulwahn@gmail.com>
CC: Nick Desaulniers <ndesaulniers@google.com>
CC: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Tested-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Suggested-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8032fc91

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -1445,7 +1445,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) 
static struct bnx2fc_interface *

bnx2fc_interface_create(struct bnx2fc_hba *hba,

			struct net_device *netdev,

			enum fip_state fip_mode)

			enum fip_mode fip_mode)

{

	struct fcoe_ctlr_device *ctlr_dev;

	struct bnx2fc_interface *interface;

drivers/scsi/fcoe/fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 
 * Returns: pointer to a struct fcoe_interface or NULL on error

 */

static struct fcoe_interface *fcoe_interface_create(struct net_device *netdev,

						    enum fip_state fip_mode)

						    enum fip_mode fip_mode)

{

	struct fcoe_ctlr_device *ctlr_dev;

	struct fcoe_ctlr *ctlr;

drivers/scsi/fcoe/fcoe_ctlr.c

+5 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void fcoe_ctlr_map_dest(struct fcoe_ctlr *fip) 
 * fcoe_ctlr_init() - Initialize the FCoE Controller instance

 * @fip: The FCoE controller to initialize

 */

void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_state mode)

void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_mode mode)

{

	fcoe_ctlr_set_state(fip, FIP_ST_LINK_WAIT);

	fip->mode = mode;
@@ -454,7 +454,10 @@ void fcoe_ctlr_link_up(struct fcoe_ctlr *fip) 
		mutex_unlock(&fip->ctlr_mutex);

		fc_linkup(fip->lp);

	} else if (fip->state == FIP_ST_LINK_WAIT) {

		fcoe_ctlr_set_state(fip, fip->mode);

		if (fip->mode == FIP_MODE_NON_FIP)

			fcoe_ctlr_set_state(fip, FIP_ST_NON_FIP);

		else

			fcoe_ctlr_set_state(fip, FIP_ST_AUTO);

		switch (fip->mode) {

		default:

			LIBFCOE_FIP_DBG(fip, "invalid mode %d\n", fip->mode);

drivers/scsi/fcoe/fcoe_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static int fcoe_transport_create(const char *buffer, 
	int rc = -ENODEV;

	struct net_device *netdev = NULL;

	struct fcoe_transport *ft = NULL;

	enum fip_state fip_mode = (enum fip_state)(long)kp->arg;

	enum fip_mode fip_mode = (enum fip_mode)kp->arg;



	mutex_lock(&ft_mutex);

drivers/scsi/qedf/qedf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1418,7 +1418,7 @@ static struct libfc_function_template qedf_lport_template = { 


static void qedf_fcoe_ctlr_setup(struct qedf_ctx *qedf)

{

	fcoe_ctlr_init(&qedf->ctlr, FIP_ST_AUTO);

	fcoe_ctlr_init(&qedf->ctlr, FIP_MODE_AUTO);



	qedf->ctlr.send = qedf_fip_send;

	qedf->ctlr.get_src_addr = qedf_get_src_mac;