ad61dfe590
https://source.android.com/security/bulletin/2020-02-01
CVE-2020-0030
CVE-2019-11599
* tag 'ASB-2020-02-05_4.19': (4206 commits)
UPSTREAM: sched/fair/util_est: Implement faster ramp-up EWMA on utilization increases
ANDROID: Re-use SUGOV_RT_MAX_FREQ to control uclamp rt behavior
BACKPORT: sched/fair: Make EAS wakeup placement consider uclamp restrictions
BACKPORT: sched/fair: Make task_fits_capacity() consider uclamp restrictions
ANDROID: sched/core: Move SchedTune task API into UtilClamp wrappers
ANDROID: sched/core: Add a latency-sensitive flag to uclamp
ANDROID: sched/tune: Move SchedTune cpu API into UtilClamp wrappers
ANDROID: init: kconfig: Only allow sched tune if !uclamp
FROMGIT: sched/core: Fix size of rq::uclamp initialization
FROMGIT: sched/uclamp: Fix a bug in propagating uclamp value in new cgroups
FROMGIT: sched/uclamp: Rename uclamp_util_with() into uclamp_rq_util_with()
FROMGIT: sched/uclamp: Make uclamp util helpers use and return UL values
FROMGIT: sched/uclamp: Remove uclamp_util()
BACKPORT: sched/rt: Make RT capacity-aware
UPSTREAM: tools headers UAPI: Sync sched.h with the kernel
UPSTREAM: sched/uclamp: Fix overzealous type replacement
UPSTREAM: sched/uclamp: Fix incorrect condition
UPSTREAM: sched/core: Fix compilation error when cgroup not selected
UPSTREAM: sched/core: Fix uclamp ABI bug, clean up and robustify sched_read_attr() ABI logic and code
UPSTREAM: sched/uclamp: Always use 'enum uclamp_id' for clamp_id values
...
Conflicts:
drivers/char/random.c
drivers/devfreq/devfreq.c
drivers/gpu/drm/drm_fb_helper.c
drivers/media/i2c/ov2680.c
drivers/media/i2c/ov2685.c
drivers/media/i2c/ov5670.c
drivers/media/i2c/ov5695.c
drivers/media/usb/uvc/uvc_driver.c
drivers/mmc/host/cqhci.c
drivers/spi/spi-rockchip.c
drivers/usb/dwc2/params.c
drivers/usb/dwc3/debugfs.c
drivers/usb/dwc3/gadget.c
drivers/usb/serial/usb_wwan.c
include/linux/clk-provider.h
include/linux/mfd/rk808.h
kernel/cpu.c
sound/usb/quirks.c
- Export symbol mm_trace_rss_stat on mm/memory.c for GPU drivers.
- Fix sound/usb/pcm.c for SNDRV_PCM_TRIGGER_SUSPEND.
- Enable DEBUG_FS which is not selected by TRACING.
- Disable of_devlink which broken boot. of_devlink is enabled by commit
ba3aa33b8f ("ANDROID: of: property: Enable of_devlink by default").
- Add CLK_DONT_HOLD_STATE and CLK_KEEP_REQ_RATE to clk_flags
on drivers/clk/clk.c.
Change-Id: I500ca1bbc735753f9c8251ed2ac8ad757d5a24a4
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
141 lines
4.0 KiB
Plaintext
141 lines
4.0 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
config USB_DWC3
|
|
tristate "DesignWare USB3 DRD Core Support"
|
|
depends on (USB || USB_GADGET) && HAS_DMA
|
|
select USB_XHCI_PLATFORM if USB_XHCI_HCD
|
|
help
|
|
Say Y or M here if your system has a Dual Role SuperSpeed
|
|
USB controller based on the DesignWare USB3 IP Core.
|
|
|
|
If you choose to build this driver is a dynamically linked
|
|
module, the module will be called dwc3.ko.
|
|
|
|
if USB_DWC3
|
|
|
|
config USB_DWC3_ULPI
|
|
bool "Register ULPI PHY Interface"
|
|
depends on USB_ULPI_BUS=y || USB_ULPI_BUS=USB_DWC3
|
|
help
|
|
Select this if you have ULPI type PHY attached to your DWC3
|
|
controller.
|
|
|
|
choice
|
|
bool "DWC3 Mode Selection"
|
|
default USB_DWC3_DUAL_ROLE if (USB && USB_GADGET)
|
|
default USB_DWC3_HOST if (USB && !USB_GADGET)
|
|
default USB_DWC3_GADGET if (!USB && USB_GADGET)
|
|
|
|
config USB_DWC3_HOST
|
|
bool "Host only mode"
|
|
depends on USB=y || USB=USB_DWC3
|
|
help
|
|
Select this when you want to use DWC3 in host mode only,
|
|
thereby the gadget feature will be regressed.
|
|
|
|
config USB_DWC3_GADGET
|
|
bool "Gadget only mode"
|
|
depends on USB_GADGET=y || USB_GADGET=USB_DWC3
|
|
help
|
|
Select this when you want to use DWC3 in gadget mode only,
|
|
thereby the host feature will be regressed.
|
|
|
|
config USB_DWC3_DUAL_ROLE
|
|
bool "Dual Role mode"
|
|
depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))
|
|
depends on (EXTCON=y || EXTCON=USB_DWC3)
|
|
help
|
|
This is the default mode of working of DWC3 controller where
|
|
both host and gadget features are enabled.
|
|
|
|
endchoice
|
|
|
|
comment "Platform Glue Driver Support"
|
|
|
|
config USB_DWC3_OMAP
|
|
tristate "Texas Instruments OMAP5 and similar Platforms"
|
|
depends on ARCH_OMAP2PLUS || COMPILE_TEST
|
|
depends on EXTCON || !EXTCON
|
|
depends on OF
|
|
default USB_DWC3
|
|
help
|
|
Some platforms from Texas Instruments like OMAP5, DRA7xxx and
|
|
AM437x use this IP for USB2/3 functionality.
|
|
|
|
Say 'Y' or 'M' here if you have one such device
|
|
|
|
config USB_DWC3_EXYNOS
|
|
tristate "Samsung Exynos Platform"
|
|
depends on (ARCH_EXYNOS || COMPILE_TEST) && OF
|
|
default USB_DWC3
|
|
help
|
|
Recent Exynos5 SoCs ship with one DesignWare Core USB3 IP inside,
|
|
say 'Y' or 'M' if you have one such device.
|
|
|
|
config USB_DWC3_PCI
|
|
tristate "PCIe-based Platforms"
|
|
depends on USB_PCI && ACPI
|
|
default USB_DWC3
|
|
help
|
|
If you're using the DesignWare Core IP with a PCIe (but not HAPS
|
|
platform), please say 'Y' or 'M' here.
|
|
|
|
config USB_DWC3_HAPS
|
|
tristate "Synopsys PCIe-based HAPS Platforms"
|
|
depends on USB_PCI
|
|
default USB_DWC3
|
|
help
|
|
If you're using the DesignWare Core IP with a Synopsys PCIe HAPS
|
|
platform, please say 'Y' or 'M' here.
|
|
|
|
config USB_DWC3_KEYSTONE
|
|
tristate "Texas Instruments Keystone2 Platforms"
|
|
depends on ARCH_KEYSTONE || COMPILE_TEST
|
|
default USB_DWC3
|
|
help
|
|
Support of USB2/3 functionality in TI Keystone2 platforms.
|
|
Say 'Y' or 'M' here if you have one such device
|
|
|
|
config USB_DWC3_OF_SIMPLE
|
|
tristate "Generic OF Simple Glue Layer"
|
|
depends on OF && COMMON_CLK
|
|
default USB_DWC3
|
|
help
|
|
Support USB2/3 functionality in simple SoC integrations.
|
|
Currently supports Xilinx and Qualcomm DWC USB3 IP.
|
|
Say 'Y' or 'M' if you have one such device.
|
|
|
|
config USB_DWC3_ROCKCHIP_INNO
|
|
tristate "Rockchip Platforms with INNO PHY"
|
|
depends on OF && COMMON_CLK && (ARCH_ROCKCHIP || COMPILE_TEST)
|
|
depends on USB=y || USB=USB_DWC3
|
|
default USB_DWC3
|
|
help
|
|
Support of USB2/3 functionality in Rockchip platforms
|
|
with INNO USB 3.0 PHY IP inside.
|
|
say 'Y' or 'M' if you have one such device.
|
|
|
|
config USB_DWC3_ST
|
|
tristate "STMicroelectronics Platforms"
|
|
depends on (ARCH_STI || COMPILE_TEST) && OF
|
|
default USB_DWC3
|
|
help
|
|
STMicroelectronics SoCs with one DesignWare Core USB3 IP
|
|
inside (i.e. STiH407).
|
|
Say 'Y' or 'M' if you have one such device.
|
|
|
|
config USB_DWC3_QCOM
|
|
tristate "Qualcomm Platform"
|
|
depends on ARCH_QCOM || COMPILE_TEST
|
|
depends on EXTCON || !EXTCON
|
|
depends on OF
|
|
default USB_DWC3
|
|
help
|
|
Some Qualcomm SoCs use DesignWare Core IP for USB2/3
|
|
functionality.
|
|
This driver also handles Qscratch wrapper which is needed
|
|
for peripheral mode support.
|
|
Say 'Y' or 'M' if you have one such device.
|
|
|
|
endif
|