shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,080,385 Commits 55 Branches 2,486 Tags
9eeeb8705a6b99d89ce8d2c13acf37cf146a599e
Commit Graph

1080385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dongjin Kim
9eeeb8705a ODROID-M1: dtb/dtbo: add Waveshare 1.69" ISP lcd 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ib9d7616fc5145149ed6416708272f7d93431dae5
 2024-01-10 00:17:54 +09:00
Dongjin Kim
9daf51bbce ODROID-M1S: dtb/dtbo: add 1.44" 128x128 TFT LCD with 'st7735' controller 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I46ae1370749feeb2da330ef951172bc3c9b6e510
 2024-01-09 00:29:35 +09:00
Dongjin Kim
cb43bd573c ODROID-M1S: dtb/dtbo: add Waveshare 1.47" ISP lcd 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I630dfa9a96a1bd227052ef410c60f8330f3a1e4f
 2024-01-09 00:29:35 +09:00
Dongjin Kim
3fe0363ed7 ODROID-M1S: dtb/dtbo: add Waveshare 1.69" ISP lcd 
Change-Id: Id6de414b02cf79354f2d93c1c914f31a9fb042de
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2024-01-09 00:29:35 +09:00
Steve Jeong
9cd2fd27d5 ODROID-M1/S: dtb/dtbo: Add circuitpython dtbo 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: Ic7510118c686d6f3a0cbcd4bd20bb396207dae80
 2024-01-08 08:09:13 +00:00
Dongjin Kim
c02b8f4544 ODROID-COMMON: drm/tiny: add support for Waveshare 1.47" / 1.69" LCD module 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Id7cf8db6061d753e99daca805f3a9ad930c02537
 2024-01-04 16:36:15 +09:00
Xuezhi Zhang
be416fdc5f ODROID-COMMON: drm/tiny: add support for Waveshare 2inch LCD module 
This adds a new module for the ST7789V controller with parameters for
the Waveshare 2inch LCD module.

Signed-off-by: Xuezhi Zhang <zhangxuezhi1@yulong.com>
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I6b8e472ed86c06b2293d00410fa3c55b5de1ac0e
 2024-01-04 16:35:53 +09:00
Dongjin Kim
275c8052ec Merge "ODROID-COMMON: drm/rockchip: remove calling 'rockchip_drm_show_logo()'" into odroidm1-5.10.y 2024-01-02 02:18:17 +09:00
Dongjin Kim
5380fc5baa Merge "ODROID-M1/M1S: Add iwlwifi driver." into odroidm1-5.10.y 2023-12-26 19:22:16 +09:00
Dongjin Kim
93aca98223 ODROID-M1S: arm64/dts: Fix wrong GPIO for touch screen reset 
GPIO4_B0 is assigned to Ethernet 'GMAC1_RXD1_M1'

Change-Id: I0f8feffb0e41e14a3dd71b3e296acf86965838ef
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2023-12-26 16:15:34 +09:00
Luke Go
4639069c52 ODROID-M1/M1S: Add iwlwifi driver. 
Signed-off-by: Luke Go <sangch.go@gmail.com>
Change-Id: Ic64cabc75546b1bcdc7105250ba7125af3fc724e
 2023-12-26 12:31:37 +09:00
Dongjin Kim
5ba51a06df ODROID-COMMON: drm/rockchip: remove calling 'rockchip_drm_show_logo()' 
For some reason, kernel crashes when booting with ODROID-Vu8S panel
display unlike 'ODROID-Vu5S' which use 'compatible = "simple-panel-dsi'.
This patch is a quick work around sine there is no problem showing boot
splash rendered in U-Boot even if the function is not called. :(

[    3.067170] rockchip-drm display-subsystem: bound fe040000.vop (ops 0xffffffc008bec7d0)
[    3.067365] rockchip-drm display-subsystem: bound fe060000.dsi (ops 0xffffffc008bfcab0)
[    3.067421] mali fde60000.gpu: Probed as mali0
[    3.068264] (��: Underflow of regulator enable count
[    3.068413] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
[    3.090908] Mem abort info:
[    3.091167]   ESR = 0x96000005
[    3.091447]   EC = 0x25: DABT (current EL), IL = 32 bits
[    3.091940]   SET = 0, FnV = 0
[    3.092220]   EA = 0, S1PTW = 0
[    3.092508] Data abort info:
[    3.092773]   ISV = 0, ISS = 0x00000005
[    3.093119]   CM = 0, WnR = 0
[    3.093397] user pgtable: 4k pages, 39-bit VAs, pgdp=00000001049eb000
[    3.093975] [0000000000000000] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000
[    3.094766] Internal error: Oops: 96000005 [#1] SMP
[    3.095206] Modules linked in:
[    3.095493] CPU: 2 PID: 89 Comm: kworker/u8:1 Not tainted 5.10.0-odroid-arm64 #1 Ubuntu 5.10.160-202312182246~focal
[    3.096419] Hardware name: Hardkernel ODROID-M1S (DT)
[    3.096882] Workqueue: events_unbound deferred_probe_work_func
[    3.097409] pstate: 80c00009 (Nzcv daif +PAN +UAO -TCO BTYPE=--)
[    3.097959] pc : __memcpy+0xbc/0x180
[    3.098289] lr : drm_mode_copy+0x30/0x48
[    3.098646] sp : ffffffc009e13830
[    3.098945] x29: ffffffc009e13830 x28: ffffff810564e000
[    3.099426] x27: ffffff8104c90240 x26: 0000000000000003
[    3.099906] x25: ffffff8100d2b000 x24: ffffff8105c21448
[    3.100386] x23: ffffff81049f9600 x22: ffffff810564e000
[    3.100865] x21: 0000000000000000 x20: 0000000000000000
[    3.101344] x19: ffffff81049f9180 x18: 0000000000000000
[    3.101823] x17: 00000000000057b0 x16: 0000000000000000
[    3.102302] x15: 000000000000000a x14: 0000000000000577
[    3.102781] x13: ffffffffffffffff x12: ffffffffffffffff
[    3.103261] x11: 0000000000000000 x10: 0000000000000a20
[    3.103740] x9 : ffffffc0085b4408 x8 : ffffff81049f9200
[    3.104219] x7 : 0000000000000000 x6 : ffffff81049f9180
[    3.104698] x5 : 0000000000000040 x4 : 0000000000000000
[    3.105177] x3 : 0000000000000080 x2 : fffffffffffffff8
[    3.105655] x1 : 0000000000000000 x0 : ffffff81049f9180
[    3.106135] Call trace:
[    3.106370]  __memcpy+0xbc/0x180
[    3.106672]  drm_mode_duplicate+0x30/0x44
[    3.107046]  ili9881c_get_modes+0x34/0xb8
[    3.107420]  drm_panel_get_modes+0x2c/0x48
[    3.107795]  dw_mipi_dsi_connector_get_modes+0x48/0x54
[    3.108262]  rockchip_drm_show_logo+0xad4/0x1438
[    3.108680]  rockchip_drm_bind+0x6b8/0x740
[    3.109053]  try_to_bring_up_master+0xa0/0x284
[    3.109460]  component_master_add_with_match+0xdc/0x100
[    3.109939]  rockchip_drm_platform_probe+0x254/0x28c
[    3.110392]  platform_drv_probe+0x5c/0xac
[    3.110764]  really_probe+0x2dc/0x46c
[    3.111101]  driver_probe_device+0x134/0x144
[    3.111495]  __device_attach_driver+0xd0/0x118
[    3.111904]  bus_for_each_drv+0xa0/0xc8
[    3.112252]  __device_attach+0xf8/0x184
[    3.112600]  device_initial_probe+0x1c/0x28
[    3.112984]  bus_probe_device+0x38/0x9c
[    3.113333]  deferred_probe_work_func+0xdc/0xf0
[    3.113757]  process_one_work+0x1e0/0x298
[    3.114129]  process_scheduled_works+0x4c/0x50
[    3.114536]  worker_thread+0x1f4/0x278
[    3.114885]  kthread+0xf4/0x104
[    3.115177]  ret_from_fork+0x10/0x30

Change-Id: I2c76298218dfd2ef1609fe1d8810ca4045ed04b4
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2023-12-21 17:32:26 +09:00
Arnd Bergmann
dd878e40cc scsi: lpfc: Fix gcc -Wstringop-overread warning 
gcc-11 warns about an strnlen with a length larger than the size of the
passed buffer:

drivers/scsi/lpfc/lpfc_attr.c: In function 'lpfc_nvme_info_show':
drivers/scsi/lpfc/lpfc_attr.c:518:25: error: 'strnlen' specified bound 4095 exceeds source size 24 [-Werror=stringop-overread]
  518 |                         strnlen(LPFC_NVME_INFO_MORE_STR, PAGE_SIZE - 1)
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In this case, the code is entirely valid, as the string is properly
terminated, and the size argument is only there out of extra caution in
case it exceeds a page.

This cannot really happen here, so just simplify it to a sizeof().

Link: https://lore.kernel.org/r/20210322160253.4032422-10-arnd@kernel.org
Fixes: afff0d2321 ("scsi: lpfc: Add Buffer overflow check, when nvme_info larger than PAGE_SIZE")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
 2023-12-18 22:45:51 +09:00
Steve Jeong
f0e33d28fc ODROID-M1S: dtb/dtbo: Add uart5, uart7, uart9 overlays 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: Ide44b337ddf5c351f1397c1338acb37a89fdc1b4
 2023-11-28 18:37:23 +09:00
Steve Jeong
4c53b9b6a1 ODROID-M1S: arm64/dts: Fixup uart5 pinctrl 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I88fb8b67ac3de8df4306eadd6422b6597c661c44
 2023-11-28 18:37:23 +09:00
Steve Jeong
491a87c554 ODROID-M1/S: dtb/dtbo: Add weather_board_zero 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I0013aa97e97c535ace228e76a7b491735a15ea02
 2023-11-28 16:26:47 +09:00
Dongjin Kim
2294df4bd1 ODROID-M1S: arm64/dts: fix typo for PIN_35 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I44efaf7456c075ab83a92888df3a81f6e74189b0
 2023-11-24 13:08:13 +09:00
Tobias Gruetzmacher
5c18ae0b6a nvme-pci: Crucial P2 has bogus namespace ids 
[ Upstream commit d6c52fa3e9 ]

This adds a quirk for the Crucial P2.

Signed-off-by: Tobias Gruetzmacher <tobias-git@23.gs>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: 74391b3e69 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Change-Id: Ibcabeb0be115459df0c639f22cd638bf5d94bb03
 2023-11-24 10:37:03 +09:00
Stefan Reiter
d665257c48 nvme-pci: add NVME_QUIRK_BOGUS_NID for ADATA XPG GAMMIX S50 
[ Upstream commit 3765fad508 ]

ADATA XPG GAMMIX S50 drives report bogus eui64 values that appear to
be the same across drives in one system. Quirk them out so they are
not marked as "non globally unique" duplicates.

Signed-off-by: Stefan Reiter <stefan@pimaker.at>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: 74391b3e69 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for T-FORCE Z330 SSD")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Change-Id: I105713f41f06931d7eec2aea12d70c05653ddf57
 2023-11-24 10:37:02 +09:00
Xander Li
3449c2a47c nvme-pci: disable write zeroes on various Kingston SSD 
[ Upstream commit ac9b57d4e1 ]

Kingston SSDs do support NVMe Write_Zeroes cmd but take long time to
process.  The firmware version is locked by these SSDs, we can not expect
firmware improvement, so disable Write_Zeroes cmd.

Signed-off-by: Xander Li <xander_li@kingston.com.tw>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Stable-dep-of: 8d6e38f636 ("nvme-pci: add NVME_QUIRK_BOGUS_NID for Netac NV7000")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Change-Id: Icd0676b9ac84ce39ed4b93168e940bd4e1a1d623
 2023-11-24 10:33:46 +09:00
ckkim
59e4ac47ac ODROID-M1S: dtb/dtbo: add new device tree for spdif sound (using 14-pin "J3": pin-12(GPIO3_C.5)) 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: I6f80deba2aad8f267ae3859fa850b3e10609c6d0
 2023-11-23 12:47:28 +09:00
Steve Jeong
37b5e76cac ODROID-M1S: arm64/dts: Fixup device-tree compatible string 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I3deb45c249ae9c236ea9ccae54091079df96ff23
 2023-11-14 14:27:57 +09:00
Dongjin Kim
674a9d7cea ODROID-COMMON: net/wireless: rtl8821cu: fix use absolute path 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ic720bee7fef50acdb2d435c22522a487b346d8e3
 2023-11-14 14:27:57 +09:00
Steve Jeong
99f510e4d7 ODROID-M1S: dtb/dtbo: Add can0 overlay 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I2e0413a0f1bd59a5f9286cb492a83039b5849f8b
 2023-11-14 14:27:57 +09:00
Steve Jeong
6dbfba9772 ODROID-M1: dtb/dtbo: Change the can0 clock setting location to the parent device tree 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I02e34573ac00bba7a8b182930a25f5a942b43d48
 2023-11-14 14:27:56 +09:00
Luke go
eb813b205e ODROID-M1/S: arm64/dtbs: Changed led names. 
- power -> red
- work -> blue

Signed-off-by: Luke go <sangch.go@gmail.com>
Change-Id: I5454a5c51bbbe242feed1be8f9d6c4f764f07c6b
 2023-11-14 14:27:56 +09:00
Steve Jeong
fc230888f7 ODROID-M1S: dtb/dtbo: remove ov5647 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I48040466a845fea514e5962ce1174009de4e0df3
 2023-11-14 14:27:56 +09:00
ckkim
171a522826 ODROID-M1S: arm64/dts: add new device tree for ODROID-Vu5S display/touchscreen (rename "vu5s") 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: I7181acfb9d6edbbff1195978c26b4e18853268c7
 2023-11-14 14:27:56 +09:00
Dongjin Kim
8fa4e313ea ODROID-COMMON: drm/panel: improving Vu8M display panel setup 
Change-Id: I8a35f7b0bdc5e6654a3b8f7214e808b0514faf1a
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2023-11-14 14:27:56 +09:00
Dongjin Kim
3735ade228 ODROID-M1S: drm/panel: panel setting update 
Change-Id: I8c91ab413e645027294112541435d9f3923cefe6
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2023-11-14 14:27:56 +09:00
Steve Jeong
b1718c4268 ODROID-M1S: dtb/dtbo: Add board_multiio overlay 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I44d6820e8df3bd05cf3824c37a52edb68a2d5603
 2023-11-14 14:27:56 +09:00
Dongjin Kim
94513a0c74 ODROID-M1/M1S: dtb/dtbo: add to switch FIQ debug port to UART2 
By default, the debug port is binded to /dev/ttyFIQ0 for the FIQ
debugger. In order to switch the port to generic UART port,
'fiq-debugger' must be disabled and 'uart2' is required to be enabled
with proper pins.

Change-Id: I213cd319a119bde044458a59b2b0a1bded1f9546
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
 2023-11-14 14:27:56 +09:00
Steve Jeong
6db04b29a1 ODROID-M1S: dtb/dtbo: Add board_stepper overlay 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: Id2a5ba73566dd3eccadf8e43955859b807f61bd5
 2023-11-14 14:27:56 +09:00
Steve Jeong
83d45143ee ODROID-M1S: arm64/dts: Add gpiomem 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I6d88a64bc18c908907d3550060c206b5db61e4f2
 2023-11-14 14:27:56 +09:00
Dongjin Kim
97940bfde4 ODROID-M1S: arm64/dts: change GPIO polarity of power LED 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I8b31788d10afe12d88c513822eeeb683a052d962
 2023-11-14 14:27:56 +09:00
ckkim
7442e66c14 ODROID-M1S: dtb/dtbo: add new device tree for 5" display 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: Ie0002e9db55c230149dcd0e6530f8d525619ad38
 2023-11-14 14:27:56 +09:00
ckkim
b5ce0291bd ODROID-M1S: arm64/dts: 3.5" LCD + LCD connector board (dsi-1lane,RGB888) 
Change-Id: Ic4adc6e3019d78c6364fdba3515c49ff80b7d885
 2023-11-14 14:27:55 +09:00
Dongjin Kim
3e2f2dbd73 ODROID-M1S: dtb/dtbo: add new device tree for ODROID-Vu8S display 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Iae3b1b7fd4499c1b6b112ea47ba6dd7516b370cb
 2023-11-14 14:27:55 +09:00
Dongjin Kim
d2c685f6e3 ODROID-M1S: arm64/dts: add touch screen device node to I2C2 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I906bd184a13ec9dba2536d2a99be837f61ca0193
 2023-11-14 14:27:55 +09:00
ckkim
cb381f39b2 ODROID-M1S: arm64/dts: Set default HP_OUT volume to 0dB. 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: I8e90c6052265d63a242b7a26e9d3eac624443e1f
 2023-11-14 14:27:55 +09:00
Dongjin Kim
349af09015 ODROID-M1: drm/panel: add new panel compatible 'odroid,vu8m' 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I841191641d9d0218b3881cf5b802904c751fa8f5
 2023-11-14 14:27:55 +09:00
Dongjin Kim
6d883603ec ODROID-M1S: drm/panel: add new 8" MIPI display panel 'Vu8S' 
The new panel ODROID-Vu8S is physically same as ODROID-Vu8M, but it's
necessary to apply different controller setup. Therefore new display
panel information with controller setup codes are added as
'odroid,vu8s'.

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Icc005d1793aa2cd69fc618e8663c5f5b133e221f
(cherry picked from commit 855f74c871898b280ffd839336eafd068078a85d)
 2023-11-14 14:27:55 +09:00
ckkim
da64f8fb59 ODROID-M1S: arm64/dts: USB dr_mode change to "otg" (micro-usb port) 
Signed-off-by: ckkim <changkon12@gmail.com>
Change-Id: I6669b92dda33e0f118b6df1e4731188d7bec4a33
 2023-11-14 14:27:55 +09:00
Steve Jeong
19afe5f464 ODROID-M1S: defconfig: Add sensor shtc1 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: Ic79a6621a9dcabf099bc1a537aa4098c7c80dd37
 2023-11-14 14:27:55 +09:00
Steve Jeong
a3d6bec07b ODROID-M1S: defconfig: Add mcp251xfd module 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I86802a579d16f7b77ba02d2091d7afc4cd9c37b9
 2023-11-14 14:27:55 +09:00
Steve Jeong
98505ea46b ODROID-M1S: dtb/dtbo: Add odroidm1s dtb overlays 
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I4b2146e4e8a1800d6112ccbce5997a0b874f0aaf
 2023-11-14 14:27:55 +09:00
Dongjin Kim
341179d501 ODROID-M1S: add new board ODROID-M1S with Rockchip RK3566 
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Signed-off-by: ckkim <changkon12@gmail.com>
Signed-off-by: Steve Jeong <steve@how2flow.net>
Change-Id: I88a7636892858b6cf9fc1c602b7b7b7707e4a3ea
 2023-11-14 14:27:55 +09:00
Dongjin Kim
94a0430efb ODROID-COMMON: PCIe/dw: rockchip: fix compile error 
This error happens after reverting the commit,
[c3f038c2dc] "PCI: rockchip: dw_ep: Delaying the link training after hot reset"

drivers/pci/controller/dwc/pcie-dw-rockchip.c: In function 'rk_pcie_really_probe':
drivers/pci/controller/dwc/pcie-dw-rockchip.c:2105:9: error: 'struct rk_pcie' has no member named 'hot_rst_wq'
  rk_pcie->hot_rst_wq = create_singlethread_workqueue("rk_pcie_hot_rst_wq");
         ^~
drivers/pci/controller/dwc/pcie-dw-rockchip.c:2106:14: error: 'struct rk_pcie' has no member named 'hot_rst_wq'
  if (!rk_pcie->hot_rst_wq) {
              ^~
In file included from ./include/linux/srcu.h:21:0,
                 from ./include/linux/notifier.h:16,
                 from ./include/linux/clk.h:14,
                 from drivers/pci/controller/dwc/pcie-dw-rockchip.c:11:

Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: Ic948980de4a1ba9a30fbdcb4daf8f518c96f054b
 2023-11-06 14:24:08 +09:00
Dongjin Kim
bd1ea209fd Revert "PCIe: dw: rockchip: Delaying the link training after hot reset" 
This reverts commit ae1af9a1a7fa7214501bde3a35af0fec25b455a3.

Change-Id: Iec1c3c54ea3a33aca1d010bd1c0c36c771da501e
 2023-11-06 14:24:08 +09:00
Dongjin Kim
fcdb66609c Revert "PCIe: dw: rockchip: Setting rk_pcie_hot_rst_wq before interrupt unmask" 
This reverts commit 709dbbec5e.

Change-Id: Id8c813c377fd404c244692bf169ecab4c3c98171
 2023-11-06 14:24:07 +09:00