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

Commit de82582b authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Handle unsupported MAC versions early 



There is no point in trying to bring up the chip when
the MAC version is not present in the supported list.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e4ef2763

drivers/net/wireless/ath/ath9k/hw.c

+24 −24
Original line number Diff line number Diff line
@@ -474,6 +474,30 @@ static int __ath9k_hw_init(struct ath_hw *ah) 


	ath9k_hw_read_revisions(ah);



	switch (ah->hw_version.macVersion) {

	case AR_SREV_VERSION_5416_PCI:

	case AR_SREV_VERSION_5416_PCIE:

	case AR_SREV_VERSION_9160:

	case AR_SREV_VERSION_9100:

	case AR_SREV_VERSION_9280:

	case AR_SREV_VERSION_9285:

	case AR_SREV_VERSION_9287:

	case AR_SREV_VERSION_9271:

	case AR_SREV_VERSION_9300:

	case AR_SREV_VERSION_9330:

	case AR_SREV_VERSION_9485:

	case AR_SREV_VERSION_9340:

	case AR_SREV_VERSION_9462:

	case AR_SREV_VERSION_9550:

	case AR_SREV_VERSION_9565:

		break;

	default:

		ath_err(common,

			"Mac Chip Rev 0x%02x.%x is not supported by this driver\n",

			ah->hw_version.macVersion, ah->hw_version.macRev);

		return -EOPNOTSUPP;

	}



	/*

	 * Read back AR_WA into a permanent copy and set bits 14 and 17.

	 * We need to do this to avoid RMW of this register. We cannot
@@ -527,30 +551,6 @@ static int __ath9k_hw_init(struct ath_hw *ah) 
	else

		ah->config.max_txtrig_level = MAX_TX_FIFO_THRESHOLD;



	switch (ah->hw_version.macVersion) {

	case AR_SREV_VERSION_5416_PCI:

	case AR_SREV_VERSION_5416_PCIE:

	case AR_SREV_VERSION_9160:

	case AR_SREV_VERSION_9100:

	case AR_SREV_VERSION_9280:

	case AR_SREV_VERSION_9285:

	case AR_SREV_VERSION_9287:

	case AR_SREV_VERSION_9271:

	case AR_SREV_VERSION_9300:

	case AR_SREV_VERSION_9330:

	case AR_SREV_VERSION_9485:

	case AR_SREV_VERSION_9340:

	case AR_SREV_VERSION_9462:

	case AR_SREV_VERSION_9550:

	case AR_SREV_VERSION_9565:

		break;

	default:

		ath_err(common,

			"Mac Chip Rev 0x%02x.%x is not supported by this driver\n",

			ah->hw_version.macVersion, ah->hw_version.macRev);

		return -EOPNOTSUPP;

	}



	if (AR_SREV_9271(ah) || AR_SREV_9100(ah) || AR_SREV_9340(ah) ||

	    AR_SREV_9330(ah) || AR_SREV_9550(ah))

		ah->is_pciexpress = false;