samsung-jxelte: display, USB network and zram fixes (MR 4852)

Added postmarketos-base-downstream and msm-fb-refresher to jxelte
dependencies.
    The modules_install and firmware_install targets install binary
files as the zram files among others.
    Added the 'mfc_fw.bin' binary to be installed from the firmware
package.
    The '0002-fix-usb-gadget-random-mac.patch' patch make it possible
to get ethernet over usb, and the 'disable-charging-bootmode.patch'
avoid error messages on dmesg about 'sec_battery_probe'.

[ci:skip-build]: already built successfully in CI

device/testing/device-samsung-jxelte/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-samsung-jxelte
 pkgdesc="Samsung Galaxy J7(2016)"
 pkgver=0.1
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-jxelte mkbootimg"
+depends="postmarketos-base postmarketos-base-downstream linux-samsung-jxelte mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -26,7 +26,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-
 sha512sums="
 d496a683197cec642434f9e588e73dff86d3750d5366dfca0e70fa5e255fd96749649a27e65c01b3d8cf8f09e431ac53a7105e1215a6ae9e4a74596a86a3a537  deviceinfo
 "

device/testing/firmware-samsung-jxelte/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=firmware-samsung-jxelte
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy J7 2016 Firmware"
 url="https://gitlab.com/android_samsung_universal7870"
 arch="aarch64"
@@ -20,13 +20,20 @@ for _file in $_files_etc; do
 	source="$source $_prefix-$_file::$_repo/etc/wifi/$_file"
 done
 
+source="$source $_prefix-mfc_fw.bin::$_repo/firmware/mfc_fw.bin"
+
 package() {
 	local file
 	for file in $_files_etc; do
 		install -Dm644 "$srcdir/$_prefix-$file" \
 		"$pkgdir/lib/firmware/postmarketos/$file"
 	done
+	install -Dm644 "$srcdir/$_prefix-mfc_fw.bin" \
+		"$pkgdir/lib/firmware/postmarketos/mfc_fw.bin"
 
 }
-sha512sums="3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin
+sha512sums="
-c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt"
+3a70de63fc0a842306fc05f66f75ac2fcf7b7726b1a195cf6746c49bb0b563e994c46f6f02c4ad3e3a14819cbc5d5ba930ef0ab720aa1cd2a4839a1d04bf0096  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-bcmdhd_sta.bin
+c34bb422662fcfb604ff0942a294d3b8ec360e07ca5b4a586472d42ec37ba60776e010f99f56ce511c5a1779c438605ec7a0fd965dece9b3b70b9e093d7913e3  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-nvram.txt
+1aef3df174f07204e59d099242cb2d0ad63d957583723bd9423be5d316c2aa426e9136bfedde8d3b3080b99fb608e6ffce9ca4f419080b79f9bf00732ec99d57  firmware-samsung-jxelte-9cf17bec93940d68755158e69b9b3abdf3b4ece1-mfc_fw.bin
+"

device/testing/linux-samsung-jxelte/0002-fix-usb-gadget-random-mac.patch

@@ -0,0 +1,36 @@
+From 80287a9b00b966d2441336cd568a297629781251 Mon Sep 17 00:00:00 2001
+From: "armel.guido" <armel.guido@gmx.com>
+Date: Fri, 2 Feb 2024 15:34:04 -0300
+Subject: [PATCH 2/5] fix usb gadget random mac
+
+---
+ drivers/usb/gadget/function/u_ether.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
+index de5b83cb..e9677a1f 100644
+--- a/drivers/usb/gadget/function/u_ether.c
++++ b/drivers/usb/gadget/function/u_ether.c
+@@ -1257,18 +1257,13 @@ struct eth_dev *gether_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
+ 	if (get_ether_addr(dev_addr, net->dev_addr))
+ 		dev_warn(&g->dev,
+ 			"using random %s ethernet address\n", "self");
+-#ifdef CONFIG_USB_ANDROID_SAMSUNG_COMPOSITE
+-	memcpy(dev->host_mac, ethaddr, ETH_ALEN);
+-	printk(KERN_DEBUG "usb: set unique host mac\n");
+-	
+-#else
+ 	if (get_ether_addr(host_addr, dev->host_mac))
+ 		dev_warn(&g->dev,
+ 			"using random %s ethernet address\n", "host");
+ 
+ 	if (ethaddr)
+ 		memcpy(ethaddr, dev->host_mac, ETH_ALEN);
+-#endif
++
+ 	net->netdev_ops = &eth_netdev_ops;
+ 
+ 	net->ethtool_ops = &ops;
+-- 
+2.39.2
+

device/testing/linux-samsung-jxelte/APKBUILD

@@ -3,14 +3,14 @@
 
 pkgname=linux-samsung-jxelte
 pkgver=3.18.14
-pkgrel=4
+pkgrel=5
 pkgdesc="Samsung Galaxy J7(2016) kernel fork"
 arch="aarch64"
 _carch="arm64"
 _flavor="samsung-jxelte"
 url="https://kernel.org"
 license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
+options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-zram"
 makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool-exynos"
 
 # Source
@@ -26,14 +26,13 @@ source="
 	01-fix-dtb.patch
 	02-fix-video-argb-setting.patch
 	linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
+	0002-fix-usb-gadget-random-mac.patch
+	disable-charging-bootmode.patch
 "
 
-
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
 
-
-
 prepare() {
 	default_prepare
 	. downstreamkernel_prepare
@@ -51,18 +50,31 @@ build() {
 }
 
 package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
+	make modules_install firmware_install \
+		O="$_outdir" \
+		ARCH="$_carch" \
+		CC="${CC:-gcc}" \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1
+
+	install -D "$_outdir/include/config/kernel.release" \
+		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
+
+	install -Dm644 "$_outdir/arch/arm64/boot/Image" "$pkgdir/boot/vmlinuz"
+
 	install -Dm644 "$_outdir/arch/$_carch/boot"/dt.img \
 		"$pkgdir"/boot/dt.img
 }
 
 sha512sums="
 e6602a988b66a632114b431743a170fca15f069f3eb5f743d2859bf9d0de020faaeabbf3a9b574a2f3b1167efb04a42c7d818ecff2e730d268d24966e73b16c4  linux-samsung-jxelte-6a08243a47caf497bf07d34baacbf7e822344b24.tar.gz
-637c2db7abaa76c14c75efcc99b5846d522321e7ff67e326eddb237970e6dac45ffbd68bcf87d9523d30caf9f0ed7f314c589a0bff816589dd26a67cb9647877  config-samsung-jxelte.aarch64
+25ec755b4e24c2f534f9420ba2778c4a26ff346e41a46a5b0e242a8c2eac739b2dc3baa9c9fd7b08a3accb178e28fd0be53862bafc2155802d6fb4e3df71a4b7  config-samsung-jxelte.aarch64
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 1ea1501b7b7f1ab3ef4c54a74c01183c96b0403b0a57e3f7c37f299c5c338b86ef5e281a7273b97e87dae5a8d49ffa8a7a3e55d433e34fb53d97fbffdc631d55  01-fix-dtb.patch
 3156b7badd136700ba6332a6d20844ed00452d0a89eda81c32a7d008f61bec1a694d6afbddc35e1f5ffbd400d1119e176361b7e9647ea7edd4310f2cf4ba5caa  02-fix-video-argb-setting.patch
 75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6  linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
+0b1836f86020e9e7701f0cf0819149a8f079b69eab87ef301ded7753cda77207a6fff00103dbd5c2a5f60493b46d060ead5967ea800e55ae29fc651b49aab41a  0002-fix-usb-gadget-random-mac.patch
+32e51c6171bcb72b15f5f11a9c9b3279e03e630f2ea6d14b66fbfdd8a8c1587bdb7e88698197e9a81e05c47dba08d13c1ff4a5e4692d14b042f07dd2006c1cc0  disable-charging-bootmode.patch
 "

device/testing/linux-samsung-jxelte/config-samsung-jxelte.aarch64

@@ -128,11 +128,11 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
-# CONFIG_RD_BZIP2 is not set
+CONFIG_RD_BZIP2=y
-# CONFIG_RD_LZMA is not set
+CONFIG_RD_LZMA=y
-# CONFIG_RD_XZ is not set
+CONFIG_RD_XZ=y
-# CONFIG_RD_LZO is not set
+CONFIG_RD_LZO=y
-# CONFIG_RD_LZ4 is not set
+CONFIG_RD_LZ4=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -213,7 +213,14 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-# CONFIG_MODULES is not set
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_BSG is not set
@@ -382,7 +389,7 @@ CONFIG_SETEND_EMULATION=y
 CONFIG_CMDLINE=""
 # CONFIG_EFI is not set
 # CONFIG_TIMA is not set
-# CONFIG_TIMA_LKMAUTH is not set
+CONFIG_TIMA_LKMAUTH=y
 # CONFIG_TIMA_TEST_INFRA is not set
 # CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE is not set
 
@@ -881,6 +888,7 @@ CONFIG_XPS=y
 # CONFIG_CGROUP_NET_CLASSID is not set
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
 CONFIG_NET_FLOW_LIMIT=y
 
 #
@@ -1018,7 +1026,9 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_ZRAM is not set
+CONFIG_ZRAM=m
+CONFIG_ZRAM_LZ4_COMPRESS=y
+# CONFIG_ZRAM_DEBUG is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -1699,6 +1709,7 @@ CONFIG_I2C_S3C2410=y
 #
 # Other I2C/SMBus bus drivers
 #
+# CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -2233,6 +2244,7 @@ CONFIG_I2C_RTC6213N=y
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
 
 #
 # Audio decoders, processors and mixers
@@ -3092,6 +3104,8 @@ CONFIG_DMA_OF=y
 #
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_R8188EU is not set
 # CONFIG_R8723AU is not set
@@ -3220,6 +3234,8 @@ CONFIG_ION_EXYNOS_OF=y
 # CONFIG_FIQ_WATCHDOG is not set
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_LUSTRE_FS is not set
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
 
@@ -3977,11 +3993,16 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_USER_COPY is not set
+# CONFIG_TEST_BPF is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_SAMPLES is not set
@@ -3991,6 +4012,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 
 #
 # Security options
@@ -4056,6 +4078,7 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=y
 # CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
 CONFIG_CRYPTO_ABLK_HELPER=y
 
 #
@@ -4189,9 +4212,21 @@ CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
-# CONFIG_XZ_DEC is not set
+CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_BCJ is not set
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=y

device/testing/linux-samsung-jxelte/disable-charging-bootmode.patch

@@ -0,0 +1,14 @@
+diff --git a/drivers/staging/samsung/sec_batt.c b/drivers/staging/samsung/sec_batt.c
+index 89960640..5de0b91e 100644
+--- a/drivers/staging/samsung/sec_batt.c
++++ b/drivers/staging/samsung/sec_batt.c
+@@ -20,9 +20,6 @@ EXPORT_SYMBOL(lpcharge);
+ 
+ static int sec_bat_is_lpm_check(char *str)
+ {
+-	if (strncmp(str, "charger", 7) == 0)
+-		lpcharge = 1;
+-
+ 	pr_info("%s: Low power charging mode: %d\n", __func__, lpcharge);
+ 
+ 	return lpcharge;