Chris Zhong [Wed, 26 Aug 2015 09:54:55 +0000 (17:54 +0800)]
rk808: fix a err when no sleep pin in dts
Rk808 will data abort if it has not sleep gpio in dts, and there is no
pmic_sleep_gpio for some board, add a validity checking before
gpio_request can fix this data abort.
Change-Id: Ic2b40f7bfb00e95d283dce72a33dd844cc2c7e27
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Shen Zhenyi [Mon, 7 Sep 2015 09:22:06 +0000 (17:22 +0800)]
tve: rk1000: modify process, make it more reasonable
Change-Id: I021682c0da4e3096ceadf7b8e320a7391c55208b
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
Tang Yun ping [Mon, 7 Sep 2015 03:41:43 +0000 (11:41 +0800)]
rk3368 DDR: using unified smc call and get trust firmware version function
Change-Id: I81d5fae0a3679081d35d137500e20d5dd705eb15
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
David Wu [Sun, 6 Sep 2015 10:05:01 +0000 (18:05 +0800)]
rk3288: pwm: rkpwm use same interrupt, voppwm would not use capture mode
Change-Id: Ic4d27adeb800406efa1efa5b34fc78677b4def72
Signed-off-by: David Wu <wdc@rock-chips.com>
Jianhong Chen [Sun, 6 Sep 2015 06:23:12 +0000 (14:23 +0800)]
dtsi: rk312x-sdk: update rk818 battery node
Change-Id: I1d0dd1b005e94281cff0792e6380deb3f02efaaf
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Jianhong Chen [Sun, 6 Sep 2015 06:22:17 +0000 (14:22 +0800)]
dts: rk3288-tb: update rk818 battery node
Change-Id: I4a76e7ac0ff3af791839ab5e5f9656ce72612dd1
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Jianhong Chen [Sun, 6 Sep 2015 03:03:13 +0000 (11:03 +0800)]
power: rk81x-battery: fix charge termination voltage define error
the charge termination voltage configration is like bellow:
000: 4.05v, 001: 4.10v, 010: 4.15v
011: 4.20v, 100: 4.25v, 101: 4.30v
110: 4.35v, 111: 4.35v
Change-Id: I17c7df5952c3913eaf509ae2603f2d96d7ea96c8
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Wu Liang feng [Wed, 2 Sep 2015 02:07:56 +0000 (10:07 +0800)]
usb: dwc_otg_310: gadget: stop current transfer on dequeue
If the request being dequeued is already started, disable endpoint
to stop the transfer and then call dwc_otg_request_done().
Endpoint will be re-enabled on next call to dwc_otg_ep_start_transfer().
TEST=use RK3128/RK3288/RK3368 board, adb root and then adb reboot,
check if usb_req->buf is used after free.
Change-Id: I8c9304f29c578f679ad0841350920f1350bd32df
Signed-off-by: Wu Liang feng <wulf@rock-chips.com>
Zheng Yang [Wed, 2 Sep 2015 10:13:42 +0000 (18:13 +0800)]
video: rockchip: hdmi: introduce vic flag HDMI_UBOOT_NOT_INIT
If uboot_vic has HDMI_UBOOT_NOT_INIT flag, it means uboot just
pass the preset vic value, registers has not been set in uboot.
If not, hdmi has been power up in uboot, should not operate phy
register again.
Change-Id: I64f48bd878ec124a94f25a752a74dc9bae502b2b
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 11:16:41 +0000 (19:16 +0800)]
rk3368 tb: enable fiq debugger and disable the original uart console
Change the device from ttyS2 to ttyFIQ0
Change-Id: Ibc2ab1c9adf1dd5d1718c3c2d80fe578725b409a
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 11:15:11 +0000 (19:15 +0800)]
rk3368: add fiq debugger node in rk3368.dtsi
Change-Id: Iecbfd409d18b5a963bacbbc277e4d7157fe20fb7
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 11:13:43 +0000 (19:13 +0800)]
rk3368: add fiq debugger config, and enabled default
Change-Id: Idc36f89d82e739e37153117bea20ecca1f5d516c
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 11:10:42 +0000 (19:10 +0800)]
rk3368: add fiq debugger for rk3368
It is also for the later soc based on arch v8
Change-Id: I5e4fef1fa4176ea371b1653ead8cef87e4ac0e6f
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 10:10:37 +0000 (18:10 +0800)]
rockchip: add psci interfaces for other modules
Change-Id: I000e3033305f695a8929fbab98a87eea608e76cd
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Huibin Hong [Tue, 1 Sep 2015 10:00:04 +0000 (18:00 +0800)]
rockchip: add dts spec for fiq debugger
Documentation/devicetree/bindings/serial/rockchip_fiq_debugger.txt
Change-Id: Iab6cd308aed816ad614006a155816cd3e32df6f6
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Sugar Zhang [Wed, 2 Sep 2015 08:46:36 +0000 (16:46 +0800)]
ASoC: rockchip: spdif: increase dma burst size
increase dma burst size from 4 to 16 to optimize dma transfer.
Change-Id: I1a9112e6b89ed1f29d24a3e4b5f42bf4201a9e71
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Huang Jiachai [Mon, 31 Aug 2015 08:09:13 +0000 (16:09 +0800)]
video: rockchip: fb: close rk_fb_iommu_debug default
Change-Id: I285c091fe2932906070eb861ce98943b4605e101
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
huang zhibao [Thu, 27 Aug 2015 08:03:41 +0000 (16:03 +0800)]
ARM: dts: rk3288: move the remote-ctrl of PWM into box dts
Thinking about the PWM remote-ctrl is used by box, we should
put this into box dts.
Meanwhile, that PWM configure will break the normal PWM driver.
This patch will fix it.
Change-Id: I14878332631f94f512412ced5ceb8689f8bfbe46
Signed-off-by: huang zhibao <hzb@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Caesar Wang [Tue, 1 Sep 2015 08:50:20 +0000 (16:50 +0800)]
ARM: dts: rk3288: add the interrupts property for PWM
We are assuming that PWM need use the property, we can support the
SPI interrupts for PWM.
At the moment, we can find the remotectl pwm is needed on box.
We can add the property for all PWMs. AFAIK, the pwm driver don't use it
but the drivers/input/remotectl/rockchip_pwm_remotectl.c
Change-Id: Ia223e6cc0e882477614b555bd09c86fd4bf8dbd7
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Xiao Feng [Thu, 27 Aug 2015 04:03:55 +0000 (12:03 +0800)]
cpufreq: rockchip: change the frequency of cci400 dynamically
when the frequency of big cluster and little cluster are bigger then
600MHz, set the frequency of cci400 to 576MHz, otherwise set the
frequency of cci400 to 288MHz.
Change-Id: I9e28b51bfdfcaf62464b8511c731fa2cd0ed5d9d
Signed-off-by: Xiao Feng <xf@rock-chips.com>
Feng Mingli [Wed, 29 Jul 2015 06:11:42 +0000 (14:11 +0800)]
USB: dwc_otg_310: hcd: modify reboot or shutdown painc
When reboot or shutdown, hcd clean urbs and disable host interrupts. But
there may pending interrupts, so clean them.
Change-Id: Ide34aab5857a790a0912fb56ebe18d43ba228cf0
Signed-off-by: Feng Mingli <fml@rock-chips.com>
Signed-off-by: Yunzhi Li <lyz@rock-chips.com>
Yunzhi Li [Fri, 28 Aug 2015 07:34:34 +0000 (15:34 +0800)]
USB: dwc_otg_310: release channel for qtd that has been dequeued before
Change-Id: I184ed185074b2ccee24cbbf57c9ff1dad06bd9d7
Signed-off-by: Yunzhi Li <lyz@rock-chips.com>
Caesar Wang [Tue, 25 Aug 2015 10:09:53 +0000 (18:09 +0800)]
ANDROID: input: elan_i2c: add elan touchpad driver
SMbus and I2C handling from driver core into separate
transport modules and makes them optional.
This driver pick up from chromium 3.14-kernel
Here is the URL:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/v3.14
----Note a bit different-----
we can easy replace the reinit_completion(completion);
with "completion->done = 0" in driver.
Change-Id: Idf373a502faea7913889f4a2f14ba71cae0da5b8
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Caesar Wang [Tue, 25 Aug 2015 10:21:42 +0000 (18:21 +0800)]
ANDROID: input: Add "inhibited" property for input devices
Under certain circumstances, we want to disable some input
devices from userspace. In particular, when we detect that the lid of a
laptop is closed, we want to be able to disable touchpad and
touchscreen to avoid bogus input.
To facilitate this, we introduce the "inhibited" sysfs property for
input devices. Using this property, userspace can tell a driver that the
events it can provide are not currently of interest and should be
ignored. We provide hooks so that the driver can take additional
actions, such as powering down the device.
We deliberately keep this limited to input devices for now to keep the
implementation as straightforward as possible.
(cherry-pick from: https://chromium-review.googlesource.com/207989)
verify that touchpad works
echo 1 > /sys/bus/i2c/drivers/elan_i2c/4-0015/input/input0/inhibited
touchpad stops working
echo 0 > /sys/bus/i2c/drivers/elan_i2c/4-0015/input/input0/inhibited
touchpad works again
Signed-off-by: Patrik Fimml <patrikf@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/207989
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
Change-Id: I889d37ef7ffc49f3c073b1c283d5c3327c263b7f
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Greg Kroah-Hartman [Wed, 21 Aug 2013 20:47:50 +0000 (13:47 -0700)]
sysfs: add sysfs_create/remove_groups()
commit
3e9b2bae8369661070622d05570cbcdfa01770e6 upstream
These functions are being open-coded in 3 different places in the driver
core, and other driver subsystems will want to start doing this as well,
so move it to the sysfs core to keep it all in one place, where we know
it is written properly.
Conflicts:
git checkout drivers/base/bus.c, In actul we don't use the interfaces in
drivers/base/bus.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I0046a5572c780a0ea2b175ef753c408f6c10ba85
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Zheng Yang [Thu, 27 Aug 2015 01:02:17 +0000 (09:02 +0800)]
hdmi: rk3288: No need to enable scrambling again in uboot mode
If scrambling mode is enabled in uboot and set again in kernel,
picture will flicker serveral frame.
Change-Id: Ib8fe0b1e2ce2a74eb10fcfbb6c8eb872452cfd20
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Reviewed-on: https://10.10.10.29/30
Tested-by: Huang, Tao <huangtao@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>
hjc [Wed, 26 Aug 2015 09:50:57 +0000 (17:50 +0800)]
Documentation: add rockchip,rk3368-lcdc to rockchip_lcdc.txt
Change-Id: I8a88116f65aff7b594c87e67e5aef25a262e7b8a
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Reviewed-on: https://10.10.10.29/27
Reviewed-by: Zheng Yang <zhengyang@rock-chips.com>
Tested-by: Huang, Tao <huangtao@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>
hjc [Wed, 26 Aug 2015 08:15:47 +0000 (16:15 +0800)]
rk3368 lcdc: Update coding style
Change-Id: I84175f75e05d54394ff6eb20495cb89a17292b52
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
Reviewed-on: https://10.10.10.29/25
Reviewed-by: Zheng Yang <zhengyang@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>
Tested-by: Huang, Tao <huangtao@rock-chips.com>
Zheng Yang [Tue, 25 Aug 2015 07:59:54 +0000 (15:59 +0800)]
hdmi:rk3288/rk3368: No need to reset tmdsclk in uboot mode.
If hdcp is enalbed, reset tmdsclk in uboot mode will make hdcp unstable,
which make sink check hdcp failed and show black picture.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
hjc [Tue, 25 Aug 2015 07:23:16 +0000 (15:23 +0800)]
rk3368 lcdc: lineflag1 line number move to uboot, because we don't know hdmi/cvbs vmode
Signed-off-by: hjc <hjc@rock-chips.com>
Tang Yun ping [Fri, 21 Aug 2015 09:14:10 +0000 (17:14 +0800)]
RK3368 DDR: new ddr change freq method
Using fiq to notify trust to stop cpu when ddr changing freq.
1.bl30 must update to rk3368bl30_v2.10.bin and bl31 must update to
rk3368bl31_v1.5.bin.
2.Insure kernel commit
7643ffa0e67d5 and
cc6e554e54fe1 were merged.
Change-Id: I2449613221c49a49ba14dab54e77714e961dcd16
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Tang Yun ping [Mon, 24 Aug 2015 11:03:31 +0000 (19:03 +0800)]
RK3368 Scpi: add Scpi version check
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
xxh [Tue, 25 Aug 2015 01:34:25 +0000 (09:34 +0800)]
bcmdhd wifi:update driver 1.201.59.5
Zheng Yang [Mon, 24 Aug 2015 09:59:16 +0000 (17:59 +0800)]
hdmi:rk3288/rk3368: support lte_340mcsc_scramble.
If EDID indicate sink support lte_340mcsc_scramble, we enable scrambing mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Mon, 24 Aug 2015 09:44:13 +0000 (17:44 +0800)]
hdmi:rk3288/rk3368: clear scrambling bit and SCDC register when switching to v1.4 mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
hjc [Mon, 24 Aug 2015 02:35:51 +0000 (10:35 +0800)]
rk3368 lcdc: In advance 500us to trigger lineflage1x interrupt
Signed-off-by: hjc <hjc@rock-chips.com>
Tang Yun ping [Mon, 24 Aug 2015 02:55:51 +0000 (10:55 +0800)]
mailbox: rk3868 change max_chan_num attribute to static
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Frank Wang [Mon, 17 Aug 2015 03:25:03 +0000 (11:25 +0800)]
mailbox: rk3868: Added mailbox channel management function and fixed the bug of mailbox timeout.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Frank Wang [Mon, 17 Aug 2015 01:22:16 +0000 (09:22 +0800)]
dts: rk3368.dtsi: Configured SCPI mbox to 3 channels.
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
lyz [Fri, 21 Aug 2015 02:58:36 +0000 (10:58 +0800)]
rk3368: usb: reset usb phy when channel halt
Signed-off-by: lyz <lyz@rock-chips.com>
Mark Yao [Thu, 20 Aug 2015 09:15:11 +0000 (17:15 +0800)]
rk_fb: video: fix YUV422/YUV422_10 uv_stride calc
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Shawn Lin [Thu, 20 Aug 2015 08:04:58 +0000 (16:04 +0800)]
mmc: dw_mmc-rockchip: limit phase for WA
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Shawn Lin [Thu, 20 Aug 2015 08:03:42 +0000 (16:03 +0800)]
mmc: rk_sdmmc: reset cmd_status before request
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Shawn Lin [Wed, 12 Aug 2015 08:25:27 +0000 (16:25 +0800)]
mmc: rk_sdmmc: fix SW-IOMMU memory leak
We could quickly reproduce this bug by decrease IO_TLB_DEFAULT_SIZE
and manually disable mmc DTO interrupt which can make driver fall into
post_tmo all the time.
So, some of these dump for swiotlb we can get here due to no enough
IO_TLB can be used to map page for kernel space:
DMA: Out of SW-IOMMU space for 128 bytes at device
ff0f0000.rksdmmc
DMA: Out of SW-IOMMU space for 128 bytes at device
ff0f0000.rksdmmc
...
DMA: Out of SW-IOMMU space for 128 bytes at device
ff0f0000.rksdmmc
DMA: Out of SW-IOMMU space for 128 bytes at device
ff0f0000.rksdmmc
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Reported-and-tested-by: Jianhong Chen <chenjh@rock-chips.com>
Cc: Yao Xiao <xy@rock-chips.com>
Sugar Zhang [Wed, 19 Aug 2015 10:33:16 +0000 (18:33 +0800)]
ASoC: spdif: fix spdif work abnormally when xrun occurs.
when xrun occurs, it will do snd_pcm_stop to disable spdif
and then clear logic, next snd_pcm_lib_write1 will trigger
snd_pcm_start to enable spdif, but not to excute hw_params
to configue spdif, so need to save spdif configuration to
reconfigure spdif.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Feng Mingli [Mon, 17 Aug 2015 01:24:49 +0000 (09:24 +0800)]
USB: dwc_otg_310: modify usb mode change detect bug
When dwc controller change mode form device to host, may check_vbus_work is running
on other cpu, but we don't have a good synchronization id_status_change and
check_vbus_work, as a result, phy and clk may in incorrect state. So modify it.
Signed-off-by: Feng Mingli <fml@rock-chips.com>
Signed-off-by: lyz <lyz@rock-chips.com>
Conflicts:
drivers/usb/dwc_otg_310/dwc_otg_pcd_linux.c
luoxt [Tue, 18 Aug 2015 08:47:43 +0000 (16:47 +0800)]
ASoC: rk312x: fix rk3128 codec right channel output
changed codec register order according to IP datasheet to fix
right channel no output when low volume
Signed-off-by: luoxt <lxt@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Roman Pen [Wed, 15 Apr 2015 23:13:48 +0000 (16:13 -0700)]
mm/vmalloc: fix possible exhaustion of vmalloc space caused by vm_map_ram allocator
Recently I came across high fragmentation of vm_map_ram allocator:
vmap_block has free space, but still new blocks continue to appear.
Further investigation showed that certain mapping/unmapping sequences
can exhaust vmalloc space. On small 32bit systems that's not a big
problem, cause purging will be called soon on a first allocation failure
(alloc_vmap_area), but on 64bit machines, e.g. x86_64 has 45 bits of
vmalloc space, that can be a disaster.
1) I came up with a simple allocation sequence, which exhausts virtual
space very quickly:
while (iters) {
/* Map/unmap big chunk */
vaddr = vm_map_ram(pages, 16, -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, 16);
/* Map/unmap small chunks.
*
* -1 for hole, which should be left at the end of each block
* to keep it partially used, with some free space available */
for (i = 0; i < (VMAP_BBMAP_BITS - 16) / 8 - 1; i++) {
vaddr = vm_map_ram(pages, 8, -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, 8);
}
}
The idea behind is simple:
1. We have to map a big chunk, e.g. 16 pages.
2. Then we have to occupy the remaining space with smaller chunks, i.e.
8 pages. At the end small hole should remain to keep block in free list,
but do not let big chunk to occupy remaining space.
3. Goto 1 - allocation request of 16 pages can't be completed (only 8 slots
are left free in the block in the #2 step), new block will be allocated,
all further requests will lay into newly allocated block.
To have some measurement numbers for all further tests I setup ftrace and
enabled 4 basic calls in a function profile:
echo vm_map_ram > /sys/kernel/debug/tracing/set_ftrace_filter;
echo alloc_vmap_area >> /sys/kernel/debug/tracing/set_ftrace_filter;
echo vm_unmap_ram >> /sys/kernel/debug/tracing/set_ftrace_filter;
echo free_vmap_block >> /sys/kernel/debug/tracing/set_ftrace_filter;
So for this scenario I got these results:
BEFORE (all new blocks are put to the head of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram 126000 30683.30 us 0.243 us 30819.36 us
vm_unmap_ram 126000 22003.24 us 0.174 us 340.886 us
alloc_vmap_area 1000 4132.065 us 4.132 us 0.903 us
AFTER (all new blocks are put to the tail of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram 126000 28713.13 us 0.227 us 24944.70 us
vm_unmap_ram 126000 20403.96 us 0.161 us 1429.872 us
alloc_vmap_area 993 3916.795 us 3.944 us 29.370 us
free_vmap_block 992 654.157 us 0.659 us 1.273 us
SUMMARY:
The most interesting numbers in those tables are numbers of block
allocations and deallocations: alloc_vmap_area and free_vmap_block
calls, which show that before the change blocks were not freed, and
virtual space and physical memory (vmap_block structure allocations,
etc) were consumed.
Average time which were spent in vm_map_ram/vm_unmap_ram became slightly
better. That can be explained with a reasonable amount of blocks in a
free list, which we need to iterate to find a suitable free block.
2) Another scenario is a random allocation:
while (iters) {
/* Randomly take number from a range [1..32/64] */
nr = rand(1, VMAP_MAX_ALLOC);
vaddr = vm_map_ram(pages, nr, -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, nr);
}
I chose mersenne twister PRNG to generate persistent random state to
guarantee that both runs have the same random sequence. For each
vm_map_ram call random number from [1..32/64] was taken to represent
amount of pages which I do map.
I did 10'000 vm_map_ram calls and got these two tables:
BEFORE (all new blocks are put to the head of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram 10000 10170.01 us 1.017 us 993.609 us
vm_unmap_ram 10000 5321.823 us 0.532 us 59.789 us
alloc_vmap_area 420 2150.239 us 5.119 us 3.307 us
free_vmap_block 37 159.587 us 4.313 us 134.344 us
AFTER (all new blocks are put to the tail of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram 10000 7745.637 us 0.774 us 395.229 us
vm_unmap_ram 10000 5460.573 us 0.546 us 67.187 us
alloc_vmap_area 414 2201.650 us 5.317 us 5.591 us
free_vmap_block 412 574.421 us 1.394 us 15.138 us
SUMMARY:
'BEFORE' table shows, that 420 blocks were allocated and only 37 were
freed. Remained 383 blocks are still in a free list, consuming virtual
space and physical memory.
'AFTER' table shows, that 414 blocks were allocated and 412 were really
freed. 2 blocks remained in a free list.
So fragmentation was dramatically reduced. Why? Because when we put
newly allocated block to the head, all further requests will occupy new
block, regardless remained space in other blocks. In this scenario all
requests come randomly. Eventually remained free space will be less
than requested size, free list will be iterated and it is possible that
nothing will be found there - finally new block will be created. So
exhaustion in random scenario happens for the maximum possible
allocation size: 32 pages for 32-bit system and 64 pages for 64-bit
system.
Also average cost of vm_map_ram was reduced from 1.017 us to 0.774 us.
Again this can be explained by iteration through smaller list of free
blocks.
3) Next simple scenario is a sequential allocation, when the allocation
order is increased for each block. This scenario forces allocator to
reach maximum amount of partially free blocks in a free list:
while (iters) {
/* Populate free list with blocks with remaining space */
for (order = 0; order <= ilog2(VMAP_MAX_ALLOC); order++) {
nr = VMAP_BBMAP_BITS / (1 << order);
/* Leave a hole */
nr -= 1;
for (i = 0; i < nr; i++) {
vaddr = vm_map_ram(pages, (1 << order), -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, (1 << order));
}
/* Completely occupy blocks from a free list */
for (order = 0; order <= ilog2(VMAP_MAX_ALLOC); order++) {
vaddr = vm_map_ram(pages, (1 << order), -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, (1 << order));
}
}
Results which I got:
BEFORE (all new blocks are put to the head of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram
2032000 399545.2 us 0.196 us 467123.7 us
vm_unmap_ram
2032000 363225.7 us 0.178 us 111405.9 us
alloc_vmap_area 7001 30627.76 us 4.374 us 495.755 us
free_vmap_block 6993 7011.685 us 1.002 us 159.090 us
AFTER (all new blocks are put to the tail of a free list)
# cat /sys/kernel/debug/tracing/trace_stat/function0
Function Hit Time Avg s^2
-------- --- ---- --- ---
vm_map_ram
2032000 394259.7 us 0.194 us 589395.9 us
vm_unmap_ram
2032000 292500.7 us 0.143 us 94181.08 us
alloc_vmap_area 7000 31103.11 us 4.443 us 703.225 us
free_vmap_block 7000 6750.844 us 0.964 us 119.112 us
SUMMARY:
No surprises here, almost all numbers are the same.
Fixing this fragmentation problem I also did some improvements in a
allocation logic of a new vmap block: occupy block immediately and get
rid of extra search in a free list.
Also I replaced dirty bitmap with min/max dirty range values to make the
logic simpler and slightly faster, since two longs comparison costs
less, than loop thru bitmap.
This patchset raises several questions:
Q: Think the problem you comments is already known so that I wrote comments
about it as "it could consume lots of address space through fragmentation".
Could you tell me about your situation and reason why it should be avoided?
Gioh Kim
A: Indeed, there was a commit
364376383 which adds explicit comment about
fragmentation. But fragmentation which is described in this comment caused
by mixing of long-lived and short-lived objects, when a whole block is pinned
in memory because some page slots are still in use. But here I am talking
about blocks which are free, nobody uses them, and allocator keeps them alive
forever, continuously allocating new blocks.
Q: I think that if you put newly allocated block to the tail of a free
list, below example would results in enormous performance degradation.
new block: 1MB (256 pages)
while (iters--) {
vm_map_ram(3 or something else not dividable for 256) * 85
vm_unmap_ram(3) * 85
}
On every iteration, it needs newly allocated block and it is put to the
tail of a free list so finding it consumes large amount of time.
Joonsoo Kim
A: Second patch in current patchset gets rid of extra search in a free list,
so new block will be immediately occupied..
Also, the scenario above is impossible, cause vm_map_ram allocates virtual
range in orders, i.e. 2^n. I.e. passing 3 to vm_map_ram you will allocate
4 slots in a block and 256 slots (capacity of a block) of course dividable
on 4, so block will be completely occupied.
But there is a worst case which we can achieve: each free block has a hole
equal to order size.
The maximum size of allocation is 64 pages for 64-bit system
(if you try to map more, original alloc_vmap_area will be called).
So the maximum order is 6. That means that worst case, before allocator
makes a decision to allocate a new block, is to iterate 7 blocks:
HEAD
1st block - has 1 page slot free (order 0)
2nd block - has 2 page slots free (order 1)
3rd block - has 4 page slots free (order 2)
4th block - has 8 page slots free (order 3)
5th block - has 16 page slots free (order 4)
6th block - has 32 page slots free (order 5)
7th block - has 64 page slots free (order 6)
TAIL
So the worst scenario on 64-bit system is that each CPU queue can have 7
blocks in a free list.
This can happen only and only if you allocate blocks increasing the order.
(as I did in the function written in the comment of the first patch)
This is weird and rare case, but still it is possible. Afterwards you will
get 7 blocks in a list.
All further requests should be placed in a newly allocated block or some
free slots should be found in a free list.
Seems it does not look dramatically awful.
This patch (of 3):
If suitable block can't be found, new block is allocated and put into a
head of a free list, so on next iteration this new block will be found
first.
That's bad, because old blocks in a free list will not get a chance to be
fully used, thus fragmentation will grow.
Let's consider this simple example:
#1 We have one block in a free list which is partially used, and where only
one page is free:
HEAD |xxxxxxxxx-| TAIL
^
free space for 1 page, order 0
#2 New allocation request of order 1 (2 pages) comes, new block is allocated
since we do not have free space to complete this request. New block is put
into a head of a free list:
HEAD |----------|xxxxxxxxx-| TAIL
#3 Two pages were occupied in a new found block:
HEAD |xx--------|xxxxxxxxx-| TAIL
^
two pages mapped here
#4 New allocation request of order 0 (1 page) comes. Block, which was created
on #2 step, is located at the beginning of a free list, so it will be found
first:
HEAD |xxX-------|xxxxxxxxx-| TAIL
^ ^
page mapped here, but better to use this hole
It is obvious, that it is better to complete request of #4 step using the
old block, where free space is left, because in other case fragmentation
will be highly increased.
But fragmentation is not only the case. The worst thing is that I can
easily create scenario, when the whole vmalloc space is exhausted by
blocks, which are not used, but already dirty and have several free pages.
Let's consider this function which execution should be pinned to one CPU:
static void exhaust_virtual_space(struct page *pages[16], int iters)
{
/* Firstly we have to map a big chunk, e.g. 16 pages.
* Then we have to occupy the remaining space with smaller
* chunks, i.e. 8 pages. At the end small hole should remain.
* So at the end of our allocation sequence block looks like
* this:
* XX big chunk
* |XXxxxxxxx-| x small chunk
* - hole, which is enough for a small chunk,
* but is not enough for a big chunk
*/
while (iters--) {
int i;
void *vaddr;
/* Map/unmap big chunk */
vaddr = vm_map_ram(pages, 16, -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, 16);
/* Map/unmap small chunks.
*
* -1 for hole, which should be left at the end of each block
* to keep it partially used, with some free space available */
for (i = 0; i < (VMAP_BBMAP_BITS - 16) / 8 - 1; i++) {
vaddr = vm_map_ram(pages, 8, -1, PAGE_KERNEL);
vm_unmap_ram(vaddr, 8);
}
}
}
On every iteration new block (1MB of vm area in my case) will be
allocated and then will be occupied, without attempt to resolve small
allocation request using previously allocated blocks in a free list.
In case of random allocation (size should be randomly taken from the
range [1..64] in 64-bit case or [1..32] in 32-bit case) situation is the
same: new blocks continue to appear if maximum possible allocation size
(32 or 64) passed to the allocator, because all remaining blocks in a
free list do not have enough free space to complete this allocation
request.
In summary if new blocks are put into the head of a free list eventually
virtual space will be exhausted.
In current patch I simply put newly allocated block to the tail of a
free list, thus reduce fragmentation, giving a chance to resolve
allocation request using older blocks with possible holes left.
Signed-off-by: Roman Pen <r.peniaev@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Acked-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: David Rientjes <rientjes@google.com>
Cc: WANG Chao <chaowang@redhat.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Christoph Lameter <cl@linux.com>
Cc: Gioh Kim <gioh.kim@lge.com>
Cc: Rob Jones <rob.jones@codethink.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Zheng Yang [Tue, 18 Aug 2015 06:15:06 +0000 (14:15 +0800)]
hdmi:rk3288/rk3368: polling avi status register instead of delay.
When sending avi introduced by commit
132ad528d034c38bd9b43bb8f08a5c2910a968c2,
we polling avi sending status register until avi is send, instead of delay 100ms.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
xxx [Mon, 17 Aug 2015 09:34:38 +0000 (17:34 +0800)]
rk3368-p9_818.dts: add suspend config
zxl [Mon, 17 Aug 2015 06:11:54 +0000 (14:11 +0800)]
RK3368 GPU version: Rogue L 0.22
merge 1.4_ED3632227 DDK code.
Zheng Yang [Fri, 14 Aug 2015 05:59:13 +0000 (13:59 +0800)]
hdmi:cec: delete maroc DEBUG definaion.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Fri, 14 Aug 2015 05:57:29 +0000 (13:57 +0800)]
hdmi:fix edid parse 4096x2160@24Hz error.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
chenzhen [Wed, 12 Aug 2015 09:54:35 +0000 (17:54 +0800)]
rk3288_mali_t760_driver_r6p0-02rel0_13_x@0
David Wu [Tue, 11 Aug 2015 18:47:10 +0000 (02:47 +0800)]
rk-keys: make input registered before key isr and key timer.
fix get pdata NULL pointer error.
Signed-off-by: David Wu <wdc@rock-chips.com>
Tang Yun ping [Tue, 11 Aug 2015 06:43:32 +0000 (14:43 +0800)]
RK3368 DDR: fix HDMI display abnormal when ddr change freq
add parameter of lcdc type for mcu to fix HDMI display abnormal when do ddr
change freq. it must update bl30 to rk3368bl30_v2.09.bin at the same time.
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Zheng Yang [Wed, 12 Aug 2015 01:35:53 +0000 (09:35 +0800)]
hdmi:cec: Define cec send frame return value.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Wed, 12 Aug 2015 01:10:54 +0000 (09:10 +0800)]
hdmi:cec:update driver to match android HDMI CEC HAL.
Android 5.x introduce HDMI CEC, so we need to porting
cec hal and driver to make it work.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Alpha Lin [Tue, 11 Aug 2015 08:00:48 +0000 (16:00 +0800)]
RK312x, VPU: add Reset resource.
support vpu combo cru reset for rk312x.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
Alpha Lin [Mon, 10 Aug 2015 08:05:12 +0000 (16:05 +0800)]
VCODEC: detect hevc resolution to determine the running frequency.
Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
Mark Yao [Mon, 10 Aug 2015 08:22:51 +0000 (16:22 +0800)]
rk32: lvds/rgb: fix rgb output when have no lvds_format
If we don't add lvds_format on the display timing, the lvds_format
value may be -1, means 0xffffffff when do register write, that is
wrong and display not works.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Xiao Feng [Fri, 7 Aug 2015 13:03:58 +0000 (21:03 +0800)]
dvfs: rockchip: add pvtm_get_temp for pvtm_set_dvfs_table
Signed-off-by: Xiao Feng <xf@rock-chips.com>
chenzhen [Wed, 5 Aug 2015 09:51:30 +0000 (17:51 +0800)]
rk3288_mali_t760_driver_r6p0-02rel0_12_x@0
Xiao Feng [Wed, 5 Aug 2015 01:01:28 +0000 (09:01 +0800)]
dvfs: rockchip: arm pvtm add RK3368_PROCESS_V0
Signed-off-by: Xiao Feng <xf@rock-chips.com>
Xiao Feng [Wed, 5 Aug 2015 00:54:16 +0000 (08:54 +0800)]
arm64: rockchip: rk3368: tb-dts: add arm pvtm support
Signed-off-by: Xiao Feng <xf@rock-chips.com>
David Wu [Tue, 4 Aug 2015 10:18:04 +0000 (18:18 +0800)]
rk3368: tsadc: set saradc_clk cycle to mcu
Signed-off-by: David Wu <wdc@rock-chips.com>
David Wu [Tue, 4 Aug 2015 10:17:27 +0000 (18:17 +0800)]
rk3368: scpi: add interface set cycle for tsadc
Signed-off-by: David Wu <wdc@rock-chips.com>
Zheng Yang [Tue, 4 Aug 2015 10:07:54 +0000 (18:07 +0800)]
hdmi:rk3288/rk3368: Reset tmdsclk after configure frame composer regiseter.
It is required to perform a reset tmdsclk action on one of the frame composer
registers changed. Or transport video and audio sample may mistake.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Xiao Feng [Mon, 3 Aug 2015 09:50:59 +0000 (17:50 +0800)]
arm64: rockchip: rk3368: dts: modify the regulator-name of rk818_ldo2
Signed-off-by: Xiao Feng <xf@rock-chips.com>
chenzhen [Mon, 3 Aug 2015 03:22:45 +0000 (11:22 +0800)]
rk312x, mali_400_driver : modify build_log, upgrade rk_ko_ver to 4.
chenzhen [Mon, 3 Aug 2015 03:20:05 +0000 (11:20 +0800)]
rk312x, mali_400_driver : fix bug that gpu_clk could not jump to he highest level.
huang zhibao [Fri, 31 Jul 2015 09:55:56 +0000 (17:55 +0800)]
dts: set wifi type and enable pwm1 in rk3288-p977_8846.dts
Signed-off-by: huang zhibao <hzb@rock-chips.com>
Zheng Yang [Thu, 30 Jul 2015 08:53:26 +0000 (16:53 +0800)]
hdmi:rk3036/rk3128: support 3D type Frame packing.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 30 Jul 2015 02:56:21 +0000 (10:56 +0800)]
hdmi: reconfigure audio when enable/disable 3D Frame packing mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 30 Jul 2015 02:43:04 +0000 (10:43 +0800)]
hdmi:rk3288/rk3368: support 3D type Frame packing.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
dalon.zhang [Wed, 29 Jul 2015 07:49:34 +0000 (15:49 +0800)]
camsys_drv: v0.0x21.0
Jianhong Chen [Mon, 27 Jul 2015 06:04:55 +0000 (14:04 +0800)]
dts: rk3368-p9: battery add and enable power_dc2otg
enable: otg device get power from dc adapter
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: xushengfei <xsf@rock-chips.com>
Jianhong Chen [Mon, 27 Jul 2015 06:04:16 +0000 (14:04 +0800)]
power: rk81x-battery: support otg device get power from dc
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: xushengfei <xsf@rock-chips.com>
Jianhong Chen [Sun, 26 Jul 2015 11:24:31 +0000 (19:24 +0800)]
power: rk81x-battery: fix power on sec base error
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>
Signed-off-by: xushengfei <xsf@rock-chips.com>
Xiao Feng [Mon, 27 Jul 2015 06:28:02 +0000 (14:28 +0800)]
dvfs: rockchip: print error when clk is disable
Signed-off-by: Xiao Feng <xf@rock-chips.com>
Sugar Zhang [Fri, 24 Jul 2015 10:04:31 +0000 (18:04 +0800)]
ASoC: rockchip: i2s: add pcm transfer mode support.
usage: add i2s dts property "rockchip,xfer-mode"
rockchip,xfer-mode = <0>: i2s transfer mode.
rockchip,xfer-mode = <1>: pcm transfer mode.
if not define, use i2s transfer mode default.
pcm transfer mode is usually used for bt/modem voice.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Zheng Yang [Fri, 24 Jul 2015 08:31:28 +0000 (16:31 +0800)]
hdmi:rk3288:enable supporting 10bit output.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Fri, 24 Jul 2015 08:30:44 +0000 (16:30 +0800)]
hdmi:use 30bit lcdc interface when output 10bit mode.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
hjc [Fri, 24 Jul 2015 07:26:59 +0000 (15:26 +0800)]
rk fb: add YUV420 10bit output mode for next soc
Signed-off-by: hjc <hjc@rock-chips.com>
Zheng Yang [Fri, 24 Jul 2015 03:05:37 +0000 (11:05 +0800)]
hdmi: hdmi_submit_work function support synchronous operation.
If hdmi_submit_work work in synchronous mode, the malloced delayed_work
is free by caller, not by hdmi_work_queue, to prevent delayed_work is
free before flush_delayed_work fucntion is executed.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 23 Jul 2015 09:04:57 +0000 (17:04 +0800)]
dts:arm:rk3288-box: ddr frequency set to 533 when playing 4K video.
If we playing 4K60Hz video, and there are more than two ui layer which
is continuously refreshing, bandwith will be not enougth under ddr 456MHz.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 23 Jul 2015 01:21:03 +0000 (09:21 +0800)]
hdmi:rk3288/rk3368: enable PHY SVSRET mode while in power-down mode.
While in power-down mode, the HDMI Tx PHY can be additionally set in
a lower mode of consumption by enabling the SVSRET mode, achieved by
asserting the SVSRET_MODEZ signal low.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Zheng Yang [Thu, 23 Jul 2015 01:05:37 +0000 (09:05 +0800)]
hdmi:rk3288/rk3368: set controller register in uboot logo mode.
EDID data readed in uboot and kernel may be different, and hdmi
output color mode is different in uboot and kernel: uboot output
RGB when EDID is wrong and kernel output YCbCr with right EDID.
But avi infomation and controller register is not set in kernel,
so the picture is wrong. Now fix this bug.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
zhangqing [Tue, 21 Jul 2015 16:33:11 +0000 (09:33 -0700)]
rk3288: clk: support clk_ddr round rate.
support clk_ddr round and set rate.
slove the develop-3.10-next merge missing some function.
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
Shengqin.Zhang [Tue, 21 Jul 2015 06:44:46 +0000 (14:44 +0800)]
fix rga_ioctl return error
Signed-off-by: Shengqin.Zhang <zsq@rock-chips.com>
Zheng Yang [Mon, 20 Jul 2015 06:52:13 +0000 (14:52 +0800)]
hdmi: use dps->lock replace of hdmi->lock.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
linwei [Mon, 20 Jul 2015 03:33:02 +0000 (11:33 +0800)]
EDP:RK3288: add debugfs node for psr function.
enter the drectory:debugfs/edp.
command as follows:
echo 0 > psr : disable psr
echo 1 > psr : config and enable psr
echo 2 > psr : sink get in psr inactive
echo 3 > psr : sink get in psr state2
echo 4 > psr : sink get in psr state3
echo 5 > psr : open phy 4 lanes
echo 6 > psr : close phy 4 lanes
Signed-off-by: linwei <buluo.lin@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
Mark Yao [Wed, 15 Jul 2015 10:09:21 +0000 (18:09 +0800)]
rk_fb: rk3288: fix win2 disable iommu crash.
dalon.zhang [Fri, 17 Jul 2015 07:12:06 +0000 (15:12 +0800)]
uvc: support the query of iommu_enabled
hwg [Thu, 16 Jul 2015 12:32:39 +0000 (20:32 +0800)]
bcmdhd wifi: support ap6356 nvram auto recognize
Zheng Yang [Thu, 16 Jul 2015 09:45:14 +0000 (17:45 +0800)]
eDP:rk3288:ignore grf probe error when probe.
rockhip,grf node is not exist on rk3288, we
need to ignore grf probe error.
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
linwei [Wed, 15 Jul 2015 10:12:06 +0000 (18:12 +0800)]
eDP:RK3288 check format for rk32_dp.c rk32_dp.h
Signed-off-by: linwei <buluo.lin@rock-chips.com>
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
zhangqing [Thu, 16 Jul 2015 11:49:42 +0000 (04:49 -0700)]
rk3288: clk: slove make warning for clk-ops.c
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
zhangqing [Thu, 16 Jul 2015 11:11:36 +0000 (04:11 -0700)]
rk3288: clk: support clk_vop set 594M.
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
zhangqing [Wed, 15 Jul 2015 18:05:22 +0000 (11:05 -0700)]
rk3288: clk: support aclk_vio 594M.
Signed-off-by: zhangqing <zhangqing@rock-chips.com>