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

Unverified Commit 51fc2f7b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of... 

Merge tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19 into android13-4.19-kona

"LA.UM.9.12.r1-17400-SMxx50.QSSI13.0"

* tag 'LA.UM.9.12.r1-17400-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19:
  dwc3-msm-core: Remove usage of DWC31_LINK_GDBGLTSSM with POR
  defconfig: kona: Fix for SonyDualSenseEdge cts failures
  defconfig: kona: Fix for SonyDualSenseEdge cts failures
  usb: dwc3-msm-core: Set pipectl susphy in conndone interrupt
  BACKPORT: bpf: add bpf_ktime_get_boot_ns()
  bus: mhi: fix potential out-of-bound access
  usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens
  msm: kgsl: Limit the syncpoint count for AUX commands
  msm: kgsl: Prevent wrap around during user address mapping
  bt: Unset multi channel bit for 44.1/88.2Khz A2DP Rx
  BACKPORT: bpf: add bpf_ktime_get_boot_ns()
  iommu: Fix missing return check of arm_lpae_init_pte
  block: ratelimit handle_bad_sector() message
  securemsm-kernel: Fix multiple listener registration on same fd

Change-Id: I37201afb12aba0a082bdce6acb461839ed3a77b8
parents 2f041349 f3875bf8

arch/arm64/configs/vendor/kona-perf_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -462,8 +462,6 @@ CONFIG_HID_MICROSOFT=y 
CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLAYSTATION=y

CONFIG_PLAYSTATION_FF=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_HID_QVR=y

arch/arm64/configs/vendor/kona_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -478,8 +478,6 @@ CONFIG_HID_MICROSOFT=y 
CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLAYSTATION=y

CONFIG_PLAYSTATION_FF=y

CONFIG_HID_SONY=y

CONFIG_SONY_FF=y

CONFIG_HID_QVR=y

block/blk-core.c

+5 −5
Original line number Diff line number Diff line
@@ -2133,8 +2133,8 @@ static void handle_bad_sector(struct bio *bio, sector_t maxsector) 
{

	char b[BDEVNAME_SIZE];



	printk(KERN_INFO "attempt to access beyond end of device\n");

	printk(KERN_INFO "%s: rw=%d, want=%Lu, limit=%Lu\n",

	pr_info_ratelimited("attempt to access beyond end of device\n"

			    "%s: rw=%d, want=%Lu, limit=%Lu\n",

			    bio_devname(bio, b), bio->bi_opf,

			    (unsigned long long)bio_end_sector(bio),

			    (long long)maxsector);

drivers/bluetooth/btfm_slim_slave.c

+17 −4
Original line number Diff line number Diff line
@@ -81,14 +81,12 @@ int btfm_slim_slave_enable_port(struct btfmslim *btfmslim, uint8_t port_num, 
	uint8_t reg_val = 0, en;

	uint8_t rxport_num = 0;

	uint16_t reg;

	uint8_t prev_reg_val = 0;



	BTFMSLIM_DBG("port(%d) enable(%d)", port_num, enable);

	if (rxport) {

		BTFMSLIM_DBG("sample rate is %d", btfmslim->sample_rate);

		if (enable &&

			btfmslim->sample_rate != 44100 &&

			btfmslim->sample_rate != 88200) {

			BTFMSLIM_DBG("setting multichannel bit");

		if (enable) {

			/* For SCO Rx, A2DP Rx other than 44.1 and 88.2Khz */

			if (port_num < 24) {

				rxport_num = port_num - 16;
@@ -102,6 +100,21 @@ int btfm_slim_slave_enable_port(struct btfmslim *btfmslim, uint8_t port_num, 
					rxport_num);

			}



			if (btfmslim->sample_rate == 44100 ||

				btfmslim->sample_rate == 88200) {

				BTFMSLIM_DBG("unsetting multichannel bit");

				ret = btfm_slim_read(btfmslim, reg,  1,

							&prev_reg_val, IFD);

				if (ret < 0) {

					BTFMSLIM_ERR("error %d reading", ret);

					prev_reg_val = 0;

				}

				BTFMSLIM_DBG("prev_reg_val (%d) from reg(%x)",

						prev_reg_val, reg);

				reg_val = prev_reg_val & ~reg_val;

			} else

				BTFMSLIM_DBG("setting multichannel bit");



			BTFMSLIM_DBG("writing reg_val (%d) to reg(%x)",

				reg_val, reg);

			ret = btfm_slim_write(btfmslim, reg, 1, &reg_val, IFD);

drivers/bus/mhi/devices/mhi_satellite.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static struct mhi_sat_device *find_sat_dev_by_id( 
static bool mhi_sat_isvalid_header(struct sat_header *hdr, int len)

{

	/* validate payload size */

	if (len >= sizeof(*hdr) && (len != hdr->payload_size + sizeof(*hdr)))

	if (len < sizeof(*hdr) || len != hdr->payload_size + sizeof(*hdr))

		return false;



	/* validate SAT IPC version */