Skip to content

Commit 66682f5

Browse files
committed
fix unstable bluetooth
1 parent 19cb40a commit 66682f5

File tree

3 files changed

+37
-125
lines changed

3 files changed

+37
-125
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
2+
index dcb675d980d4..2688ac2a7e55 100644
3+
--- a/drivers/spmi/spmi-pmic-arb.c
4+
+++ b/drivers/spmi/spmi-pmic-arb.c
5+
@@ -289,7 +289,6 @@ static int pmic_arb_wait_for_done(struct spmi_controller *ctrl,
6+
if (status & PMIC_ARB_STATUS_FAILURE) {
7+
dev_err(&ctrl->dev, "%s: %#x %#x: transaction failed (%#x)\n",
8+
__func__, sid, addr, status);
9+
- WARN_ON(1);
10+
return -EIO;
11+
}
12+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
2+
index 08dc3e2a729c..d79dfe71410b 100644
3+
--- a/drivers/tty/serial/qcom_geni_serial.c
4+
+++ b/drivers/tty/serial/qcom_geni_serial.c
5+
@@ -823,7 +823,7 @@ static void qcom_geni_serial_handle_rx_dma(struct uart_port *uport, bool drop)
6+
rx_in = readl(uport->membase + SE_DMA_RX_LEN_IN);
7+
if (!rx_in) {
8+
dev_warn(uport->dev, "serial engine reports 0 RX bytes in!\n");
9+
- return;
10+
+ //return;
11+
}
12+
13+
if (!drop)

linux-arm64-sm8250.config

Lines changed: 12 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,6 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
736736
CONFIG_STRICT_MODULE_RWX=y
737737
CONFIG_HAVE_ARCH_COMPILER_H=y
738738
CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
739-
CONFIG_ARCH_USE_MEMREMAP_PROT=y
740739
# CONFIG_LOCK_EVENT_COUNTS is not set
741740
CONFIG_ARCH_HAS_RELR=y
742741
CONFIG_HAVE_PREEMPT_DYNAMIC=y
@@ -1501,20 +1500,15 @@ CONFIG_NET_FLOW_LIMIT=y
15011500
# end of Networking options
15021501

15031502
# CONFIG_HAMRADIO is not set
1504-
CONFIG_CAN=m
1505-
CONFIG_CAN_RAW=m
1506-
CONFIG_CAN_BCM=m
1507-
CONFIG_CAN_GW=m
1508-
# CONFIG_CAN_J1939 is not set
1509-
# CONFIG_CAN_ISOTP is not set
1503+
# CONFIG_CAN is not set
15101504
CONFIG_BT=m
15111505
CONFIG_BT_BREDR=y
15121506
# CONFIG_BT_RFCOMM is not set
15131507
# CONFIG_BT_BNEP is not set
15141508
CONFIG_BT_HIDP=m
15151509
# CONFIG_BT_HS is not set
15161510
# CONFIG_BT_LE is not set
1517-
CONFIG_BT_LEDS=y
1511+
# CONFIG_BT_LEDS is not set
15181512
# CONFIG_BT_MSFTEXT is not set
15191513
# CONFIG_BT_AOSPEXT is not set
15201514
# CONFIG_BT_DEBUGFS is not set
@@ -1545,7 +1539,7 @@ CONFIG_BT_HCIUART_QCA=y
15451539
# CONFIG_BT_HCIVHCI is not set
15461540
# CONFIG_BT_MRVL is not set
15471541
# CONFIG_BT_MTKUART is not set
1548-
CONFIG_BT_QCOMSMD=m
1542+
# CONFIG_BT_QCOMSMD is not set
15491543
# CONFIG_BT_VIRTIO is not set
15501544
# CONFIG_BT_NXPUART is not set
15511545
# end of Bluetooth device drivers
@@ -1579,36 +1573,10 @@ CONFIG_RFKILL=m
15791573
CONFIG_RFKILL_LEDS=y
15801574
CONFIG_RFKILL_INPUT=y
15811575
# CONFIG_RFKILL_GPIO is not set
1582-
CONFIG_NET_9P=y
1583-
CONFIG_NET_9P_FD=y
1584-
CONFIG_NET_9P_VIRTIO=y
1585-
# CONFIG_NET_9P_DEBUG is not set
1576+
# CONFIG_NET_9P is not set
15861577
# CONFIG_CAIF is not set
15871578
# CONFIG_CEPH_LIB is not set
1588-
CONFIG_NFC=m
1589-
# CONFIG_NFC_DIGITAL is not set
1590-
CONFIG_NFC_NCI=m
1591-
# CONFIG_NFC_NCI_SPI is not set
1592-
# CONFIG_NFC_NCI_UART is not set
1593-
# CONFIG_NFC_HCI is not set
1594-
1595-
#
1596-
# Near Field Communication (NFC) devices
1597-
#
1598-
# CONFIG_NFC_VIRTUAL_NCI is not set
1599-
# CONFIG_NFC_FDP is not set
1600-
# CONFIG_NFC_PN533_USB is not set
1601-
# CONFIG_NFC_PN533_I2C is not set
1602-
# CONFIG_NFC_PN532_UART is not set
1603-
# CONFIG_NFC_MRVL_USB is not set
1604-
# CONFIG_NFC_ST_NCI_I2C is not set
1605-
# CONFIG_NFC_ST_NCI_SPI is not set
1606-
CONFIG_NFC_NXP_NCI=m
1607-
CONFIG_NFC_NXP_NCI_I2C=m
1608-
# CONFIG_NFC_S3FWRN5_I2C is not set
1609-
# CONFIG_NFC_S3FWRN82_UART is not set
1610-
# end of Near Field Communication (NFC) devices
1611-
1579+
# CONFIG_NFC is not set
16121580
# CONFIG_PSAMPLE is not set
16131581
# CONFIG_NET_IFE is not set
16141582
# CONFIG_LWTUNNEL is not set
@@ -1845,7 +1813,6 @@ CONFIG_EFI_CAPSULE_LOADER=y
18451813
# CONFIG_EFI_TEST is not set
18461814
# CONFIG_RESET_ATTACK_MITIGATION is not set
18471815
# CONFIG_EFI_DISABLE_PCI_DMA is not set
1848-
CONFIG_EFI_EARLYCON=y
18491816
CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
18501817
# CONFIG_EFI_DISABLE_RUNTIME is not set
18511818
# CONFIG_EFI_COCO_SECRET is not set
@@ -2500,52 +2467,6 @@ CONFIG_VITESSE_PHY=y
25002467
# CONFIG_XILINX_GMII2RGMII is not set
25012468
# CONFIG_MICREL_KS8995MA is not set
25022469
# CONFIG_PSE_CONTROLLER is not set
2503-
CONFIG_CAN_DEV=m
2504-
# CONFIG_CAN_VCAN is not set
2505-
# CONFIG_CAN_VXCAN is not set
2506-
CONFIG_CAN_NETLINK=y
2507-
CONFIG_CAN_CALC_BITTIMING=y
2508-
CONFIG_CAN_RX_OFFLOAD=y
2509-
# CONFIG_CAN_CAN327 is not set
2510-
CONFIG_CAN_FLEXCAN=m
2511-
# CONFIG_CAN_GRCAN is not set
2512-
# CONFIG_CAN_KVASER_PCIEFD is not set
2513-
# CONFIG_CAN_SLCAN is not set
2514-
# CONFIG_CAN_XILINXCAN is not set
2515-
# CONFIG_CAN_C_CAN is not set
2516-
# CONFIG_CAN_CC770 is not set
2517-
# CONFIG_CAN_CTUCANFD_PCI is not set
2518-
# CONFIG_CAN_CTUCANFD_PLATFORM is not set
2519-
# CONFIG_CAN_IFI_CANFD is not set
2520-
# CONFIG_CAN_M_CAN is not set
2521-
# CONFIG_CAN_PEAK_PCIEFD is not set
2522-
# CONFIG_CAN_SJA1000 is not set
2523-
# CONFIG_CAN_SOFTING is not set
2524-
2525-
#
2526-
# CAN SPI interfaces
2527-
#
2528-
# CONFIG_CAN_HI311X is not set
2529-
# CONFIG_CAN_MCP251X is not set
2530-
# CONFIG_CAN_MCP251XFD is not set
2531-
# end of CAN SPI interfaces
2532-
2533-
#
2534-
# CAN USB interfaces
2535-
#
2536-
# CONFIG_CAN_8DEV_USB is not set
2537-
# CONFIG_CAN_EMS_USB is not set
2538-
# CONFIG_CAN_ESD_USB is not set
2539-
# CONFIG_CAN_ETAS_ES58X is not set
2540-
# CONFIG_CAN_F81604 is not set
2541-
# CONFIG_CAN_GS_USB is not set
2542-
# CONFIG_CAN_KVASER_USB is not set
2543-
# CONFIG_CAN_MCBA_USB is not set
2544-
# CONFIG_CAN_PEAK_USB is not set
2545-
# CONFIG_CAN_UCAN is not set
2546-
# end of CAN USB interfaces
2547-
2548-
# CONFIG_CAN_DEBUG_DEVICES is not set
25492470
CONFIG_MDIO_DEVICE=y
25502471
CONFIG_MDIO_BUS=y
25512472
CONFIG_FWNODE_MDIO=y
@@ -2910,67 +2831,36 @@ CONFIG_LDISC_AUTOLOAD=y
29102831
#
29112832
# Serial drivers
29122833
#
2913-
CONFIG_SERIAL_EARLYCON=y
2914-
CONFIG_SERIAL_8250=y
2915-
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
2916-
CONFIG_SERIAL_8250_PNP=y
2917-
CONFIG_SERIAL_8250_16550A_VARIANTS=y
2918-
# CONFIG_SERIAL_8250_FINTEK is not set
2919-
CONFIG_SERIAL_8250_CONSOLE=y
2920-
CONFIG_SERIAL_8250_DMA=y
2921-
CONFIG_SERIAL_8250_PCILIB=y
2922-
CONFIG_SERIAL_8250_PCI=y
2923-
CONFIG_SERIAL_8250_EXAR=y
2924-
CONFIG_SERIAL_8250_NR_UARTS=4
2925-
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
2926-
CONFIG_SERIAL_8250_EXTENDED=y
2927-
# CONFIG_SERIAL_8250_MANY_PORTS is not set
2928-
CONFIG_SERIAL_8250_PCI1XXXX=y
2929-
CONFIG_SERIAL_8250_SHARE_IRQ=y
2930-
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
2931-
# CONFIG_SERIAL_8250_RSA is not set
2932-
CONFIG_SERIAL_8250_DWLIB=y
2933-
CONFIG_SERIAL_8250_FSL=y
2934-
CONFIG_SERIAL_8250_DW=y
2935-
# CONFIG_SERIAL_8250_RT288X is not set
2936-
CONFIG_SERIAL_8250_PERICOM=y
2937-
CONFIG_SERIAL_OF_PLATFORM=y
2834+
# CONFIG_SERIAL_8250 is not set
29382835

29392836
#
29402837
# Non-8250 serial port support
29412838
#
29422839
# CONFIG_SERIAL_AMBA_PL010 is not set
2943-
CONFIG_SERIAL_AMBA_PL011=y
2944-
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
2840+
# CONFIG_SERIAL_AMBA_PL011 is not set
29452841
# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
29462842
# CONFIG_SERIAL_MAX3100 is not set
29472843
# CONFIG_SERIAL_MAX310X is not set
29482844
# CONFIG_SERIAL_UARTLITE is not set
29492845
CONFIG_SERIAL_CORE=y
2950-
CONFIG_SERIAL_CORE_CONSOLE=y
29512846
# CONFIG_SERIAL_JSM is not set
2952-
CONFIG_SERIAL_MSM=y
2953-
CONFIG_SERIAL_MSM_CONSOLE=y
2847+
# CONFIG_SERIAL_MSM is not set
29542848
CONFIG_SERIAL_QCOM_GENI=y
2955-
CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
2849+
# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set
29562850
# CONFIG_SERIAL_SIFIVE is not set
29572851
# CONFIG_SERIAL_SCCNXP is not set
29582852
# CONFIG_SERIAL_SC16IS7XX is not set
29592853
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
29602854
# CONFIG_SERIAL_ALTERA_UART is not set
2961-
CONFIG_SERIAL_XILINX_PS_UART=y
2962-
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
2855+
# CONFIG_SERIAL_XILINX_PS_UART is not set
29632856
# CONFIG_SERIAL_ARC is not set
29642857
# CONFIG_SERIAL_RP2 is not set
2965-
CONFIG_SERIAL_FSL_LPUART=y
2966-
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
2967-
CONFIG_SERIAL_FSL_LINFLEXUART=y
2968-
CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
2858+
# CONFIG_SERIAL_FSL_LPUART is not set
2859+
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
29692860
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
29702861
# CONFIG_SERIAL_SPRD is not set
29712862
# end of Serial drivers
29722863

2973-
CONFIG_SERIAL_MCTRL_GPIO=y
29742864
# CONFIG_SERIAL_NONSTANDARD is not set
29752865
# CONFIG_N_GSM is not set
29762866
# CONFIG_NOZOMI is not set
@@ -3209,7 +3099,6 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
32093099
CONFIG_PTP_1588_CLOCK_KVM=y
32103100
# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
32113101
# CONFIG_PTP_1588_CLOCK_IDTCM is not set
3212-
# CONFIG_PTP_1588_CLOCK_OCP is not set
32133102
# end of PTP clock support
32143103

32153104
CONFIG_PINCTRL=y
@@ -3296,7 +3185,6 @@ CONFIG_GPIO_ALTERA=m
32963185
# CONFIG_GPIO_AMDPT is not set
32973186
# CONFIG_GPIO_CADENCE is not set
32983187
CONFIG_GPIO_DWAPB=y
3299-
# CONFIG_GPIO_EXAR is not set
33003188
# CONFIG_GPIO_FTGPIO010 is not set
33013189
# CONFIG_GPIO_GENERIC_PLATFORM is not set
33023190
# CONFIG_GPIO_GRGPIO is not set
@@ -6978,7 +6866,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
69786866
# CONFIG_SMB_SERVER is not set
69796867
# CONFIG_CODA_FS is not set
69806868
# CONFIG_AFS_FS is not set
6981-
# CONFIG_9P_FS is not set
69826869
CONFIG_NLS=y
69836870
CONFIG_NLS_DEFAULT="iso8859-1"
69846871
CONFIG_NLS_CODEPAGE_437=y

0 commit comments

Comments
 (0)