diff --git a/.github/workflows/build-kernel.yml b/.github/workflows/build-kernel.yml new file mode 100644 index 0000000000000..4359c3159b22c --- /dev/null +++ b/.github/workflows/build-kernel.yml @@ -0,0 +1,43 @@ +name: Build kernel Image.gz + +on: + workflow_dispatch: + push: + pull_request: + +jobs: + build-arm64: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + bc \ + bison \ + flex \ + gcc-aarch64-linux-gnu \ + libelf-dev \ + libssl-dev \ + make + + - name: Configure (defconfig) + run: make ARCH=arm64 defconfig + + - name: Build Image.gz + run: make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j"$(nproc)" Image.gz + + - name: Make DTBS + run: make dtbs + + - name: Append DTBS + run: cat arch/arm64/boot/Image.gz arch/arm64/boot/dts/**/*.dtb > arch/arm64/boot/Image.gz-dtb + + - name: Upload Image.gz-dtb + uses: actions/upload-artifact@v4 + with: + name: Image.gz-dtb + path: arch/arm64/boot/Image.gz-dtb diff --git a/.gitignore b/.gitignore index f41aee5d389d7..11b89ecaf1109 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ # Normal rules (sorted alphabetically) # .* +!.github/ +!.github/** *.a *.asn1.[ch] *.bin diff --git a/Documentation/devicetree/bindings~HEAD b/Documentation/devicetree/bindings~HEAD deleted file mode 120000 index 2977badf1905b..0000000000000 --- a/Documentation/devicetree/bindings~HEAD +++ /dev/null @@ -1 +0,0 @@ -../../arch/arm64/boot/dts/vendor/bindings \ No newline at end of file diff --git a/Documentation/devicetree/bindings~HEAD/README.md b/Documentation/devicetree/bindings~HEAD/README.md new file mode 100644 index 0000000000000..c2dba7e6b7b9b --- /dev/null +++ b/Documentation/devicetree/bindings~HEAD/README.md @@ -0,0 +1 @@ +# Dummy bindings placeholder diff --git a/Makefile b/Makefile index 642bc195f4344..499b324b4aa14 100755 --- a/Makefile +++ b/Makefile @@ -419,6 +419,13 @@ include $(srctree)/scripts/subarch.include # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile ARCH ?= $(SUBARCH) +ifeq ($(ARCH),arm64) +ifneq ($(SUBARCH),arm64) +ifeq ($(CROSS_COMPILE),) +CROSS_COMPILE := aarch64-linux-gnu- +endif +endif +endif # Architecture as present in compile.h UTS_MACHINE := $(ARCH) diff --git a/arch/arm64/boot/dts/vendor b/arch/arm64/boot/dts/vendor deleted file mode 120000 index e4ccfdab240eb..0000000000000 --- a/arch/arm64/boot/dts/vendor +++ /dev/null @@ -1 +0,0 @@ -../../../../../qcom/proprietary/devicetree \ No newline at end of file diff --git a/arch/arm64/boot/dts/vendor/README.md b/arch/arm64/boot/dts/vendor/README.md new file mode 100644 index 0000000000000..26fe54bb83375 --- /dev/null +++ b/arch/arm64/boot/dts/vendor/README.md @@ -0,0 +1 @@ +# Dummy DTC include placeholder diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d5c7a0a5aaa1f..f5c4348ac111c 100755 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -72,6 +72,11 @@ CONFIG_ARCH_VISCONTI=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y CONFIG_ARM64_VA_BITS_48=y +CONFIG_ARM64_PTR_AUTH=y +CONFIG_ARM64_PTR_AUTH_KERNEL=y +CONFIG_ARM64_TLB_RANGE=y +CONFIG_ARM64_MTE=y +CONFIG_SHADOW_CALL_STACK=n CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_NUMA=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index ab00ca28cf0c3..745a8d2849033 100755 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -67,7 +67,7 @@ CONFIG_ARM64_PMEM=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set CONFIG_UNWIND_PATCH_PAC_INTO_SCS=y -CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.page_alloc.sample=10 kasan.stacktrace=off kvm-arm.mode=protected bootconfig ioremap_guard" +CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure kasan.page_alloc.sample=10 kasan.stacktrace=off kvm-arm.mode=nvhe bootconfig ioremap_guard" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_HIBERNATION=y @@ -92,7 +92,6 @@ CONFIG_ARM_SCPI_CPUFREQ=y CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_PKVM_MODULE_PATH="/lib/modules/" CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y diff --git a/drivers/android/oplus_binder b/drivers/android/oplus_binder deleted file mode 120000 index 4385a6f8a2e9a..0000000000000 --- a/drivers/android/oplus_binder +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/ipc \ No newline at end of file diff --git a/drivers/android/oplus_binder/Makefile b/drivers/android/oplus_binder/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/android/oplus_binder/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/base/kernelFwUpdate b/drivers/base/kernelFwUpdate deleted file mode 120000 index b7cd21923ea81..0000000000000 --- a/drivers/base/kernelFwUpdate +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/touchpanel/kernelFwUpdate \ No newline at end of file diff --git a/drivers/base/kernelFwUpdate/Kconfig b/drivers/base/kernelFwUpdate/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/base/kernelFwUpdate/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/base/kernelFwUpdate/Makefile b/drivers/base/kernelFwUpdate/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/base/kernelFwUpdate/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/base/touchpanel_notify b/drivers/base/touchpanel_notify deleted file mode 120000 index ba0c4d59d949f..0000000000000 --- a/drivers/base/touchpanel_notify +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/touchpanel/touchpanel_notify \ No newline at end of file diff --git a/drivers/base/touchpanel_notify/Kconfig b/drivers/base/touchpanel_notify/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/base/touchpanel_notify/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/base/touchpanel_notify/Makefile b/drivers/base/touchpanel_notify/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/base/touchpanel_notify/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/clk/qcom/apcs-msm8916.c b/drivers/clk/qcom/apcs-msm8916.c index 89e0730810ac7..d24f882a9dea2 100644 --- a/drivers/clk/qcom/apcs-msm8916.c +++ b/drivers/clk/qcom/apcs-msm8916.c @@ -17,7 +17,10 @@ #include "clk-regmap.h" #include "clk-regmap-mux-div.h" -static const u32 gpll0_a53cc_map[] = { 4, 5 }; +static const struct parent_map gpll0_a53cc_map[] = { + { 0, 4 }, + { 1, 5 }, +}; static const struct clk_parent_data pdata[] = { { .fw_name = "aux", .name = "gpll0_vote", }, diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index a1d824aa6a1db..6e7ae407b4980 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -59,7 +59,7 @@ int qcom_clk_crm_init(struct device *dev, struct clk_crm *crm) if (crm->name) { crm->dev = crm_get_device(crm->name); if (IS_ERR(crm->dev)) { - pr_err("%s Failed to get crm dev=%s, ret=%d\n", + pr_err("%s Failed to get crm dev=%s, ret=%ld\n", __func__, crm->name, PTR_ERR(crm->dev)); return PTR_ERR(crm->dev); } diff --git a/drivers/clk/qcom/gcc-sc8180x.c b/drivers/clk/qcom/gcc-sc8180x.c index db85bb33639b9..57310fe6f7616 100644 --- a/drivers/clk/qcom/gcc-sc8180x.c +++ b/drivers/clk/qcom/gcc-sc8180x.c @@ -208,23 +208,6 @@ static struct clk_alpha_pll gpll9 = { }, }; -static struct clk_alpha_pll gpll9 = { - .offset = 0x1c000, - .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_TRION], - .clkr = { - .enable_reg = 0x52000, - .enable_mask = BIT(9), - .hw.init = &(const struct clk_init_data) { - .name = "gpll9", - .parent_data = &(const struct clk_parent_data) { - .fw_name = "bi_tcxo", - }, - .num_parents = 1, - .ops = &clk_alpha_pll_fixed_trion_ops, - }, - }, -}; - static const struct parent_map gcc_parent_map_0[] = { { P_BI_TCXO, 0 }, { P_GPLL0_OUT_MAIN, 1 }, @@ -356,7 +339,7 @@ static const struct freq_tbl ftbl_gcc_cpuss_ahb_clk_src[] = { { } }; -static struct clk_rcg2 gcc_cpuss_ahb_clk_src = { +static struct clk_rcg2 gcc_cpuss_ahb_clk_src __maybe_unused = { .cmd_rcgr = 0x48014, .mnd_width = 0, .hid_width = 5, diff --git a/drivers/clk/qcom/trace.h b/drivers/clk/qcom/trace.h index 9fa5d24f53ffb..da2a0553992b1 100644 --- a/drivers/clk/qcom/trace.h +++ b/drivers/clk/qcom/trace.h @@ -80,7 +80,7 @@ DEFINE_EVENT(clk_measure_support, clk_measure, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/clk/qcom #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace diff --git a/drivers/clk/qcom/vdd-level-sm8150.h b/drivers/clk/qcom/vdd-level-sm8150.h index 78e78ec6dd080..99230910286cf 100644 --- a/drivers/clk/qcom/vdd-level-sm8150.h +++ b/drivers/clk/qcom/vdd-level-sm8150.h @@ -36,7 +36,7 @@ static int vdd_corner[] = { [VDD_HIGH_L1] = RPMH_REGULATOR_LEVEL_TURBO_L1, }; -static int vdd_dual_corner[] = { +static const int vdd_dual_corner[] __maybe_unused = { 0, 0, RPMH_REGULATOR_LEVEL_MIN_SVS, RPMH_REGULATOR_LEVEL_MIN_SVS, RPMH_REGULATOR_LEVEL_LOW_SVS_D1, RPMH_REGULATOR_LEVEL_LOW_SVS_D1, diff --git a/drivers/clk/qcom/vdd-level.h b/drivers/clk/qcom/vdd-level.h index b91bfa257b0c4..e65eba1cb3fdd 100644 --- a/drivers/clk/qcom/vdd-level.h +++ b/drivers/clk/qcom/vdd-level.h @@ -23,7 +23,7 @@ enum vdd_levels { VDD_NUM, }; -static int vdd_corner[] = { +static int vdd_corner[] __maybe_unused = { [VDD_NONE] = 0, [VDD_MIN] = RPMH_REGULATOR_LEVEL_MIN_SVS, [VDD_LOWER_D1] = RPMH_REGULATOR_LEVEL_LOW_SVS_D1, diff --git a/drivers/dma-buf/heaps/mm_boost_pool b/drivers/dma-buf/heaps/mm_boost_pool deleted file mode 120000 index 77c47fb18e10c..0000000000000 --- a/drivers/dma-buf/heaps/mm_boost_pool +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/mm/mm_boost_pool \ No newline at end of file diff --git a/drivers/dma-buf/heaps/mm_boost_pool/Makefile b/drivers/dma-buf/heaps/mm_boost_pool/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/dma-buf/heaps/mm_boost_pool/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.c b/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.c new file mode 100644 index 0000000000000..fdfcdb851e372 --- /dev/null +++ b/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include "oplus_boost_pool.h" + +struct dynamic_boost_pool *dynamic_boost_pool_create_pack(void) +{ + return NULL; +} + +void dynamic_boost_pool_alloc_pack(struct dynamic_boost_pool *pool, + unsigned long *size_remaining, + unsigned int *max_order, + struct list_head *pages, + int *page_count) +{ + (void)pool; + (void)size_remaining; + (void)max_order; + (void)pages; + (void)page_count; +} + +int dynamic_boost_pool_free(struct dynamic_boost_pool *pool, struct page *page, int index) +{ + (void)pool; + (void)page; + (void)index; + return -EINVAL; +} diff --git a/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.h b/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.h new file mode 100644 index 0000000000000..91d9f0ab07b52 --- /dev/null +++ b/drivers/dma-buf/heaps/mm_boost_pool/oplus_boost_pool.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_BOOST_POOL_H +#define _OPLUS_BOOST_POOL_H + +#include +#include + +struct dynamic_boost_pool { + unsigned int dummy; +}; + +struct dynamic_boost_pool *dynamic_boost_pool_create_pack(void); +void dynamic_boost_pool_alloc_pack(struct dynamic_boost_pool *pool, + unsigned long *size_remaining, + unsigned int *max_order, + struct list_head *pages, + int *page_count); +int dynamic_boost_pool_free(struct dynamic_boost_pool *pool, struct page *page, int index); + +#endif /* _OPLUS_BOOST_POOL_H */ diff --git a/drivers/dma/qcom/bam_dma_trace.h b/drivers/dma/qcom/bam_dma_trace.h index 20f8e07a5195f..900a574e9ef69 100644 --- a/drivers/dma/qcom/bam_dma_trace.h +++ b/drivers/dma/qcom/bam_dma_trace.h @@ -33,6 +33,6 @@ TRACE_EVENT(bam_dma_info, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/dma/qcom #define TRACE_INCLUDE_FILE bam_dma_trace #include diff --git a/drivers/firmware/qcom_scm-smc.c b/drivers/firmware/qcom_scm-smc.c index 9c6a05843c57b..ef00dcae87c11 100755 --- a/drivers/firmware/qcom_scm-smc.c +++ b/drivers/firmware/qcom_scm-smc.c @@ -59,7 +59,7 @@ static void __scm_smc_do_quirk(const struct arm_smccc_args *smc, static void fill_wq_resume_args(struct arm_smccc_args *resume, u32 smc_call_ctx) { - memset(resume->args, 0, ARRAY_SIZE(resume->args)); + memset(resume->args, 0, sizeof(resume->args)); resume->args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, ARM_SMCCC_OWNER_SIP, @@ -72,7 +72,7 @@ static void fill_wq_resume_args(struct arm_smccc_args *resume, u32 smc_call_ctx) static void fill_wq_wake_ack_args(struct arm_smccc_args *wake_ack, u32 smc_call_ctx) { - memset(wake_ack->args, 0, ARRAY_SIZE(wake_ack->args)); + memset(wake_ack->args, 0, sizeof(wake_ack->args)); wake_ack->args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_STD_CALL, ARM_SMCCC_SMC_64, ARM_SMCCC_OWNER_SIP, @@ -85,7 +85,7 @@ static void fill_wq_wake_ack_args(struct arm_smccc_args *wake_ack, u32 smc_call_ static void fill_get_wq_ctx_args(struct arm_smccc_args *get_wq_ctx) { - memset(get_wq_ctx->args, 0, ARRAY_SIZE(get_wq_ctx->args)); + memset(get_wq_ctx->args, 0, sizeof(get_wq_ctx->args)); get_wq_ctx->args[0] = ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_64, ARM_SMCCC_OWNER_SIP, @@ -135,7 +135,7 @@ static int scm_smc_do_quirk(struct device *dev, struct arm_smccc_args *smc, qscm = dev_get_drvdata(dev); wq = qcom_scm_lookup_wq(qscm, wq_ctx); if (IS_ERR_OR_NULL(wq)) { - pr_err("Did not find waitqueue for wq_ctx %d: %d\n", + pr_err("Did not find waitqueue for wq_ctx %u: %ld\n", wq_ctx, PTR_ERR(wq)); return PTR_ERR(wq); } diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index a52c40313751b..4352d48aa2016 100755 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -320,6 +320,7 @@ static int qcom_scm_call_noretry(struct device *dev, return scm_smc_call(dev, desc, res, QCOM_SCM_CALL_NORETRY); case SMC_CONVENTION_LEGACY: BUG_ON(1); /* No current implementation */ + return -EINVAL; default: pr_err("Unknown current SCM calling convention.\n"); return -EINVAL; @@ -2929,8 +2930,10 @@ static int qcom_scm_query_wq_queue_info(struct qcom_scm *scm) scm->waitq.irq = res.result[1] & 0xFFFF; scm->waitq.wq_feature = QCOM_SCM_MULTI_SMC_WHITE_LIST_ALLOW; - pr_info("WQ Info, feature: %d call_ctx_cnt: %d irq: %d\n", - scm->waitq.wq_feature, scm->waitq.call_ctx_cnt, scm->waitq.irq); + pr_info("WQ Info, feature: %llu call_ctx_cnt: %llu irq: %llu\n", + (unsigned long long)scm->waitq.wq_feature, + (unsigned long long)scm->waitq.call_ctx_cnt, + (unsigned long long)scm->waitq.irq); return ret; } @@ -3018,7 +3021,7 @@ static void scm_irq_work(struct work_struct *work) wq_to_wake = qcom_scm_lookup_wq(scm, wq_ctx); if (IS_ERR_OR_NULL(wq_to_wake)) { - pr_err("No waitqueue found for wq_ctx %d: %d\n", + pr_err("No waitqueue found for wq_ctx %u: %ld\n", wq_ctx, PTR_ERR(wq_to_wake)); return; } @@ -3121,7 +3124,7 @@ int scm_mem_protection_init_do(void) pid_offset = offsetof(struct task_struct, pid); task_name_offset = offsetof(struct task_struct, comm); - pr_debug("offset of pid is %zu, offset of comm is %zu\n", + pr_debug("offset of pid is %u, offset of comm is %u\n", pid_offset, task_name_offset); desc.args[0] = pid_offset, desc.args[1] = task_name_offset, diff --git a/drivers/firmware/qtee_shmbridge.c b/drivers/firmware/qtee_shmbridge.c index 51b901e6a4639..3f1be4ab962bd 100644 --- a/drivers/firmware/qtee_shmbridge.c +++ b/drivers/firmware/qtee_shmbridge.c @@ -306,8 +306,8 @@ int32_t qtee_shmbridge_register( mutex_lock(&bridge_list_head.lock); ret = qtee_shmbridge_query_locked(paddr); if (ret) { - pr_debug("%s: found 0%x already exist with shmbridge\n", - __func__, paddr); + pr_debug("%s: found 0x%llx already exist with shmbridge\n", + __func__, (unsigned long long)paddr); goto bridge_exist; } @@ -406,7 +406,7 @@ int32_t qtee_shmbridge_allocate_shm(size_t size, struct qtee_shm *shm) } if (size > default_bridge.size) { - pr_err("requestd size %zu is larger than bridge size %d\n", + pr_err("requestd size %zu is larger than bridge size %zu\n", size, default_bridge.size); ret = -EINVAL; goto exit; @@ -496,7 +496,7 @@ static int qtee_shmbridge_init(struct platform_device *pdev) else default_bridge.size = custom_bridge_size * MIN_BRIDGE_SIZE; - pr_err("qtee shmbridge registered default bridge with size %d bytes\n", + pr_err("qtee shmbridge registered default bridge with size %zu bytes\n", default_bridge.size); default_bridge.vaddr = (void *)__get_free_pages(GFP_KERNEL|__GFP_COMP, @@ -562,8 +562,8 @@ static int qtee_shmbridge_init(struct platform_device *pdev) goto exit_deregister_default_bridge; } - pr_debug("qtee shmbridge registered default bridge with size %d bytes\n", - default_bridge.size); +pr_debug("qtee shmbridge registered default bridge with size %zu bytes\n", + default_bridge.size); mem_protection_enabled = scm_mem_protection_init_do(); pr_err("MEM protection %s, %d\n", diff --git a/drivers/iio/stm/imu/st_asm330lhhx/Kconfig b/drivers/iio/stm/imu/st_asm330lhhx/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/iio/stm/imu/st_asm330lhhx/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/iio/stm/imu/st_asm330lhhx/Makefile b/drivers/iio/stm/imu/st_asm330lhhx/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/iio/stm/imu/st_asm330lhhx/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c index 4b513b1a97098..8beed82f168bf 100755 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -38,7 +38,7 @@ #define PON_RESIN_N_SET BIT(1) #define PON_GEN3_RESIN_N_SET BIT(6) #define PON_GEN3_KPDPWR_N_SET BIT(7) -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) #define PON_GEN3_KPDPWR_RESIN_N_SET BIT(2) #endif @@ -60,7 +60,7 @@ #define PON_DBC_SHIFT_GEN1 6 #define PON_DBC_SHIFT_GEN2 14 -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) #include static struct oplus_power_notify_data g_oplus_power_notify_host; #endif @@ -95,7 +95,7 @@ struct pm8941_pwrkey { bool pull_up; bool log_kpd_event; const struct pm8941_data *data; -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) struct delayed_work oplus_bark_work; struct workqueue_struct *oplus_pon_workqueue; #endif @@ -205,7 +205,7 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data) input_report_key(pwrkey->input, pwrkey->code, sts); input_sync(pwrkey->input); -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) if (!strcmp(pwrkey->data->name,"pmic_pwrkey_resin_bark")) { dev_err(pwrkey->dev, "[Oplus_LCD]pm8941_pwrkey_irq name:%s status_bit:0x%x\n", pwrkey->data->name, sts); if (sts == PON_GEN3_KPDPWR_RESIN_N_SET) { @@ -218,7 +218,7 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data) return IRQ_HANDLED; } -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) static void oplus_bark_work_func(struct work_struct *work) { g_oplus_power_notify_host.pon_status = OPLUS_PON_KPDPWR_RESIN_BARK; @@ -494,8 +494,8 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) if (error) dev_err(&pdev->dev, "failed to read PON_RT_STS rc=%d\n", error); else - pr_info("KPDPWR status at init=0x%02x, KPDPWR_ON=%d\n", - sts, (sts & PON_KPDPWR_N_SET)); + pr_info("KPDPWR status at init=0x%02x, KPDPWR_ON=%u\n", + sts, !!(sts & PON_KPDPWR_N_SET)); } error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq, @@ -526,7 +526,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pwrkey); device_init_wakeup(&pdev->dev, 1); -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) if (!strcmp(pwrkey->data->name,"pmic_pwrkey_resin_bark")) { INIT_DELAYED_WORK(&pwrkey->oplus_bark_work, oplus_bark_work_func); pwrkey->oplus_pon_workqueue = create_singlethread_workqueue("oplus_pon_workqueue"); @@ -584,7 +584,7 @@ static const struct pm8941_data pon_gen3_resin_data = { .has_pon_pbs = true, }; -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) static const struct pm8941_data pon_gen3_pwrkey_resin_data = { .status_bit = PON_GEN3_KPDPWR_RESIN_N_SET, .name = "pmic_pwrkey_resin_bark", @@ -600,7 +600,7 @@ static const struct of_device_id pm8941_pwr_key_id_table[] = { { .compatible = "qcom,pm8941-resin", .data = &resin_data }, { .compatible = "qcom,pmk8350-pwrkey", .data = &pon_gen3_pwrkey_data }, { .compatible = "qcom,pmk8350-resin", .data = &pon_gen3_resin_data }, -#if IS_ENABLED(CONFIG_OPLUS_POWER_NOTIFIER) +#if IS_REACHABLE(CONFIG_OPLUS_POWER_NOTIFIER) { .compatible = "qcom,pmk8350-pwrkey-resin", .data = &pon_gen3_pwrkey_resin_data }, #endif { } diff --git a/drivers/input/oplus_secure_drivers b/drivers/input/oplus_secure_drivers deleted file mode 120000 index 57a079bce29b0..0000000000000 --- a/drivers/input/oplus_secure_drivers +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/secure/common/bsp/drivers \ No newline at end of file diff --git a/drivers/input/oplus_secure_drivers/Makefile b/drivers/input/oplus_secure_drivers/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/input/oplus_secure_drivers/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/input/uff_fp_drivers b/drivers/input/uff_fp_drivers deleted file mode 120000 index 7c498946fb2df..0000000000000 --- a/drivers/input/uff_fp_drivers +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/secure/biometrics/fingerprints/bsp/uff/driver \ No newline at end of file diff --git a/drivers/input/uff_fp_drivers/Kconfig b/drivers/input/uff_fp_drivers/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/input/uff_fp_drivers/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/input/uff_fp_drivers/Makefile b/drivers/input/uff_fp_drivers/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/input/uff_fp_drivers/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/interconnect/qcom/Kconfig b/drivers/interconnect/qcom/Kconfig index 39e3e53db7eb8..f8cdd31945642 100644 --- a/drivers/interconnect/qcom/Kconfig +++ b/drivers/interconnect/qcom/Kconfig @@ -109,6 +109,7 @@ config INTERCONNECT_QCOM_SC8180X depends on INTERCONNECT_QCOM_RPMH_POSSIBLE select INTERCONNECT_QCOM_RPMH select INTERCONNECT_QCOM_BCM_VOTER + select INTERCONNECT_QCOM_QOS help This is a driver for the Qualcomm Network-on-Chip on sc8180x-based platforms. diff --git a/drivers/interconnect/qcom/icc-debug.h b/drivers/interconnect/qcom/icc-debug.h index d747854749c0f..5848edac12f15 100644 --- a/drivers/interconnect/qcom/icc-debug.h +++ b/drivers/interconnect/qcom/icc-debug.h @@ -5,8 +5,21 @@ #define __QCOM_ICC_DEBUG_H__ #include +#include +#if IS_REACHABLE(CONFIG_INTERCONNECT_QCOM_DEBUG) int qcom_icc_debug_register(struct icc_provider *provider); int qcom_icc_debug_unregister(struct icc_provider *provider); +#else +static inline int qcom_icc_debug_register(struct icc_provider *provider) +{ + return 0; +} + +static inline int qcom_icc_debug_unregister(struct icc_provider *provider) +{ + return 0; +} +#endif #endif diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index 1235906ad4444..e148570b9cbdc 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -142,8 +142,10 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst) if (clk_rate > 0) { ret = clk_set_rate(qn->clk, clk_rate); if (ret) - dev_warn(qp->dev, "Failed to set %s rate to %d for %s\n", - qn->clk_name, clk_rate, qn->name); + dev_warn(qp->dev, "Failed to set %s rate to %llu for %s\n", + qn->clk_name, + (unsigned long long)clk_rate, + qn->name); if (qn->toggle_clk && !qn->clk_enabled) { ret = clk_prepare_enable(qn->clk); diff --git a/drivers/interconnect/qcom/trace.h b/drivers/interconnect/qcom/trace.h index 8a673204e8059..1d8fb91991b38 100644 --- a/drivers/interconnect/qcom/trace.h +++ b/drivers/interconnect/qcom/trace.h @@ -44,7 +44,7 @@ TRACE_EVENT(bcm_voter_commit, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_PATH ../../drivers/interconnect/qcom #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-debug.c index 87e76802db219..81ada404c64c1 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-debug.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-debug.c @@ -200,18 +200,19 @@ void arm_smmu_debug_dump_debugchain(struct device *dev, void __iomem *debugchain u64 val; chain_length = arm_smmu_debug_qtb_debugchain_load(debugchain_base); - dev_info(dev, "Dumping Debug chain: Length : %d\n", chain_length); + dev_info(dev, "Dumping Debug chain: Length : %ld\n", chain_length); /* First read is to dump away the 0xDEADBEEF value */ arm_smmu_debug_qtb_debugchain_dump(debugchain_base); do { val = arm_smmu_debug_qtb_debugchain_dump(debugchain_base); - dev_info(dev, "Debug chain: Index :%ld, val : 0x%lx\n", index++, val); + dev_info(dev, "Debug chain: Index :%ld, val : 0x%llx\n", index++, + (unsigned long long)val); } while (chain_length--); } void arm_smmu_debug_dump_qtb_regs(struct device *dev, void __iomem *tbu_base) { - dev_info(dev, "QSMSTATUS: 0x%lx IDLESTATUS: 0x%lx\n", + dev_info(dev, "QSMSTATUS: 0x%x IDLESTATUS: 0x%x\n", readl_relaxed(tbu_base + Qtb500_QtbNsDbgQsmStatus), readl_relaxed(tbu_base + Qtb500_QtbNsDbgIdleStatus)); } @@ -300,7 +301,7 @@ static void arm_smmu_debug_dump_tbu_qns4_testbus(struct device *dev, reg = arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0); reg = (reg & ~TBU_QNS4_BRIDGE_MASK) | i << 0; arm_smmu_debug_tbu_testbus_select(tbu_base, WRITE, reg); - dev_info(dev, "testbus_sel: 0x%lx Index: %d val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x Index: %d val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), i, arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -324,7 +325,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, dev_info(dev, "Dumping TBU clk gate controller:\n"); arm_smmu_debug_program_tbu_testbus(tbu_base, TBU_CLK_GATE_CONTROLLER_TESTBUS); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -348,7 +349,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, dev_info(dev, "Dumping multi master qchannel:\n"); arm_smmu_debug_program_tbu_testbus(tbu_base, TBU_MULTIMASTER_QCHANNEL_TESTBUS); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -358,7 +359,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, dev_info(dev, "Dumping tbu clk gate controller ext:\n"); arm_smmu_debug_program_tbu_testbus(tbu_base, TBU_CLK_GATE_CONTROLLER_EXT_TESTBUS); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -368,7 +369,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, dev_info(dev, "Dumping tbu low power status:\n"); arm_smmu_debug_program_tbu_testbus(tbu_base, TBU_LOW_POWER_STATUS_TESTBUS); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -378,7 +379,7 @@ void arm_smmu_debug_dump_tbu_testbus(struct device *dev, void __iomem *tbu_base, dev_info(dev, "Dumping tbu qns4 vld rdy:\n"); arm_smmu_debug_program_tbu_testbus(tbu_base, TBU_QNS4_VLD_RDY); - dev_info(dev, "testbus_sel: 0x%lx val: 0x%llx\n", + dev_info(dev, "testbus_sel: 0x%x val: 0x%x\n", arm_smmu_debug_tbu_testbus_select(tbu_base, READ, 0), arm_smmu_debug_tbu_testbus_output(tbu_base)); @@ -401,7 +402,7 @@ static void arm_smmu_debug_program_tcu_testbus(struct device *dev, arm_smmu_debug_tcu_testbus_select(phys_addr, tcu_base, PTW_AND_CACHE_TESTBUS, WRITE, reg); if (print) - dev_info(dev, "testbus_sel: 0x%lx Index: %d val: 0x%lx\n", + dev_info(dev, "testbus_sel: 0x%x Index: %d val: 0x%x\n", arm_smmu_debug_tcu_testbus_select(phys_addr, tcu_base, PTW_AND_CACHE_TESTBUS, READ, 0), i, arm_smmu_debug_tcu_testbus_output(phys_addr)); @@ -445,7 +446,7 @@ void arm_smmu_debug_dump_tcu_testbus(struct device *dev, phys_addr_t phys_addr, TCU_PTW_TESTBUS_SEL2, TCU_PTW_TESTBUS_SEL2 + 1, 0, false); - dev_info(dev, "testbus_sel: 0x%lx Index: %d val: 0x%lx\n", + dev_info(dev, "testbus_sel: 0x%x Index: %d val: 0x%x\n", arm_smmu_debug_tcu_testbus_select(phys_addr, tcu_base, PTW_AND_CACHE_TESTBUS, READ, 0), i, arm_smmu_debug_tcu_testbus_output(phys_addr)); @@ -464,7 +465,7 @@ void arm_smmu_debug_dump_tcu_testbus(struct device *dev, phys_addr_t phys_addr, /* program ARM_SMMU_TESTBUS_SEL_HLOS1_NS to select TCU clk testbus*/ arm_smmu_debug_tcu_testbus_select(phys_addr, tcu_base, CLK_TESTBUS, WRITE, TCU_CLK_TESTBUS_SEL); - dev_info(dev, "Programming Tcu clk gate controller: testbus_sel: 0x%lx\n", +dev_info(dev, "Programming Tcu clk gate controller: testbus_sel: 0x%x\n", arm_smmu_debug_tcu_testbus_select(phys_addr, tcu_base, CLK_TESTBUS, READ, 0)); } diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 09a24247f1a03..7bbb9a9bf2f33 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -2039,36 +2039,36 @@ static ssize_t arm_smmu_debug_capturebus_snapshot_read(struct file *file, for (i = 0, x = 0; i < TTQTB_Capture_Points && x < 2*TTQTB_Capture_Points; i++, x += 2) { scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Latency_%d : 0x%lx\n", - i, ttlogs_time[x]); + "Latency_%d : 0x%llx\n", + i, (unsigned long long)ttlogs_time[x]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Timestamp_%d : 0x%lx\n", - i, ttlogs_time[x+1]); + "Timestamp_%d : 0x%llx\n", + i, (unsigned long long)ttlogs_time[x+1]); if (qtb_type == 1) { for (j = 0, y = 0; j < TTQTB_Regs_Per_Capture_Points && y < 2*TTQTB_Regs_Per_Capture_Points; j++, y += 2) { scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogIn_%d_%d : 0x%lx\n", - i, j, gfxttlogs[i][y]); + "LogIn_%d_%d : 0x%llx\n", + i, j, (unsigned long long)gfxttlogs[i][y]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogOut_%d_%d : 0x%lx\n", - i, j, gfxttlogs[i][y+1]); + "LogOut_%d_%d : 0x%llx\n", + i, j, (unsigned long long)gfxttlogs[i][y+1]); } } else if (qtb_type == 2) { for (j = 0, y = 0; j < TTQTB_Regs_Per_Capture_Points && y < 4*TTQTB_Regs_Per_Capture_Points; j++, y += 4) { scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogIn_%d_%d_Low : 0x%lx\n", - i, j, ttlogs[i][y]); + "LogIn_%d_%d_Low : 0x%llx\n", + i, j, (unsigned long long)ttlogs[i][y]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogIn_%d_%d_High : 0x%lx\n", - i, j, ttlogs[i][y+1]); + "LogIn_%d_%d_High : 0x%llx\n", + i, j, (unsigned long long)ttlogs[i][y+1]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogOut_%d_%d_Low : 0x%lx\n", - i, j, ttlogs[i][y+2]); + "LogOut_%d_%d_Low : 0x%llx\n", + i, j, (unsigned long long)ttlogs[i][y+2]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "LogOut_%d_%d_High : 0x%lx\n", - i, j, ttlogs[i][y+3]); + "LogOut_%d_%d_High : 0x%llx\n", + i, j, (unsigned long long)ttlogs[i][y+3]); } } @@ -2310,13 +2310,13 @@ static ssize_t arm_smmu_debug_capturebus_config_read(struct file *file, if (config == (TTQTB_GlbEn | TTQTB_IgnoreCtiTrigIn0 | TTQTB_LogAsstEn)) scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Custom configuration selected, MainCtl filter val: 0x%0lx\n", - config); + "Custom configuration selected, MainCtl filter val: 0x%0llx\n", + (unsigned long long)config); else if (config == (TTQTB_GlbEn | TTQTB_IgnoreCtiTrigIn0 | TTQTB_LogAll)) scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Default configuration selected, MainCtl filter val : 0x%0lx\n", - config); + "Default configuration selected, MainCtl filter val : 0x%0llx\n", + (unsigned long long)config); buflen = min(count, strlen(buf)); @@ -2360,7 +2360,8 @@ static ssize_t arm_smmu_debug_capturebus_config_read(struct file *file, scnprintf(buf + strlen(buf), buf_len - strlen(buf), "Match_%d : 0x%0llx\n", i+1, match[i]); } - scnprintf(buf + strlen(buf), buf_len - strlen(buf), "0x%0lx\n", val); + scnprintf(buf + strlen(buf), buf_len - strlen(buf), + "0x%0llx\n", (unsigned long long)val); buflen = min(count, strlen(buf)); if (copy_to_user(ubuf, buf, buflen)) { @@ -2500,11 +2501,11 @@ static ssize_t arm_smmu_debug_capturebus_filter_read(struct file *file, arm_smmu_power_off(smmu, smmu->pwr); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Filter_TrType : 0x%lx\n", filter[i]); + "Filter_TrType : 0x%llx\n", (unsigned long long)filter[i]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Filter_AddressMin : 0x%lx\n", filter[i+1]); + "Filter_AddressMin : 0x%llx\n", (unsigned long long)filter[i+1]); scnprintf(buf + strlen(buf), buf_len - strlen(buf), - "Filter_AddressMax : 0x%lx\n", filter[i+2]); + "Filter_AddressMax : 0x%llx\n", (unsigned long long)filter[i+2]); buflen = min(count, strlen(buf)); diff --git a/drivers/iommu/qcom-io-pgtable-alloc.h b/drivers/iommu/qcom-io-pgtable-alloc.h index f900fa2d15f88..1276490f153cc 100644 --- a/drivers/iommu/qcom-io-pgtable-alloc.h +++ b/drivers/iommu/qcom-io-pgtable-alloc.h @@ -5,12 +5,46 @@ #ifndef __QCOM_IO_PGTABLE_ALLOC_H #define __QCOM_IO_PGTABLE_ALLOC_H +#include +#include +#include +#include +#include + +#if IS_REACHABLE(CONFIG_QCOM_IOMMU_UTIL) int qcom_io_pgtable_allocator_register(u32 vmid); void qcom_io_pgtable_allocator_unregister(u32 vmid); struct page *qcom_io_pgtable_alloc_page(u32 vmid, gfp_t gfp); void qcom_io_pgtable_free_page(struct page *page); int qcom_io_pgtable_alloc_init(void); void qcom_io_pgtable_alloc_exit(void); +#else +static inline int qcom_io_pgtable_allocator_register(u32 vmid) +{ + return -ENODEV; +} -#endif /* __QCOM_IO_PGTABLE_ALLOC_H */ +static inline void qcom_io_pgtable_allocator_unregister(u32 vmid) +{ +} + +static inline struct page *qcom_io_pgtable_alloc_page(u32 vmid, gfp_t gfp) +{ + return NULL; +} + +static inline void qcom_io_pgtable_free_page(struct page *page) +{ +} +static inline int qcom_io_pgtable_alloc_init(void) +{ + return -ENODEV; +} + +static inline void qcom_io_pgtable_alloc_exit(void) +{ +} +#endif + +#endif /* __QCOM_IO_PGTABLE_ALLOC_H */ diff --git a/drivers/mailbox/qcom-ipcc.c b/drivers/mailbox/qcom-ipcc.c index c0f37a947d619..4a317494dbc59 100644 --- a/drivers/mailbox/qcom-ipcc.c +++ b/drivers/mailbox/qcom-ipcc.c @@ -298,7 +298,7 @@ static void qcom_ipcc_restore_unmask_irq(struct device *dev) qcom_ipcc_chan_info->signal_id); if (qcom_ipcc_chan_info->is_signal_enabled) { dev_dbg(dev, - "%s: restore 0x%lx for client_id: %u signal_id: %u\n", + "%s: restore 0x%x for client_id: %u signal_id: %u\n", __func__, packed_id, qcom_ipcc_chan_info->client_id, qcom_ipcc_chan_info->signal_id); writel(packed_id, diff --git a/drivers/misc/oplus_procs_load b/drivers/misc/oplus_procs_load deleted file mode 120000 index 44266839a2406..0000000000000 --- a/drivers/misc/oplus_procs_load +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/power/procs_load \ No newline at end of file diff --git a/drivers/misc/oplus_procs_load/Makefile b/drivers/misc/oplus_procs_load/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/misc/oplus_procs_load/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/misc/vibrator b/drivers/misc/vibrator deleted file mode 120000 index 1daadce53019a..0000000000000 --- a/drivers/misc/vibrator +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/vibrator \ No newline at end of file diff --git a/drivers/misc/vibrator/aw8697_haptic/Kconfig b/drivers/misc/vibrator/aw8697_haptic/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/misc/vibrator/aw8697_haptic/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/misc/vibrator/aw8697_haptic/Makefile b/drivers/misc/vibrator/aw8697_haptic/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/misc/vibrator/aw8697_haptic/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/misc/vibrator/oplus_haptic/Kconfig b/drivers/misc/vibrator/oplus_haptic/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/misc/vibrator/oplus_haptic/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/misc/vibrator/oplus_haptic/Makefile b/drivers/misc/vibrator/oplus_haptic/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/misc/vibrator/oplus_haptic/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/misc/vibrator/si_haptic/Kconfig b/drivers/misc/vibrator/si_haptic/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/misc/vibrator/si_haptic/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/misc/vibrator/si_haptic/Makefile b/drivers/misc/vibrator/si_haptic/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/misc/vibrator/si_haptic/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 0a459c5ecdc5c..921fc2a378238 100755 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -30,7 +30,9 @@ #include #include +#if IS_ENABLED(CONFIG_ANDROID_VENDOR_HOOKS) #include +#endif #include "../core/mmc_ops.h" #include "../core/host.h" #include "../core/core.h" @@ -874,7 +876,7 @@ static int msm_init_cm_dll(struct sdhci_host *host, mclk_freq = ROUND(dll_clock * cycle_cnt, TCXO_FREQ); if (dll_clock < 100000000) - pr_err("%s: %s: Non standard clk freq =%u\n", + pr_err("%s: %s: Non standard clk freq =%lu\n", mmc_hostname(mmc), __func__, dll_clock); writel_relaxed(((readl_relaxed(host->ioaddr + msm_offset->core_dll_config_2) @@ -4400,7 +4402,8 @@ static int mmc_partial_init(struct mmc_host *mmc) return err; } -static void sdhci_msm_mmc_suspend(void *unused, struct mmc_host *mmc) +static void __maybe_unused sdhci_msm_mmc_suspend(void *unused, + struct mmc_host *mmc) { mmc_cache_card(mmc); @@ -4409,7 +4412,9 @@ static void sdhci_msm_mmc_suspend(void *unused, struct mmc_host *mmc) #endif } -static void sdhci_msm_mmc_resume(void *unused, struct mmc_host *mmc, bool *resume_success) +static void __maybe_unused sdhci_msm_mmc_resume(void *unused, + struct mmc_host *mmc, + bool *resume_success) { int err; @@ -4692,8 +4697,8 @@ static int sdhci_msm_setup_qos(struct sdhci_msm_host *msm_host) goto free_mem; } qcg->initialized = true; - dev_dbg(&pdev->dev, "%s: qcg: 0x%08x | mask: 0x%08x\n", - __func__, qcg, qcg->mask); + dev_dbg(&pdev->dev, "%s: qcg: %p | mask: %*pb\n", + __func__, qcg, cpumask_pr_args(&qcg->mask)); } /* Vote pmqos during setup for first set of mask*/ @@ -5589,8 +5594,10 @@ static int sdhci_msm_probe(struct platform_device *pdev) pm_runtime_put_autosuspend(&pdev->dev); if (host->mmc->caps & MMC_CAP_NONREMOVABLE) { +#if IS_ENABLED(CONFIG_ANDROID_VENDOR_HOOKS) register_trace_android_rvh_mmc_suspend(sdhci_msm_mmc_suspend, NULL); register_trace_android_rvh_mmc_resume(sdhci_msm_mmc_resume, NULL); +#endif } msm_host->sdhci_msm_pm_notifier.notifier_call = sdhci_msm_hibernation_notifier; diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index d7967efade5b8..0653e9daf9b07 100755 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1868,7 +1868,7 @@ static int msm_pinctrl_hibernation_suspend(void) else tile_addr = pctrl->regs[0] + soc->dir_conn_addr[i]; - pr_err("The tile addr generated is 0x%lx\n", (u64)tile_addr); + pr_err("The tile addr generated is %p\n", tile_addr); for (j = 0; j < 8; j++) pctrl->msm_tile_regs[i].dir_con_regs[j] = readl_relaxed(tile_addr + j*4); @@ -1918,7 +1918,7 @@ static void msm_pinctrl_hibernation_resume(void) tile_addr = pctrl->regs[i] + soc->dir_conn_addr[i]; else tile_addr = pctrl->regs[0] + soc->dir_conn_addr[i]; - pr_err("The tile addr generated is 0x%lx\n", (u64)tile_addr); + pr_err("The tile addr generated is %p\n", tile_addr); for (j = 0; j < 8; j++) writel_relaxed(pctrl->msm_tile_regs[i].dir_con_regs[j], tile_addr + j*4); diff --git a/drivers/power/oplus b/drivers/power/oplus deleted file mode 120000 index 7874b1e2c7213..0000000000000 --- a/drivers/power/oplus +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/charger \ No newline at end of file diff --git a/drivers/power/oplus/Kconfig b/drivers/power/oplus/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/power/oplus/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/power/oplus/Makefile b/drivers/power/oplus/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/power/oplus/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 3b869e0599e0f..7a8654cb52824 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1311,8 +1311,8 @@ static int qcom_glink_rx_data_zero_copy(struct qcom_glink *glink, size_t avail) goto advance_rx; } if (intent->size) { - CH_ERR(channel, "zero copy req wrong intent liid:%d size:%d\n", - liid, intent->size); + CH_ERR(channel, "zero copy req wrong intent liid:%d size:%zu\n", + liid, (size_t)intent->size); goto advance_rx; } diff --git a/drivers/soc/oplus/boot b/drivers/soc/oplus/boot deleted file mode 120000 index a92ff6bb36071..0000000000000 --- a/drivers/soc/oplus/boot +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/boot \ No newline at end of file diff --git a/drivers/soc/oplus/boot/Makefile b/drivers/soc/oplus/boot/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/bootloader_log/Kconfig b/drivers/soc/oplus/boot/bootloader_log/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/bootloader_log/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/bootloader_log/Makefile b/drivers/soc/oplus/boot/bootloader_log/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/bootloader_log/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/bootmode/Kconfig b/drivers/soc/oplus/boot/bootmode/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/bootmode/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/bootmode/Makefile b/drivers/soc/oplus/boot/bootmode/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/bootmode/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/cmdline_parser/Kconfig b/drivers/soc/oplus/boot/cmdline_parser/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/cmdline_parser/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/cmdline_parser/Makefile b/drivers/soc/oplus/boot/cmdline_parser/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/cmdline_parser/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/htb/Kconfig b/drivers/soc/oplus/boot/htb/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/htb/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/htb/Makefile b/drivers/soc/oplus/boot/htb/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/htb/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/oplus_projectinfo/Kconfig b/drivers/soc/oplus/boot/oplus_projectinfo/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/oplus_projectinfo/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/oplus_projectinfo/Makefile b/drivers/soc/oplus/boot/oplus_projectinfo/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/oplus_projectinfo/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/boot/qcom_watchdog/Kconfig b/drivers/soc/oplus/boot/qcom_watchdog/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/boot/qcom_watchdog/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/boot/qcom_watchdog/Makefile b/drivers/soc/oplus/boot/qcom_watchdog/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/boot/qcom_watchdog/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/device_info b/drivers/soc/oplus/device_info deleted file mode 120000 index 4a2c7e7f135c7..0000000000000 --- a/drivers/soc/oplus/device_info +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/device_info/device_info \ No newline at end of file diff --git a/drivers/soc/oplus/device_info/Kconfig b/drivers/soc/oplus/device_info/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/device_info/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/device_info/Makefile b/drivers/soc/oplus/device_info/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/device_info/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/dfr b/drivers/soc/oplus/dfr deleted file mode 120000 index 52d7e52e96814..0000000000000 --- a/drivers/soc/oplus/dfr +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/dfr \ No newline at end of file diff --git a/drivers/soc/oplus/dfr/Kconfig b/drivers/soc/oplus/dfr/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/dfr/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/dfr/Makefile b/drivers/soc/oplus/dfr/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/dfr/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/dft b/drivers/soc/oplus/dft deleted file mode 120000 index 61bfcade4cdb4..0000000000000 --- a/drivers/soc/oplus/dft +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/dft \ No newline at end of file diff --git a/drivers/soc/oplus/dft/Kconfig b/drivers/soc/oplus/dft/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/dft/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/dft/Makefile b/drivers/soc/oplus/dft/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/dft/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/hans b/drivers/soc/oplus/hans deleted file mode 120000 index a382fe1862052..0000000000000 --- a/drivers/soc/oplus/hans +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/hans \ No newline at end of file diff --git a/drivers/soc/oplus/hans/Kconfig b/drivers/soc/oplus/hans/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/hans/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/hans/Makefile b/drivers/soc/oplus/hans/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/hans/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/mdmrst b/drivers/soc/oplus/mdmrst deleted file mode 120000 index 963c32d3cef43..0000000000000 --- a/drivers/soc/oplus/mdmrst +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/hardware/radio/mdmrst/common \ No newline at end of file diff --git a/drivers/soc/oplus/mdmrst/Kconfig b/drivers/soc/oplus/mdmrst/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/mdmrst/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/mdmrst/Makefile b/drivers/soc/oplus/mdmrst/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/mdmrst/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/midas b/drivers/soc/oplus/midas deleted file mode 120000 index f216f234664ab..0000000000000 --- a/drivers/soc/oplus/midas +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/cpu/midas \ No newline at end of file diff --git a/drivers/soc/oplus/midas/Kconfig b/drivers/soc/oplus/midas/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/midas/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/midas/Makefile b/drivers/soc/oplus/midas/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/midas/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/multimedia b/drivers/soc/oplus/multimedia deleted file mode 120000 index 633f461ee5757..0000000000000 --- a/drivers/soc/oplus/multimedia +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/multimedia/feedback \ No newline at end of file diff --git a/drivers/soc/oplus/multimedia/Kconfig b/drivers/soc/oplus/multimedia/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/multimedia/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/multimedia/Makefile b/drivers/soc/oplus/multimedia/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/multimedia/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/power b/drivers/soc/oplus/power deleted file mode 120000 index ebdd494a83a1a..0000000000000 --- a/drivers/soc/oplus/power +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/power \ No newline at end of file diff --git a/drivers/soc/oplus/power/Kconfig b/drivers/soc/oplus/power/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/power/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/power/Makefile b/drivers/soc/oplus/power/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/power/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/power/subsys_sleep_monitor/Kconfig b/drivers/soc/oplus/power/subsys_sleep_monitor/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/power/subsys_sleep_monitor/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/power/subsys_sleep_monitor/Makefile b/drivers/soc/oplus/power/subsys_sleep_monitor/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/power/subsys_sleep_monitor/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/storage b/drivers/soc/oplus/storage deleted file mode 120000 index 85763db0e9b8e..0000000000000 --- a/drivers/soc/oplus/storage +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/storage/storage_feature_in_module \ No newline at end of file diff --git a/drivers/soc/oplus/storage/Kconfig b/drivers/soc/oplus/storage/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/storage/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/storage/Makefile b/drivers/soc/oplus/storage/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/storage/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/storage/common/file_record/Kconfig b/drivers/soc/oplus/storage/common/file_record/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/storage/common/file_record/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/storage/common/file_record/Makefile b/drivers/soc/oplus/storage/common/file_record/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/storage/common/file_record/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/oplus/trackpoint b/drivers/soc/oplus/trackpoint deleted file mode 120000 index 4e4687b61a7cc..0000000000000 --- a/drivers/soc/oplus/trackpoint +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/qcom/opensource/display-drivers/oplus/common/trackpoint \ No newline at end of file diff --git a/drivers/soc/oplus/trackpoint/Kconfig b/drivers/soc/oplus/trackpoint/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/drivers/soc/oplus/trackpoint/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/drivers/soc/oplus/trackpoint/Makefile b/drivers/soc/oplus/trackpoint/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/drivers/soc/oplus/trackpoint/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index 2667487e6c7d5..e3dc936717bf2 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -1144,8 +1144,8 @@ static int qcom_smem_probe(struct platform_device *pdev) if (hwlock_id < 0) { if (hwlock_id != -EPROBE_DEFER) dev_err(&pdev->dev, "failed to retrieve hwlock\n"); - ret = hwlock_id; - goto release; + ret = hwlock_id; + goto release; } smem->hwlock = hwspin_lock_request_specific(hwlock_id); diff --git a/drivers/thermal/qcom/thermal_zone_internal.h b/drivers/thermal/qcom/thermal_zone_internal.h index 536c9b4480dea..d039eba8d6806 100644 --- a/drivers/thermal/qcom/thermal_zone_internal.h +++ b/drivers/thermal/qcom/thermal_zone_internal.h @@ -51,7 +51,7 @@ static inline __maybe_unused int qti_update_tz_ops(struct thermal_zone_device *t return 0; } -static void disable_cdev_stats(void *unused, +static void __maybe_unused disable_cdev_stats(void *unused, struct thermal_cooling_device *cdev, bool *disable) { *disable = true; @@ -60,6 +60,7 @@ static void disable_cdev_stats(void *unused, /* Generic thermal vendor hooks initialization API */ static inline __maybe_unused void thermal_vendor_hooks_init(void) { +#if IS_ENABLED(CONFIG_ANDROID_VENDOR_HOOKS) int ret; ret = register_trace_android_vh_disable_thermal_cooling_stats( @@ -68,12 +69,15 @@ static inline __maybe_unused void thermal_vendor_hooks_init(void) pr_err("Failed to register disable thermal cdev stats hooks\n"); return; } +#endif } static inline __maybe_unused void thermal_vendor_hooks_exit(void) { +#if IS_ENABLED(CONFIG_ANDROID_VENDOR_HOOKS) unregister_trace_android_vh_disable_thermal_cooling_stats( disable_cdev_stats, NULL); +#endif } /*Generic helpers for thermal zone -> get_trend ops */ diff --git a/include/dt-bindings/clock/qcom,gcc-sm8250.h b/include/dt-bindings/clock/qcom,gcc-sm8250.h index 7b7abe327e372..1edc4c3405aaa 100644 --- a/include/dt-bindings/clock/qcom,gcc-sm8250.h +++ b/include/dt-bindings/clock/qcom,gcc-sm8250.h @@ -207,6 +207,16 @@ #define GCC_VIDEO_AXI0_CLK 197 #define GCC_VIDEO_AXI1_CLK 198 #define GCC_VIDEO_XO_CLK 199 +#define GCC_AGGRE_UFS_CARD_AXI_HW_CTL_CLK 200 +#define GCC_AGGRE_UFS_PHY_AXI_HW_CTL_CLK 201 +#define GCC_UFS_CARD_AXI_HW_CTL_CLK 202 +#define GCC_UFS_CARD_ICE_CORE_HW_CTL_CLK 203 +#define GCC_UFS_CARD_PHY_AUX_HW_CTL_CLK 204 +#define GCC_UFS_CARD_UNIPRO_CORE_HW_CTL_CLK 205 +#define GCC_UFS_PHY_AXI_HW_CTL_CLK 206 +#define GCC_UFS_PHY_ICE_CORE_HW_CTL_CLK 207 +#define GCC_UFS_PHY_PHY_AUX_HW_CTL_CLK 208 +#define GCC_UFS_PHY_UNIPRO_CORE_HW_CTL_CLK 209 /* GCC resets */ #define GCC_GPU_BCR 0 diff --git a/include/linux/cpufreq_bouncing.h b/include/linux/cpufreq_bouncing.h deleted file mode 120000 index f57763ac1be13..0000000000000 --- a/include/linux/cpufreq_bouncing.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/cpu/cpufreq_bouncing/cpufreq_bouncing.h \ No newline at end of file diff --git a/include/linux/cpufreq_bouncing.h b/include/linux/cpufreq_bouncing.h new file mode 100644 index 0000000000000..65ceb12aa87cd --- /dev/null +++ b/include/linux/cpufreq_bouncing.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_CPUFREQ_BOUNCING_H +#define _OPLUS_CPUFREQ_BOUNCING_H + +#include + +static inline void cb_update(struct cpufreq_policy *policy, u64 time) +{ + (void)policy; + (void)time; +} + +static inline void cb_ceiling_free(bool enable) +{ + (void)enable; +} + +static inline void cb_stuff_init(struct cpufreq_policy *policy) +{ + (void)policy; +} + +#endif /* _OPLUS_CPUFREQ_BOUNCING_H */ diff --git a/include/linux/cpufreq_health.h b/include/linux/cpufreq_health.h deleted file mode 120000 index f7be80c2dc59d..0000000000000 --- a/include/linux/cpufreq_health.h +++ /dev/null @@ -1 +0,0 @@ -../../kernel/oplus_cpu/cpufreq_health/cpufreq_health.h \ No newline at end of file diff --git a/include/linux/cpufreq_health.h b/include/linux/cpufreq_health.h new file mode 100644 index 0000000000000..c0cfaf7b9d026 --- /dev/null +++ b/include/linux/cpufreq_health.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_CPUFREQ_HEALTH_H +#define _OPLUS_CPUFREQ_HEALTH_H + +#include + +static inline int cpufreq_health_register(struct cpufreq_policy *policy) +{ + return 0; +} + +static inline void cpufreq_health_get_edtask_state(int cpu, int flag) +{ + (void)cpu; + (void)flag; +} + +static inline void cpufreq_health_get_state(struct cpufreq_policy *policy) +{ + (void)policy; +} + +static inline void cpufreq_health_get_newtask_state(struct cpufreq_policy *policy, int flag) +{ + (void)policy; + (void)flag; +} + +#endif /* _OPLUS_CPUFREQ_HEALTH_H */ diff --git a/include/linux/oplus_omrg.h b/include/linux/oplus_omrg.h deleted file mode 120000 index 3733da0848285..0000000000000 --- a/include/linux/oplus_omrg.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/cpu/oplus_omrg/oplus_omrg.h \ No newline at end of file diff --git a/include/linux/oplus_omrg.h b/include/linux/oplus_omrg.h new file mode 100644 index 0000000000000..9fefd9ff07784 --- /dev/null +++ b/include/linux/oplus_omrg.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_OMRG_H +#define _OPLUS_OMRG_H + +#include + +static inline void omrg_ceiling_free(bool enable) +{ + (void)enable; +} + +static inline void omrg_cpufreq_check_limit(struct cpufreq_policy *policy, unsigned int freq) +{ + (void)policy; + (void)freq; +} + +static inline void omrg_cpufreq_unregister(struct cpufreq_policy *policy) +{ + (void)policy; +} + +static inline void omrg_cpufreq_register(struct cpufreq_policy *policy) +{ + (void)policy; +} + +#endif /* _OPLUS_OMRG_H */ diff --git a/include/linux/pogo_common.h b/include/linux/pogo_common.h deleted file mode 120000 index 0bd65ab393a8f..0000000000000 --- a/include/linux/pogo_common.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/device_info/pogo_keyboard/pogo_common.h \ No newline at end of file diff --git a/include/linux/pogo_common.h b/include/linux/pogo_common.h new file mode 100644 index 0000000000000..9b6b4dc57bc7e --- /dev/null +++ b/include/linux/pogo_common.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_POGO_COMMON_H +#define _OPLUS_POGO_COMMON_H + +struct uart_port; + +struct pogo_keyboard_operations { + const char *name; + int (*init)(struct uart_port *port, int enable); + int (*write)(void *data, int value); + int (*recv)(unsigned char *buf, int len); + int (*resume)(struct uart_port *port); + int (*suspend)(struct uart_port *port); + int (*remove)(struct uart_port *port); + int (*check)(struct uart_port *port); +}; + +struct pogo_keyboard_operations *get_pogo_keyboard_operations(void); + +#endif /* _OPLUS_POGO_COMMON_H */ diff --git a/include/linux/qcom-io-pgtable.h b/include/linux/qcom-io-pgtable.h index dd515e7b19e49..f4ec0eeb35086 100644 --- a/include/linux/qcom-io-pgtable.h +++ b/include/linux/qcom-io-pgtable.h @@ -7,6 +7,7 @@ #define __QCOM_QCOM_IO_PGTABLE_H #include +#include struct qcom_iommu_pgtable_log_ops { void (*log_new_table)(void *cookie, void *virt, unsigned long iova, size_t granule); @@ -37,10 +38,28 @@ container_of((x), struct qcom_io_pgtable_info, cfg) #define ARM_V8L_FAST ((unsigned int)-1) #define QCOM_ARM_64_LPAE_S1 ((unsigned int)-2) +#if IS_REACHABLE(CONFIG_QCOM_IOMMU_UTIL) struct io_pgtable_ops *qcom_alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, struct qcom_io_pgtable_info *pgtbl_info, void *cookie); void qcom_free_io_pgtable_ops(struct io_pgtable_ops *ops); +#else +static inline struct io_pgtable_ops *qcom_alloc_io_pgtable_ops(enum io_pgtable_fmt fmt, + struct qcom_io_pgtable_info *pgtbl_info, + void *cookie) +{ + if (fmt < IO_PGTABLE_NUM_FMTS) + return alloc_io_pgtable_ops(fmt, &pgtbl_info->cfg, cookie); + + return NULL; +} + +static inline void qcom_free_io_pgtable_ops(struct io_pgtable_ops *ops) +{ + if (ops) + free_io_pgtable_ops(ops); +} +#endif static inline void qcom_io_pgtable_tlb_add_walk_page(const struct qcom_iommu_flush_ops *tlb_ops, void *cookie, diff --git a/include/linux/qcom-iommu-util.h b/include/linux/qcom-iommu-util.h index a921a781d8162..9fae574d20e39 100644 --- a/include/linux/qcom-iommu-util.h +++ b/include/linux/qcom-iommu-util.h @@ -9,6 +9,8 @@ #include #include +#include +#include #include #include @@ -108,6 +110,7 @@ struct qcom_iommu_ops { }; #define to_qcom_iommu_ops(x) (container_of(x, struct qcom_iommu_ops, domain_ops)) +#if IS_REACHABLE(CONFIG_QCOM_IOMMU_UTIL) struct device_node *qcom_iommu_group_parse_phandle(struct device *dev); int qcom_iommu_generate_dma_regions(struct device *dev, struct list_head *head); @@ -145,6 +148,99 @@ int qcom_iommu_set_fault_handler_irq(struct iommu_domain *domain, int qcom_iommu_enable_s1_translation(struct iommu_domain *domain); int qcom_iommu_get_mappings_configuration(struct iommu_domain *domain); +#else +static inline struct device_node *qcom_iommu_group_parse_phandle(struct device *dev) +{ + return NULL; +} + +static inline int qcom_iommu_generate_dma_regions(struct device *dev, + struct list_head *head) +{ + return -ENODEV; +} + +static inline void qcom_iommu_generate_resv_regions(struct device *dev, + struct list_head *list) +{ +} + +static inline int qcom_iommu_get_fast_iova_range(struct device *dev, + dma_addr_t *ret_iova_base, + dma_addr_t *ret_iova_end) +{ + return -ENODEV; +} + +static inline void qcom_iommu_get_resv_regions(struct device *dev, + struct list_head *list) +{ +} + +static inline phys_addr_t qcom_iommu_iova_to_phys_hard(struct iommu_domain *domain, + struct qcom_iommu_atos_txn *txn) +{ + return 0; +} + +static inline int qcom_iommu_sid_switch(struct device *dev, enum sid_switch_direction dir) +{ + return -ENODEV; +} + +static inline int qcom_skip_tlb_management(struct device *dev, bool skip) +{ + return -ENODEV; +} + +static inline int qcom_iommu_get_fault_ids(struct iommu_domain *domain, + struct qcom_iommu_fault_ids *f_ids) +{ + return -ENODEV; +} + +static inline int qcom_iommu_get_msi_size(struct device *dev, u32 *msi_size) +{ + return -ENODEV; +} + +static inline int qcom_iommu_get_context_bank_nr(struct iommu_domain *domain) +{ + return -ENODEV; +} + +static inline int qcom_iommu_get_asid_nr(struct iommu_domain *domain) +{ + return -ENODEV; +} + +static inline int qcom_iommu_set_secure_vmid(struct iommu_domain *domain, enum vmid vmid) +{ + return -ENODEV; +} + +static inline int qcom_iommu_set_fault_model(struct iommu_domain *domain, int fault_model) +{ + return -ENODEV; +} + +static inline int qcom_iommu_set_fault_handler_irq(struct iommu_domain *domain, + fault_handler_irq_t handler_irq, + void *token) +{ + return -ENODEV; +} + +static inline int qcom_iommu_enable_s1_translation(struct iommu_domain *domain) +{ + return -ENODEV; +} + +static inline int qcom_iommu_get_mappings_configuration(struct iommu_domain *domain) +{ + return -ENODEV; +} +#endif #ifdef CONFIG_IOMMU_IO_PGTABLE_LPAE int __init qcom_arm_lpae_do_selftests(void); diff --git a/include/linux/task_overload.h b/include/linux/task_overload.h deleted file mode 120000 index f96cb82fa4c33..0000000000000 --- a/include/linux/task_overload.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/cpu/oplus_overload/task_overload.h \ No newline at end of file diff --git a/include/linux/task_overload.h b/include/linux/task_overload.h new file mode 100644 index 0000000000000..007a7ad900e38 --- /dev/null +++ b/include/linux/task_overload.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_TASK_OVERLOAD_H +#define _OPLUS_TASK_OVERLOAD_H + +#include + +static inline void test_task_overload(struct task_struct *p) +{ + (void)p; +} + +#endif /* _OPLUS_TASK_OVERLOAD_H */ diff --git a/include/soc/oplus/boot b/include/soc/oplus/boot deleted file mode 120000 index 5402fcef4b6d3..0000000000000 --- a/include/soc/oplus/boot +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/boot/include \ No newline at end of file diff --git a/include/soc/oplus/boot/boot_mode.h b/include/soc/oplus/boot/boot_mode.h new file mode 100644 index 0000000000000..7bdad3cfc9ded --- /dev/null +++ b/include/soc/oplus/boot/boot_mode.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_BOOT_MODE_H +#define _OPLUS_BOOT_MODE_H + +#endif /* _OPLUS_BOOT_MODE_H */ diff --git a/include/soc/oplus/boot/oplus_project.h b/include/soc/oplus/boot/oplus_project.h new file mode 100644 index 0000000000000..86bf5022eb1f0 --- /dev/null +++ b/include/soc/oplus/boot/oplus_project.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_PROJECT_H +#define _OPLUS_PROJECT_H + +#endif /* _OPLUS_PROJECT_H */ diff --git a/include/soc/oplus/device_info.h b/include/soc/oplus/device_info.h deleted file mode 120000 index 4401b3c173920..0000000000000 --- a/include/soc/oplus/device_info.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/device_info/device_info/device_info.h \ No newline at end of file diff --git a/include/soc/oplus/device_info.h b/include/soc/oplus/device_info.h new file mode 100644 index 0000000000000..5f4785f3e9f27 --- /dev/null +++ b/include/soc/oplus/device_info.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_DEVICE_INFO_H +#define _OPLUS_DEVICE_INFO_H + +struct oplus_device_info { + int dummy; +}; + +#endif /* _OPLUS_DEVICE_INFO_H */ diff --git a/include/soc/oplus/dfr b/include/soc/oplus/dfr deleted file mode 120000 index f2b9eb49c18f9..0000000000000 --- a/include/soc/oplus/dfr +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/dfr/include \ No newline at end of file diff --git a/include/soc/oplus/dfr/dfr_stub.h b/include/soc/oplus/dfr/dfr_stub.h new file mode 100644 index 0000000000000..49e9748b75b23 --- /dev/null +++ b/include/soc/oplus/dfr/dfr_stub.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_DFR_STUB_H +#define _OPLUS_DFR_STUB_H + +#endif /* _OPLUS_DFR_STUB_H */ diff --git a/include/soc/oplus/dft b/include/soc/oplus/dft deleted file mode 120000 index 71a91b6e5af76..0000000000000 --- a/include/soc/oplus/dft +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/dft/include \ No newline at end of file diff --git a/include/soc/oplus/dft/dft_stub.h b/include/soc/oplus/dft/dft_stub.h new file mode 100644 index 0000000000000..cd314417c4f3b --- /dev/null +++ b/include/soc/oplus/dft/dft_stub.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_DFT_STUB_H +#define _OPLUS_DFT_STUB_H + +#endif /* _OPLUS_DFT_STUB_H */ diff --git a/include/soc/oplus/kernelFwUpdate.h b/include/soc/oplus/kernelFwUpdate.h deleted file mode 120000 index cf85ee3b92062..0000000000000 --- a/include/soc/oplus/kernelFwUpdate.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/touchpanel/kernelFwUpdate/kernelFwUpdate.h \ No newline at end of file diff --git a/include/soc/oplus/kernelFwUpdate.h b/include/soc/oplus/kernelFwUpdate.h new file mode 100644 index 0000000000000..f5abdf576dda3 --- /dev/null +++ b/include/soc/oplus/kernelFwUpdate.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_KERNEL_FW_UPDATE_H +#define _OPLUS_KERNEL_FW_UPDATE_H + +#endif /* _OPLUS_KERNEL_FW_UPDATE_H */ diff --git a/include/soc/oplus/oplus_mm_kevent_fb.h b/include/soc/oplus/oplus_mm_kevent_fb.h deleted file mode 120000 index 8d342e786e67b..0000000000000 --- a/include/soc/oplus/oplus_mm_kevent_fb.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/multimedia/feedback/oplus_mm_kevent_fb.h \ No newline at end of file diff --git a/include/soc/oplus/oplus_mm_kevent_fb.h b/include/soc/oplus/oplus_mm_kevent_fb.h new file mode 100644 index 0000000000000..dd4ffe20c8cfe --- /dev/null +++ b/include/soc/oplus/oplus_mm_kevent_fb.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_MM_KEVENT_FB_H +#define _OPLUS_MM_KEVENT_FB_H + +#define OPLUS_AUDIO_EVENTID_HEADSET_DET 0 +#define OPLUS_AUDIO_EVENTID_ADSP_DAEMON 1 +#define OPLUS_AUDIO_EVENTID_ADSP_CRASH 2 + +#define MM_FB_KEY_RATELIMIT_5MIN 0 +#define MM_FB_KEY_RATELIMIT_30MIN 1 + +static inline void mm_fb_audio_kevent_named(int event_id, int rate_limit, const char *fmt, ...) +{ + (void)event_id; + (void)rate_limit; + (void)fmt; +} + +#endif /* _OPLUS_MM_KEVENT_FB_H */ diff --git a/include/soc/oplus/oplus_trackpoint_report.h b/include/soc/oplus/oplus_trackpoint_report.h deleted file mode 120000 index f44d9c25203f4..0000000000000 --- a/include/soc/oplus/oplus_trackpoint_report.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/qcom/opensource/display-drivers/oplus/common/trackpoint/oplus_trackpoint_report.h \ No newline at end of file diff --git a/include/soc/oplus/oplus_trackpoint_report.h b/include/soc/oplus/oplus_trackpoint_report.h new file mode 100644 index 0000000000000..22508be96c4f3 --- /dev/null +++ b/include/soc/oplus/oplus_trackpoint_report.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_TRACKPOINT_REPORT_H +#define _OPLUS_TRACKPOINT_REPORT_H + +struct oplus_trackpoint_report { + int dummy; +}; + +#endif /* _OPLUS_TRACKPOINT_REPORT_H */ diff --git a/include/soc/oplus/system/kernel_fb.h b/include/soc/oplus/system/kernel_fb.h deleted file mode 120000 index 329169ef492d0..0000000000000 --- a/include/soc/oplus/system/kernel_fb.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../vendor/oplus/kernel/dft/include/kernel_fb.h \ No newline at end of file diff --git a/include/soc/oplus/system/kernel_fb.h b/include/soc/oplus/system/kernel_fb.h new file mode 100644 index 0000000000000..229c1df5dc0b5 --- /dev/null +++ b/include/soc/oplus/system/kernel_fb.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_KERNEL_FB_H +#define _OPLUS_KERNEL_FB_H + +#endif /* _OPLUS_KERNEL_FB_H */ diff --git a/include/soc/oplus/system/olc.h b/include/soc/oplus/system/olc.h deleted file mode 120000 index bfc107ee9462a..0000000000000 --- a/include/soc/oplus/system/olc.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../vendor/oplus/kernel/dft/include/olc.h \ No newline at end of file diff --git a/include/soc/oplus/system/olc.h b/include/soc/oplus/system/olc.h new file mode 100644 index 0000000000000..7075e05a3f25c --- /dev/null +++ b/include/soc/oplus/system/olc.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_OLC_H +#define _OPLUS_OLC_H + +#endif /* _OPLUS_OLC_H */ diff --git a/include/soc/oplus/touchpanel_event_notify.h b/include/soc/oplus/touchpanel_event_notify.h deleted file mode 120000 index cfa6edfb85c16..0000000000000 --- a/include/soc/oplus/touchpanel_event_notify.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/touchpanel/touchpanel_notify/touchpanel_event_notify.h \ No newline at end of file diff --git a/include/soc/oplus/touchpanel_event_notify.h b/include/soc/oplus/touchpanel_event_notify.h new file mode 100644 index 0000000000000..d87d11db29b92 --- /dev/null +++ b/include/soc/oplus/touchpanel_event_notify.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_TOUCHPANEL_EVENT_NOTIFY_H +#define _OPLUS_TOUCHPANEL_EVENT_NOTIFY_H + +#endif /* _OPLUS_TOUCHPANEL_EVENT_NOTIFY_H */ diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index 83f9150b7d249..2325913f3d1a5 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -7,6 +7,8 @@ #ifndef __SOC_QCOM_SOCINFO_H__ #define __SOC_QCOM_SOCINFO_H__ +#include +#include #include enum feature_code { @@ -121,7 +123,7 @@ enum subset_cluster_type { NUM_CLUSTERS_MAX, }; -#if IS_ENABLED(CONFIG_QCOM_SOCINFO) +#if IS_REACHABLE(CONFIG_QCOM_SOCINFO) uint32_t socinfo_get_id(void); uint32_t socinfo_get_serial_number(void); const char *socinfo_get_id_string(void); @@ -151,39 +153,39 @@ static inline const char *socinfo_get_id_string(void) { return "N/A"; } -int socinfo_get_feature_code(void) +static inline int socinfo_get_feature_code(void) { return -EINVAL; } -int socinfo_get_pcode(void) +static inline int socinfo_get_pcode(void) { return -EINVAL; } -const char *socinfo_get_partinfo_part_name(unsigned int part_id) +static inline const char *socinfo_get_partinfo_part_name(unsigned int part_id) { return NULL; } -uint32_t socinfo_get_partinfo_chip_id(unsigned int part_id) +static inline uint32_t socinfo_get_partinfo_chip_id(unsigned int part_id) { return 0; } -uint32_t socinfo_get_partinfo_vulkan_id(unsigned int part_id) +static inline uint32_t socinfo_get_partinfo_vulkan_id(unsigned int part_id) { return 0; } -uint32_t socinfo_get_cluster_info(enum subset_cluster_type cluster) +static inline uint32_t socinfo_get_cluster_info(enum subset_cluster_type cluster) { return 0; } -bool socinfo_get_part_info(enum subset_part_type part) +static inline bool socinfo_get_part_info(enum subset_part_type part) { return false; } -int socinfo_get_part_count(enum subset_part_type part) +static inline int socinfo_get_part_count(enum subset_part_type part) { return -EINVAL; } -int socinfo_get_subpart_info(enum subset_part_type part, +static inline int socinfo_get_subpart_info(enum subset_part_type part, u32 *part_info, u32 num_parts) { diff --git a/include/trace/events/oplus_omrg_trace.h b/include/trace/events/oplus_omrg_trace.h deleted file mode 120000 index 7f02fe73c48f8..0000000000000 --- a/include/trace/events/oplus_omrg_trace.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../vendor/oplus/kernel/cpu/oplus_omrg/oplus_omrg_trace.h \ No newline at end of file diff --git a/include/trace/events/oplus_omrg_trace.h b/include/trace/events/oplus_omrg_trace.h new file mode 100644 index 0000000000000..a8af2d9c2c50f --- /dev/null +++ b/include/trace/events/oplus_omrg_trace.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_OMRG_TRACE_H +#define _OPLUS_OMRG_TRACE_H + +/* Placeholder trace header */ + +#endif /* _OPLUS_OMRG_TRACE_H */ diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index da9781f9cad92..48314ec51372d 100755 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -222,7 +222,7 @@ static inline long __trace_sched_switch_state(bool preempt, /* * Tracepoint for task switches, performed by the scheduler: */ -static int get_compound_prio(struct task_struct *p) +static __maybe_unused int get_compound_prio(struct task_struct *p) { struct css_set *cset; int prio, cpu_cid, cpuset_cid; diff --git a/kernel/locking/locking_main.h b/kernel/locking/locking_main.h deleted file mode 120000 index 7b0aab795f945..0000000000000 --- a/kernel/locking/locking_main.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/synchronize/oplus_locking.h \ No newline at end of file diff --git a/kernel/locking/locking_main.h b/kernel/locking/locking_main.h new file mode 100644 index 0000000000000..12a6aa0df4989 --- /dev/null +++ b/kernel/locking/locking_main.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_LOCKING_MAIN_H +#define _OPLUS_LOCKING_MAIN_H + +#endif /* _OPLUS_LOCKING_MAIN_H */ diff --git a/kernel/locking/oplus_locking b/kernel/locking/oplus_locking deleted file mode 120000 index 377068823db21..0000000000000 --- a/kernel/locking/oplus_locking +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/synchronize \ No newline at end of file diff --git a/kernel/locking/oplus_locking.c b/kernel/locking/oplus_locking.c deleted file mode 120000 index bf5d91689ec8c..0000000000000 --- a/kernel/locking/oplus_locking.c +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/synchronize/oplus_locking.c \ No newline at end of file diff --git a/kernel/locking/oplus_locking.c b/kernel/locking/oplus_locking.c new file mode 100644 index 0000000000000..21c5490514d67 --- /dev/null +++ b/kernel/locking/oplus_locking.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include + +/* Dummy Oplus locking implementation */ + +void __weak android_vh_pcpu_rwsem_handler(u64 sem, struct task_struct *tsk, + unsigned long jiffies) +{ +} + +void __weak pcp_wait_handler(struct percpu_rw_semaphore *sem, bool is_reader, + int phase) +{ +} + +void __weak mutex_lock_handler(u64 lock, struct task_struct *tsk, + unsigned long jiffies) +{ +} + +void __weak mutex_wait_handler(struct mutex *lock) +{ +} + +void __weak rwsem_lock_handler(u64 sem, struct task_struct *tsk, + unsigned long jiffies) +{ +} + +void __weak rwsem_read_wait_handler(struct rw_semaphore *sem) +{ +} + +void __weak rtmutex_lock_handler(u64 lock, struct task_struct *tsk, + unsigned long jiffies) +{ +} + +void __weak rtmutex_wait_handler(struct rt_mutex_base *lock) +{ +} diff --git a/kernel/locking/oplus_locking/README.md b/kernel/locking/oplus_locking/README.md new file mode 100644 index 0000000000000..11c99ef0ec4f4 --- /dev/null +++ b/kernel/locking/oplus_locking/README.md @@ -0,0 +1 @@ +# Dummy oplus locking directory diff --git a/kernel/locking/sa_common_struct.h b/kernel/locking/sa_common_struct.h deleted file mode 120000 index 995033021b284..0000000000000 --- a/kernel/locking/sa_common_struct.h +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/oplus/kernel/cpu/sched/sched_assist/sa_common_struct.h \ No newline at end of file diff --git a/kernel/locking/sa_common_struct.h b/kernel/locking/sa_common_struct.h new file mode 100644 index 0000000000000..ccb0f30b70b29 --- /dev/null +++ b/kernel/locking/sa_common_struct.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_COMMON_STRUCT_H +#define _OPLUS_SA_COMMON_STRUCT_H + +struct sa_common_stub { + int dummy; +}; + +#endif /* _OPLUS_SA_COMMON_STRUCT_H */ diff --git a/kernel/oplus_cpu b/kernel/oplus_cpu deleted file mode 120000 index 59db880294668..0000000000000 --- a/kernel/oplus_cpu +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/oplus/kernel/cpu \ No newline at end of file diff --git a/kernel/oplus_cpu/cpufreq_bouncing/Kconfig b/kernel/oplus_cpu/cpufreq_bouncing/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_bouncing/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/cpufreq_bouncing/Makefile b/kernel/oplus_cpu/cpufreq_bouncing/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_bouncing/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/cpufreq_bouncing/cpufreq_bouncing.h b/kernel/oplus_cpu/cpufreq_bouncing/cpufreq_bouncing.h new file mode 100644 index 0000000000000..65ceb12aa87cd --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_bouncing/cpufreq_bouncing.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_CPUFREQ_BOUNCING_H +#define _OPLUS_CPUFREQ_BOUNCING_H + +#include + +static inline void cb_update(struct cpufreq_policy *policy, u64 time) +{ + (void)policy; + (void)time; +} + +static inline void cb_ceiling_free(bool enable) +{ + (void)enable; +} + +static inline void cb_stuff_init(struct cpufreq_policy *policy) +{ + (void)policy; +} + +#endif /* _OPLUS_CPUFREQ_BOUNCING_H */ diff --git a/kernel/oplus_cpu/cpufreq_health/Kconfig b/kernel/oplus_cpu/cpufreq_health/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_health/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/cpufreq_health/Makefile b/kernel/oplus_cpu/cpufreq_health/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_health/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/cpufreq_health/cpufreq_health.h b/kernel/oplus_cpu/cpufreq_health/cpufreq_health.h new file mode 100644 index 0000000000000..c0cfaf7b9d026 --- /dev/null +++ b/kernel/oplus_cpu/cpufreq_health/cpufreq_health.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_CPUFREQ_HEALTH_H +#define _OPLUS_CPUFREQ_HEALTH_H + +#include + +static inline int cpufreq_health_register(struct cpufreq_policy *policy) +{ + return 0; +} + +static inline void cpufreq_health_get_edtask_state(int cpu, int flag) +{ + (void)cpu; + (void)flag; +} + +static inline void cpufreq_health_get_state(struct cpufreq_policy *policy) +{ + (void)policy; +} + +static inline void cpufreq_health_get_newtask_state(struct cpufreq_policy *policy, int flag) +{ + (void)policy; + (void)flag; +} + +#endif /* _OPLUS_CPUFREQ_HEALTH_H */ diff --git a/kernel/oplus_cpu/misc/sched_assist/Makefile b/kernel/oplus_cpu/misc/sched_assist/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/misc/sched_assist/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/misc/sched_assist/oem_fair.c b/kernel/oplus_cpu/misc/sched_assist/oem_fair.c new file mode 100644 index 0000000000000..2bb380620cc90 --- /dev/null +++ b/kernel/oplus_cpu/misc/sched_assist/oem_fair.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Dummy Oplus sched assist implementation */ diff --git a/kernel/oplus_cpu/oplus_omrg/Kconfig b/kernel/oplus_cpu/oplus_omrg/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/oplus_omrg/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/oplus_omrg/Makefile b/kernel/oplus_cpu/oplus_omrg/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/oplus_omrg/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/oplus_omrg/oplus_omrg.h b/kernel/oplus_cpu/oplus_omrg/oplus_omrg.h new file mode 100644 index 0000000000000..9fefd9ff07784 --- /dev/null +++ b/kernel/oplus_cpu/oplus_omrg/oplus_omrg.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_OMRG_H +#define _OPLUS_OMRG_H + +#include + +static inline void omrg_ceiling_free(bool enable) +{ + (void)enable; +} + +static inline void omrg_cpufreq_check_limit(struct cpufreq_policy *policy, unsigned int freq) +{ + (void)policy; + (void)freq; +} + +static inline void omrg_cpufreq_unregister(struct cpufreq_policy *policy) +{ + (void)policy; +} + +static inline void omrg_cpufreq_register(struct cpufreq_policy *policy) +{ + (void)policy; +} + +#endif /* _OPLUS_OMRG_H */ diff --git a/kernel/oplus_cpu/oplus_omrg/oplus_omrg_trace.h b/kernel/oplus_cpu/oplus_omrg/oplus_omrg_trace.h new file mode 100644 index 0000000000000..a8af2d9c2c50f --- /dev/null +++ b/kernel/oplus_cpu/oplus_omrg/oplus_omrg_trace.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_OMRG_TRACE_H +#define _OPLUS_OMRG_TRACE_H + +/* Placeholder trace header */ + +#endif /* _OPLUS_OMRG_TRACE_H */ diff --git a/kernel/oplus_cpu/oplus_overload/Kconfig b/kernel/oplus_cpu/oplus_overload/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/oplus_overload/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/oplus_overload/Makefile b/kernel/oplus_cpu/oplus_overload/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/oplus_overload/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/oplus_overload/task_overload.h b/kernel/oplus_cpu/oplus_overload/task_overload.h new file mode 100644 index 0000000000000..007a7ad900e38 --- /dev/null +++ b/kernel/oplus_cpu/oplus_overload/task_overload.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_TASK_OVERLOAD_H +#define _OPLUS_TASK_OVERLOAD_H + +#include + +static inline void test_task_overload(struct task_struct *p) +{ + (void)p; +} + +#endif /* _OPLUS_TASK_OVERLOAD_H */ diff --git a/kernel/oplus_cpu/sched/Kconfig b/kernel/oplus_cpu/sched/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/sched/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/sched/Makefile b/kernel/oplus_cpu/sched/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/sched/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/sched/eas_opt/Makefile b/kernel/oplus_cpu/sched/eas_opt/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/sched/eas_opt/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/sched/eas_opt/oplus_cap.h b/kernel/oplus_cpu/sched/eas_opt/oplus_cap.h new file mode 100644 index 0000000000000..0922d6ba37722 --- /dev/null +++ b/kernel/oplus_cpu/sched/eas_opt/oplus_cap.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_CAP_H +#define _OPLUS_CAP_H + +#define OPLUS_CLUSTERS 4 + +static int eas_opt_enable; +static int oplus_cap_multiple[OPLUS_CLUSTERS] = { 100, 100, 100, 100 }; +static int nr_oplus_cap_multiple[OPLUS_CLUSTERS] = { 100, 100, 100, 100 }; +static int util_thresh_percent[OPLUS_CLUSTERS] = { 100, 100, 100, 100 }; + +static inline void oplus_cap_systrace_c(int cpu, unsigned long cap, unsigned long real) +{ + (void)cpu; + (void)cap; + (void)real; +} + +#endif /* _OPLUS_CAP_H */ diff --git a/kernel/oplus_cpu/sched/eas_opt/oplus_iowait.h b/kernel/oplus_cpu/sched/eas_opt/oplus_iowait.h new file mode 100644 index 0000000000000..ef66a4520e2a4 --- /dev/null +++ b/kernel/oplus_cpu/sched/eas_opt/oplus_iowait.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_IOWAIT_H +#define _OPLUS_IOWAIT_H + +static int sysctl_oplus_iowait_boost_enabled; +static int sysctl_oplus_iowait_skip_min_enabled; + +#endif /* _OPLUS_IOWAIT_H */ diff --git a/kernel/oplus_cpu/sched/frame_boost/Makefile b/kernel/oplus_cpu/sched/frame_boost/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/sched/frame_boost/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/sched/frame_boost/frame_group.h b/kernel/oplus_cpu/sched/frame_boost/frame_group.h new file mode 100644 index 0000000000000..571a3b0db4253 --- /dev/null +++ b/kernel/oplus_cpu/sched/frame_boost/frame_group.h @@ -0,0 +1,74 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_FRAME_GROUP_H +#define _OPLUS_FRAME_GROUP_H + +#include +#include + +struct rq; + +static inline bool frame_boost_enabled(void) +{ + return false; +} + +static inline bool is_fbg_task(struct task_struct *p) +{ + (void)p; + return false; +} + +static inline bool fbg_rt_task_fits_capacity(struct task_struct *p, int cpu) +{ + (void)p; + (void)cpu; + return true; +} + +static inline bool fbg_need_up_migration(struct task_struct *p, struct rq *rq) +{ + (void)p; + (void)rq; + return false; +} + +static inline bool fbg_skip_migration(struct task_struct *p, int src_cpu, int dst_cpu) +{ + (void)p; + (void)src_cpu; + (void)dst_cpu; + return false; +} + +static inline void fbg_game_ed(struct rq *rq) +{ + (void)rq; +} + +static inline void fbg_freq_policy_util(int flags, const struct cpumask *cpus, + unsigned long *util) +{ + (void)flags; + (void)cpus; + (void)util; +} + +static inline void fbg_add_update_freq_hook(void (*hook)(struct rq *rq, int flags)) +{ + (void)hook; +} + +static inline bool set_frame_group_task_to_perfer_cpu(struct task_struct *p, int *cpu) +{ + (void)p; + (void)cpu; + return false; +} + +static inline void init_fbg_halt_mask(struct cpumask *mask) +{ + if (mask) + cpumask_clear(mask); +} + +#endif /* _OPLUS_FRAME_GROUP_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/Makefile b/kernel/oplus_cpu/sched/sched_assist/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_audio.h b/kernel/oplus_cpu/sched/sched_assist/sa_audio.h new file mode 100644 index 0000000000000..ae26034e6e5a9 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_audio.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_AUDIO_H +#define _OPLUS_SA_AUDIO_H + +/* Placeholder for sched assist audio helpers. */ + +#endif /* _OPLUS_SA_AUDIO_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_balance.h b/kernel/oplus_cpu/sched/sched_assist/sa_balance.h new file mode 100644 index 0000000000000..46078c593cff1 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_balance.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_BALANCE_H +#define _OPLUS_SA_BALANCE_H + +/* Placeholder for sched assist balance helpers. */ + +#endif /* _OPLUS_SA_BALANCE_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_common.h b/kernel/oplus_cpu/sched/sched_assist/sa_common.h new file mode 100644 index 0000000000000..df4776fc0550d --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_common.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_COMMON_H +#define _OPLUS_SA_COMMON_H + +#include +#include + +struct rq; + +static inline void adjust_rt_lowest_mask(struct task_struct *p, + struct cpumask *lowest_mask, + int ret, bool force) +{ + (void)p; + (void)lowest_mask; + (void)ret; + (void)force; +} + +static inline void sa_skip_rt_sync(struct rq *rq, struct task_struct *p, int *sync) +{ + (void)rq; + (void)p; + (void)sync; +} + +static inline void sa_corectl_systrace_c(void) +{ +} + +#endif /* _OPLUS_SA_COMMON_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_common_struct.h b/kernel/oplus_cpu/sched/sched_assist/sa_common_struct.h new file mode 100644 index 0000000000000..ccb0f30b70b29 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_common_struct.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_COMMON_STRUCT_H +#define _OPLUS_SA_COMMON_STRUCT_H + +struct sa_common_stub { + int dummy; +}; + +#endif /* _OPLUS_SA_COMMON_STRUCT_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_fair.h b/kernel/oplus_cpu/sched/sched_assist/sa_fair.h new file mode 100644 index 0000000000000..1475c1f7cb756 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_fair.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_FAIR_H +#define _OPLUS_SA_FAIR_H + +/* Placeholder for sched assist fair helpers. */ + +#endif /* _OPLUS_SA_FAIR_H */ diff --git a/kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h b/kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h new file mode 100644 index 0000000000000..22267ed11460f --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SA_PIPELINE_H +#define _OPLUS_SA_PIPELINE_H + +#include + +static inline bool oplus_pipeline_task_skip_cpu(struct task_struct *p, int cpu) +{ + (void)p; + (void)cpu; + return false; +} + +static inline bool oplus_is_pipeline_scene(void) +{ + return false; +} + +static inline int oplus_get_task_pipeline_cpu(struct task_struct *p) +{ + (void)p; + return -1; +} + +static inline bool oplus_pipeline_low_latency_task(int cpu) +{ + (void)cpu; + return false; +} + +#endif /* _OPLUS_SA_PIPELINE_H */ diff --git a/kernel/oplus_cpu/sched/sched_tune/Makefile b/kernel/oplus_cpu/sched/sched_tune/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_tune/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/sched/sched_tune/tune.h b/kernel/oplus_cpu/sched/sched_tune/tune.h new file mode 100644 index 0000000000000..373eb3ee41f8e --- /dev/null +++ b/kernel/oplus_cpu/sched/sched_tune/tune.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _OPLUS_SCHED_TUNE_H +#define _OPLUS_SCHED_TUNE_H + +#include +#include +#include + +static inline void schedtune_enqueue_task(struct task_struct *p, int cpu) +{ + (void)p; + (void)cpu; +} + +static inline void schedtune_dequeue_task(struct task_struct *p, int cpu) +{ + (void)p; + (void)cpu; +} + +static inline void schedtune_attach(struct task_struct *p) +{ + (void)p; +} + +static inline void schedtune_root_alloc(void) +{ +} + +static inline void schedtune_alloc(struct task_group *tg, struct cgroup_subsys_state *css) +{ + (void)tg; + (void)css; +} + +static inline void schedtune_free(struct cgroup_subsys_state *css) +{ + (void)css; +} + +static inline s64 schedtune_boost_read(struct cgroup_subsys_state *css, struct cftype *cft) +{ + (void)css; + (void)cft; + return 0; +} + +static inline int schedtune_boost_write(struct cgroup_subsys_state *css, struct cftype *cft, s64 val) +{ + (void)css; + (void)cft; + (void)val; + return 0; +} + +#endif /* _OPLUS_SCHED_TUNE_H */ diff --git a/kernel/oplus_cpu/uad/Kconfig b/kernel/oplus_cpu/uad/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/uad/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/uad/Makefile b/kernel/oplus_cpu/uad/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/uad/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/oplus_cpu/waker_identify/Kconfig b/kernel/oplus_cpu/waker_identify/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/kernel/oplus_cpu/waker_identify/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/kernel/oplus_cpu/waker_identify/Makefile b/kernel/oplus_cpu/waker_identify/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/kernel/oplus_cpu/waker_identify/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 11bcdff141ed9..d1f8f5d5c9b25 100755 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -100,7 +100,7 @@ #include #if IS_ENABLED(CONFIG_OPLUS_SCHED_TUNE) -#include <../kernel/oplus_cpu/sched/sched_tune/tune.h> +#include "../oplus_cpu/sched/sched_tune/tune.h" #endif /* diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index d1477659575b2..3dd0d0057abcf 100755 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -2486,7 +2486,8 @@ static void free_dsq_irq_workfn(struct irq_work *irq_work) kfree_rcu(dsq); } -static DEFINE_IRQ_WORK(free_dsq_irq_work, free_dsq_irq_workfn); +static __maybe_unused struct irq_work free_dsq_irq_work = + IRQ_WORK_INIT(free_dsq_irq_workfn); static void destroy_dsq(u64 dsq_id) { diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 1801b7d7ada0c..918b598b3fb30 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -59,7 +59,7 @@ #include #if IS_ENABLED(CONFIG_OPLUS_SCHED_TUNE) -#include <../kernel/oplus_cpu/sched/sched_tune/tune.h> +#include "../oplus_cpu/sched/sched_tune/tune.h" #endif EXPORT_TRACEPOINT_SYMBOL_GPL(sched_stat_runtime); diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 116e8a70252eb..5a24bfd46fb03 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -7,7 +7,7 @@ #include #if IS_ENABLED(CONFIG_OPLUS_SCHED_TUNE) -#include <../kernel/oplus_cpu/sched/sched_tune/tune.h> +#include "../oplus_cpu/sched/sched_tune/tune.h" #endif int sched_rr_timeslice = RR_TIMESLICE; diff --git a/kernel/sched/walt/core_ctl.c b/kernel/sched/walt/core_ctl.c index 84ff423f44a35..1cbc29db557b3 100755 --- a/kernel/sched/walt/core_ctl.c +++ b/kernel/sched/walt/core_ctl.c @@ -22,7 +22,7 @@ #include "trace.h" #if IS_ENABLED(CONFIG_OPLUS_FEATURE_PIPELINE) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h> +#include "../../oplus_cpu/sched/sched_assist/sa_pipeline.h" #endif /* mask of all CPUs with a fully pause claim outstanding */ diff --git a/kernel/sched/walt/cpufreq_walt.c b/kernel/sched/walt/cpufreq_walt.c index b7f0bddaf5e8d..0039f8d5bc095 100755 --- a/kernel/sched/walt/cpufreq_walt.c +++ b/kernel/sched/walt/cpufreq_walt.c @@ -22,15 +22,15 @@ #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #if IS_ENABLED(CONFIG_OPLUS_CPUFREQ_IOWAIT_PROTECT) -#include <../kernel/oplus_cpu/sched/eas_opt/oplus_iowait.h> +#include "../../oplus_cpu/sched/eas_opt/oplus_iowait.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_VT_CAP) -#include <../kernel/oplus_cpu/sched/eas_opt/oplus_cap.h> +#include "../../oplus_cpu/sched/eas_opt/oplus_cap.h" #endif #ifdef CONFIG_OPLUS_FEATURE_SUGOV_TL diff --git a/kernel/sched/walt/oem_sched b/kernel/sched/walt/oem_sched deleted file mode 120000 index f43b55088c1f3..0000000000000 --- a/kernel/sched/walt/oem_sched +++ /dev/null @@ -1 +0,0 @@ -../../oplus_cpu/misc/sched_assist \ No newline at end of file diff --git a/kernel/sched/walt/oem_sched/oem_fair.c b/kernel/sched/walt/oem_sched/oem_fair.c new file mode 100644 index 0000000000000..2bb380620cc90 --- /dev/null +++ b/kernel/sched/walt/oem_sched/oem_fair.c @@ -0,0 +1,2 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Dummy Oplus sched assist implementation */ diff --git a/kernel/sched/walt/walt.c b/kernel/sched/walt/walt.c index 4b6f41b347928..72ba87235c68a 100755 --- a/kernel/sched/walt/walt.c +++ b/kernel/sched/walt/walt.c @@ -32,21 +32,21 @@ #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_ABNORMAL_FLAG) #include #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_VT_CAP) -#include <../kernel/oplus_cpu/sched/eas_opt/oplus_cap.h> +#include "../../oplus_cpu/sched/eas_opt/oplus_cap.h" #endif #if IS_ENABLED(CONFIG_OPLUS_CPUFREQ_IOWAIT_PROTECT) -#include <../kernel/oplus_cpu/sched/eas_opt/oplus_iowait.h> +#include "../../oplus_cpu/sched/eas_opt/oplus_iowait.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_PIPELINE) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h> +#include "../../oplus_cpu/sched/sched_assist/sa_pipeline.h" #endif #ifdef CONFIG_OPLUS_BENCHMARK_CPU diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h index 6282fd9446237..e434d1babca7e 100755 --- a/kernel/sched/walt/walt.h +++ b/kernel/sched/walt/walt.h @@ -24,11 +24,11 @@ #define MSEC_TO_NSEC (1000 * 1000) #if IS_ENABLED(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_fair.h> +#include "../../oplus_cpu/sched/sched_assist/sa_fair.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #ifdef CONFIG_HZ_300 diff --git a/kernel/sched/walt/walt_cfs.c b/kernel/sched/walt/walt_cfs.c index 88624ec3bb6af..f3e8087f96127 100755 --- a/kernel/sched/walt/walt_cfs.c +++ b/kernel/sched/walt/walt_cfs.c @@ -14,22 +14,22 @@ #include "../../../drivers/android/binder_trace.h" #if IS_ENABLED(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_fair.h> -#include <../kernel/oplus_cpu/sched/sched_assist/sa_common.h> +#include "../../oplus_cpu/sched/sched_assist/sa_fair.h" +#include "../../oplus_cpu/sched/sched_assist/sa_common.h" #ifdef CONFIG_OPLUS_CPU_AUDIO_PERF -#include <../kernel/oplus_cpu/sched/sched_assist/sa_audio.h> +#include "../../oplus_cpu/sched/sched_assist/sa_audio.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_PIPELINE) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h> +#include "../../oplus_cpu/sched/sched_assist/sa_pipeline.h" #endif #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_VT_CAP) -#include <../kernel/oplus_cpu/sched/eas_opt/oplus_cap.h> +#include "../../oplus_cpu/sched/eas_opt/oplus_cap.h" #endif #ifdef CONFIG_OPLUS_BENCHMARK_CPU diff --git a/kernel/sched/walt/walt_halt.c b/kernel/sched/walt/walt_halt.c index 9004fb5b4754c..1f03963a17e2a 100755 --- a/kernel/sched/walt/walt_halt.c +++ b/kernel/sched/walt/walt_halt.c @@ -11,11 +11,11 @@ #ifdef CONFIG_OPLUS_ADD_CORE_CTRL_MASK #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_common.h> -#include <../kernel/oplus_cpu/sched/sched_assist/sa_fair.h> +#include "../../oplus_cpu/sched/sched_assist/sa_common.h" +#include "../../oplus_cpu/sched/sched_assist/sa_fair.h" #endif #endif /* CONFIG_OPLUS_ADD_CORE_CTRL_MASK */ diff --git a/kernel/sched/walt/walt_lb.c b/kernel/sched/walt/walt_lb.c index 9efac9845479d..ad3c4caa19c65 100755 --- a/kernel/sched/walt/walt_lb.c +++ b/kernel/sched/walt/walt_lb.c @@ -9,7 +9,7 @@ #include "walt.h" #include "trace.h" #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_LOADBALANCE) @@ -18,15 +18,15 @@ #if IS_ENABLED(CONFIG_OPLUS_FEATURE_ABNORMAL_FLAG) #include -#include <../kernel/oplus_cpu/sched/sched_assist/sa_common.h> +#include "../../oplus_cpu/sched/sched_assist/sa_common.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_PIPELINE) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_pipeline.h> +#include "../../oplus_cpu/sched/sched_assist/sa_pipeline.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_common.h> +#include "../../oplus_cpu/sched/sched_assist/sa_common.h" #endif static inline unsigned long walt_lb_cpu_util(int cpu) diff --git a/kernel/sched/walt/walt_rt.c b/kernel/sched/walt/walt_rt.c index 97a3336a18d03..ab45ff37c5db0 100644 --- a/kernel/sched/walt/walt_rt.c +++ b/kernel/sched/walt/walt_rt.c @@ -10,10 +10,10 @@ #include "walt.h" #include "trace.h" #if IS_ENABLED(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) -#include <../kernel/oplus_cpu/sched/sched_assist/sa_common.h> +#include "../../oplus_cpu/sched/sched_assist/sa_common.h" #endif #if IS_ENABLED(CONFIG_OPLUS_FEATURE_FRAME_BOOST) -#include <../kernel/oplus_cpu/sched/frame_boost/frame_group.h> +#include "../../oplus_cpu/sched/frame_boost/frame_group.h" #endif #ifdef CONFIG_OPLUS_BENCHMARK_CPU diff --git a/mm/mm_osvelte b/mm/mm_osvelte deleted file mode 120000 index 09fb0b4bdabf2..0000000000000 --- a/mm/mm_osvelte +++ /dev/null @@ -1 +0,0 @@ -../../../vendor/oplus/kernel/mm/mm_osvelte \ No newline at end of file diff --git a/mm/mm_osvelte/Kconfig b/mm/mm_osvelte/Kconfig new file mode 100644 index 0000000000000..d4dd9a97ae473 --- /dev/null +++ b/mm/mm_osvelte/Kconfig @@ -0,0 +1 @@ +# Dummy Kconfig placeholder diff --git a/mm/mm_osvelte/Makefile b/mm/mm_osvelte/Makefile new file mode 100644 index 0000000000000..7fcfd1c276b83 --- /dev/null +++ b/mm/mm_osvelte/Makefile @@ -0,0 +1 @@ +# Dummy Makefile placeholder diff --git a/mm/vmstat.c b/mm/vmstat.c index 55a00d714fe3e..f88a052623c1b 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -34,8 +34,9 @@ #ifdef CONFIG_BLOCKIO_UX_OPT extern unsigned long counter, total_us, max_us, min_us, aver_us; extern unsigned long restart_time, blk_send_ipi_counter; -extern unsigned long erofs_decompress_ux, erofs_decompress_set_ux; -extern unsigned long queue_work_ux; +unsigned long __weak erofs_decompress_ux; +unsigned long __weak erofs_decompress_set_ux; +unsigned long __weak queue_work_ux; static int block_io_stat_show(struct seq_file *m, void *arg) { seq_printf(m, "uxio sortirq: total_us = %lu, counter = %lu, "