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

Commit 100ef01f authored by Gavin Shan's avatar Gavin Shan Committed by David S. Miller
Browse files

net/ncsi: Disable HWA mode when no channels are found 



When there are no NCSI channels probed, HWA (Hardware Arbitration)
mode is enabled. It's not correct because HWA depends on the fact:
NCSI channels exist and all of them support HWA mode. This disables
HWA when no channels are probed.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarSamuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0795fb20

net/ncsi/ncsi-manage.c

+10 −2
Original line number Diff line number Diff line
@@ -1005,12 +1005,15 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp) 
	struct ncsi_package *np;

	struct ncsi_channel *nc;

	unsigned int cap;

	bool has_channel = false;



	/* The hardware arbitration is disabled if any one channel

	 * doesn't support explicitly.

	 */

	NCSI_FOR_EACH_PACKAGE(ndp, np) {

		NCSI_FOR_EACH_CHANNEL(np, nc) {

			has_channel = true;



			cap = nc->caps[NCSI_CAP_GENERIC].cap;

			if (!(cap & NCSI_CAP_GENERIC_HWA) ||

			    (cap & NCSI_CAP_GENERIC_HWA_MASK) !=
@@ -1021,10 +1024,15 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp) 
		}

	}



	if (has_channel) {

		ndp->flags |= NCSI_DEV_HWA;

		return true;

	}



	ndp->flags &= ~NCSI_DEV_HWA;

	return false;

}



static int ncsi_enable_hwa(struct ncsi_dev_priv *ndp)

{

	struct ncsi_package *np;