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

Commit 0b24b774 authored by Bharath's avatar Bharath
Browse files

Merge branch '234devices-r-FP3-MR1' into 'v1-r' 

FP3: Update to MR1

See merge request !11
parents 37845e6d a80ab0f3

AndroidKernel.mk

+2 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ TARGET_KERNEL_HEADER_ARCH := $(strip $(TARGET_KERNEL_HEADER_ARCH)) 
ifeq ($(TARGET_KERNEL_HEADER_ARCH),)

KERNEL_HEADER_ARCH := $(KERNEL_ARCH)

else

$(warning Forcing kernel header generation only for '$(TARGET_KERNEL_HEADER_ARCH)')

KERNEL_HEADER_ARCH := $(TARGET_KERNEL_HEADER_ARCH)

endif
@@ -59,7 +58,6 @@ ifeq ($(KERNEL_LLVM_SUPPORT), true) 
    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

     KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler

    $(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))

  endif

endif
@@ -70,9 +68,9 @@ KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" | $(KERNEL_CR 
real_cc :=

ifeq ($(KERNEL_LLVM_SUPPORT),true)

  ifeq ($(KERNEL_ARCH), arm64)

    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-

    real_cc := CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=aarch64-linux-gnu-

  else

    real_cc := REAL_CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=arm-linux-gnueabihf

    real_cc := CC=$(KERNEL_LLVM_BIN) CLANG_TRIPLE=arm-linux-gnueabihf

  endif

else

ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0)

Makefile

+1 −6
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ include scripts/Kbuild.include 
# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as

LD		= $(CROSS_COMPILE)ld

REAL_CC		= $(CROSS_COMPILE)gcc

CC		= $(CROSS_COMPILE)gcc

LDGOLD		= $(CROSS_COMPILE)ld.gold

CPP		= $(CC) -E

AR		= $(CROSS_COMPILE)ar
@@ -364,10 +364,6 @@ PERL = perl 
PYTHON		= python

CHECK		= sparse



# Use the wrapper for the compiler.  This wrapper scans for new

# warnings and causes the build to stop upon encountering them

CC		= $(PYTHON) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void $(CF)

NOSTDINC_FLAGS  =
@@ -535,7 +531,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier) 
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

KBUILD_CFLAGS += -Wno-undefined-optimized

KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare

KBUILD_CFLAGS += $(call cc-option, -Wno-sometimes-uninitialized)

KBUILD_CFLAGS += -Wno-asm-operand-widths

arch/arm64/configs/msm8953-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ CONFIG_GPIOLIB=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_QCOM_DLOAD_MODE=n

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

drivers/char/adsprpc.c

+3 −3
Original line number Diff line number Diff line
@@ -917,6 +917,9 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
				(unsigned int)map->attr);

			map->refs = 2;

		}

		VERIFY(err, !IS_ERR_OR_NULL(map->buf = dma_buf_get(fd)));

		if (err)

			goto bail;

		VERIFY(err, !IS_ERR_OR_NULL(map->handle =

				ion_import_dma_buf_fd(fl->apps->client, fd)));

		if (err)
@@ -947,9 +950,6 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
		if (map->attr & FASTRPC_ATTR_NOVA && !sess->smmu.coherent)

			map->uncached = 1;



		VERIFY(err, !IS_ERR_OR_NULL(map->buf = dma_buf_get(fd)));

		if (err)

			goto bail;

		VERIFY(err, !IS_ERR_OR_NULL(map->attach =

				dma_buf_attach(map->buf, sess->smmu.dev)));

		if (err)

drivers/char/diag/diag_dci.c

+14 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2022, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1619,7 +1619,6 @@ static int diag_send_dci_pkt(struct diag_cmd_reg_t *entry, 
		return -EIO;

	}



	mutex_lock(&driver->dci_mutex);

	/* prepare DCI packet */

	header.start = CONTROL_CHAR;

	header.version = 1;
@@ -1638,7 +1637,6 @@ static int diag_send_dci_pkt(struct diag_cmd_reg_t *entry, 
		diag_update_pkt_buffer(driver->apps_dci_buf, write_len,

				       DCI_PKT_TYPE);

		diag_update_sleeping_process(entry->pid, DCI_PKT_TYPE);

		mutex_unlock(&driver->dci_mutex);

		return DIAG_DCI_NO_ERROR;

	}
@@ -1658,7 +1656,6 @@ static int diag_send_dci_pkt(struct diag_cmd_reg_t *entry, 
		       entry->proc);

		status = DIAG_DCI_SEND_DATA_FAIL;

	}

	mutex_unlock(&driver->dci_mutex);

	return status;

}
@@ -1984,12 +1981,13 @@ static int diag_process_dci_pkt_rsp(unsigned char *buf, int len) 
{

	int ret = DIAG_DCI_TABLE_ERR;

	int common_cmd = 0, header_len = 0;

	int req_tag = 0;

	struct diag_pkt_header_t *header = NULL;

	unsigned char *temp = buf;

	unsigned char *req_buf = NULL;

	uint8_t retry_count = 0, max_retries = 3;

	uint32_t read_len = 0, req_len = len;

	struct dci_pkt_req_entry_t *req_entry = NULL;

	struct dci_pkt_req_entry_t *req_entry = NULL, *test_entry = NULL;

	struct diag_dci_client_tbl *dci_entry = NULL;

	struct dci_pkt_req_t req_hdr;

	struct diag_cmd_reg_t *reg_item;
@@ -2093,6 +2091,7 @@ static int diag_process_dci_pkt_rsp(unsigned char *buf, int len) 
		mutex_unlock(&driver->dci_mutex);

		return DIAG_DCI_NO_REG;

	}

	req_tag = req_entry->tag;

	mutex_unlock(&driver->dci_mutex);



	/*
@@ -2100,14 +2099,14 @@ static int diag_process_dci_pkt_rsp(unsigned char *buf, int len) 
	 * remote processor

	 */

	if (dci_entry->client_info.token > 0) {

		ret = diag_send_dci_pkt_remote(req_buf, req_len, req_entry->tag,

		ret = diag_send_dci_pkt_remote(req_buf, req_len, req_tag,

					       dci_entry->client_info.token);

		return ret;

	}



	/* Check if it is a dedicated Apps command */

	ret = diag_dci_process_apps_pkt(header, req_buf, req_len,

					req_entry->tag, header_len);

					req_tag, header_len);

	if ((ret == DIAG_DCI_NO_ERROR && !common_cmd) || ret < 0)

		return ret;
@@ -2130,8 +2129,14 @@ static int diag_process_dci_pkt_rsp(unsigned char *buf, int len) 
	if (temp_entry) {

		reg_item = container_of(temp_entry, struct diag_cmd_reg_t,

								entry);

		mutex_lock(&driver->dci_mutex);

		test_entry = diag_dci_get_request_entry(req_tag);

		if (test_entry)

			ret = diag_send_dci_pkt(reg_item, req_buf, req_len,

					req_entry->tag);

					test_entry->tag);

		else

			ret = -EIO;

		mutex_unlock(&driver->dci_mutex);

	} else {

		DIAG_LOG(DIAG_DEBUG_DCI, "Command not found: %02x %02x %02x\n",

				reg_entry.cmd_code, reg_entry.subsys_id,