陈亮 [Tue, 5 Aug 2014 01:08:25 +0000 (18:08 -0700)]
ddr_rk32.c: reinit reserve_t when chang freq success
Signed-off-by: 陈亮 <cl@rock-chips.com>
lyz [Tue, 5 Aug 2014 01:06:13 +0000 (09:06 +0800)]
usb: udc: receive 1 SETUP packet in BDMA mode
Minchan Kim [Mon, 12 Aug 2013 06:13:56 +0000 (15:13 +0900)]
zram: don't grab mutex in zram_slot_free_noity
[1] introduced down_write in zram_slot_free_notify to prevent race
between zram_slot_free_notify and zram_bvec_[read|write]. The race
could happen if somebody who has right permission to open swap device
is reading swap device while it is used by swap in parallel.
However, zram_slot_free_notify is called with holding spin_lock of
swap layer so we shouldn't avoid holing mutex. Otherwise, lockdep
warns it.
This patch adds new list to handle free slot and workqueue
so zram_slot_free_notify just registers slot index to be freed and
registers the request to workqueue. If workqueue is expired,
it holds mutex_lock so there is no problem any more.
If any I/O is issued, zram handles pending slot-free request
caused by zram_slot_free_notify right before handling issued
request because workqueue wouldn't be expired yet so zram I/O
request handling function can miss it.
Lastly, when zram is reset, flush_work could handle all of pending
free request so we shouldn't have memory leak.
NOTE: If zram_slot_free_notify's kmalloc with GFP_ATOMIC would be
failed, the slot will be freed when next write I/O write the slot.
[1] [
57ab0485, zram: use zram->lock to protect zram_free_page()
in swap free notify path]
* from v2
* refactoring
* from v1
* totally redesign
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
a0c516cbfc7452c8cbd564525fef66d9f20b46d1)
Conflicts:
drivers/staging/zram/zram_drv.c
luowei [Mon, 4 Aug 2014 01:14:23 +0000 (09:14 +0800)]
spi:fix the bug while read one byte
郭毅 [Mon, 4 Aug 2014 01:06:22 +0000 (09:06 +0800)]
inv_mpu: only setup timer once.
zyc [Thu, 31 Jul 2014 09:58:15 +0000 (17:58 +0800)]
camsys_drv : v0.0x12.0 ,camsys_head : v0.0x8.0
CMY [Tue, 22 Jul 2014 07:35:12 +0000 (15:35 +0800)]
Revert "rk: cma: attempt to allocate same range memory while cma allocation failure"
This reverts commit
17beed5e65b338169ff45cfc6f9c4f28f86b3899.
xxm [Thu, 31 Jul 2014 08:16:47 +0000 (16:16 +0800)]
rockchip:iommu:fix build error when iommu disabled
郭毅 [Thu, 31 Jul 2014 03:41:29 +0000 (11:41 +0800)]
rk3288: Adjust the temp-limit to 100 degrees Celsius
xxm [Thu, 31 Jul 2014 03:32:35 +0000 (11:32 +0800)]
rockchip:iommu:define function use inline instead of #define when iommu disabled
xxm [Wed, 30 Jul 2014 09:28:33 +0000 (17:28 +0800)]
rockchip:iommu:fix build error when iommu disabled
xxm [Tue, 29 Jul 2014 06:15:25 +0000 (14:15 +0800)]
rockchip:midgard:1,update gpu version to r4p1-00rel0 2,add input handler when runtime on/off 3,version to 0x09
wlf [Tue, 29 Jul 2014 02:32:44 +0000 (10:32 +0800)]
USB: Fix usb debug log
zyc [Tue, 29 Jul 2014 01:38:12 +0000 (09:38 +0800)]
camsys_drv : v0.0x11.0
陈亮 [Mon, 28 Jul 2014 11:51:31 +0000 (04:51 -0700)]
rockchip: kernel add efuse support
Signed-off-by: 陈亮 <cl@rock-chips.com>
CMY [Mon, 28 Jul 2014 08:26:04 +0000 (16:26 +0800)]
rk: ion: iommu: fix build error
dkl [Fri, 25 Jul 2014 09:51:54 +0000 (17:51 +0800)]
rockchip: rockchip_defconfig select rk818
dkl [Fri, 25 Jul 2014 07:10:53 +0000 (15:10 +0800)]
pmic: rk818: modify shutdown function and fix compile errors
1. Modify the rk818 shutdown function refering to rk808.
2. Fix some compile errors.
xjh [Wed, 23 Jul 2014 04:44:21 +0000 (12:44 +0800)]
MIPI: 1.fixed compile error; 2.support VOP BIG/LIT
陈亮 [Mon, 21 Jul 2014 12:27:24 +0000 (05:27 -0700)]
ddr_test: use dvfs_clk_set_rate() when change freq
Signed-off-by: 陈亮 <cl@rock-chips.com>
CMY [Mon, 21 Jul 2014 10:18:36 +0000 (18:18 +0800)]
rk: cma: attempt to allocate same range memory while cma allocation failure
郭毅 [Mon, 21 Jul 2014 07:54:38 +0000 (15:54 +0800)]
rk32: gmac: better support 1000M
gwl [Mon, 21 Jul 2014 08:25:19 +0000 (16:25 +0800)]
Wifi:RTL8188EU: modify to creat p2p0 interface for wifi direct.
xxm [Mon, 21 Jul 2014 06:47:44 +0000 (14:47 +0800)]
rockchip:midgard:1,keep gpu clock when runtime resume 2,version to 0x07
gwl [Mon, 21 Jul 2014 07:01:35 +0000 (15:01 +0800)]
Wifi:RTL8188EU: fix driver compile warning. version 4.60.WFD.
dalon.zhang [Mon, 21 Jul 2014 01:56:45 +0000 (09:56 +0800)]
camsys: v0.0x10.0
xxm [Mon, 21 Jul 2014 01:03:35 +0000 (09:03 +0800)]
rockchip:midgard:
1.use list_for_each_safe instead of list_for_each ,_list_del may happend in
interrupt,may cause the unsync operation
2.add msleep(500) in the entry of kbase_release to postpone the operation when app quit
3.version to 0x06
郭毅 [Fri, 18 Jul 2014 09:30:29 +0000 (17:30 +0800)]
rk: dts: default uboot-logo-on
郭毅 [Fri, 18 Jul 2014 09:22:31 +0000 (17:22 +0800)]
rk: tb: adjust lowmem/vmalloc area to 496/504 MB
郭毅 [Fri, 18 Jul 2014 09:18:30 +0000 (17:18 +0800)]
rk: ion: enable CMA that placed in highmem zone and default ion 640M
zwl [Fri, 18 Jul 2014 02:40:44 +0000 (10:40 +0800)]
rk fb: add support 4k video rotate and cancel map rotate fb
郭毅 [Fri, 18 Jul 2014 01:53:15 +0000 (09:53 +0800)]
cw201x: shielding unnecessary dev_info
zwl [Thu, 17 Jul 2014 09:20:47 +0000 (17:20 +0800)]
rk fb: add support yuv format rotate through rga module that used for HDMI
zyc [Thu, 17 Jul 2014 07:57:16 +0000 (15:57 +0800)]
camsys_drv : v0.f.0
wlf [Wed, 16 Jul 2014 10:06:43 +0000 (18:06 +0800)]
USB: fix dwc_otg hcd desc dma allocate memory with GFP_ATOMIC.
lintao [Wed, 16 Jul 2014 10:00:16 +0000 (18:00 +0800)]
mmc: rk_sdmmc: fix calculation of erase unbusy timeout
wlf [Wed, 16 Jul 2014 06:13:57 +0000 (14:13 +0800)]
USB: fix ep_queue request buf dma map and unmap.
1. For 0 length buf, perform dma map with length 4
to avoid kernel stack dump occurred.
2. Do dma unmap before req->complete to avoid dma
addr reused after unmapped.
wlf [Wed, 16 Jul 2014 06:09:10 +0000 (14:09 +0800)]
USB: fix otg pcd DMA allocate memory with GFP_ATOMIC.
In dwc_otg_pcd_ep_queue, allocate DMA memory for
align buf. Because dwc_otg_pcd_ep_queue can be
called in irq, so it must be used GFP_ATOMIC to
avoid sleep in irq.
hcy [Tue, 15 Jul 2014 10:24:27 +0000 (18:24 +0800)]
ddr_rk32.c: fix ddr change freq deidle bug
郭毅 [Mon, 14 Jul 2014 05:51:58 +0000 (13:51 +0800)]
rk3288: act8846: modify sd init voltage
lintao [Mon, 14 Jul 2014 03:43:27 +0000 (11:43 +0800)]
mmc: fix drv_e for sd in ultraHS sw
张晴 [Mon, 14 Jul 2014 02:50:18 +0000 (10:50 +0800)]
rk3288:act8846:modify sd init voltage
郭毅 [Fri, 11 Jul 2014 10:20:32 +0000 (18:20 +0800)]
dts: add uboot-logo-on
郭毅 [Fri, 11 Jul 2014 10:14:45 +0000 (18:14 +0800)]
dts: fix no vmmc regulator found
CMY [Fri, 11 Jul 2014 07:13:38 +0000 (15:13 +0800)]
rk: mm: CMA memory busy error may have a variety of reasons, in the larger one is:
the pages being used in the system come from CMA, and now need recycling
them for new CMA allocation, it need to allocate a new page for storing data
that will be reclaim CMA's pages, but new page may also be come from CMA memory
when memory allocate fall back to MIGRATE_CMA freelist.
Now we protect the CMA's pages in the memory fallback allocate
[ 1637.058550] alloc_contig_range test_pages_isolated(431a0, 431c0) failed
黄涛 [Thu, 10 Jul 2014 12:50:59 +0000 (20:50 +0800)]
ARM: rockchip: ddr_test: fix compilation warning
lintao [Thu, 10 Jul 2014 03:33:21 +0000 (11:33 +0800)]
mmc: update dev_e to default 8ma
郭毅 [Thu, 10 Jul 2014 02:46:11 +0000 (10:46 +0800)]
tb_8846 : default support mpu6050 for sdk_v2.0
陈亮 [Wed, 9 Jul 2014 11:30:00 +0000 (04:30 -0700)]
remove reboot_config_done flag, do not close ddrfreq thread after reboot notify, because that may cause ddrfreq_system_status_notifier_call block forever
Signed-off-by: 陈亮 <cl@rock-chips.com>
lintao [Wed, 9 Jul 2014 10:08:47 +0000 (18:08 +0800)]
mmc: support drv_e and sr modify
张晴 [Wed, 9 Jul 2014 07:16:58 +0000 (15:16 +0800)]
rk3288:tsadc:slove pull down power_hold when power on
lyz [Mon, 7 Jul 2014 11:24:02 +0000 (19:24 +0800)]
usb: update soft reset
1.add rst_flag to distinguish different reset cases
2.use new reset framework APIs
xxm [Tue, 8 Jul 2014 02:54:48 +0000 (10:54 +0800)]
rockchip:midgard:1,keep processing if fence NULL 2,version to 0x05
qjb [Tue, 8 Jul 2014 02:19:18 +0000 (10:19 +0800)]
rk616 codec : remove call function rk616_codec_power_up after
kfree rk616_priv.
dkl [Mon, 7 Jul 2014 10:22:12 +0000 (18:22 +0800)]
rockchip: dvfs: switch regulator mode dynamically as rate changes
张晴 [Mon, 7 Jul 2014 10:07:25 +0000 (18:07 +0800)]
rk3288:pmic:sdk:support new pmic hardware
lintao [Mon, 7 Jul 2014 08:41:49 +0000 (16:41 +0800)]
mmc: host: rk_sdmmc: prepare for next Soc(s)
fix edma slave config phy regs
qjb [Mon, 7 Jul 2014 07:58:53 +0000 (15:58 +0800)]
rk616 codec: fixed rk616 codec shutdown function null pointer
zsq [Sun, 6 Jul 2014 07:34:26 +0000 (15:34 +0800)]
fix rga1/rga2 mem leak when create mmu table use user malloc buf
陈亮 [Fri, 4 Jul 2014 05:51:38 +0000 (22:51 -0700)]
set screen status before and after ddr change freq
Signed-off-by: 陈亮 <cl@rock-chips.com>
黄涛 [Fri, 4 Jul 2014 04:59:57 +0000 (12:59 +0800)]
scripts/checkpatch.pl: update to
b43ae21bd1d8199df10548f3fc0d806052027f29 and enable strict default
陈亮 [Fri, 4 Jul 2014 03:58:01 +0000 (20:58 -0700)]
change ddrfreq directly in ddr_init() since lcdc is not init
Signed-off-by: 陈亮 <cl@rock-chips.com>
zwl [Fri, 4 Jul 2014 01:29:04 +0000 (09:29 +0800)]
rk screen: add the judgement if the variable rk_screen is null pointer
zwl [Thu, 3 Jul 2014 08:43:50 +0000 (16:43 +0800)]
rk616 hdmi: coding reorganize for 3.10 and clean up unused code
郭毅 [Thu, 3 Jul 2014 02:41:37 +0000 (10:41 +0800)]
tb_8846: dts : fix gpu voltage
yxj [Thu, 3 Jul 2014 01:12:44 +0000 (09:12 +0800)]
default disabled lcdc iommu in dts
黄涛 [Wed, 2 Jul 2014 11:58:15 +0000 (19:58 +0800)]
reset: rockchip: fix compilation warning
dkl [Fri, 27 Jun 2014 13:37:45 +0000 (21:37 +0800)]
rockchip: add reset-rockchip driver to support Generic Reset Controller framework
zwl [Wed, 2 Jul 2014 03:55:27 +0000 (11:55 +0800)]
rk fb: add the judgement that if the variable dev_drv is null pointer
lintao [Wed, 2 Jul 2014 01:57:08 +0000 (09:57 +0800)]
mmc: host: rk_sdmmc: no requirement to reclaim edmac in err handle routine
Signed-off-by: lintao <lintao@rock-chips.com>
Cc: xujh <xujh@rock-chips.com>
黄涛 [Tue, 1 Jul 2014 11:13:28 +0000 (19:13 +0800)]
ARM: rockchip: ft support GPU test
xxx [Tue, 1 Jul 2014 08:58:51 +0000 (16:58 +0800)]
add:ddr reg dump,resume code data align
黄涛 [Tue, 1 Jul 2014 07:57:34 +0000 (15:57 +0800)]
ARM: rockchip: pm: fix compilation warning
黄涛 [Tue, 1 Jul 2014 07:38:56 +0000 (15:38 +0800)]
ARM: rockchip: fix compilation error when SENSORS_ROCKCHIP_TSADC is not selected
黄涛 [Tue, 1 Jul 2014 07:43:00 +0000 (15:43 +0800)]
ARM: rockchip: pm-rk3288.c fix compilation warning when RK_LAST_LOG is not selected
xxx [Tue, 1 Jul 2014 07:43:34 +0000 (15:43 +0800)]
suspend:resume arm errata818325
郭毅 [Tue, 1 Jul 2014 03:05:49 +0000 (11:05 +0800)]
tb_8846 : dts: swap lcd0 and lcd1
郭毅 [Tue, 1 Jul 2014 03:03:47 +0000 (11:03 +0800)]
dts: delete rk3288-tb1.dts
zwl [Tue, 1 Jul 2014 02:32:18 +0000 (10:32 +0800)]
rk fb: add set screen status for ddr change
陈亮 [Mon, 30 Jun 2014 09:00:50 +0000 (02:00 -0700)]
auto down ldcd0 or lcdc1 dclk rate when ddr change rate.
This commit corresponds to commit
debf1d2237185a26503d737d54db730f62cf5ea5
Signed-off-by: 陈亮 <cl@rock-chips.com>
lintao [Mon, 30 Jun 2014 02:03:26 +0000 (10:03 +0800)]
mmc: host: rk_sdmmc: fix re-put count of dma
黄涛 [Mon, 30 Jun 2014 12:27:52 +0000 (20:27 +0800)]
ARM: rockchip: enable ARM_ERRATA_818325 for RK3288
黄涛 [Mon, 30 Jun 2014 12:21:22 +0000 (20:21 +0800)]
ARM: errata: Workaround for Cortex-A12 erratum 818325
On Cortex-A12 (r0p0..r0p1-00lac0-rc11), when a CPU executes a sequence of
two conditional store instructions with opposite condition code and
updating the same register, the system might enter a deadlock if the
second conditional instruction is an UNPREDICTABLE STR or STM
instruction. This workaround setting bit[12] of the Feature Register
prevents the erratum. This bit disables an optimisation applied to a
sequence of 2 instructions that use opposing condition codes.
wlf [Mon, 30 Jun 2014 09:01:12 +0000 (17:01 +0800)]
USB: fix DWC_OTG HCD disconnect bug to avoid NULL pointer.
CMY [Mon, 30 Jun 2014 06:52:36 +0000 (14:52 +0800)]
rk: ion: add caller info in snapshot if alloc failed
郭毅 [Mon, 30 Jun 2014 06:29:09 +0000 (14:29 +0800)]
Author: CMY <cmy@rock-chips.com>
rk: dts: more convenient to modify CMA region
张晴 [Mon, 30 Jun 2014 03:35:50 +0000 (11:35 +0800)]
rk3288:tsadc:support auto mode,high temp to reset cru or cut down pmic
郭毅 [Mon, 30 Jun 2014 02:30:58 +0000 (10:30 +0800)]
p977:dts: modify gpu freq to 420M
郭毅 [Mon, 30 Jun 2014 02:04:47 +0000 (10:04 +0800)]
rk3288: dts: add rk3288-tb_8846.dts for sdk v2.0
xxx [Fri, 27 Jun 2014 10:23:08 +0000 (18:23 +0800)]
fixed : ft test config
lintao [Fri, 27 Jun 2014 06:56:34 +0000 (14:56 +0800)]
mmc: core: rk_sdmmc: fix NULL pointer cause by edma complete
If card been removed after sending read cmd to it, and before its
response data sent to host, data null pointer occur.
lintao [Fri, 27 Jun 2014 01:56:52 +0000 (09:56 +0800)]
mmc: host: rk_sdmmc: fix edma src max burst size
lintao [Thu, 26 Jun 2014 13:27:48 +0000 (21:27 +0800)]
mmc: core: rk_sdmmc: prepare for next Soc(s)
Merge branch from develop-3.10-next into develop-3.10
陈亮 [Thu, 26 Jun 2014 11:27:24 +0000 (04:27 -0700)]
fix BUG: sleeping function called from invalid context at kernel/mutex.c
xxx [Thu, 26 Jun 2014 10:19:48 +0000 (18:19 +0800)]
add ft tst func
xxx [Thu, 26 Jun 2014 10:17:08 +0000 (18:17 +0800)]
add arm pll rate conf
xxx [Thu, 26 Jun 2014 10:15:27 +0000 (18:15 +0800)]
fixed not define CONFIG_PM warning
xxx [Thu, 26 Jun 2014 10:13:16 +0000 (18:13 +0800)]
ddr_rk32.c:fixed warning
CMY [Thu, 26 Jun 2014 10:01:34 +0000 (18:01 +0800)]
rk: dts: more convenient to modify CMA region
gwl [Thu, 26 Jun 2014 07:55:05 +0000 (15:55 +0800)]
WiFi:bcmdhd: fix wifi driver endless loop when initialization fail.