Skip to content

Commit

Permalink
treewide: update kernel source code to BUJ3 firmware
Browse files Browse the repository at this point in the history
  • Loading branch information
amd64 committed Mar 24, 2022
1 parent 06c3f50 commit b6a4355
Show file tree
Hide file tree
Showing 519 changed files with 45,202 additions and 10,418 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8283,7 +8283,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8283,7 +8283,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8283,7 +8283,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8293,7 +8293,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8293,7 +8293,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8293,7 +8293,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8293,7 +8293,7 @@
target = <0xffffffff>;

__overlay__ {
reg = <0x0 0x90400000 0x0 0x4600000>;
reg = <0x0 0x90400000 0x0 0x600000>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Required properties:
qca,qca6390
qca,wcn6750
- qca,bt-reset-gpio: GPIO pin to bring BT Controller out of reset
- qca,wl-reset-gpio: GPIO pin for WLAN EN, used here to check status only

Optional properties:
- qca,bt-vdd-pa-supply: Bluetooth VDD PA regulator handle
Expand Down Expand Up @@ -50,6 +51,7 @@ Example:
pinctrl-names = "default";
pinctrl-0 = <&bt_en_sleep>;
qca,bt-reset-gpio = <&tlmm 21 0>; /* BT_EN */
qca,wl-reset-gpio = <&tlmm 90 0>; /* WL_EN */
qca,bt-vdd-aon-supply = <&pm8150_s6>;
qca,bt-vdd-dig-supply = <&pm8009_s2>;
qca,bt-vdd-rfa1-supply = <&pm8150_s5>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/vendor/qcom/kona-mtp-ws.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
pinctrl-names = "default";
pinctrl-0 = <&bt_en_sleep>;
qca,bt-reset-gpio = <&tlmm 21 0>; /* BT_EN */
qca,wl-reset-gpio = <&tlmm 90 0>; /* WL_EN */
qca,bt-sw-ctrl-gpio = <&tlmm 124 0>; /* SW_CTRL */
qca,bt-vdd-aon-supply = <&pm8150_s6>;
qca,bt-vdd-dig-supply = <&pm8150_s6>;
Expand Down
9 changes: 0 additions & 9 deletions arch/arm64/boot/dts/vendor/qcom/kona.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -398,15 +398,6 @@
reg = <0x0 0x80900000 0x0 0x200000>;
};

ramoops: ramoops@80880000 {
compatible = "removed-dma-pool", "ramoops";
reg = <0 0x80880000 0 0x00080000>;
record-size = <0x10000>;
console-size = <0x60000>;
pmsg-size = <0x10000>;
no-map;
};

removed_mem: removed_region@80b00000 {
no-map;
reg = <0x0 0x80b00000 0x0 0x5300000>;
Expand Down
15 changes: 12 additions & 3 deletions arch/arm64/configs/vendor/gts7xl_eur_open_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_SCHED_WALT=y
# CONFIG_WALT_POWER_FEATURE is not set
CONFIG_SCHED_SEC_TASK_BOOST=y
CONFIG_HAVE_SCHED_AVG_IRQ=y
# CONFIG_BSD_PROCESS_ACCT is not set
Expand Down Expand Up @@ -2413,6 +2414,7 @@ CONFIG_TOUCHSCREEN_FTS1BA90A=y
# CONFIG_TOUCHSCREEN_NOVATEK_NT36523 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MSS100 is not set
# CONFIG_TOUCHSCREEN_ZINITIX_ZT7650 is not set
# CONFIG_TOUCHSCREEN_STM_FTS5CU56A is not set
CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=y
CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C=y
# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_SPI is not set
Expand Down Expand Up @@ -3611,6 +3613,7 @@ CONFIG_PANEL_S6TUUM3_AMSA24VU01_WQXGA=y
# CONFIG_PANEL_S6E3FA7_AMB623VH01_HD is not set
# CONFIG_PANEL_EA8076A_AMS646UJ10_FHD is not set
# CONFIG_PANEL_EA8079B_AMS646YB01_FHD is not set
# CONFIG_PANEL_S6E3FC3_AMS646YD01_FHD is not set
CONFIG_SEC_DISPLAYPORT=y
# CONFIG_SEC_DISPLAYPORT_MST is not set
CONFIG_SEC_DISPLAYPORT_BIGDATA=y
Expand Down Expand Up @@ -5839,6 +5842,7 @@ CONFIG_SENSORS_A96T3X6_UNSUPPORT_OTG=y
# CONFIG_SENSORS_VL53L5_SUPPORT_UAPI is not set
# CONFIG_SENSORS_VL53L5_SUPPORT_KERNEL_INTERFACE is not set
# CONFIG_SEC_SLPI_SLEEP_DEBUG is not set
# CONFIG_SEC_SENSORS_ENG_DEBUG is not set
# CONFIG_SENSORS_HRMSENSOR is not set
# CONFIG_SENSORS_MAX86915 is not set
# CONFIG_SENSORS_TCS3407 is not set
Expand Down Expand Up @@ -5874,7 +5878,10 @@ CONFIG_SEC_LOG_BUF_NO_CONSOLE=y
CONFIG_SEC_LOG_LAST_KMSG=y
CONFIG_SEC_LOG_STORE_LAST_KMSG=y
# CONFIG_SEC_LOG_STORE_LPM_KMSG is not set
# CONFIG_SEC_STORE_POWER_ONOFF_HISTORY is not set
CONFIG_SEC_DEBUG_SCHED_LOG=y
# CONFIG_SEC_DEBUG_SCHED_LOG_PER_CPU is not set
# CONFIG_SEC_DEBUG_SCHED_LOG_IRQ_V2 is not set
# CONFIG_SEC_DEBUG_MSG_LOG is not set
# CONFIG_SEC_DEBUG_DCVS_LOG is not set
# CONFIG_SEC_DEBUG_POWER_LOG is not set
Expand All @@ -5894,6 +5901,7 @@ CONFIG_SEC_DEBUG_MDM_FILE_INFO=y
# CONFIG_SEC_FILE_LEAK_DEBUG is not set
CONFIG_KERNEL_MODE_NEON_DEBUG=y
CONFIG_SEC_CP_SEPARATE_DEBUG=y
CONFIG_SEC_DEBUG_MODULE_INFO=y
CONFIG_SEC_BOOTSTAT=y
CONFIG_SEC_NOEYEINFO=y
CONFIG_SEC_QPNP_PON_SPARE_BITS=7
Expand All @@ -5907,9 +5915,9 @@ CONFIG_SEC_DEBUG_APPS_CLK_LOGGING=y
# Samsung Vbus Notifier drivers
#
# CONFIG_VBUS_NOTIFIER_MODULE is not set
# CONFIG_SEC_QUEST_AUTO_TRIGGER_KWORKER is not set
# CONFIG_SEC_QUEST_AUTO_TRIGGER_INIT_WRITE is not set
# CONFIG_SEC_QUEST_UEFI_ACT_TRIGGER is not set
CONFIG_SEC_QUEST=y
CONFIG_SEC_QUEST_UEFI=y
CONFIG_SEC_QUEST_UEFI_ENHANCEMENT=y
# CONFIG_SEC_QUEST_UEFI_USER is not set
# CONFIG_SEC_QUEST_DDR_SCAN_USER is not set
CONFIG_ADSP_FACTORY=y
Expand Down Expand Up @@ -5944,6 +5952,7 @@ CONFIG_VEML3328_SUB_FACTORY=y
# CONFIG_VEML3235_SUB_FACTORY is not set
# CONFIG_SUPPORT_TMD4907_STK33610_FACTORY is not set
# CONFIG_SUPPORT_SSC_AOD_RECT is not set
# CONFIG_SUPPORT_LIGHT_DUALIZATION is not set

#
# NOTIFIER configs
Expand Down
20 changes: 15 additions & 5 deletions arch/arm64/configs/vendor/gts7xl_eur_open_stock_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
CONFIG_IRQ_TIME_ACCOUNTING=y
CONFIG_SCHED_WALT=y
# CONFIG_WALT_POWER_FEATURE is not set
CONFIG_SCHED_SEC_TASK_BOOST=y
CONFIG_HAVE_SCHED_AVG_IRQ=y
# CONFIG_BSD_PROCESS_ACCT is not set
Expand Down Expand Up @@ -2459,6 +2460,7 @@ CONFIG_TOUCHSCREEN_FTS1BA90A=y
# CONFIG_TOUCHSCREEN_NOVATEK_NT36523 is not set
# CONFIG_TOUCHSCREEN_MELFAS_MSS100 is not set
# CONFIG_TOUCHSCREEN_ZINITIX_ZT7650 is not set
# CONFIG_TOUCHSCREEN_STM_FTS5CU56A is not set
CONFIG_TOUCHSCREEN_SYNAPTICS_TCM=y
CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_I2C=y
# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM_SPI is not set
Expand Down Expand Up @@ -3657,6 +3659,7 @@ CONFIG_PANEL_S6TUUM3_AMSA24VU01_WQXGA=y
# CONFIG_PANEL_S6E3FA7_AMB623VH01_HD is not set
# CONFIG_PANEL_EA8076A_AMS646UJ10_FHD is not set
# CONFIG_PANEL_EA8079B_AMS646YB01_FHD is not set
# CONFIG_PANEL_S6E3FC3_AMS646YD01_FHD is not set
CONFIG_SEC_DISPLAYPORT=y
# CONFIG_SEC_DISPLAYPORT_MST is not set
CONFIG_SEC_DISPLAYPORT_BIGDATA=y
Expand Down Expand Up @@ -5898,6 +5901,7 @@ CONFIG_SENSORS_A96T3X6_UNSUPPORT_OTG=y
# CONFIG_SENSORS_VL53L5_SUPPORT_UAPI is not set
# CONFIG_SENSORS_VL53L5_SUPPORT_KERNEL_INTERFACE is not set
# CONFIG_SEC_SLPI_SLEEP_DEBUG is not set
# CONFIG_SEC_SENSORS_ENG_DEBUG is not set
# CONFIG_SENSORS_HRMSENSOR is not set
# CONFIG_SENSORS_MAX86915 is not set
# CONFIG_SENSORS_TCS3407 is not set
Expand Down Expand Up @@ -5933,7 +5937,10 @@ CONFIG_SEC_LOG_BUF_NO_CONSOLE=y
CONFIG_SEC_LOG_LAST_KMSG=y
CONFIG_SEC_LOG_STORE_LAST_KMSG=y
# CONFIG_SEC_LOG_STORE_LPM_KMSG is not set
# CONFIG_SEC_STORE_POWER_ONOFF_HISTORY is not set
CONFIG_SEC_DEBUG_SCHED_LOG=y
# CONFIG_SEC_DEBUG_SCHED_LOG_PER_CPU is not set
# CONFIG_SEC_DEBUG_SCHED_LOG_IRQ_V2 is not set
# CONFIG_SEC_DEBUG_MSG_LOG is not set
# CONFIG_SEC_DEBUG_DCVS_LOG is not set
# CONFIG_SEC_DEBUG_POWER_LOG is not set
Expand All @@ -5959,17 +5966,17 @@ CONFIG_SEC_NOEYEINFO=y
CONFIG_SEC_QPNP_PON_SPARE_BITS=7
CONFIG_ARGOS=y
CONFIG_SEC_MISC=y
CONFIG_SEC_SMEM=yCONFIG_FIVE_SIGN
CONFIG_SEC_SMEM=y
CONFIG_SEC_SMEM_VENDOR1_VERSION=5
CONFIG_SEC_DEBUG_APPS_CLK_LOGGING=y

#
# Samsung Vbus Notifier drivers
#
# CONFIG_VBUS_NOTIFIER_MODULE is not set
# CONFIG_SEC_QUEST_AUTO_TRIGGER_KWORKER is not set
# CONFIG_SEC_QUEST_AUTO_TRIGGER_INIT_WRITE is not set
# CONFIG_SEC_QUEST_UEFI_ACT_TRIGGER is not set
CONFIG_SEC_QUEST=y
CONFIG_SEC_QUEST_UEFI=y
CONFIG_SEC_QUEST_UEFI_ENHANCEMENT=y
# CONFIG_SEC_QUEST_UEFI_USER is not set
# CONFIG_SEC_QUEST_DDR_SCAN_USER is not set
CONFIG_ADSP_FACTORY=y
Expand Down Expand Up @@ -6004,6 +6011,7 @@ CONFIG_VEML3328_SUB_FACTORY=y
# CONFIG_VEML3235_SUB_FACTORY is not set
# CONFIG_SUPPORT_TMD4907_STK33610_FACTORY is not set
# CONFIG_SUPPORT_SSC_AOD_RECT is not set
# CONFIG_SUPPORT_LIGHT_DUALIZATION is not set

#
# NOTIFIER configs
Expand Down Expand Up @@ -6052,7 +6060,7 @@ CONFIG_CC_ATTACH_LOG=y
#
CONFIG_REDRIVER=y
# CONFIG_COMBO_REDRIVER_PTN36502 is not set
CONFIG_COMBO_REDRIVER_PS5169=yCONFIG_FIVE_SIGN
CONFIG_COMBO_REDRIVER_PS5169=y
# CONFIG_SUPPORT_PS5169_ADBTUNE is not set

#
Expand Down Expand Up @@ -6397,6 +6405,8 @@ CONFIG_SECURITY_DEFEX=y
# CONFIG_DEFEX_KERNEL_ONLY is not set
CONFIG_SECURITY_DSMS=y
CONFIG_FIVE=n
# CONFIG_FIVE_GKI_10 is not set
# CONFIG_FIVE_GKI_20 is not set
# CONFIG_FIVE_DEBUG is not set
CONFIG_FIVE_CERT_USER="x509_five_user.der"
CONFIG_FIVE_DEFAULT_HASH_SHA1=y
Expand Down
4 changes: 3 additions & 1 deletion arch/arm64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ static void show_extra_register_data(struct pt_regs *regs, int nbytes)

fs = get_fs();
set_fs(KERNEL_DS);
show_data(regs->pc - nbytes, nbytes * 2, "PC");
show_data(regs->regs[30] - nbytes, nbytes * 2, "LR");
show_data(regs->sp - nbytes, nbytes * 2, "SP");
for (i = 0; i < 30; i++) {
char name[4];
Expand Down Expand Up @@ -340,7 +342,7 @@ void __show_regs(struct pt_regs *regs)
pr_cont("\n");
}

if (!user_mode(regs))
if (!user_mode(regs) && (oops_in_progress == 1 || oops_in_progress == 2))
show_extra_register_data(regs, 128);

}
Expand Down
2 changes: 1 addition & 1 deletion block/blk-mq.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static void blk_mq_check_disk_inflight_rw(struct blk_mq_hw_ctx *hctx,
{
struct mq_inflight *mi = priv;

/* This function sholud be called only when mi->part is a whole disk */
/* This function should be called only when mi->part is a whole disk */
mi->inflight[rq_data_dir(rq)]++;
}

Expand Down
3 changes: 2 additions & 1 deletion block/blk-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count)
unsigned long ra_kb;
ssize_t ret;
static const char temp[] = "temporary ";


/* IOPP-ra-v2.1.4.14 */
if (strncmp(page, temp, sizeof(temp) - 1) != 0)
return count;

Expand Down
5 changes: 4 additions & 1 deletion block/cfq-iosched.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ static u64 cfq_slice_async = NSEC_PER_SEC / 25;
static const int cfq_slice_async_rq = 2;
static u64 cfq_slice_idle = NSEC_PER_SEC / 125;
static u64 cfq_group_idle = NSEC_PER_SEC / 125;
/* IOPP-cfq_rt_idle_only-v1.0.k4.19 */
static int cfq_rt_idle_only = 1;
static const u64 cfq_target_latency = (u64)NSEC_PER_SEC * 3/10; /* 300 ms */
static const int cfq_hist_divisor = 4;
/* IOPP-cfq_max_async_dispatch-v1.0.4.4 */
static int cfq_max_async_dispatch = 4;

/*
Expand Down Expand Up @@ -3821,7 +3823,8 @@ static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,
cfq_mark_cfqq_prio_changed(cfqq);

if (is_sync) {
if (!cfq_class_idle(cfqq) && (!cfqd->cfq_rt_idle_only || cfq_class_rt(cfqq)))
if (!cfq_class_idle(cfqq) &&
(!cfqd->cfq_rt_idle_only || cfq_class_rt(cfqq)))
cfq_mark_cfqq_idle_window(cfqq);
cfq_mark_cfqq_sync(cfqq);
}
Expand Down
7 changes: 3 additions & 4 deletions block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ static int show_iodevs(struct seq_file *seqf, void *v)
struct hd_struct *part;
char buf[BDEVNAME_SIZE];

/* Don't show non-partitionable removeable devices or empty devices */
/* Don't show non-partitionable removable devices or empty devices */
if (!get_capacity(sgp) || (!disk_max_parts(sgp) &&
(sgp->flags & GENHD_FL_REMOVABLE)))
return 0;
Expand Down Expand Up @@ -1694,7 +1694,7 @@ static const struct seq_operations diskstats_op = {
.show = diskstats_show
};

/* IOPP-iod-v1.1.4.19 - change inflight count */
/* IOPP-iod-v1.1.k4.19 */
#define PG2KB(x) ((unsigned long)((x) << (PAGE_SHIFT - 10)))
static int iostats_show(struct seq_file *seqf, void *v)
{
Expand Down Expand Up @@ -1740,14 +1740,13 @@ static int iostats_show(struct seq_file *seqf, void *v)
inflight[0] + inflight[1],
jiffies_to_msecs(part_stat_read(hd, io_ticks)),
jiffies_to_msecs(part_stat_read(hd, time_in_queue)),
/* followings are added */
/* following are added */
part_stat_read(hd, ios[STAT_DISCARD]),
part_stat_read(hd, sectors[STAT_DISCARD]),
part_stat_read(hd, flush_ios),
gp->queue->flush_ios,

inflight[0], /* read request count */
/* hd->io_time_us / USEC_PER_MSEC, */
gp->queue->in_flight_time / USEC_PER_MSEC,
PG2KB(thresh),
PG2KB(bdi->last_thresh),
Expand Down
Loading

0 comments on commit b6a4355

Please sign in to comment.