R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"LA.UM.9.12.r1-14800-SMxx50.QSSI13.0"

* tag 'LA.UM.9.12.r1-14800-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19:
  qcom/l2cache_counters: Add support to check available CPUS
  FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
  media:uvc: supports dynamic setting of urb configuration
  msm: camera: Increase the total number of camera ID's supported
  cpu-topology: Don't error on more than CONFIG_NR_CPUS CPUs in device tree
  usb: gadget: rndis: prevent integer overflow in rndis_set_response()
  FROMLIST: binder: fix UAF of ref->proc caused by race condition
  msm_perf: check cpu_possible to improve stability
  msm: adsprpc: Validate the CID
  soc: qcom: socinfo: Add soc information for Khaje IOT
  power: qpnp-fg-gen4: Improve SDAM corruption check

Change-Id: I541aeb4e4c8ae7c2e23e03e66bf3092886a4e48f
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
UtsavBalar1231 2022-10-19 10:43:50 +05:30
commit 484fb07784
10 changed files with 178 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm64/kernel/topology.c
View File

@ -31,6 +31,16 @@
#include <asm/cputype.h>
#include <asm/topology.h>
/*
* This function returns the logic cpu number of the node.
* There are basically three kinds of return values:
* (1) logic cpu number which is > 0.
* (2) -ENODEV when the device tree(DT) node is valid and found in the DT but
* there is no possible logical CPU in the kernel to match. This happens
* when CONFIG_NR_CPUS is configure to be smaller than the number of
* CPU nodes in DT. We need to just ignore this case.
* (3) -1 if the node does not exist in the device tree
*/
static int __init get_cpu_for_node(struct device_node *node)
{
struct device_node *cpu_node;
@ -44,8 +54,8 @@ static int __init get_cpu_for_node(struct device_node *node)
if (cpu >= 0)
topology_parse_cpu_capacity(cpu_node, cpu);
else
pr_crit("Unable to find CPU node for %pOF\n", cpu_node);
pr_info("CPU node for %pOF exist but the possible cpu range is :%*pbl\n",
cpu_node, cpumask_pr_args(cpu_possible_mask));
of_node_put(cpu_node);
return cpu;
}
@ -69,7 +79,7 @@ static int __init parse_core(struct device_node *core, int package_id,
cpu_topology[cpu].package_id = package_id;
cpu_topology[cpu].core_id = core_id;
cpu_topology[cpu].thread_id = i;
} else {
} else if (cpu != -ENODEV) {
pr_err("%pOF: Can't get CPU for thread\n",
t);
of_node_put(t);
@ -90,7 +100,7 @@ static int __init parse_core(struct device_node *core, int package_id,
cpu_topology[cpu].package_id = package_id;
cpu_topology[cpu].core_id = core_id;
} else if (leaf) {
} else if (leaf && cpu != -ENODEV) {
pr_err("%pOF: Can't get CPU for leaf core\n", core);
return -EINVAL;
}

7
drivers/char/adsprpc.c
View File

@ -1466,8 +1466,11 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel,
spin_lock(&fl->hlock);
hlist_add_head(&ctx->hn, &clst->pending);
cid = (fl->cid >= ADSP_DOMAIN_ID && fl->cid < NUM_CHANNELS)
? fl->cid : 0;
if (!(fl->cid >= ADSP_DOMAIN_ID && fl->cid < NUM_CHANNELS)) {
err = -ECHRNG;
goto bail;
}
cid = fl->cid;
chan = &me->channel[cid];
spin_unlock(&fl->hlock);

71
drivers/media/usb/uvc/uvc_driver.c
View File

@ -2096,6 +2096,71 @@ struct uvc_device_info {
u32 meta_format;
};
/* ------------------------------------------------------------------------
* set urb queue size and urb packet size
*
*/
static ssize_t store_urb_config(struct device *dev,
struct device_attribute *attr, const char *buff, size_t count)
{
struct uvc_streaming *stream;
struct usb_interface *intf = to_usb_interface(dev);
struct uvc_device *udev = usb_get_intfdata(intf);
long max_urb, max_urb_packets;
int ret;
char *arr, *tmp;
arr = kstrdup(buff, GFP_KERNEL);
if (!arr)
return -ENOMEM;
tmp = strsep(&arr, ":");
if (!tmp)
return -EINVAL;
ret = kstrtol(tmp, 10, &max_urb);
if (ret < 0)
return ret;
tmp = strsep(&arr, ":");
if (!tmp)
return -EINVAL;
ret = kstrtol(tmp, 10, &max_urb_packets);
if (ret < 0)
return ret;
if (max_urb <= 0 || max_urb > 128 ||
max_urb_packets <= 0 || max_urb_packets > 128)
return -EINVAL;
list_for_each_entry(stream, &udev->streams, list) {
if (stream->refcnt)
continue;
stream->max_urb = max_urb;
stream->max_urb_packets = max_urb_packets;
}
return count;
}
static ssize_t show_urb_config(struct device *dev,
struct device_attribute *attr, char *buff)
{
return 0;
}
static struct device_attribute urb_config_attr = {
.attr = {
.name = "urb_config",
.mode = 00660,
},
.show = show_urb_config,
.store = store_urb_config,
};
static int uvc_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
@ -2228,6 +2293,12 @@ static int uvc_probe(struct usb_interface *intf,
uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n");
usb_enable_autosuspend(udev);
/* sysfs file for dynamically setting urb configs */
ret = sysfs_create_file(&dev->intf->dev.kobj, &urb_config_attr.attr);
if (ret != 0)
pr_info("Unable to initialize urb configuration: %d\n", ret);
return 0;
error:

40
drivers/media/usb/uvc/uvc_video.c
View File

@ -1547,7 +1547,7 @@ static void uvc_free_urb_buffers(struct uvc_streaming *stream)
{
unsigned int i;
for (i = 0; i < UVC_URBS; ++i) {
for (i = 0; i < stream->max_urb; ++i) {
if (stream->urb_buffer[i]) {
#ifndef CONFIG_DMA_NONCOHERENT
usb_free_coherent(stream->dev->udev, stream->urb_size,
@ -1587,12 +1587,22 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
* payloads across multiple URBs.
*/
npackets = DIV_ROUND_UP(size, psize);
if (npackets > UVC_MAX_PACKETS)
npackets = UVC_MAX_PACKETS;
if (npackets > stream->max_urb_packets)
npackets = stream->max_urb_packets;
/* Allocate memory for storing URB pointers */
stream->urb = kcalloc(stream->max_urb,
sizeof(struct urb *), gfp_flags | __GFP_NOWARN);
stream->urb_buffer = kcalloc(stream->max_urb,
sizeof(char *), gfp_flags | __GFP_NOWARN);
stream->urb_dma = kcalloc(stream->max_urb,
sizeof(dma_addr_t), gfp_flags | __GFP_NOWARN);
/* Retry allocations until one succeed. */
for (; npackets > 1; npackets /= 2) {
for (i = 0; i < UVC_URBS; ++i) {
for (i = 0; i < stream->max_urb; ++i) {
stream->urb_size = psize * npackets;
#ifndef CONFIG_DMA_NONCOHERENT
stream->urb_buffer[i] = usb_alloc_coherent(
@ -1608,10 +1618,10 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
}
}
if (i == UVC_URBS) {
uvc_trace(UVC_TRACE_VIDEO, "Allocated %u URB buffers "
"of %ux%u bytes each.\n", UVC_URBS, npackets,
psize);
if (i == stream->max_urb) {
uvc_trace(UVC_TRACE_VIDEO,
"Allocated %u URB buffers of %ux%u bytes each.\n",
stream->max_urb, npackets, psize);
return npackets;
}
}
@ -1631,7 +1641,7 @@ static void uvc_uninit_video(struct uvc_streaming *stream, int free_buffers)
uvc_video_stats_stop(stream);
for (i = 0; i < UVC_URBS; ++i) {
for (i = 0; i < stream->max_urb; ++i) {
urb = stream->urb[i];
if (urb == NULL)
continue;
@ -1643,6 +1653,8 @@ static void uvc_uninit_video(struct uvc_streaming *stream, int free_buffers)
if (free_buffers)
uvc_free_urb_buffers(stream);
stream->refcnt--;
}
/*
@ -1692,7 +1704,7 @@ static int uvc_init_video_isoc(struct uvc_streaming *stream,
size = npackets * psize;
for (i = 0; i < UVC_URBS; ++i) {
for (i = 0; i < stream->max_urb; ++i) {
urb = usb_alloc_urb(npackets, gfp_flags);
if (urb == NULL) {
uvc_uninit_video(stream, 1);
@ -1758,7 +1770,7 @@ static int uvc_init_video_bulk(struct uvc_streaming *stream,
if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
size = 0;
for (i = 0; i < UVC_URBS; ++i) {
for (i = 0; i < stream->max_urb; ++i) {
urb = usb_alloc_urb(0, gfp_flags);
if (urb == NULL) {
uvc_uninit_video(stream, 1);
@ -1867,7 +1879,8 @@ static int uvc_init_video(struct uvc_streaming *stream, gfp_t gfp_flags)
return ret;
/* Submit the URBs. */
for (i = 0; i < UVC_URBS; ++i) {
stream->refcnt++;
for (i = 0; i < stream->max_urb; ++i) {
ret = usb_submit_urb(stream->urb[i], gfp_flags);
if (ret < 0) {
uvc_printk(KERN_ERR, "Failed to submit URB %u "
@ -2028,6 +2041,9 @@ int uvc_video_init(struct uvc_streaming *stream)
stream->cur_format = format;
stream->cur_frame = frame;
stream->max_urb = UVC_URBS;
stream->max_urb_packets = UVC_MAX_PACKETS;
/* Select the video decoding function */
if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
if (stream->dev->quirks & UVC_QUIRK_BUILTIN_ISIGHT)

15
drivers/media/usb/uvc/uvcvideo.h
View File

@ -535,9 +535,9 @@ struct uvc_streaming {
u32 max_payload_size;
} bulk;
struct urb *urb[UVC_URBS];
char *urb_buffer[UVC_URBS];
dma_addr_t urb_dma[UVC_URBS];
struct urb **urb;
char **urb_buffer;
dma_addr_t *urb_dma;
unsigned int urb_size;
u32 sequence;
@ -570,6 +570,15 @@ struct uvc_streaming {
spinlock_t lock;
} clock;
/* Maximum number of URBs that can be submitted */
u32 max_urb;
/* Maximum number of packets per URB */
u32 max_urb_packets;
/*set if stream in progress */
u8 refcnt;
};
struct uvc_device {

12
drivers/perf/qcom_l2_counters.c
View File

@ -1037,8 +1037,8 @@ static int l2_cache_pmu_probe_cluster(struct device *parent,
struct cluster_pmu *cluster;
u32 fw_cluster_id;
struct resource res;
int ret;
int irq;
int ret = 0;
int irq, cpu, cpu_count = 0;
cluster = kzalloc(sizeof(*cluster), GFP_KERNEL);
if (!cluster) {
@ -1064,6 +1064,14 @@ static int l2_cache_pmu_probe_cluster(struct device *parent,
goto err_put_dev;
}
for_each_possible_cpu(cpu) {
if (topology_physical_package_id(cpu) == fw_cluster_id) {
cpu_count++;
break;
}
}
if (cpu_count == 0)
goto err_put_dev;
ret = of_address_to_resource(cn, 0, &res);
if (ret) {
pr_err(L2_COUNTERS_BUG "not able to find the resource\n");

32
drivers/power/supply/qcom/qpnp-fg-gen4.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#define pr_fmt(fmt) "FG: %s: " fmt, __func__
@ -30,12 +31,13 @@
#define FG_MEM_IF_PM8150B 0x0D
#define FG_ADC_RR_PM8150B 0x13
#define SDAM_COOKIE_OFFSET 0x80
#define SDAM_CYCLE_COUNT_OFFSET 0x81
#define SDAM_CAP_LEARN_OFFSET 0x91
#define SDAM_COOKIE 0xA5
#define SDAM_FG_PARAM_LENGTH 20
#define SDAM_COOKIE_OFFSET_4BYTE 0x95
#define SDAM_COOKIE_4BYTE 0x12345678
#define FG_SRAM_LEN 972
#define PROFILE_LEN 416
#define PROFILE_COMP_LEN 24
@ -1302,7 +1304,7 @@ static int fg_gen4_store_learned_capacity(void *data, int64_t learned_cap_uah)
struct fg_dev *fg;
int16_t cc_mah;
int rc;
u8 cookie = SDAM_COOKIE;
u32 cookie_4byte = SDAM_COOKIE_4BYTE;
if (!chip)
return -ENODEV;
@ -1329,8 +1331,8 @@ static int fg_gen4_store_learned_capacity(void *data, int64_t learned_cap_uah)
return rc;
}
rc = nvmem_device_write(chip->fg_nvmem, SDAM_COOKIE_OFFSET, 1,
&cookie);
rc = nvmem_device_write(chip->fg_nvmem,
SDAM_COOKIE_OFFSET_4BYTE, 1, &cookie_4byte);
if (rc < 0) {
pr_err("Error in writing cookie to SDAM, rc=%d\n", rc);
return rc;
@ -2377,17 +2379,17 @@ static bool is_sdam_cookie_set(struct fg_gen4_chip *chip)
{
struct fg_dev *fg = &chip->fg;
int rc;
u8 cookie;
u32 cookie_4byte;
rc = nvmem_device_read(chip->fg_nvmem, SDAM_COOKIE_OFFSET, 1,
&cookie);
rc = nvmem_device_read(chip->fg_nvmem, SDAM_COOKIE_OFFSET_4BYTE, 4,
&cookie_4byte);
if (rc < 0) {
pr_err("Error in reading SDAM_COOKIE rc=%d\n", rc);
return false;
}
fg_dbg(fg, FG_STATUS, "cookie: %x\n", cookie);
return (cookie == SDAM_COOKIE);
fg_dbg(fg, FG_STATUS, "cookie_4byte: %08x\n", cookie_4byte);
return (cookie_4byte == SDAM_COOKIE_4BYTE);
}
static void fg_gen4_clear_sdam(struct fg_gen4_chip *chip)
@ -2411,8 +2413,9 @@ static void fg_gen4_clear_sdam(struct fg_gen4_chip *chip)
static void fg_gen4_post_profile_load(struct fg_gen4_chip *chip)
{
struct fg_dev *fg = &chip->fg;
int rc, act_cap_mah;
int rc = 0, act_cap_mah;
u8 buf[16] = {0};
u32 cookie_4byte = 0;
if (chip->dt.multi_profile_load &&
chip->batt_age_level != chip->last_batt_age_level) {
@ -2466,6 +2469,13 @@ static void fg_gen4_post_profile_load(struct fg_gen4_chip *chip)
pr_err("Error in writing learned capacity to SDAM, rc=%d\n",
rc);
}
/* Set the COOKIE to prevent rechecking the SRAM again */
cookie_4byte = SDAM_COOKIE_4BYTE;
rc = nvmem_device_write(chip->fg_nvmem,
SDAM_COOKIE_OFFSET_4BYTE, 4, (u8 *)&cookie_4byte);
if (rc < 0)
pr_err("Failed to set SDAM cookie, rc=%d\n", rc);
}
/* Restore the cycle counters so that it would be valid at this point */

25
drivers/soc/qcom/msm_performance.c
View File

@ -76,13 +76,15 @@ static int set_cpu_min_freq(const char *buf, const struct kernel_param *kp)
for (i = 0; i < ntokens; i += 2) {
if (sscanf(cp, "%u:%u", &cpu, &val) != 2)
return -EINVAL;
if (cpu > (num_present_cpus() - 1))
return -EINVAL;
if (cpu >= nr_cpu_ids)
break;
i_cpu_stats = &per_cpu(msm_perf_cpu_stats, cpu);
if (cpu_possible(cpu)) {
i_cpu_stats = &per_cpu(msm_perf_cpu_stats, cpu);
i_cpu_stats->min = val;
cpumask_set_cpu(cpu, limit_mask);
i_cpu_stats->min = val;
cpumask_set_cpu(cpu, limit_mask);
}
cp = strnchr(cp, strlen(cp), ' ');
cp++;
@ -153,14 +155,15 @@ static int set_cpu_max_freq(const char *buf, const struct kernel_param *kp)
for (i = 0; i < ntokens; i += 2) {
if (sscanf(cp, "%u:%u", &cpu, &val) != 2)
return -EINVAL;
if (cpu > (num_present_cpus() - 1))
return -EINVAL;
if (cpu >= nr_cpu_ids)
break;
i_cpu_stats = &per_cpu(msm_perf_cpu_stats, cpu);
i_cpu_stats->max = val;
cpumask_set_cpu(cpu, limit_mask);
if (cpu_possible(cpu)) {
i_cpu_stats = &per_cpu(msm_perf_cpu_stats, cpu);
i_cpu_stats->max = val;
cpumask_set_cpu(cpu, limit_mask);
}
cp = strnchr(cp, strlen(cp), ' ');
cp++;
}

1
drivers/soc/qcom/socinfo.c
View File

@ -340,6 +340,7 @@ static struct msm_soc_info cpu_of_id[] = {
/* Khaje ID */
[518] = {MSM_CPU_KHAJE, "KHAJE"},
[586] = {MSM_CPU_KHAJE, "KHAJE"},
/* Khajep ID */
[561] = {MSM_CPU_KHAJEP, "KHAJEP"},

2
include/uapi/media/msm_camsensor_sdk.h
View File

@ -62,6 +62,8 @@ enum msm_sensor_camera_id_t {
CAMERA_1,
CAMERA_2,
CAMERA_3,
CAMERA_4,
CAMERA_5,
MAX_CAMERAS,
};