You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
Merge commit '52f971ee6e023d89d24f9e3cd145d86d707e459c'
* commit '52f971ee6e023d89d24f9e3cd145d86d707e459c': (84565 commits) arm64: dts: rockchip: rk3562: Enable viLKsvPwrActive for soc bus mtd: spi-nor: esmt: Support New devices mtd: spi-nor: fmsh: Support New devices mtd: spi-nor: gigadevice: Support New devices mtd: spinand: gsto: Add code mtd: spinand: hyf: Support new devices mmc: convert thunder boot dependency ARM: dts: rockchip: rv1106: add node for system sleep ARM: rockchip: support rv1106 suspend ARM: rockchip: add some pm-related functions video: rockchip: mpp: fix rk3528 avsd not probe issue arm64: dts: rockchip: rk3588-vehicle-maxim-serdes: Add BOE AV156FHT L83 support arm64: rockchip_defconfig: Enable CONFIG_DRM_PANEL_MAXIM_MAX96752F drm/panel: Add panel driver for Maxim MAX96752F based LCDs media: i2c: techpoint: add support 4 channel 2 lane mode drm/rockchip: dsi2: fix NULL in component_ops .unbind helper media: rockchip: vicap: fixes cma can not alloc when capture raw media: rockchip: vicap: fixed vc err for multi channel media: rockchip: hdmirx: fix timing info for interlaced resolution media: rockchip: hdmirx: fix code error for cec register failed ... Change-Id: Ia7ac365455d87a295e62bbf481d80694a9712f30 Conflicts: .gitignore Documentation/devicetree/bindings/clock/rockchip,px30-cru.txt Documentation/devicetree/bindings/connector/usb-connector.yaml Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt Documentation/devicetree/bindings/hwmon/pwm-fan.txt Documentation/devicetree/bindings/iio/light/vl6180.txt Documentation/devicetree/bindings/iommu/rockchip,iommu.txt Documentation/devicetree/bindings/mtd/rockchip,nand-controller.yaml Documentation/devicetree/bindings/net/rockchip-dwmac.yaml Documentation/devicetree/bindings/net/snps,dwmac.yaml Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml Documentation/devicetree/bindings/power/rockchip-io-domain.txt Documentation/devicetree/bindings/regulator/fan53555.txt Documentation/devicetree/bindings/soc/rockchip/power_domain.txt Documentation/devicetree/bindings/sound/rockchip,pdm.yaml Documentation/devicetree/bindings/sound/rockchip-spdif.yaml Documentation/devicetree/bindings/spi/spi-rockchip.yaml Documentation/devicetree/bindings/thermal/rockchip-thermal.txt Documentation/devicetree/bindings/usb/usb-xhci.txt Documentation/filesystems/erofs.rst arch/arm/Kconfig arch/arm/Makefile arch/arm/boot/compressed/head.S arch/arm/boot/dts/rk3036.dtsi arch/arm/boot/dts/rk3066a-rayeager.dts arch/arm/boot/dts/rk3066a.dtsi arch/arm/boot/dts/rk322x.dtsi arch/arm/boot/dts/rk3288.dtsi arch/arm/boot/dts/rk3xxx.dtsi arch/arm64/boot/dts/rockchip/Makefile arch/arm64/boot/dts/rockchip/px30.dtsi arch/arm64/boot/dts/rockchip/rk3308.dtsi arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi arch/arm64/boot/dts/rockchip/rk3399.dtsi arch/arm64/boot/dts/rockchip/rk3566.dtsi arch/arm64/boot/dts/rockchip/rk3568-pinctrl.dtsi arch/arm64/boot/dts/rockchip/rk3568.dtsi arch/arm64/boot/dts/rockchip/rockchip-pinconf.dtsi arch/arm64/kernel/process.c arch/arm64/mm/Makefile arch/arm64/mm/fault.c arch/arm64/mm/init.c drivers/Kconfig drivers/Makefile drivers/android/Kconfig drivers/ata/ahci_platform.c drivers/char/hw_random/Kconfig drivers/char/hw_random/Makefile drivers/clk/clk.c drivers/clk/rockchip/Kconfig drivers/clk/rockchip/Makefile drivers/clk/rockchip/clk-cpu.c drivers/clk/rockchip/clk-rk3036.c drivers/clk/rockchip/clk-rk3188.c drivers/clk/rockchip/clk-rk3308.c drivers/clk/rockchip/clk-rk3399.c drivers/clk/rockchip/clk-rk3568.c drivers/clk/rockchip/clk-rv1126.c drivers/clk/rockchip/clk.c drivers/clk/rockchip/clk.h drivers/cpufreq/cpufreq-dt.c drivers/crypto/Kconfig drivers/devfreq/Makefile drivers/devfreq/devfreq.c drivers/dma-buf/dma-buf.c drivers/dma-buf/heaps/Makefile drivers/dma/pl330.c drivers/firmware/Kconfig drivers/gpio/Kconfig drivers/gpio/Makefile drivers/gpio/gpio-rockchip.c drivers/gpu/Makefile drivers/gpu/drm/Kconfig drivers/gpu/drm/Makefile drivers/gpu/drm/bridge/Kconfig drivers/gpu/drm/bridge/Makefile drivers/gpu/drm/bridge/analogix/analogix_dp_core.c drivers/gpu/drm/bridge/analogix/analogix_dp_core.h drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c drivers/gpu/drm/bridge/display-connector.c drivers/gpu/drm/bridge/sii902x.c drivers/gpu/drm/bridge/synopsys/Makefile drivers/gpu/drm/bridge/synopsys/dw-hdmi.c drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c drivers/gpu/drm/drm_atomic_helper.c drivers/gpu/drm/drm_crtc_internal.h drivers/gpu/drm/drm_edid.c drivers/gpu/drm/panel/panel-simple.c drivers/gpu/drm/rockchip/Kconfig drivers/gpu/drm/rockchip/Makefile drivers/gpu/drm/rockchip/analogix_dp-rockchip.c drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c drivers/gpu/drm/rockchip/inno_hdmi.c drivers/gpu/drm/rockchip/rockchip_drm_drv.c drivers/gpu/drm/rockchip/rockchip_drm_drv.h drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c drivers/gpu/drm/rockchip/rockchip_drm_gem.c drivers/gpu/drm/rockchip/rockchip_drm_vop.c drivers/gpu/drm/rockchip/rockchip_drm_vop.h drivers/gpu/drm/rockchip/rockchip_drm_vop2.c drivers/gpu/drm/rockchip/rockchip_lvds.c drivers/gpu/drm/rockchip/rockchip_rgb.c drivers/gpu/drm/rockchip/rockchip_vop2_reg.c drivers/gpu/drm/rockchip/rockchip_vop_reg.c drivers/gpu/drm/rockchip/rockchip_vop_reg.h drivers/hwmon/pwm-fan.c drivers/hwspinlock/Kconfig drivers/hwspinlock/Makefile drivers/i2c/busses/i2c-rk3x.c drivers/i2c/i2c-core-base.c drivers/iio/adc/Kconfig drivers/iio/adc/rockchip_saradc.c drivers/iio/industrialio-event.c drivers/input/touchscreen/Makefile drivers/iommu/iommu.c drivers/iommu/rockchip-iommu.c drivers/irqchip/irq-gic-v3-its.c drivers/leds/Makefile drivers/mailbox/Kconfig drivers/media/common/videobuf2/Makefile drivers/media/i2c/Kconfig drivers/media/i2c/Makefile drivers/media/i2c/dw9714.c drivers/media/i2c/hi556.c drivers/media/i2c/imx214.c drivers/media/i2c/imx258.c drivers/media/i2c/imx334.c drivers/media/i2c/imx335.c drivers/media/i2c/ov5648.c drivers/media/i2c/ov5670.c drivers/media/i2c/ov5695.c drivers/media/i2c/ov7251.c drivers/media/platform/Kconfig drivers/media/platform/Makefile drivers/media/platform/rockchip/Kconfig drivers/media/spi/Kconfig drivers/media/spi/Makefile drivers/media/usb/uvc/uvc_driver.c drivers/media/usb/uvc/uvcvideo.h drivers/media/v4l2-core/v4l2-async.c drivers/media/v4l2-core/v4l2-ioctl.c drivers/mfd/rk808.c drivers/mmc/core/block.c drivers/mmc/core/host.c drivers/mmc/core/mmc.c drivers/mmc/core/mmc_ops.c drivers/mmc/host/Makefile drivers/mmc/host/dw_mmc-rockchip.c drivers/mmc/host/dw_mmc.c drivers/mmc/host/dw_mmc.h drivers/mmc/host/sdhci-of-dwcmshc.c drivers/mtd/nand/Makefile drivers/mtd/nand/raw/Kconfig drivers/mtd/nand/raw/Makefile drivers/mtd/nand/raw/rockchip-nand-controller.c drivers/mtd/nand/spi/Makefile drivers/mtd/nand/spi/core.c drivers/mtd/nand/spi/gigadevice.c drivers/mtd/nand/spi/macronix.c drivers/mtd/nand/spi/xtx.c drivers/mtd/spi-nor/Kconfig drivers/mtd/spi-nor/Makefile drivers/mtd/spi-nor/core.c drivers/mtd/spi-nor/core.h drivers/mtd/spi-nor/eon.c drivers/mtd/spi-nor/esmt.c drivers/mtd/spi-nor/gigadevice.c drivers/mtd/spi-nor/macronix.c drivers/mtd/spi-nor/winbond.c drivers/mtd/spi-nor/xmc.c drivers/net/ethernet/stmicro/stmmac/Makefile drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c drivers/net/ethernet/stmicro/stmmac/stmmac.h drivers/net/ethernet/stmicro/stmmac/stmmac_main.c drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c drivers/net/phy/Kconfig drivers/net/phy/motorcomm.c drivers/net/phy/phy_device.c drivers/nvmem/Kconfig drivers/nvmem/Makefile drivers/pci/controller/dwc/Makefile drivers/pci/controller/dwc/pcie-designware-host.c drivers/pci/controller/dwc/pcie-dw-rockchip.c drivers/pci/controller/pcie-rockchip-host.c drivers/pci/controller/pcie-rockchip.h drivers/pci/pci-sysfs.c drivers/pci/pcie/Makefile drivers/phy/rockchip/Kconfig drivers/phy/rockchip/Makefile drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c drivers/phy/rockchip/phy-rockchip-inno-usb2.c drivers/phy/rockchip/phy-rockchip-naneng-combphy.c drivers/phy/rockchip/phy-rockchip-snps-pcie3.c drivers/phy/rockchip/phy-rockchip-typec.c drivers/pinctrl/Kconfig drivers/pinctrl/Makefile drivers/pinctrl/pinctrl-rk805.c drivers/pinctrl/pinctrl-rockchip.c drivers/pinctrl/pinctrl-rockchip.h drivers/power/supply/Kconfig drivers/power/supply/Makefile drivers/power/supply/bq25890_charger.c drivers/power/supply/rk817_charger.c drivers/pwm/core.c drivers/pwm/pwm-rockchip.c drivers/regulator/fan53555.c drivers/regulator/rk808-regulator.c drivers/rtc/rtc-hym8563.c drivers/soc/rockchip/Kconfig drivers/soc/rockchip/Makefile drivers/soc/rockchip/grf.c drivers/soc/rockchip/io-domain.c drivers/soc/rockchip/pm_domains.c drivers/spi/Kconfig drivers/spi/spi-rockchip-sfc.c drivers/spi/spi-rockchip.c drivers/spi/spidev.c drivers/staging/android/ion/heaps/ion_system_heap.c drivers/thermal/rockchip_thermal.c drivers/tty/serial/8250/8250_dma.c drivers/tty/serial/8250/8250_dw.c drivers/tty/serial/8250/8250_dwlib.c drivers/tty/serial/8250/8250_port.c drivers/usb/dwc2/platform.c drivers/usb/dwc3/core.c drivers/usb/dwc3/core.h drivers/usb/dwc3/ep0.c drivers/usb/dwc3/gadget.c drivers/usb/gadget/configfs.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_uvc.c drivers/usb/gadget/function/uvc.h drivers/usb/gadget/function/uvc_configfs.c drivers/usb/gadget/function/uvc_queue.c drivers/usb/gadget/function/uvc_v4l2.c drivers/usb/gadget/function/uvc_video.c drivers/usb/gadget/udc/core.c drivers/usb/host/ehci-hcd.c drivers/usb/host/ehci-platform.c drivers/usb/storage/unusual_uas.h drivers/usb/typec/altmodes/Kconfig drivers/usb/typec/altmodes/displayport.c drivers/usb/typec/class.c drivers/usb/typec/tcpm/tcpm.c fs/Kconfig fs/cifs/inode.c fs/dax.c fs/erofs/data.c fs/erofs/inode.c fs/erofs/internal.h fs/erofs/super.c fs/f2fs/super.c fs/fuse/dev.c include/drm/bridge/dw_hdmi.h include/drm/drm_connector.h include/drm/drm_edid.h include/dt-bindings/clock/rk3568-cru.h include/dt-bindings/power/rk3568-power.h include/dt-bindings/power/rk3588-power.h include/linux/clk-provider.h include/linux/cma.h include/linux/dma-buf.h include/linux/dma-heap.h include/linux/mfd/rk808.h include/linux/mtd/spi-nor.h include/linux/mtd/spinand.h include/linux/phy/pcie.h include/linux/pwm.h include/linux/sched/sysctl.h include/linux/slub_def.h include/linux/stmmac.h include/linux/usb/typec.h include/media/v4l2-async.h include/soc/rockchip/pm_domains.h include/uapi/drm/drm_fourcc.h include/uapi/linux/iio/types.h include/uapi/linux/media-bus-format.h init/Kconfig init/main.c kernel/printk/printk.c kernel/rcu/Kconfig.debug kernel/rcu/tree_stall.h kernel/sched/core.c kernel/sched/cpufreq_schedutil.c kernel/sched/fair.c kernel/sched/pelt.c kernel/sched/rt.c kernel/sched/sched.h kernel/softirq.c kernel/sysctl.c mm/Makefile mm/cma.c mm/page_alloc.c mm/slub.c scripts/.gitignore scripts/headers_install.sh sound/soc/codecs/Kconfig sound/soc/codecs/Makefile sound/soc/codecs/es8326.c sound/soc/codecs/es8326.h sound/soc/codecs/hdmi-codec.c sound/soc/codecs/rk817_codec.c sound/soc/rockchip/Kconfig sound/soc/rockchip/Makefile sound/soc/rockchip/rockchip_i2s.c sound/soc/rockchip/rockchip_i2s_tdm.c sound/soc/rockchip/rockchip_i2s_tdm.h sound/soc/rockchip/rockchip_pdm.c sound/soc/rockchip/rockchip_spdif.c sound/soc/soc-generic-dmaengine-pcm.c tools/iio/iio_event_monitor.c
This commit is contained in:
Tao Huang
@@ -1366,6 +1366,15 @@ source "usr/Kconfig"
|
||||
|
||||
endif
|
||||
|
||||
config INITCALL_ASYNC
|
||||
bool "Call initcall async"
|
||||
depends on ROCKCHIP_THUNDER_BOOT
|
||||
help
|
||||
Call same level initcall async in kthread.
|
||||
Kernel parameter "initcall_nr_threads" control how many threads.
|
||||
initcall_nr_threads default is 0, which disable intcall async.
|
||||
initcall_nr_threads=-1, auto selected the number of threads.
|
||||
|
||||
config BOOT_CONFIG
|
||||
bool "Boot config support"
|
||||
select BLK_DEV_INITRD if !BOOT_CONFIG_EMBED
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/memblock.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/namei.h>
|
||||
#include <linux/initramfs.h>
|
||||
#include <linux/init_syscalls.h>
|
||||
#include <linux/task_work.h>
|
||||
#include <linux/umh.h>
|
||||
@@ -503,6 +504,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len)
|
||||
state = Start;
|
||||
this_header = 0;
|
||||
message = NULL;
|
||||
#if defined(CONFIG_ROCKCHIP_THUNDER_BOOT) && defined(CONFIG_ROCKCHIP_HW_DECOMPRESS)
|
||||
wait_initrd_hw_decom_done();
|
||||
#endif
|
||||
while (!message && len) {
|
||||
loff_t saved_offset = this_header;
|
||||
if (*buf == '0' && !(this_header & 3)) {
|
||||
|
||||
212
init/main.c
212
init/main.c
@@ -967,7 +967,23 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
|
||||
build_all_zonelists(NULL);
|
||||
page_alloc_init();
|
||||
|
||||
#ifdef CONFIG_ARCH_ROCKCHIP
|
||||
{
|
||||
const char *s = saved_command_line;
|
||||
const char *e = &saved_command_line[strlen(saved_command_line)];
|
||||
int n =
|
||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||
n -= strlen("Kernel command line: ");
|
||||
s += n;
|
||||
/* command line maybe too long to print one time */
|
||||
while (n > 0 && s < e) {
|
||||
n = pr_cont("%s\n", s);
|
||||
s += n;
|
||||
}
|
||||
}
|
||||
#else
|
||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||
#endif
|
||||
/* parameters may set static keys */
|
||||
jump_label_init();
|
||||
parse_early_param();
|
||||
@@ -1361,6 +1377,183 @@ static int __init ignore_unknown_bootoption(char *param, char *val,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_INITCALL_ASYNC
|
||||
extern initcall_entry_t __initcall0s_start[];
|
||||
extern initcall_entry_t __initcall1s_start[];
|
||||
extern initcall_entry_t __initcall2s_start[];
|
||||
extern initcall_entry_t __initcall3s_start[];
|
||||
extern initcall_entry_t __initcall4s_start[];
|
||||
extern initcall_entry_t __initcall5s_start[];
|
||||
extern initcall_entry_t __initcall6s_start[];
|
||||
extern initcall_entry_t __initcall7s_start[];
|
||||
|
||||
static initcall_entry_t *initcall_sync_levels[] __initdata = {
|
||||
__initcall0s_start,
|
||||
__initcall1s_start,
|
||||
__initcall2s_start,
|
||||
__initcall3s_start,
|
||||
__initcall4s_start,
|
||||
__initcall5s_start,
|
||||
__initcall6s_start,
|
||||
__initcall7s_start,
|
||||
__initcall_end,
|
||||
};
|
||||
|
||||
struct initcall_work {
|
||||
struct kthread_work work;
|
||||
initcall_t call;
|
||||
};
|
||||
|
||||
struct initcall_worker {
|
||||
struct kthread_worker *worker;
|
||||
bool queued;
|
||||
};
|
||||
|
||||
static struct initcall_worker *initcall_workers;
|
||||
static int initcall_nr_workers;
|
||||
|
||||
static int __init setup_initcall_nr_threads(char *str)
|
||||
{
|
||||
get_option(&str, &initcall_nr_workers);
|
||||
|
||||
return 1;
|
||||
}
|
||||
__setup("initcall_nr_threads=", setup_initcall_nr_threads);
|
||||
|
||||
static void __init initcall_work_func(struct kthread_work *work)
|
||||
{
|
||||
struct initcall_work *iwork =
|
||||
container_of(work, struct initcall_work, work);
|
||||
|
||||
do_one_initcall(iwork->call);
|
||||
}
|
||||
|
||||
static void __init initcall_queue_work(struct initcall_worker *iworker,
|
||||
struct initcall_work *iwork)
|
||||
{
|
||||
kthread_queue_work(iworker->worker, &iwork->work);
|
||||
iworker->queued = true;
|
||||
}
|
||||
|
||||
static void __init initcall_flush_worker(int level, bool sync)
|
||||
{
|
||||
int i;
|
||||
struct initcall_worker *iworker;
|
||||
|
||||
for (i = 0; i < initcall_nr_workers; i++) {
|
||||
iworker = &initcall_workers[i];
|
||||
if (iworker->queued) {
|
||||
kthread_flush_worker(iworker->worker);
|
||||
iworker->queued = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int __init do_initcall_level_threaded(int level)
|
||||
{
|
||||
initcall_entry_t *fn;
|
||||
size_t i = 0, w = 0;
|
||||
size_t n = initcall_levels[level + 1] - initcall_levels[level];
|
||||
struct initcall_work *iwork, *iworks;
|
||||
ktime_t start = 0, end;
|
||||
|
||||
if (!n)
|
||||
return 0;
|
||||
|
||||
iworks = kmalloc_array(n, sizeof(*iworks), GFP_KERNEL);
|
||||
if (!iworks)
|
||||
return -ENOMEM;
|
||||
|
||||
if (initcall_debug)
|
||||
start = ktime_get();
|
||||
|
||||
for (fn = initcall_levels[level]; fn < initcall_sync_levels[level];
|
||||
fn++, i++) {
|
||||
iwork = &iworks[i];
|
||||
iwork->call = initcall_from_entry(fn);
|
||||
kthread_init_work(&iwork->work, initcall_work_func);
|
||||
initcall_queue_work(&initcall_workers[w], iwork);
|
||||
if (++w >= initcall_nr_workers)
|
||||
w = 0;
|
||||
}
|
||||
if (initcall_sync_levels[level] > initcall_levels[level]) {
|
||||
initcall_flush_worker(level, false);
|
||||
|
||||
if (initcall_debug) {
|
||||
end = ktime_get();
|
||||
printk(KERN_DEBUG "initcall level %s %lld usecs\n",
|
||||
initcall_level_names[level],
|
||||
ktime_us_delta(end, start));
|
||||
start = end;
|
||||
}
|
||||
}
|
||||
|
||||
for (fn = initcall_sync_levels[level]; fn < initcall_levels[level + 1];
|
||||
fn++, i++) {
|
||||
iwork = &iworks[i];
|
||||
iwork->call = initcall_from_entry(fn);
|
||||
kthread_init_work(&iwork->work, initcall_work_func);
|
||||
initcall_queue_work(&initcall_workers[w], iwork);
|
||||
if (++w >= initcall_nr_workers)
|
||||
w = 0;
|
||||
}
|
||||
if (initcall_levels[level + 1] > initcall_sync_levels[level]) {
|
||||
initcall_flush_worker(level, true);
|
||||
|
||||
if (initcall_debug) {
|
||||
end = ktime_get();
|
||||
printk(KERN_DEBUG "initcall level %s_sync %lld usecs\n",
|
||||
initcall_level_names[level],
|
||||
ktime_us_delta(end, start));
|
||||
}
|
||||
}
|
||||
|
||||
kfree(iworks);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __init initcall_init_workers(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (initcall_nr_workers < 0)
|
||||
initcall_nr_workers = num_online_cpus() * 2;
|
||||
|
||||
if (!initcall_nr_workers)
|
||||
return;
|
||||
|
||||
initcall_workers =
|
||||
kcalloc(initcall_nr_workers, sizeof(*initcall_workers),
|
||||
GFP_KERNEL);
|
||||
if (!initcall_workers)
|
||||
initcall_nr_workers = 0;
|
||||
|
||||
for (i = 0; i < initcall_nr_workers; i++) {
|
||||
struct kthread_worker *worker;
|
||||
|
||||
worker = kthread_create_worker(0, "init/%d", i);
|
||||
if (IS_ERR(worker)) {
|
||||
i--;
|
||||
initcall_nr_workers = (i >= 0 ? i : 0);
|
||||
break;
|
||||
}
|
||||
initcall_workers[i].worker = worker;
|
||||
}
|
||||
}
|
||||
|
||||
static void __init initcall_free_works(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < initcall_nr_workers; i++)
|
||||
if (initcall_workers[i].worker)
|
||||
kthread_destroy_worker(initcall_workers[i].worker);
|
||||
|
||||
kfree(initcall_workers);
|
||||
}
|
||||
#endif /* CONFIG_INITCALL_ASYNC */
|
||||
|
||||
static void __init do_initcall_level(int level, char *command_line)
|
||||
{
|
||||
initcall_entry_t *fn;
|
||||
@@ -1372,6 +1565,13 @@ static void __init do_initcall_level(int level, char *command_line)
|
||||
NULL, ignore_unknown_bootoption);
|
||||
|
||||
trace_initcall_level(initcall_level_names[level]);
|
||||
|
||||
#ifdef CONFIG_INITCALL_ASYNC
|
||||
if (initcall_nr_workers)
|
||||
if (do_initcall_level_threaded(level) == 0)
|
||||
return;
|
||||
#endif
|
||||
|
||||
for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
|
||||
do_one_initcall(initcall_from_entry(fn));
|
||||
}
|
||||
@@ -1382,6 +1582,10 @@ static void __init do_initcalls(void)
|
||||
size_t len = strlen(saved_command_line) + 1;
|
||||
char *command_line;
|
||||
|
||||
#ifdef CONFIG_INITCALL_ASYNC
|
||||
initcall_init_workers();
|
||||
#endif
|
||||
|
||||
command_line = kzalloc(len, GFP_KERNEL);
|
||||
if (!command_line)
|
||||
panic("%s: Failed to allocate %zu bytes\n", __func__, len);
|
||||
@@ -1393,6 +1597,10 @@ static void __init do_initcalls(void)
|
||||
}
|
||||
|
||||
kfree(command_line);
|
||||
|
||||
#ifdef CONFIG_INITCALL_ASYNC
|
||||
initcall_free_works();
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1622,6 +1830,10 @@ static noinline void __init kernel_init_freeable(void)
|
||||
smp_init();
|
||||
sched_init_smp();
|
||||
|
||||
#if defined(CONFIG_ROCKCHIP_THUNDER_BOOT) && defined(CONFIG_SMP)
|
||||
kthread_run(defer_free_memblock, NULL, "defer_mem");
|
||||
#endif
|
||||
|
||||
padata_init();
|
||||
page_alloc_init_late();
|
||||
/* Initialize page ext after all struct pages are initialized. */
|
||||
|
||||
Reference in New Issue
Block a user