tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Bluetooth: btintel: Replace CNVi id with hardware variant

Use hardware variant instead of CNVi to send dsbr command.

Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

authored by

Kiran K and committed by
Luiz Augusto von Dentz c239ad6e 21b51648

+16 -9
+9 -9
drivers/bluetooth/btintel.c
··· 2818 2818 2819 2819 struct btintel_dsbr_cmd cmd; 2820 2820 struct sk_buff *skb; 2821 - u32 dsbr, cnvi; 2822 - u8 status; 2821 + u32 dsbr; 2822 + u8 status, hw_variant; 2823 2823 int err; 2824 2824 2825 - cnvi = ver->cnvi_top & 0xfff; 2825 + hw_variant = INTEL_HW_VARIANT(ver->cnvi_bt); 2826 2826 /* DSBR command needs to be sent for, 2827 2827 * 1. BlazarI or BlazarIW + B0 step product in IML image. 2828 2828 * 2. Gale Peak2 or BlazarU in OP image. 2829 2829 * 3. Scorpious Peak in IML image. 2830 2830 */ 2831 2831 2832 - switch (cnvi) { 2833 - case BTINTEL_CNVI_BLAZARI: 2834 - case BTINTEL_CNVI_BLAZARIW: 2832 + switch (hw_variant) { 2833 + case BTINTEL_HWID_BZRI: 2834 + case BTINTEL_HWID_BZRIW: 2835 2835 if (ver->img_type == BTINTEL_IMG_IML && 2836 2836 INTEL_CNVX_TOP_STEP(ver->cnvi_top) == 0x01) 2837 2837 break; 2838 2838 return 0; 2839 - case BTINTEL_CNVI_GAP: 2840 - case BTINTEL_CNVI_BLAZARU: 2839 + case BTINTEL_HWID_GAP: 2840 + case BTINTEL_HWID_BZRU: 2841 2841 if (ver->img_type == BTINTEL_IMG_OP && 2842 2842 hdev->bus == HCI_USB) 2843 2843 break; 2844 2844 return 0; 2845 - case BTINTEL_CNVI_SCP: 2845 + case BTINTEL_HWID_SCP: 2846 2846 if (ver->img_type == BTINTEL_IMG_IML) 2847 2847 break; 2848 2848 return 0;
+7
drivers/bluetooth/btintel.h
··· 69 69 70 70 #define BTINTEL_FWID_MAXLEN 64 71 71 72 + /* CNVi Hardware variant */ 73 + #define BTINTEL_HWID_GAP 0x1c /* Gale Peak2 - Meteor Lake */ 74 + #define BTINTEL_HWID_BZRI 0x1e /* BlazarI - Lunar Lake */ 75 + #define BTINTEL_HWID_BZRU 0x1d /* BlazarU - Meteor Lake */ 76 + #define BTINTEL_HWID_SCP 0x1f /* Scorpius Peak - Panther Lake */ 77 + #define BTINTEL_HWID_BZRIW 0x22 /* BlazarIW - Wildcat Lake */ 78 + 72 79 struct intel_version_tlv { 73 80 u32 cnvi_top; 74 81 u32 cnvr_top;