* [GIT PULL] Samsung fixes for 4.8
[not found] <CGME20160916133335eucas1p2417ec5672f250c3eaca8e424293ce783@eucas1p2.samsung.com>
@ 2016-09-16 13:33 ` Sylwester Nawrocki
2016-10-21 12:26 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 9+ messages in thread
From: Sylwester Nawrocki @ 2016-09-16 13:33 UTC (permalink / raw)
To: LMML; +Cc: linux-samsung-soc
Hi Mauro,
The following changes since commit 7892a1f64a447b6f65fe2888688883b7c26d81d3:
[media] rcar-fcp: Make sure rcar_fcp_enable() returns 0 on success (2016-09-15 09:02:16 -0300)
are available in the git repository at:
git://linuxtv.org/snawrocki/samsung.git for-v4.9/media/fixes
for you to fetch changes up to 8beaa9d0595aa2ae1f63be364c80189e53cbfe15:
exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag (2016-09-16 15:25:55 +0200)
----------------------------------------------------------------
Marek Szyprowski (1):
s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
Sylwester Nawrocki (1):
exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag
drivers/media/platform/exynos4-is/fimc-is-i2c.c | 25 ++++++++++++++++++-------
drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
2 files changed, 19 insertions(+), 7 deletions(-)
--
Thanks,
Sylwester
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-09-16 13:33 ` [GIT PULL] Samsung fixes for 4.8 Sylwester Nawrocki
@ 2016-10-21 12:26 ` Mauro Carvalho Chehab
2016-10-21 13:01 ` Sylwester Nawrocki
2016-11-16 11:47 ` Sylwester Nawrocki
0 siblings, 2 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2016-10-21 12:26 UTC (permalink / raw)
To: Sylwester Nawrocki; +Cc: LMML, linux-samsung-soc
Em Fri, 16 Sep 2016 15:33:33 +0200
Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
> Hi Mauro,
>
> The following changes since commit 7892a1f64a447b6f65fe2888688883b7c26d81d3:
>
> [media] rcar-fcp: Make sure rcar_fcp_enable() returns 0 on success (2016-09-15 09:02:16 -0300)
>
> are available in the git repository at:
>
> git://linuxtv.org/snawrocki/samsung.git for-v4.9/media/fixes
>
> for you to fetch changes up to 8beaa9d0595aa2ae1f63be364c80189e53cbfe15:
>
> exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag (2016-09-16 15:25:55 +0200)
>
> ----------------------------------------------------------------
> Marek Szyprowski (1):
> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
>
> Sylwester Nawrocki (1):
> exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag
This patch didn't apply fine. Could you please rebase it?
Applying patch patches/0002-exynos4-is-Clear-I2C_ISP-adapter-s-power.ignore_chil.patch
patching file drivers/media/platform/exynos4-is/fimc-is-i2c.c
Hunk #1 NOT MERGED at 74-99, already applied at 101-104, already applied at 111.
Applied patch patches/0002-exynos4-is-Clear-I2C_ISP-adapter-s-power.ignore_chil.patch (forced; needs refresh)
Thanks,
Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-10-21 12:26 ` Mauro Carvalho Chehab
@ 2016-10-21 13:01 ` Sylwester Nawrocki
2016-11-16 11:47 ` Sylwester Nawrocki
1 sibling, 0 replies; 9+ messages in thread
From: Sylwester Nawrocki @ 2016-10-21 13:01 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: LMML, linux-samsung-soc
On 10/21/2016 02:26 PM, Mauro Carvalho Chehab wrote:
>> Sylwester Nawrocki (1):
>> > exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag
>
> This patch didn't apply fine. Could you please rebase it?
>
> Applying patch patches/0002-exynos4-is-Clear-I2C_ISP-adapter-s-power.ignore_chil.patch
> patching file drivers/media/platform/exynos4-is/fimc-is-i2c.c
> Hunk #1 NOT MERGED at 74-99, already applied at 101-104, already applied at 111.
It seems no further actions are needed since the patch is somehow already
applied in Linus' tree:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/media/platform/exynos4-is/fimc-is-i2c.c?id=056c61eb0da4d7181fc7072567dc1931cb0e1cbb
--
Regards,
Sylwester
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-10-21 12:26 ` Mauro Carvalho Chehab
2016-10-21 13:01 ` Sylwester Nawrocki
@ 2016-11-16 11:47 ` Sylwester Nawrocki
2016-11-16 14:46 ` Mauro Carvalho Chehab
1 sibling, 1 reply; 9+ messages in thread
From: Sylwester Nawrocki @ 2016-11-16 11:47 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: LMML, linux-samsung-soc
On 10/21/2016 02:26 PM, Mauro Carvalho Chehab wrote:
> Em Fri, 16 Sep 2016 15:33:33 +0200
> Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
>
>> Hi Mauro,
>>
>> The following changes since commit 7892a1f64a447b6f65fe2888688883b7c26d81d3:
>>
>> [media] rcar-fcp: Make sure rcar_fcp_enable() returns 0 on success (2016-09-15 09:02:16 -0300)
>>
>> are available in the git repository at:
>>
>> git://linuxtv.org/snawrocki/samsung.git for-v4.9/media/fixes
>>
>> for you to fetch changes up to 8beaa9d0595aa2ae1f63be364c80189e53cbfe15:
>>
>> exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag (2016-09-16 15:25:55 +0200)
>>
>> ----------------------------------------------------------------
>> Marek Szyprowski (1):
>> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
Mauro, this patch seems to had slipped through the cracks, I can't see it
in neither media fixes nor the master branch. Could you please check it?
>> Sylwester Nawrocki (1):
>> exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag
>
> This patch didn't apply fine. Could you please rebase it?
>
> Applying patch patches/0002-exynos4-is-Clear-I2C_ISP-adapter-s-power.ignore_chil.patch
> patching file drivers/media/platform/exynos4-is/fimc-is-i2c.c
> Hunk #1 NOT MERGED at 74-99, already applied at 101-104, already applied at 111.
> Applied patch patches/0002-exynos4-is-Clear-I2C_ISP-adapter-s-power.ignore_chil.patch (forced; needs refresh)
--
Thanks,
Sylwester
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-11-16 11:47 ` Sylwester Nawrocki
@ 2016-11-16 14:46 ` Mauro Carvalho Chehab
2016-11-16 15:08 ` Sylwester Nawrocki
0 siblings, 1 reply; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2016-11-16 14:46 UTC (permalink / raw)
To: Sylwester Nawrocki; +Cc: LMML, linux-samsung-soc
Em Wed, 16 Nov 2016 12:47:57 +0100
Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
> On 10/21/2016 02:26 PM, Mauro Carvalho Chehab wrote:
> > Em Fri, 16 Sep 2016 15:33:33 +0200
> > Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
> >
> >> Hi Mauro,
> >>
> >> The following changes since commit 7892a1f64a447b6f65fe2888688883b7c26d81d3:
> >>
> >> [media] rcar-fcp: Make sure rcar_fcp_enable() returns 0 on success (2016-09-15 09:02:16 -0300)
> >>
> >> are available in the git repository at:
> >>
> >> git://linuxtv.org/snawrocki/samsung.git for-v4.9/media/fixes
> >>
> >> for you to fetch changes up to 8beaa9d0595aa2ae1f63be364c80189e53cbfe15:
> >>
> >> exynos4-is: Clear I2C_ISP adapter's power.ignore_children flag (2016-09-16 15:25:55 +0200)
> >>
> >> ----------------------------------------------------------------
> >> Marek Szyprowski (1):
> >> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
>
> Mauro, this patch seems to had slipped through the cracks, I can't see it
> in neither media fixes nor the master branch. Could you please check it?
The patch seems to be on my tree:
commit 3467c9a7e7f9209a9ecd8f9db65b04a323a13932
Author: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri Sep 16 03:14:33 2016 -0300
[media] s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
s5p_mfc_alloc_memdev() function lacks proper releasing
of allocated device in case of reserved memory initialization
failure. This results in NULL pointer dereference:
[ 2.828457] Unable to handle kernel NULL pointer dereference at virtual address 00000001
[ 2.835089] pgd = c0004000
[ 2.837752] [00000001] *pgd=00000000
[ 2.844696] Internal error: Oops: 5 [#1] PREEMPT SMP ARM
[ 2.848680] Modules linked in:
[ 2.851722] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.8.0-rc6-00002-gafa1b97 #878
[ 2.859357] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree)
[ 2.865433] task: ef080000 task.stack: ef06c000
[ 2.869952] PC is at strcmp+0x0/0x30
[ 2.873508] LR is at platform_match+0x84/0xac
[ 2.877847] pc : [<c032621c>] lr : [<c03f65e8>] psr: 20000013
[ 2.877847] sp : ef06dea0 ip : 00000000 fp : 00000000
[ 2.889303] r10: 00000000 r9 : c0b34848 r8 : c0b1e968
[ 2.894511] r7 : 00000000 r6 : 00000001 r5 : c086e7fc r4 : eeb8e010
[ 2.901021] r3 : 0000006d r2 : 00000000 r1 : c086e7fc r0 : 00000001
[ 2.907533] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
[ 2.914649] Control: 10c5387d Table: 4000404a DAC: 00000051
[ 2.920378] Process swapper/0 (pid: 1, stack limit = 0xef06c210)
[ 2.926367] Stack: (0xef06dea0 to 0xef06e000)
[ 2.930711] dea0: eeb8e010 c0c2d91c c03f4a6c c03f4a8c 00000000 c0c2d91c c03f4a6c c03f2fc8
[ 2.938870] dec0: ef003274 ef10c4c0 c0c2d91c ef10cc80 c0c21270 c03f3fa4 c09c1be8 c0c2d91c
[ 2.947028] dee0: 00000006 c0c2d91c 00000006 c0b3483c c0c47000 c03f5314 c0c2d908 c0b5fed8
[ 2.955188] df00: 00000006 c010178c 60000013 c0a4ef14 00000000 c06feaa0 ef080000 60000013
[ 2.963347] df20: 00000000 c0c095c8 efffca76 c0816b8c 000000d5 c0134098 c0b34848 c09d6cdc
[ 2.971506] df40: c0a4de70 00000000 00000006 00000006 c0c09568 efffca40 c0b5fed8 00000006
[ 2.979665] df60: c0b3483c c0c47000 000000d5 c0b34848 c0b005a4 c0b00d84 00000006 00000006
[ 2.987824] df80: 00000000 c0b005a4 00000000 c06fb4d8 00000000 00000000 00000000 00000000
[ 2.995983] dfa0: 00000000 c06fb4e0 00000000 c01079b8 00000000 00000000 00000000 00000000
[ 3.004142] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
[ 3.012302] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 ffffffff ffffffff
[ 3.020469] [<c032621c>] (strcmp) from [<c03f65e8>] (platform_match+0x84/0xac)
[ 3.027672] [<c03f65e8>] (platform_match) from [<c03f4a8c>] (__driver_attach+0x20/0xb0)
[ 3.035654] [<c03f4a8c>] (__driver_attach) from [<c03f2fc8>] (bus_for_each_dev+0x54/0x88)
[ 3.043812] [<c03f2fc8>] (bus_for_each_dev) from [<c03f3fa4>] (bus_add_driver+0xe8/0x1f4)
[ 3.051971] [<c03f3fa4>] (bus_add_driver) from [<c03f5314>] (driver_register+0x78/0xf4)
[ 3.059958] [<c03f5314>] (driver_register) from [<c010178c>] (do_one_initcall+0x3c/0x16c)
[ 3.068123] [<c010178c>] (do_one_initcall) from [<c0b00d84>] (kernel_init_freeable+0x120/0x1ec)
[ 3.076802] [<c0b00d84>] (kernel_init_freeable) from [<c06fb4e0>] (kernel_init+0x8/0x118)
[ 3.084958] [<c06fb4e0>] (kernel_init) from [<c01079b8>] (ret_from_fork+0x14/0x3c)
[ 3.092506] Code: 1afffffb e12fff1e e1a03000 eafffff7 (e4d03001)
[ 3.098618] ---[ end trace 511bf9d750810709 ]---
[ 3.103207] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
This patch fixes this issue.
Fixes: c79667dd93b084fe412bcfe7fbf0ba43f7dec520 ("media: s5p-mfc: replace custom
reserved memory handling code with generic one")
CC: stable@vger.kernel.org # v4.7+
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 0a5b8f5e011e..3436eda58855 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1082,6 +1082,7 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev,
idx);
if (ret == 0)
return child;
+ device_del(child);
}
put_device(child);
git describe 3467c9a7e7f9209a9ecd8f9db65b04a323a13932
v4.9-rc1-117-g3467c9a7e7f9
Thanks,
Mauro
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-11-16 14:46 ` Mauro Carvalho Chehab
@ 2016-11-16 15:08 ` Sylwester Nawrocki
2016-11-16 15:19 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 9+ messages in thread
From: Sylwester Nawrocki @ 2016-11-16 15:08 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: LMML, linux-samsung-soc
On 11/16/2016 03:46 PM, Mauro Carvalho Chehab wrote:
>>>> Marek Szyprowski (1):
>>>> > >> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
>> >
>> > Mauro, this patch seems to had slipped through the cracks, I can't see it
>> > in neither media fixes nor the master branch. Could you please check it?
>
> The patch seems to be on my tree:
Oops, sorry, I didn't check it properly. Would be nice to see that
patch also in linux-next.
--
Thanks!
Sylwester
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-11-16 15:08 ` Sylwester Nawrocki
@ 2016-11-16 15:19 ` Mauro Carvalho Chehab
2016-11-28 19:29 ` Javier Martinez Canillas
0 siblings, 1 reply; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2016-11-16 15:19 UTC (permalink / raw)
To: Sylwester Nawrocki; +Cc: LMML, linux-samsung-soc
Em Wed, 16 Nov 2016 16:08:19 +0100
Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
> On 11/16/2016 03:46 PM, Mauro Carvalho Chehab wrote:
> >>>> Marek Szyprowski (1):
> >>>> > >> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
> >> >
> >> > Mauro, this patch seems to had slipped through the cracks, I can't see it
> >> > in neither media fixes nor the master branch. Could you please check it?
> >
> > The patch seems to be on my tree:
>
> Oops, sorry, I didn't check it properly. Would be nice to see that
> patch also in linux-next.
I'll likely add all patches at linux-next today, after handling more
patches.
Thanks,
Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-11-16 15:19 ` Mauro Carvalho Chehab
@ 2016-11-28 19:29 ` Javier Martinez Canillas
2016-11-28 19:44 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 9+ messages in thread
From: Javier Martinez Canillas @ 2016-11-28 19:29 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Sylwester Nawrocki; +Cc: LMML, linux-samsung-soc
Hello Mauro,
On 11/16/2016 12:19 PM, Mauro Carvalho Chehab wrote:
> Em Wed, 16 Nov 2016 16:08:19 +0100
> Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
>
>> On 11/16/2016 03:46 PM, Mauro Carvalho Chehab wrote:
>>>>>> Marek Szyprowski (1):
>>>>>>>>> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
>>>>>
>>>>> Mauro, this patch seems to had slipped through the cracks, I can't see it
>>>>> in neither media fixes nor the master branch. Could you please check it?
>>>
>>> The patch seems to be on my tree:
>>
This patch is indeed in your tree as commit:
https://git.linuxtv.org/media_tree.git/commit/?id=3467c9a7e7f9
and also in present in the media/v4.9-2 tag.
But the patch never made to mainline. In fact, I don't see any of the
patches in the media/v4.9-2 tag to be merged in v4.9-rc7.
>> Oops, sorry, I didn't check it properly. Would be nice to see that
>> patch also in linux-next.
>
> I'll likely add all patches at linux-next today, after handling more
> patches.
>
> Thanks,
> Mauro
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL] Samsung fixes for 4.8
2016-11-28 19:29 ` Javier Martinez Canillas
@ 2016-11-28 19:44 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 9+ messages in thread
From: Mauro Carvalho Chehab @ 2016-11-28 19:44 UTC (permalink / raw)
To: Javier Martinez Canillas; +Cc: Sylwester Nawrocki, LMML, linux-samsung-soc
Em Mon, 28 Nov 2016 16:29:25 -0300
Javier Martinez Canillas <javier@osg.samsung.com> escreveu:
> Hello Mauro,
>
> On 11/16/2016 12:19 PM, Mauro Carvalho Chehab wrote:
> > Em Wed, 16 Nov 2016 16:08:19 +0100
> > Sylwester Nawrocki <s.nawrocki@samsung.com> escreveu:
> >
> >> On 11/16/2016 03:46 PM, Mauro Carvalho Chehab wrote:
> >>>>>> Marek Szyprowski (1):
> >>>>>>>>> s5p-mfc: fix failure path of s5p_mfc_alloc_memdev()
> >>>>>
> >>>>> Mauro, this patch seems to had slipped through the cracks, I can't see it
> >>>>> in neither media fixes nor the master branch. Could you please check it?
> >>>
> >>> The patch seems to be on my tree:
> >>
>
> This patch is indeed in your tree as commit:
>
> https://git.linuxtv.org/media_tree.git/commit/?id=3467c9a7e7f9
>
> and also in present in the media/v4.9-2 tag.
>
> But the patch never made to mainline. In fact, I don't see any of the
> patches in the media/v4.9-2 tag to be merged in v4.9-rc7.
It is part of a group of 187 patches for Kernel 4.10. There aren't
anything there that fixes a regression on 4.8 or 4.9. So, no
hush.
I double-checked and all the patches at media/v4.9-2 are there at
media master. So, should be sent to 4.10.
Regards,
Mauro
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-11-28 19:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20160916133335eucas1p2417ec5672f250c3eaca8e424293ce783@eucas1p2.samsung.com>
2016-09-16 13:33 ` [GIT PULL] Samsung fixes for 4.8 Sylwester Nawrocki
2016-10-21 12:26 ` Mauro Carvalho Chehab
2016-10-21 13:01 ` Sylwester Nawrocki
2016-11-16 11:47 ` Sylwester Nawrocki
2016-11-16 14:46 ` Mauro Carvalho Chehab
2016-11-16 15:08 ` Sylwester Nawrocki
2016-11-16 15:19 ` Mauro Carvalho Chehab
2016-11-28 19:29 ` Javier Martinez Canillas
2016-11-28 19:44 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).