platform/kernel/linux-rpi.git
18 months agoRevert "Bluetooth: Store advertising handle so it can be re-enabled" 86/292886/1 accepted/tizen/unified/20230517.080114
Anuj Jain [Tue, 16 May 2023 13:55:19 +0000 (19:25 +0530)]
Revert "Bluetooth: Store advertising handle so it can be re-enabled"

This reverts commit 7087c4f69487f017722df7d299ef9b7709996b79.

Patch revert is needed as it is the cause for GATT Server TCT fail.

Change-Id: I55bedbb6b0d44058c13ac06df121c5d936611c74
Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
18 months agopackaging: ignore Werror for tools 54/292254/1
Seung-Woo Kim [Tue, 2 May 2023 09:16:04 +0000 (18:16 +0900)]
packaging: ignore Werror for tools

With gcc-12 and new binutils, there are some warnings in tools.
Do not cause error for the warnings.

Change-Id: If75607ca3acc2104a6a33bbc3d13b02757ddbcf7
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
18 months agotools bpftool: Fix compilation error with new binutils 66/292166/1
Andres Freund [Mon, 1 Aug 2022 01:38:33 +0000 (18:38 -0700)]
tools bpftool: Fix compilation error with new binutils

commit 600b7b26c07a070d0153daa76b3806c1e52c9e00 upstream.

binutils changed the signature of init_disassemble_info(), which now causes
compilation to fail for tools/bpf/bpftool/jit_disasm.c, e.g. on debian
unstable.

Relevant binutils commit:

  https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

Wire up the feature test and switch to init_disassemble_info_compat(),
which were introduced in prior commits, fixing the compilation failure.

I verified that bpftool can still disassemble bpf programs, both with an
old and new dis-asm.h API. There are no output changes for plain and json
formats. When comparing the output from old binutils (2.35)
to new bintuils with the patch (upstream snapshot) there are a few output
differences, but they are unrelated to this patch. An example hunk is:

     2f: pop    %r14
     31: pop    %r13
     33: pop    %rbx
  -  34: leaveq
  -  35: retq
  +  34: leave
  +  35: ret

Signed-off-by: Andres Freund <andres@anarazel.de>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Ben Hutchings <benh@debian.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Link: https://lore.kernel.org/r/20220801013834.156015-8-andres@anarazel.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick stable linux-5.15.y commit 4441a9009193 to resolve gcc-12-build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I4bc40a822995acad090f987a2937a6db47a6f511

18 months agotools bpf_jit_disasm: Fix compilation error with new binutils 65/292165/1
Andres Freund [Mon, 1 Aug 2022 01:38:31 +0000 (18:38 -0700)]
tools bpf_jit_disasm: Fix compilation error with new binutils

commit 96ed066054abf11c7d3e106e3011a51f3f1227a3 upstream.

binutils changed the signature of init_disassemble_info(), which now causes
compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian
unstable.

Relevant binutils commit:

  https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

Wire up the feature test and switch to init_disassemble_info_compat(),
which were introduced in prior commits, fixing the compilation failure.

I verified that bpf_jit_disasm can still disassemble bpf programs, both
with the old and new dis-asm.h API. With old binutils there's no change in
output before/after this patch. When comparing the output from old
binutils (2.35) to new bintuils with the patch (upstream snapshot) there
are a few output differences, but they are unrelated to this patch. An
example hunk is:

     f4: mov    %r14,%rsi
     f7: mov    %r15,%rdx
     fa: mov    $0x2a,%ecx
  -  ff: callq  0xffffffffea8c4988
  +  ff: call   0xffffffffea8c4988
    104: test   %rax,%rax
    107: jge    0x0000000000000110
    109: xor    %eax,%eax
  - 10b: jmpq   0x0000000000000073
  + 10b: jmp    0x0000000000000073
    110: cmp    $0x16,%rax

However, I had to use an older kernel to generate the bpf_jit_enabled =
2 output, as that has been broken since 5.18 / 1022a5498f6f745c ("bpf,
x86_64: Use bpf_jit_binary_pack_alloc").

  https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.de

Signed-off-by: Andres Freund <andres@anarazel.de>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Ben Hutchings <benh@debian.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Link: https://lore.kernel.org/r/20220801013834.156015-6-andres@anarazel.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick stable linux-5.15.y commit 1c27fab24333 to resolve gcc-12-build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: Ie64ecd2f88c14389110d8fab6e1f595bd38b1516

18 months agotools perf: Fix compilation error with new binutils 64/292164/1
Andres Freund [Mon, 1 Aug 2022 01:38:30 +0000 (18:38 -0700)]
tools perf: Fix compilation error with new binutils

commit 83aa0120487e8bc3f231e72c460add783f71f17c upstream.

binutils changed the signature of init_disassemble_info(), which now causes
compilation failures for tools/perf/util/annotate.c, e.g. on debian
unstable.

Relevant binutils commit:

  https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

Wire up the feature test and switch to init_disassemble_info_compat(),
which were introduced in prior commits, fixing the compilation failure.

I verified that perf can still disassemble bpf programs by using bpftrace
under load, recording a perf trace, and then annotating the bpf "function"
with and without the changes. With old binutils there's no change in output
before/after this patch. When comparing the output from old binutils (2.35)
to new bintuils with the patch (upstream snapshot) there are a few output
differences, but they are unrelated to this patch. An example hunk is:

       1.15 :   55:mov    %rbp,%rdx
       0.00 :   58:add    $0xfffffffffffffff8,%rdx
       0.00 :   5c:xor    %ecx,%ecx
  -    1.03 :   5e:callq  0xffffffffe12aca3c
  +    1.03 :   5e:call   0xffffffffe12aca3c
       0.00 :   63:xor    %eax,%eax
  -    2.18 :   65:leaveq
  -    2.82 :   66:retq
  +    2.18 :   65:leave
  +    2.82 :   66:ret

Signed-off-by: Andres Freund <andres@anarazel.de>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Ben Hutchings <benh@debian.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Link: https://lore.kernel.org/r/20220801013834.156015-5-andres@anarazel.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick stable linux-5.15.y commit 97f005c0bdba to resolve gcc-12 build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: Ib9c0a83b11e28e1d1f5846b7b1bf21e007aaa1fd

18 months agotools include: add dis-asm-compat.h to handle version differences 63/292163/1
Andres Freund [Mon, 1 Aug 2022 01:38:29 +0000 (18:38 -0700)]
tools include: add dis-asm-compat.h to handle version differences

commit a45b3d6926231c3d024ea0de4f7bd967f83709ee upstream.

binutils changed the signature of init_disassemble_info(), which now causes
compilation failures for tools/{perf,bpf}, e.g. on debian unstable.

Relevant binutils commit:

  https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

This commit introduces a wrapper for init_disassemble_info(), to avoid
spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent
commits will use it to fix the build failures.

It likely is worth adding a wrapper for disassember(), to avoid the already
existing DISASM_FOUR_ARGS_SIGNATURE ifdefery.

Signed-off-by: Andres Freund <andres@anarazel.de>
Signed-off-by: Ben Hutchings <benh@debian.org>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Ben Hutchings <benh@debian.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Link: https://lore.kernel.org/r/20220801013834.156015-4-andres@anarazel.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick stable linux-5.15.y commit 451c9d7b1616 to resolve gcc-12 build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I41fde6de2055b838dfbdc3d6de1b64eea3ab20c5

18 months agotools build: Add feature test for init_disassemble_info API changes 62/292162/1
Andres Freund [Mon, 1 Aug 2022 01:38:27 +0000 (18:38 -0700)]
tools build: Add feature test for init_disassemble_info API changes

commit cfd59ca91467056bb2c36907b2fa67b8e1af9952 upstream.

binutils changed the signature of init_disassemble_info(), which now causes
compilation failures for tools/{perf,bpf}, e.g. on debian unstable.

Relevant binutils commit:

  https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

This commit adds a feature test to detect the new signature.  Subsequent
commits will use it to fix the build failures.

Signed-off-by: Andres Freund <andres@anarazel.de>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Ben Hutchings <benh@debian.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: bpf@vger.kernel.org
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Link: https://lore.kernel.org/r/20220801013834.156015-2-andres@anarazel.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sw0312.kim: cherry-pick stable linux-5.15.y commit 51b99dc38c1a to resolve gcc-12 build issue]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I68d3e7bb522e3d6d5bb7c534b5a203d9ee03eb34

18 months agodm-bow: Fix 5.15 compatibility issue 95/291795/1 accepted/tizen/unified/20230424.185352
Jaehoon Chung [Fri, 21 Apr 2023 08:27:15 +0000 (17:27 +0900)]
dm-bow: Fix 5.15 compatibility issue

https://patchwork.kernel.org/project/linux-block/patch/20210804094147.459763-8-hch@lst.de/

delays registering the gendisk, so move creating our sysfs nodes until
resume.

Orignal-Author: Paul Lawrence <paullawrence@google.com>
Origin: https://android.googlesource.com/kernel/common/+/88e27b17aab604fb2d486e538b2ef55cd967a430%5E%21/#F0
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: Ib328a4b1f989cdd7359c186668417f85d633b29a
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
19 months agoARM/ARM64: config: enable DRM_LOAD_EDID_FIRMWARE 88/291288/1 accepted/tizen/unified/20230414.125224
Seung-Woo Kim [Thu, 13 Apr 2023 01:44:27 +0000 (10:44 +0900)]
ARM/ARM64: config: enable DRM_LOAD_EDID_FIRMWARE

Enable CONFIG_DRM_LOAD_EDID_FIRMWARE from tizen defconfigs to
support drm.edid_firmware paremeter.
Adding "drm.edid_firmware=edid/1920x1080.bin" to cmdline makes
all connected display connector has the 1920x1080 mode.

Kernel has prebuilt edids, 800x600.bin, 1024x768.bin,
1280x1024.bin, 1600x1200.bin, 1680x1050.bin and 1920x1080.bin and
to use other mode edids, put custom edid files into path
/lib/firmware/edid/.

Note: to build custom edid binary, please refer tools/edid/.

Change-Id: I7b80f1aa5a0422f4cb8ff8d99584d0cbdbc8ae1e
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
19 months agoARM/ARM64: config: enable DM_INIT configuration 94/291094/1
Jaehoon Chung [Mon, 10 Apr 2023 01:35:59 +0000 (10:35 +0900)]
ARM/ARM64: config: enable DM_INIT configuration

To use "dm-mod.create=", enable DM_INIT configuration.

Change-Id: I22da617243d0ecafab3048a3aa970ef53b8712c5
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
19 months agodm init: add dm-mod.waitfor to wait for asynchronously probed block devices 93/291093/1
Peter Korsgaard [Wed, 16 Nov 2022 06:16:56 +0000 (07:16 +0100)]
dm init: add dm-mod.waitfor to wait for asynchronously probed block devices

Just calling wait_for_device_probe() is not enough to ensure that
asynchronously probed block devices are available (E.G. mmc, usb), so
add a "dm-mod.waitfor=<device1>[,..,<deviceN>]" parameter to get
dm-init to explicitly wait for specific block devices before
initializing the tables with logic similar to the rootwait logic that
was introduced with commit  cc1ed7542c8c ("init: wait for
asynchronously scanned block devices").

E.G. with dm-verity on mmc using:
dm-mod.waitfor="PARTLABEL=hash-a,PARTLABEL=root-a"

[    0.671671] device-mapper: init: waiting for all devices to be available before creating mapped devices
[    0.671679] device-mapper: init: waiting for device PARTLABEL=hash-a ...
[    0.710695] mmc0: new HS200 MMC card at address 0001
[    0.711158] mmcblk0: mmc0:0001 004GA0 3.69 GiB
[    0.715954] mmcblk0boot0: mmc0:0001 004GA0 partition 1 2.00 MiB
[    0.722085] mmcblk0boot1: mmc0:0001 004GA0 partition 2 2.00 MiB
[    0.728093] mmcblk0rpmb: mmc0:0001 004GA0 partition 3 512 KiB, chardev (249:0)
[    0.738274]  mmcblk0: p1 p2 p3 p4 p5 p6 p7
[    0.751282] device-mapper: init: waiting for device PARTLABEL=root-a ...
[    0.751306] device-mapper: init: all devices available
[    0.751683] device-mapper: verity: sha256 using implementation "sha256-generic"
[    0.759344] device-mapper: ioctl: dm-0 (vroot) is ready
[    0.766540] VFS: Mounted root (squashfs filesystem) readonly on device 254:0.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
[jh80.chung: cherry picked from commit 035641b01e72af4f6c6cf22a4bdb5d7dfc4e8e8e]
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Change-Id: Ib918a6f474842b1ae633225a7781839e7ffaade4

19 months agoARM: tizen_bcm2711_defconfig: Add enable mt7921u defconfig 50/290250/3 accepted/tizen/unified/20230325.044624
Hoegeun Kwon [Wed, 22 Mar 2023 04:21:56 +0000 (13:21 +0900)]
ARM: tizen_bcm2711_defconfig: Add enable mt7921u defconfig

Enable mt7921u defconfig for wifi-6e usb interface.

Change-Id: Ia129eb71bc3b71788d3647be02b9f8b260e0b599
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomt76-6e-usb: mac80211: Use less restrictive channel usage rules 69/289969/4
astsam [Thu, 16 Mar 2023 08:45:18 +0000 (17:45 +0900)]
mt76-6e-usb: mac80211: Use less restrictive channel usage rules

Fixed an issue where Wi-Fi 6e could not be scanned. Use less
restrictive channel usage rules.

Signed-off-by: astsam <info@no-problem.cc>
Change-Id: Iafba1ceb9b3275ad1bc71f0d16c48492215d48dd
[Patch url: https://github.com/astsam/mt7921/commit/ec4206ea938037f07cbff516260c9f5706ffa9f7]
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomt76-6e-usb: mt7921: Avoid throughput drop in VO streaming, enable TX BA by default. 68/289968/4
Deren Wu [Thu, 16 Mar 2023 08:45:12 +0000 (17:45 +0900)]
mt76-6e-usb: mt7921: Avoid throughput drop in VO streaming, enable TX BA by default.

Avoid throughput drop in VO streaming, enable TX BA by default.

From: Deren Wu <deren.wu@mediatek.com>
From: YN Chen <YN.Chen@mediatek.com>

Change-Id: Id0f3ffffda64ce5e408936d82e26a3518a353c4e
[Patch url: https://patchwork.kernel.org/project/linux-wireless/patch/889fc1f28a8402f82cb83243af4916c3311c3eb1.1628072837.git.deren.wu@mediatek.com/]
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agoarm64: tizen_bcm2711_defconfig: Add enable mt7921u defconfig 67/289967/4
Hoegeun Kwon [Mon, 20 Mar 2023 08:23:18 +0000 (17:23 +0900)]
arm64: tizen_bcm2711_defconfig: Add enable mt7921u defconfig

Enable mt7921u defconfig for wifi-6e usb interface.

Change-Id: I8bc6b0731cf1257603e683ffe385d42a0c488b37
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomt76-6e-usb: mt7921u: Add support Netgear AXE3000(A8000) device 66/289966/4
Reese Russell [Thu, 16 Mar 2023 08:45:06 +0000 (17:45 +0900)]
mt76-6e-usb: mt7921u: Add support Netgear AXE3000(A8000) device

Added Netgear AXE3000 (A8000) usb_device_id to mt7921u_device_table[]

Issue: Though the Netgear AXE3000 (A8000) is based on the mt7921
chipset because of the unique USB VID:PID combination this device
does not initialize/register. Thus making it not plug and play.

Fix: Adds support for the Netgear AXE3000 (A8000) based on the Mediatek
mt7921au chipset. The method of action is adding the USD VID/PID
pair to the mt7921u_device_table[] array.

Notes: A retail sample of the Netgear AXE3000 (A8000) yeilds the following
from lsusb D 0846:9060 NetGear, Inc. Wireless_Device. This pair
0846:9060 VID:PID has been reported by other users on Github.

Signed-off-by: Reese Russell <git@qrsnap.io>
Change-Id: I321a0753c80563da4dab97cf69e319e901cbf7f7
[Patch url: https://patchwork.kernel.org/project/linux-wireless/patch/20230123090555.21415-1-git@qrsnap.io/]
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomediatek: mt76-6e-usb Fix to build error 65/289965/4
Hoegeun Kwon [Thu, 16 Mar 2023 08:45:03 +0000 (17:45 +0900)]
mediatek: mt76-6e-usb Fix to build error

Copied entire code from v5.18.y, fix build error that occurred.

Signed-off-by: astsam <info@no-problem.cc>
Change-Id: Icb2c24cc3d81cb14a2dc8db6e1208d2ba42cec17
[Patch url: https://github.com/astsam/mt7921/commit/98007d648b31581e2fa99069c4319f820cbbc30a\]
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomediatek: Add version option to support wifi-6e usb 20/290120/1
Hoegeun Kwon [Mon, 20 Mar 2023 07:39:57 +0000 (16:39 +0900)]
mediatek: Add version option to support wifi-6e usb

Add version kconfig and makefile option to support wifi-6e usb.

Change-Id: I9cf0b7035942fd62018ec6c104f9371b03bf1099
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
19 months agomediatek: mt76-6e-usb: Copied entire code from v5.18.y 19/290119/1
Hoegeun Kwon [Mon, 20 Mar 2023 03:32:52 +0000 (12:32 +0900)]
mediatek: mt76-6e-usb: Copied entire code from v5.18.y

Copied entire code to 'mt76-6e-usb' from kernel v5.18.y
'drivers/net/wireless/mediatek/mt76', for support wifi-6e usb
interface.

repo: https://github.com/raspberrypi/linux.git
kernel version: 5.18.19
last commit: d83fb0cdf903 media: i2c: arducam-pivariety: Add custom controls

Change-Id: I60f7382cd84bc47fbebc899a82d4c46c2e14e628
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
20 months agoARM: tizen_bcm2711_*defconfig: Enable USB_GSPCA_ZC3XX defconfig 63/288563/1 accepted/tizen/unified/20230223.021035 accepted/tizen/unified/20230223.162137
Seung-Woo Kim [Mon, 20 Feb 2023 04:14:44 +0000 (13:14 +0900)]
ARM: tizen_bcm2711_*defconfig: Enable USB_GSPCA_ZC3XX defconfig

To support GSPCA family usb webcam, enable CONFIG_USB_GSPCA_ZC3XX.

Change-Id: I471d6c079b2bb802248028219ba2c585149a1532
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
21 months agodrm/vc4: Workaround for crtc scanout device problem 89/288189/1 accepted/tizen/unified/20230214.171553
Hoegeun Kwon [Thu, 7 Sep 2017 07:24:56 +0000 (16:24 +0900)]
drm/vc4: Workaround for crtc scanout device problem

Currently, the crtc device does not start a scanout, the time of
vblank is always calculated as future value. As a workaround, always
change vpos to a positive number.

Change-Id: I9d9efa473f530b519637a7497c6a41f5e3c9b541
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
21 months agotizen_bcm2711_defconfig: Enable dm-bow 99/287799/1 accepted/tizen/unified/20230207.165824
Mateusz Moscicki [Thu, 8 Jul 2021 13:40:21 +0000 (15:40 +0200)]
tizen_bcm2711_defconfig: Enable dm-bow

This enables device mapper driver to allow checkpoint & restore on ext4
partitions.

Signed-off-by: Mateusz Moscicki <m.moscicki2@samsung.com>
[sw0312.kim: sync with savedefconfig]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
[mszyprow: added changes to *_rt_defconfig]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Iba3831159515bffa387210111a3fbbe733b62eef

21 months agodevice-mapper: Add dm-bow 98/287798/1
Mateusz Moscicki [Thu, 8 Jul 2021 13:36:25 +0000 (15:36 +0200)]
device-mapper: Add dm-bow

dm-bow is a device mapper driver that allows to create a checkpoint on
the volume so that it is possible to restore the state if necessary.
This is needed to protect the ext4 partition during a system upgrade in
case of a power failure.

Originally-by: Paul Lawrence <paullawrence@google.com>
Origin: https://android.googlesource.com/kernel/common/+/refs/heads/android-mainline/drivers/md/dm-bow.c
Signed-off-by: Mateusz Moscicki <m.moscicki2@samsung.com>
[mszyprow: fixed compile issue]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Id521bd9f609fdc4a55837da8e1388800f375e8a5

21 months agorpi4: boot: Update the firmwares for kernel v5.15.82 (fix booting issue) 43/287743/1
Hoegeun Kwon [Fri, 3 Feb 2023 07:18:39 +0000 (16:18 +0900)]
rpi4: boot: Update the firmwares for kernel v5.15.82 (fix booting issue)

When connected to 4k hdmi, the issue of not reading the emmc
intermittently during booting has been resolved this firmware version.

The updated files comes from https://github.com/raspberrypi/firmware.git
master branch, commit(0a7ea7028461 firmware: arm_loader: PWM1 is not available on GPIO 45)

Change-Id: Ie03b4d2f6f9d72774458254d9e5a330d28b28928
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
21 months agopackaging: enable NBD module 12/287412/2 accepted/tizen/unified/20230202.015311
Marek Pikuła [Mon, 30 Jan 2023 12:30:01 +0000 (13:30 +0100)]
packaging: enable NBD module

This will allow for booting with a remote NBD device for development
purposes with a special initrd stage (will be introduced in a separate
package).

Change-Id: I6149f3eaed4b9fb2fd61b5e471b4882efd66f9ae
Signed-off-by: Marek Pikuła <m.pikula@partner.samsung.com>
21 months agoPartially Revert "brcmfmac: p2p: Deal with set but unused variables" 18/287118/1 accepted/tizen/unified/20230120.182107
Seung-Woo Kim [Fri, 20 Jan 2023 04:41:37 +0000 (13:41 +0900)]
Partially Revert "brcmfmac: p2p: Deal with set but unused variables"

This partially reverts commit 2de64ca7c9fadd32b261530592db4a6adbfcb53f.

The commit 61325dc073e2 ("Revert "brcmfmac: move configuration of
probe request IEs"") requires vif set with p2p interface, but commit
2de64ca7c9fa removes setting. Partially revert the commit to support
p2p usage with p2p interface.

Change-Id: Iaa3a6c57bb9e14c80ef9f4714eea0cfc447d6adc
Reported-by: Jiung Yu <jiung.yu@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
22 months agoBluetooth: Add LE connection parameter update 71/286471/3 accepted/tizen/unified/20230118.172025
Anuj Jain [Fri, 6 Jan 2023 09:59:24 +0000 (15:29 +0530)]
Bluetooth: Add LE connection parameter update

Add support for BT_LE_CONN_PARAM in l2cap socket.

Change-Id: I2ed693da26ba2d3464b9997bf1880c6c136055cd
Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
22 months agodrm/vc4: Add gem_info node via debugfs for vc5 81/285881/1
Hoegeun Kwon [Mon, 19 Dec 2022 06:57:39 +0000 (15:57 +0900)]
drm/vc4: Add gem_info node via debugfs for vc5

The memps requires gem_info with gem_names to analyze graphics shared
memory, so this patch adds gem_info node via common helpers for
debugfs.

Let's save pid/tgid in private file data only once when gem object is
created or prime_fd is imported and use them on gem_info. This is to
solve the wrong pid problem of gem_info created as different processes
share fd of drm device node.

The prime fd created in vc4, but handled in v3d, modified to hanle
this in vc4.

Change-Id: Ideab3ecf282b77247f9b3706ee7e46747b2d0762
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
22 months agodrm/vc4: hdmi: Fix hotplug extcon uevent to works 80/285880/1
Hoegeun Kwon [Wed, 21 Dec 2022 09:54:25 +0000 (18:54 +0900)]
drm/vc4: hdmi: Fix hotplug extcon uevent to works

There is a problem that extcon uevent does not work hdmi hotplug, so
fixed to works.

Change-Id: Ic22bfd25c6ebf951832c6687b68dfcda286a833d
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
22 months agoAsoC: ac108: revert use of fallthrough pseudo-keywoard 07/285807/1
Jaehoon Chung [Tue, 20 Dec 2022 11:12:42 +0000 (20:12 +0900)]
AsoC: ac108: revert use of fallthrough pseudo-keywoard

This reverts commit 6a9dc5fd6170 ("lib: Revert use of fallthrough pseudo-keyword in lib/")
Now, use the fallthrough instead of /* fall through */

Change-Id: I1199d05f5830aa169f393c51310d4cbd699c79b1
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoscript: build-rpi4: Update script to clarify build errors 03/285003/3
Hoegeun Kwon [Fri, 2 Dec 2022 08:35:12 +0000 (17:35 +0900)]
script: build-rpi4: Update script to clarify build errors

Update script to clarify build errors, also do not remove dtb files to
eliminate unnecessary rebuilds.

Change-Id: I34685c2b0dfa25d79a79795b24d18a64465ed4a3
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agorpi4: boot: Update the firmwares for kernel v5.15.79
Hoegeun Kwon [Tue, 22 Nov 2022 04:56:55 +0000 (13:56 +0900)]
rpi4: boot: Update the firmwares for kernel v5.15.79

The updated files comes from https://github.com/raspberrypi/firmware.git
master branch, commit(b8a7365c70c6 kernel: Bump to 5.15.79)

Change-Id: I610b9a125231a79e423a29cc2033203c7c9b262a
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agopackaging: Change the kernel version of the spec file
Hoegeun Kwon [Tue, 22 Nov 2022 04:57:00 +0000 (13:57 +0900)]
packaging: Change the kernel version of the spec file

Change the kernel version to 5.15.79

Change-Id: I962339d32b22bc8eee4c7e3da37a834f8a406bb2
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoscripts: mkbootimg_rpi4: Fix url path for u-boot of rpi4
Hoegeun Kwon [Tue, 22 Nov 2022 05:13:09 +0000 (14:13 +0900)]
scripts: mkbootimg_rpi4: Fix url path for u-boot of rpi4

Fix url path for u-boot-rpi4.

Change-Id: I786de5c89da600d84cd48849cfd0def6806893c5
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agopackaging: add perf package for perf tool and traceevent plugins
Seung-Woo Kim [Tue, 15 Nov 2022 04:32:16 +0000 (13:32 +0900)]
packaging: add perf package for perf tool and traceevent plugins

Add perf package for perf tool and its traceevent plugins.

Note: they are built from below directories.
- perf: tools/perf
- traceevent plugins: tools/lib/traceevent

Change-Id: Ia154b6fd85dbc65f2ca3c5af018cc86cd6061f9d
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agobrd: Support for BLKFLSBUF
Hoegeun Kwon [Mon, 7 Nov 2022 04:11:13 +0000 (13:11 +0900)]
brd: Support for BLKFLSBUF

To support brd flush to free ramdisk brd_mutex is required. also to
free ramdisk memory, BLKFLSBUF support is required. this commit has
been modified to match the interface of the kernel v5.15.

This reverts commit 15f7b41f70ddcca3b555bd0fdc7c8da7466b517e.
This reverts commit ff26956875c2f05e12ecec9938411a2c7dfc767d.

Change-Id: Idde4b352924a0d8bd1c606b6da171f333dfb4f70
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agobrd: Support discard
Hoegeun Kwon [Mon, 7 Nov 2022 04:11:09 +0000 (13:11 +0900)]
brd: Support discard

To support ramdisk flush, discard is required. So, revert the commit.
Also, this commit has been modified to match the interface of the
kernel v5.15.

This reverts commit f09a06a193d942a12c1a33c153388b3962222006.

Change-Id: Ic66d8331b63e96ed35ae7ca48cb7c7349559ea58
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoRevert "block: don't call into the driver for BLKFLSBUF"
Hoegeun Kwon [Wed, 9 Nov 2022 05:59:27 +0000 (14:59 +0900)]
Revert "block: don't call into the driver for BLKFLSBUF"

Revert that commit for use with the blkdev_flushbuf ioctl.

This reverts commit 4a9d6d667f0bafed55a9e9f5ae8bceb3680749d7.

Change-Id: Ibba5ecdff7c0d3402a220005856a28783c36cc86
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoRevert "block: don't call into the driver for BLKROSET"
Hoegeun Kwon [Wed, 9 Nov 2022 06:02:38 +0000 (15:02 +0900)]
Revert "block: don't call into the driver for BLKROSET"

Revert that commit for use with the blkdev_flushbuf ioctl.

This reverts commit 732e12d805a77f74c907c0a28ece271ef1e81e01.

Change-Id: Ic0f44db39cc4bfd68a69a677949c3913763f2b88
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoRevert "block: remove __blkdev_driver_ioctl"
Hoegeun Kwon [Wed, 9 Nov 2022 05:59:19 +0000 (14:59 +0900)]
Revert "block: remove __blkdev_driver_ioctl"

Revert that commit for use with the blkdev_flushbuf ioctl.

This reverts commit a7cb3d2f09c8405aed59d97a7d02cebea43cd3c7.

Change-Id: Idd8b165ea6c83ecbacdb697afa0532414b330360
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoASoC: seeed-voicecard: Fix to not use asoc_simple_parse_xxx()
Hoegeun Kwon [Wed, 2 Nov 2022 09:26:56 +0000 (18:26 +0900)]
ASoC: seeed-voicecard: Fix to not use asoc_simple_parse_xxx()

Interface changed since kernel v5.13, modified to not use
asoc_simple_parse_xxx().

Ref patch:
Link: https://lore.kernel.org/r/87pmz0wf9u.wl-kuninori.morimoto.gx@renesas.com
Change-Id: I6131e214b44427f4e9a79e53e36947270599b72e
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM: tizen_bcm2711_defconfig: Add AC108 and SEEED configs
Hoegeun Kwon [Wed, 2 Nov 2022 09:26:54 +0000 (18:26 +0900)]
ARM: tizen_bcm2711_defconfig: Add AC108 and SEEED configs

Add support 4channels mic volume.

Change-Id: I69cea4e7fe731dbe84a490aa4872dfc08d6ccbaa
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm64: tizen_bcm2711_defconfig: Add AC108 and SEEED configs
Hoegeun Kwon [Wed, 2 Nov 2022 09:26:51 +0000 (18:26 +0900)]
arm64: tizen_bcm2711_defconfig: Add AC108 and SEEED configs

Add support 4channels mic volume.

Change-Id: Ib8e132a0d225143b7479b50ceeb2f79bc82e9ff0
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm: dts: bcm2711-rpi-4-b: Adds buttons for speaker profile
Jaechul Lee [Mon, 4 Nov 2019 07:16:17 +0000 (16:16 +0900)]
arm: dts: bcm2711-rpi-4-b: Adds buttons for speaker profile

Tizen Speaker Profile uses a keypad that consists of 5 buttons for
up/down/left/right/center. The buttons are connected to GPIO pins as
follows.

GPIO16 : KEY_VOLUMEUP
GPIO13 : KEY_VOLUMEDOWN
GPIO6 : KEY_FASTFORWARD
GPIO12 : KEY_REWIND
GPIO25 : KEY_PLAYPAUSE

Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
 Conflicts:
arch/arm/boot/dts/bcm2711-rpi-4-b.dts

Change-Id: I25bffde7c669c0572496ec3adbd4240fb2ed49cd
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm: dts: bcm2711-rpi-4-b: Adds respeaker 4mic nodes
Jaechul Lee [Mon, 4 Nov 2019 07:09:25 +0000 (16:09 +0900)]
arm: dts: bcm2711-rpi-4-b: Adds respeaker 4mic nodes

adds respeaker 4mic nodes.

Change-Id: I79bf8b7860d53e7c88fa1b37ef2af5cdc0532840
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
23 months agoASoC: ac108: Fix changed interface
Hoegeun Kwon [Wed, 20 Jan 2021 07:33:20 +0000 (16:33 +0900)]
ASoC: ac108: Fix changed interface

Fix changed interface and incorrectly used structure member names.

Change-Id: Ic22bf7d6651537d63f85ad8ba54e429a44874311
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoASoC: ac108: fix build warning about '-Wimplict-fallthrough'
Jaehoon Chung [Thu, 9 Jul 2020 10:04:51 +0000 (19:04 +0900)]
ASoC: ac108: fix build warning about '-Wimplict-fallthrough'

Fix build warning about '-Wimplicit-fallthrough'.

In file included from ./include/linux/acpi.h:15,
                 from ./include/linux/i2c.h:13,
                 from sound/soc/codecs/ac108.c:21:
sound/soc/codecs/ac108.c: In function 'ac108_set_fmt':
./include/linux/device.h:1758:5: warning: this statement may fall through [-Wimplicit-fallthrough=]

Change-Id: I89c995e338d2c2afbcc61d49495b406df76e17ab
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoASoC: seeed-voicecard: Fix init and parse func
Hoegeun Kwon [Mon, 18 May 2020 07:59:35 +0000 (16:59 +0900)]
ASoC: seeed-voicecard: Fix init and parse func

When we rebase the kernel version to v5.x, the interface changed and
a build error occurred. Modify the interface for card init and parse.

This patch is already been reviewd from [1].

[1]
  "Commit: ASoC: ac108: Adds ac108 codec and machine code"
  "Change-Id: Idd1fd85a461c3f2ac03192ec49bf527601d797b7"

Change-Id: Ib90e267e665fa910c1b4b7038375155dbea14d1f
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoASoC: ac108: Fixes kernel bug message when starting to capture
Jaechul Lee [Thu, 9 May 2019 00:26:53 +0000 (09:26 +0900)]
ASoC: ac108: Fixes kernel bug message when starting to capture

The code in the trigger function is moved to prepare function that is
called right before trigger function. clock operation would be ran by
parepare function without disabling preemption.

BUG: scheduling while atomic: arecord/1244/0x00000004
Preemption disabled at:
[<ffffff80087c4a08>] snd_pcm_stream_lock+0x30/0x68

Call trace:
[<ffffff800808b250>] dump_backtrace+0x0/0x270
[<ffffff800808b4e4>] show_stack+0x24/0x30
[<ffffff8008ae87c4>] dump_stack+0xac/0xe8
[<ffffff80080cc814>] __schedule_bug+0x7c/0xd8
[<ffffff8008afb558>] __schedule+0x718/0x880
[<ffffff8008afb6fc>] schedule+0x3c/0xa0
[<ffffff8008aff028>] schedule_timeout+0x190/0x408
[<ffffff8008afc4b8>] wait_for_common+0xa8/0x150
[<ffffff8008afc5c4>] wait_for_completion_timeout+0x2c/0x38
[<ffffff80086e5a0c>] bcm2835_i2c_xfer+0x16c/0x400
[<ffffff80086deedc>] __i2c_transfer+0x12c/0x570
[<ffffff80086df38c>] i2c_transfer+0x6c/0xc0
[<ffffff80086df430>] i2c_master_send+0x50/0x68
[<ffffff8008584454>] regmap_i2c_write+0x34/0x70
[<ffffff800857fe34>] _regmap_raw_write+0x7cc/0x7e0
[<ffffff800857feb8>] _regmap_bus_raw_write+0x70/0x88
[<ffffff800857ea48>] _regmap_write+0x70/0x160
[<ffffff800857ec10>] _regmap_update_bits+0xd8/0xf8
[<ffffff80085800b0>] regmap_update_bits_base+0x68/0x98
[<ffffff8008805838>] ac10x_update_bits+0x48/0x88
[<ffffff8008805c00>] ac108_trigger+0x118/0x130

Change-Id: Ib0f5edc86d363005abd75f989d732e917617f3fe
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
23 months agoASoC: ac108: Adds default 4channels mic volume
Jaechul Lee [Thu, 18 Apr 2019 06:02:37 +0000 (15:02 +0900)]
ASoC: ac108: Adds default 4channels mic volume

It needs to be set default volume to max value.

Change-Id: Ibee68a2885925ec8a3c1ce12c6fa0f7ff8c98dfb
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
23 months agoASoC: ac108: Adds ac108 codec and machine code
Jaechul Lee [Mon, 1 Apr 2019 02:08:55 +0000 (11:08 +0900)]
ASoC: ac108: Adds ac108 codec and machine code

adds respeaker machine code and ac101/ac108 codec code.

ReSpeaker driver
https://github.com/respeaker/seeed-voicecard

Change-Id: I30e687bef34f1e579d1646db43d9835a470df16f
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
23 months agopackaging: remove headers_check in spec file
Jaehoon Chung [Tue, 1 Nov 2022 07:15:19 +0000 (16:15 +0900)]
packaging: remove headers_check in spec file

Remove headers_check in spec file.
When build the current version, WARNING message is displayed.

[   64s] =================== WARNING ===================
[   64s] Since Linux 5.5, 'make headers_check' is no-op,
[   64s] and will be removed after Linux 5.15 release.
[   64s] Please remove headers_check from your scripts.
[   64s] ===============================================

Change-Id: I62aebbe5dae0d5909eefb518ff26dd99ce91ee3e
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agorpi4: boot: config: Add dwc2-tizen driver config
Hoegeun Kwon [Thu, 27 Oct 2022 10:55:48 +0000 (19:55 +0900)]
rpi4: boot: config: Add dwc2-tizen driver config

Add dwc2-tizen driver config for using dwc2-tizen dts by overlays dtb.

Alwo, If dwc2 mode is set to otg, forcing dwc2 mode as peripheral is
proceeded in the early boot time, but since tizen configures the gadget
with configfs after system is prepared. It causes enumeration problem.
To prevent it, default mode will be fixed as peripheral. Actully, since
type-c usb port is only used as power-source and peripheral port, it is
more precise setting though.

Change-Id: I53266309475c397db14f212d81ee64ec1d933a45
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agooverlays: Add dwc2-tizen-overlay
Hoegeun Kwon [Thu, 27 Oct 2022 10:53:47 +0000 (19:53 +0900)]
overlays: Add dwc2-tizen-overlay

Add g-extcon-always-on value,
Set extcon state for dwc2 cable as always true.

Change-Id: Ibfdeb4a022f3be3e584ceaf1ac2f3f7e2fd88499
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agomisc: tizen-inform_reboot: Fix to use kernel_write function
Hoegeun Kwon [Thu, 27 Oct 2022 08:36:02 +0000 (17:36 +0900)]
misc: tizen-inform_reboot: Fix to use kernel_write function

Fixed to use kernel_write instead of vfs_write. When using vfs_write,
there is a problem that the user buffer cannot be accessed.

Change-Id: Idb549b9c833188c585395af8191090dda8a5dc4c
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agomisc: tizen-inform-reboot: Remove force_uaccess begin and end func
Hoegeun Kwon [Thu, 27 Oct 2022 08:31:56 +0000 (17:31 +0900)]
misc: tizen-inform-reboot: Remove force_uaccess begin and end func

Configuration SET_FS is disabled, so this feature is not required.

Change-Id: I349afbd8d2a97aada87080d477cf5ca38d7016c9
Link: https://lore.kernel.org/r/20201202131558.39270-10-mark.rutland@arm.com
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM/arm64: tizen_bcm2711_rt_defconfig: Enable NOP_USB_XCEIV defconfig
Hoegeun Kwon [Wed, 26 Oct 2022 05:46:41 +0000 (14:46 +0900)]
ARM/arm64: tizen_bcm2711_rt_defconfig: Enable NOP_USB_XCEIV defconfig

Enable NOP_USB_XCEIV defconfig for UBS_PHY defconfig.

Change-Id: I1e39da1a7d915e241f542edb87019f9ed649e8c3
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM: tizen_bcm2711_defconfig: Enable NOP_USB_XCEIV defconfig
Hoegeun Kwon [Wed, 26 Oct 2022 05:43:07 +0000 (14:43 +0900)]
ARM: tizen_bcm2711_defconfig: Enable NOP_USB_XCEIV defconfig

Enable NOP_USB_XCEIV defconfig for UBS_PHY defconfig.

Change-Id: I49f8c93e403d333b9aba54239807aa5ef740ebc9
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm64: tizen_bcm2711_defconfig: Enable NOP_USB_XCEIV defconfig
Hoegeun Kwon [Wed, 26 Oct 2022 05:38:29 +0000 (14:38 +0900)]
arm64: tizen_bcm2711_defconfig: Enable NOP_USB_XCEIV defconfig

Enable NOP_USB_XCEIV defconfig for UBS_PHY defconfig.

Change-Id: Ib87795a3296000710a1d2724d9b2816a8680e414
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agorpi4: boot: config: Add display_auto_detect config for mipi dsi
Hoegeun Kwon [Wed, 26 Oct 2022 04:31:14 +0000 (13:31 +0900)]
rpi4: boot: config: Add display_auto_detect config for mipi dsi

Automatically load overlays for detected DSI displays.
Support touchscreen panel(mipi dsi vc4-kms-dsi-7inch).

Change-Id: I479d7bf8c371237b69d7901ec16c12cb714eb1d9
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agopackaging: Add kernel dtb overlays
Hoegeun Kwon [Thu, 20 Oct 2022 01:48:15 +0000 (10:48 +0900)]
packaging: Add kernel dtb overlays

Add kernel dtb overlays into boot partition.

Change-Id: I81449ca04ed865a2eb7e846a70fac23e9ab1d9e1
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agorpi4: boot: config: Add vc4-kms-v3d-pi4 dtoverlays
Hoegeun Kwon [Wed, 19 Oct 2022 10:22:10 +0000 (19:22 +0900)]
rpi4: boot: config: Add vc4-kms-v3d-pi4 dtoverlays

Add vc4-kms-v3d-pi4 dtoverlays.

Change-Id: I7c3fdb210e61b436925d6541c668f60a6feb64c2
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoscripts: mkbootimg_rpi4: Add overlays dtbo
Hoegeun Kwon [Wed, 19 Oct 2022 10:20:07 +0000 (19:20 +0900)]
scripts: mkbootimg_rpi4: Add overlays dtbo

Add overlays dtbo into boot partition.

Change-Id: Ifb1b01c2e48119492ee16971249e15bf768ba74a
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM: tizen_bcm2711_defconfig: Sync with savedefconfig
Hoegeun Kwon [Wed, 19 Oct 2022 08:24:30 +0000 (17:24 +0900)]
ARM: tizen_bcm2711_defconfig: Sync with savedefconfig

With kernel v5.15.73.

Change-Id: I78ef64316bea6f9862be9005b73866c4d429a226
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm64: tizen_bcm2711_defconfig: Sync with savedefconfig
Hoegeun Kwon [Wed, 19 Oct 2022 07:16:07 +0000 (16:16 +0900)]
arm64: tizen_bcm2711_defconfig: Sync with savedefconfig

With kernel v5.15.73.

Change-Id: I0f1457b382c0119f3b6bd968afda2aa0e9d65aa5
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM/arm64: tizen_bcm2711_rt_defconfig: Sync with savedefconfig
Hoegeun Kwon [Wed, 19 Oct 2022 09:34:52 +0000 (18:34 +0900)]
ARM/arm64: tizen_bcm2711_rt_defconfig: Sync with savedefconfig

With kernel v5.15.73.

Change-Id: Ia555ce50808a02335811544335514101c6218ac9
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agousb: serial: cp210x: Fix return type to void
Hoegeun Kwon [Wed, 19 Oct 2022 08:13:58 +0000 (17:13 +0900)]
usb: serial: cp210x: Fix return type to void

Fix return type to void for fix build error.

Change-Id: I507ea7aa5566ccdda17e69a60cc86ff756f0830a
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agodrm/v3d: Add gpu_gem_info node via debugfs
Seung-Woo Kim [Mon, 19 Sep 2022 10:35:14 +0000 (19:35 +0900)]
drm/v3d: Add gpu_gem_info node via debugfs

Add gpu_gem_info node via debugfs of dri debug sysfs for each
process with pid/tgid and its gem objects. Same gem object can be
opened from multiple processes, so from the gpu_gem_info node,
it can print same gem in multiple lines.

Ported from the commit dea4ace78ec7 ("drm/vc4: Add gem_info node
via debugfs") to v3d.

NOTE: From Raspberry Pi 4 board, v3d gpu is card0 and also render node
in dri card128, so accessing can be from both nodes. For render fixed
node, it is /sys/kernel/debug/dri/128/gpu_gem_info.
Also, Raspberry Pi 4 board gives entire gem count and total size with
/sys/kernel/debug/dri/128/bo_stats.

Change-Id: Ica09a3b92010e15dddc0a7ca117d4544106757f7
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agomm: LKSM: fix a bug in the filter length calculation
Sung-hun Kim [Thu, 19 May 2022 11:53:02 +0000 (20:53 +0900)]
mm: LKSM: fix a bug in the filter length calculation

Since type of a size variable in the calculation of the
filter length is signed integer, it can make a buggy
situation when the size of a vma is bigger than a range
of a signed integer variable. In this case, the size is
treated as a negative number. As a result, it incurs a
kernel bug at BUG_ON(size < 0).

This patch changes types of variables and members in
lksm_region data structure from signed integer to unsigned
long. Additionally, remove an assertion BUG_ON(size < 0)
because the size never be a negative number.

Change-Id: I822a2ba5d372596ee55dcbec90a019fdf1dc2416
Signed-off-by: Sung-hun Kim <sfoon.kim@samsung.com>
23 months agoARM/ARM64: tizen_bcm2711: enable CONFIG_RTL8192CU_VENDOR
Jaehoon Chung [Tue, 26 Apr 2022 05:33:01 +0000 (14:33 +0900)]
ARM/ARM64: tizen_bcm2711: enable CONFIG_RTL8192CU_VENDOR

Enable CONFIG_RTL8192CU_VENDOR as module.

Change-Id: Ic3e8954b432bafda47b50dbc1f30c922035435b1
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agonet: rtl8192cu: fix wrong configuration in Makefile
Jaehoon Chung [Tue, 26 Apr 2022 04:36:16 +0000 (13:36 +0900)]
net: rtl8192cu: fix wrong configuration in Makefile

RTL8192CU_VENDOR is to distinguish with mainline and non-mainlne.
RTL8192CU_VENDOR is for non-mainline. So it needs to use
CONFIG_RTL8192CU_VENDOR instead of CONFIG_RTL8182CU.

It's why rtl8192cu dongle doesn't work in RPI4 target.

Change-Id: I93a50f5db3a965fdb4d8ee1e5a70d3956d5f6679
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoARM64: tizen_bcm2711_defconfig: enable configs reelvant to RT2800USB
Jaehoon Chung [Tue, 19 Apr 2022 11:11:40 +0000 (20:11 +0900)]
ARM64: tizen_bcm2711_defconfig: enable configs reelvant to RT2800USB

To use USB Wifi, enable configs relevant to RT2800USB.

Change-Id: Ib0b0f6f65d0e2a6420e2fd220a29fcccbce68c94
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoARM/ARM64: tizen_bcm2711_defconfig: Enable RT_GROUP_SCHED config
Jaehoon Chung [Mon, 11 Apr 2022 00:48:04 +0000 (09:48 +0900)]
ARM/ARM64: tizen_bcm2711_defconfig: Enable RT_GROUP_SCHED config

Enable RT_GROUP_SCHED configuration to use the cgroup scheduling.

Change-Id: Iab166b7ab312a780b77316118194af1999abc4fb
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoUSB: serial: cp210x: add cp210x-stlink driver
Seung-Woo Kim [Wed, 6 Apr 2022 10:55:03 +0000 (19:55 +0900)]
USB: serial: cp210x: add cp210x-stlink driver

Support usb st-link device and its application, add fixed
version of cp210x driver.

Change-Id: Ic1d1a54723697cabf55545d708e2e92f8caddee2
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agoARM/ARM64: tizen_bcm2711_defconfig: Enable BT_HCIBTUSB config
Jaehoon Chung [Mon, 4 Apr 2022 10:48:10 +0000 (19:48 +0900)]
ARM/ARM64: tizen_bcm2711_defconfig: Enable BT_HCIBTUSB config

Enable CONFIG_BT_HCIBTUSB config.
Tizen GHI image is using the USB BT device. To test BT, it needs to enable.

Change-Id: Ic1a233dd10978ee6cd7b9535c4cf240352605bd6
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agoscript: update build-rpi4 script to support RT kernel build
Seung-Woo Kim [Tue, 15 Mar 2022 06:53:59 +0000 (15:53 +0900)]
script: update build-rpi4 script to support RT kernel build

Update build-rpi4 script to support RT kernel build.

Change-Id: I6f6e8e7579b4ae10defc4110949135f0459871ed
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agopackaging: change a file name to _localversion-rt
Jaehoon Chung [Tue, 15 Mar 2022 05:11:01 +0000 (14:11 +0900)]
packaging: change a file name to _localversion-rt

Change a file name from localversion-rt to _localversion-rt.

Change-Id: I3a8663aa8f3baab6006c554aafaa13b090b72471
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
23 months agospec: Build rt packages
Łukasz Stelmach [Thu, 3 Mar 2022 12:51:19 +0000 (13:51 +0100)]
spec: Build rt packages

Build a second set of packages with PREEMPT_RT enabled

Change-Id: I1c0ec964f68eda41d6c628b0476a5246045171ad
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
23 months agoAdd tizen_bcm2711_rt_defconfig for arm and arm64
Łukasz Stelmach [Wed, 2 Feb 2022 20:34:57 +0000 (21:34 +0100)]
Add tizen_bcm2711_rt_defconfig for arm and arm64

Add defconfigfiles with PREEMPT_RT enabled

Change-Id: I58b17d42cfa35ba9bd24c8109cd71f33fe3cd7be
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
23 months agoprintk: suppress printing less important messages to console
Łukasz Stelmach [Mon, 7 Mar 2022 23:22:54 +0000 (00:22 +0100)]
printk: suppress printing less important messages to console

Suppress printing to console messages with loglevel above the
console_loglevel via print_sync().

Change-Id: Ia8d53fd2fadb74e323d776f053c91f7832402021
Fixes: 5d6a5a2378db ("patch-5.10.100-rt62.patch")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
23 months agopatch-5.15.79-rt54.patch
Thomas Gleixner [Tue, 21 Sep 2021 21:12:50 +0000 (23:12 +0200)]
patch-5.15.79-rt54.patch

Apply PREEMPT_RT patches-5.15.79-rt54.tar.gz.

Change-Id: I60af10d2536d58460a280d9a9c1fe7e51472045b
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agousb: gadget: f_fs: Prevent panic due to failure of huge size buffer allocation
Dongwoo Lee [Fri, 26 Oct 2018 01:41:41 +0000 (10:41 +0900)]
usb: gadget: f_fs: Prevent panic due to failure of huge size buffer allocation

The f_fs daemons usually use large size buffer for increasing transfer
performance, but it can cause memory allocation failure in case of
that buddy space is fragmented. Since this, instead of just returning
error in this case, give the chance to retry to allocate memory with
a half length in order to prevent daemon crash due to failure of
buffer allocation.

Change-Id: I4df1987a6f07e558772dcc5f6f020cc550fb1b13
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
 Conflicts:
drivers/usb/gadget/function/f_fs.c

Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoWORKAROUND: Revert "staging: bcm2835-codec: Format changed should trigger drain"
Seung-Woo Kim [Wed, 16 Feb 2022 07:57:00 +0000 (16:57 +0900)]
WORKAROUND: Revert "staging: bcm2835-codec: Format changed should trigger drain"

This reverts commit b7e6b495eff31298ba4665f71b2414cc9a8f99c2.

When setting last buffer done on format changed event, bcm2835-codec does not
work for decoding because it recognizes there is no queued buffer even it is
not well fit for v4l2 codec spec. Maybe it is because v4l2 codec gst plugin
v4l2 usage is not up to date in tizen. Until properly fixing it, revert it
to support video h/w decoding on rpi4 in tizen.

Change-Id: Id7d77ee57e58d42eab5a080d63eb8eb1518e6f7a
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agoRevert "cgroup: Disable cgroup "memory" by default"
Dongwoo Lee [Thu, 10 Feb 2022 10:33:23 +0000 (19:33 +0900)]
Revert "cgroup: Disable cgroup "memory" by default"

This reverts commit 2b13c54592135b6fab269517ed687fa9f80bf8e5.

The feature is used for saving memory which is consumed by memcg-related
structure (32bytes per 4K page), but now it is no longer merged on the
latest raspberry pi kernel. So instead of enabling memory cgroup by
adding command to cmdline.txt while preserving this feature, in order to
enable memory cgroup by default, this reverts commit '2b13c5459213
("cgroup: Disable cgroup "memory" by default")'

Change-Id: I1830129125fb44b36bfe64f97fddf329ea795c3c
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agokdbus: export needed symbols for out-of-tree support
Mateusz Majewski [Thu, 25 Nov 2021 13:32:07 +0000 (14:32 +0100)]
kdbus: export needed symbols for out-of-tree support

We have been asked to move kdbus out-of-tree. It uses a couple
unexported symbols, so we need to (grudgingly) export them.

Change-Id: Ide04c46bbc71f8fffbdefca68959e1048af1c905
Signed-off-by: Mateusz Majewski <m.majewski2@samsung.com>
23 months agokdbus: Revert "fs: unexport poll_schedule_timeout"
Łukasz Stelmach [Mon, 21 Dec 2020 11:40:27 +0000 (12:40 +0100)]
kdbus: Revert "fs: unexport poll_schedule_timeout"

This reverts commit 8f546ae1fc5ce8396827d4868c7eee1f1cc6947a.

Change-Id: I5429471eeb092c55a50e37c0b642d50d69daebc7
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
23 months agopackaging: Added '.gbs.conf' for partial build
Jaechul Lee [Mon, 30 Jan 2017 23:58:22 +0000 (08:58 +0900)]
packaging: Added '.gbs.conf' for partial build

Added gbs configuration file for enhanced building.
it makes gbs build faster than before.

https://source.tizen.org/documentation/reference/git-build-system/maintenance-models-supported-gbs

Change-Id: I79d57aa5eb49d0fbfa9a3744ec2acb032a274e5e
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
23 months agoARM: tizen_bcm2711_defconfig: Enable defconfig for touchscreen
Hoegeun Kwon [Tue, 8 Feb 2022 05:52:25 +0000 (14:52 +0900)]
ARM: tizen_bcm2711_defconfig: Enable defconfig for touchscreen

Required defconfig for 7inch touchscreen operation.

Change-Id: I428d3569ec09e20a8cc44df2b41c00446710059a
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm64: tizen_bcm2711_defconfig: Enable defconfig for touchscreen
Hoegeun Kwon [Tue, 8 Feb 2022 05:52:19 +0000 (14:52 +0900)]
arm64: tizen_bcm2711_defconfig: Enable defconfig for touchscreen

Required defconfig for 7inch touchscreen operation.

Change-Id: I19a35976e0e7782a79275f56c14ebdba82099ec3
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agopackaging: Change the kernel version of the spec file
Hoegeun Kwon [Tue, 8 Feb 2022 05:51:59 +0000 (14:51 +0900)]
packaging: Change the kernel version of the spec file

Change the kernel version to 5.10.95

Change-Id: Ia92dc3b1750e4cc693608bdc06f8bb32efcc8722
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoARM: tizen_bcm2711_defconfig: Enable vc4_hdmi_cec
Hoegeun Kwon [Tue, 8 Feb 2022 05:51:56 +0000 (14:51 +0900)]
ARM: tizen_bcm2711_defconfig: Enable vc4_hdmi_cec

CEC driver is required for hdmi operation.

Change-Id: I4f6333945affe0230c78d38e456f5daee91883f2
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoarm64: tizen_bcm2711_defconfig: Enable vc4_hdmi_cec
Hoegeun Kwon [Tue, 8 Feb 2022 05:51:53 +0000 (14:51 +0900)]
arm64: tizen_bcm2711_defconfig: Enable vc4_hdmi_cec

CEC driver is required for hdmi operation.

Change-Id: I2b63797641163a4da088b492c05c3d957fbaa208
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agomisc/trinity: Fix invalid spdx identifiers for uapi haeder
Seung-Woo Kim [Wed, 5 Jan 2022 07:10:38 +0000 (16:10 +0900)]
misc/trinity: Fix invalid spdx identifiers for uapi haeder

The user api header requires "WITH Linux-syscall-note" for
SPDX-License-Identifier when installing. Without it, the command
"make headers_install" fails. To fix it, add proper spdx license
identifier for uapi header.

Change-Id: I95272a29b6808d32eea0e5e95c399a43705f1c96
Fixes: commit 12fc392663db ("misc/trinity: Add trinity npu driver")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
23 months agomisc/trinity: Fix invalid spdk identifiers
Dongju Chae [Wed, 5 Jan 2022 05:58:28 +0000 (14:58 +0900)]
misc/trinity: Fix invalid spdk identifiers

This patch fixes invalid spdk identifiers.
'//' does not work in non-source files.

Change-Id: I1e1a404eb1769440c2fbfb29a461a27c088b19ef
Signed-off-by: Dongju Chae <dongju.chae@samsung.com>
23 months agomisc/trinity: Add trinity npu driver
Dongju Chae [Wed, 29 Dec 2021 04:58:43 +0000 (13:58 +0900)]
misc/trinity: Add trinity npu driver

This patch uploads trinity npu driver source codes
(for now, triv2 only) including the srnpu iommu codes.

Note that the driver may not available in the rpi4 board,
but let's just sync codes as the reference tizen kernel.

Change-Id: I61353768adb948e6189aeb2c7c79082c3ddbc2ba
Signed-off-by: Dongju Chae <dongju.chae@samsung.com>
[Fix conflicts for kernel v5.15.y]
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agoscripts: mkbootimg_rpi4.sh: Stop build on any kind of errors
Dongwoo Lee [Wed, 1 Dec 2021 05:28:26 +0000 (14:28 +0900)]
scripts: mkbootimg_rpi4.sh: Stop build on any kind of errors

Currently, even if an error occurs during image creation, the script
does not abort, which may result in incorrect image creation. In order
to avoid confusion due to this, if any kind of error occurs during the
build process, the build will be stopped.

Change-Id: I8094f4b97128a8c754e5a9ff22f1b3395a3756b1
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
23 months agorpi4: boot: Update the firmwares for kernel v5.10.95
Marek Szyprowski [Fri, 24 Apr 2020 10:21:34 +0000 (12:21 +0200)]
rpi4: boot: Update the firmwares for kernel v5.10.95

Update RPi4 firmware files to the latest version available in firmware
stable branch. With the previous firmware, the display subsystem failed
to be initialized properly by the updated VC4 DRM drivers available in
v5.10.95 vendor tree:

root:~> dmesg | grep drm
[    0.655835] vc4-drm gpu: [drm] Couldn't stop firmware display driver: -22
[    0.656074] vc4-drm gpu: bound fe400000.hvs (ops vc4_hvs_ops)
[    1.701692] vc4-drm gpu: [drm] Couldn't stop firmware display driver: -22
[    1.703160] vc4-drm gpu: bound fe400000.hvs (ops vc4_hvs_ops)
[    1.704826] vc4-drm gpu: failed to bind fef00700.hdmi (ops vc4_hdmi_ops): -22
[    1.713616] vc4-drm gpu: master bind failed: -22
[    1.713645] vc4-drm: probe of gpu failed with error -22

The updated firmware files fix the above issue.

The updated files comes from https://github.com/raspberrypi/firmware.git
stable branch, commit 48cd70fe84 ("kernel: Update to latest kernel
5.15.61+ from master branch").

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I97de6317f3e5498a372eface39f3a62987b0c45f

23 months agorpi4: boot: config: Add ignore_lcd flag for 7inch touchscreen
Hoegeun Kwon [Tue, 8 Feb 2022 05:52:16 +0000 (14:52 +0900)]
rpi4: boot: config: Add ignore_lcd flag for 7inch touchscreen

Add flag for 7inch touchscreen operation.

Change-Id: Ie750ae0e00daf8448515ba0c4c4596168114882a
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agorpi4: boot: Update the firmwares for kernel v5.10.46
Hoegeun Kwon [Tue, 8 Feb 2022 05:52:03 +0000 (14:52 +0900)]
rpi4: boot: Update the firmwares for kernel v5.10.46

Update the firmwares with the latest version from the vendor git repo.

The commit base is "d06e0ef85c22 kernel: Bump to 5.10.46"

Since firmwares v5.10.47, there is an issue where HDMI-0 UHD does not
work. So we apply firmwaresv5.10.46.

Change-Id: Iffd23e0e866284ea68a42136ce735f5412e59f25
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
23 months agotizen: rpi4: disable obsolete options in config.txt
Marek Szyprowski [Mon, 22 Nov 2021 11:24:04 +0000 (12:24 +0100)]
tizen: rpi4: disable obsolete options in config.txt

Overlays are not supported on Tizen and 'vc4-fkms-v3d' overlay has been
obsoleted long time ago when VC4 DRM gained full support of the RPi4
hardware, so remove it from the default config.txt. Same for
'dtparam=audio=on'.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Iaa4ad049951e1538d818caa144928a08560911bd