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

Commit 022e1d06 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: Log message that B_CUT device may not work 



There are a number of problems that occur for the latest version
of the Realtek RTL8188CE device with the in-kernel driver. These
include selection of the wrong firmware, and system lockup. A full
fix is known, but is too invasive for inclusion in stable. This patch
fixes the problem with loading the wrong firmware, and logs a message
that the device may not work for kernels 3.6 and older.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Cc: Anisse Astier <anisse@astier.eu>
Cc: Li Chaoming <chaoming_li@realsil.com.cn>
Tested-by: default avatarAnisse Astier <anisse@astier.eu>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4abd044a

drivers/net/wireless/rtlwifi/rtl8192ce/def.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 


#define CHIP_VER_B			BIT(4)

#define CHIP_92C_BITMASK		BIT(0)

#define CHIP_UNKNOWN			BIT(7)

#define CHIP_92C_1T2R			0x03

#define CHIP_92C			0x01

#define CHIP_88C			0x00

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+10 −2
Original line number Diff line number Diff line
@@ -994,8 +994,16 @@ static enum version_8192c _rtl92ce_read_chip_version(struct ieee80211_hw *hw) 
		version = (value32 & TYPE_ID) ? VERSION_A_CHIP_92C :

			   VERSION_A_CHIP_88C;

	} else {

		version = (value32 & TYPE_ID) ? VERSION_B_CHIP_92C :

			   VERSION_B_CHIP_88C;

		version = (enum version_8192c) (CHIP_VER_B |

				((value32 & TYPE_ID) ? CHIP_92C_BITMASK : 0) |

				((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : 0));

		if ((!IS_CHIP_VENDOR_UMC(version)) && (value32 &

		     CHIP_VER_RTL_MASK)) {

			version = (enum version_8192c)(version |

				   ((((value32 & CHIP_VER_RTL_MASK) == BIT(12))

				   ? CHIP_VENDOR_UMC_B_CUT : CHIP_UNKNOWN) |

				   CHIP_VENDOR_UMC));

		}

	}



	switch (version) {

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+4 −2
Original line number Diff line number Diff line
@@ -162,10 +162,12 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw) 


	/* request fw */

	if (IS_VENDOR_UMC_A_CUT(rtlhal->version) &&

	    !IS_92C_SERIAL(rtlhal->version))

	    !IS_92C_SERIAL(rtlhal->version)) {

		rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU.bin";

	else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))

	} else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {

		rtlpriv->cfg->fw_name = "rtlwifi/rtl8192cfwU_B.bin";

		pr_info("****** This B_CUT device may not work with kernels 3.6 and earlier\n");

	}



	rtlpriv->max_fw_size = 0x4000;

	pr_info("Using firmware %s\n", rtlpriv->cfg->fw_name);