From 6c628d66ed3a21ea05f6a1688f3ddfe09ab0fd0a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 23 Mar 2022 19:46:24 +0100 Subject: [PATCH] samsung-{a3,a5}: also apply ModemManager "facility lock" workaround (MR 3021) It seems like at least samsung-a5 needs the same "facility lock" workaround as samsung-serranove, otherwise ModemManager can not detect the SIM card correctly. Move it to a subpackage of soc-qcom-msm8916 and apply it to samsung-a3 as well just to be sure. So far this issue seems limited to Samsung devices, at least bq-paella is not affected (tested with the same SIM card), so it does not seem right to apply it unconditionally to all devices. [ci:skip-build] Already built successfuly on CI in MR --- device/community/device-samsung-a3/APKBUILD | 4 ++-- device/community/device-samsung-a5/APKBUILD | 4 ++-- device/community/device-samsung-serranove/APKBUILD | 8 ++------ .../77-modem-samsung-msm8916.rules} | 2 +- device/community/soc-qcom-msm8916/APKBUILD | 13 ++++++++++++- 5 files changed, 19 insertions(+), 12 deletions(-) rename device/community/{device-samsung-serranove/77-modem-samsung-serranove.rules => soc-qcom-msm8916/77-modem-samsung-msm8916.rules} (65%) diff --git a/device/community/device-samsung-a3/APKBUILD b/device/community/device-samsung-a3/APKBUILD index 73fa3caf5..221d9b305 100644 --- a/device/community/device-samsung-a3/APKBUILD +++ b/device/community/device-samsung-a3/APKBUILD @@ -4,14 +4,14 @@ # Co-Maintainer: Minecrell pkgname=device-samsung-a3 pkgdesc="Samsung Galaxy A3 (2015)" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc" + soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround" makedepends="devicepkg-dev" source=" deviceinfo diff --git a/device/community/device-samsung-a5/APKBUILD b/device/community/device-samsung-a5/APKBUILD index 00d95f072..0a75c71dd 100644 --- a/device/community/device-samsung-a5/APKBUILD +++ b/device/community/device-samsung-a5/APKBUILD @@ -3,14 +3,14 @@ # Co-Maintainer: Alexey Min pkgname=device-samsung-a5 pkgdesc="Samsung Galaxy A5 (2015)" -pkgver=9 +pkgver=10 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc" + soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround" makedepends="devicepkg-dev" source="deviceinfo" subpackages=" diff --git a/device/community/device-samsung-serranove/APKBUILD b/device/community/device-samsung-serranove/APKBUILD index 1c3f0f821..7e4f5d882 100644 --- a/device/community/device-samsung-serranove/APKBUILD +++ b/device/community/device-samsung-serranove/APKBUILD @@ -2,17 +2,16 @@ # Maintainer: Minecrell pkgname=device-samsung-serranove pkgdesc="Samsung Galaxy S4 Mini Value Edition" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" arch="armv7" options="!check !archcheck" depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 - soc-qcom-msm8916 soc-qcom-msm8916-rproc" + soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround" makedepends="devicepkg-dev" source=" - 77-modem-samsung-serranove.rules deviceinfo rootston.ini " @@ -34,8 +33,6 @@ build() { package() { devicepkg_package $startdir $pkgname - install -Dm644 "$srcdir"/77-modem-samsung-serranove.rules \ - "$pkgdir"/lib/udev/rules.d/77-modem-samsung-serranove.rules } nonfree_firmware() { @@ -55,7 +52,6 @@ phosh() { } sha512sums=" -4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125 77-modem-samsung-serranove.rules d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e deviceinfo 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea rootston.ini " diff --git a/device/community/device-samsung-serranove/77-modem-samsung-serranove.rules b/device/community/soc-qcom-msm8916/77-modem-samsung-msm8916.rules similarity index 65% rename from device/community/device-samsung-serranove/77-modem-samsung-serranove.rules rename to device/community/soc-qcom-msm8916/77-modem-samsung-msm8916.rules index 989b1b2b3..adf782eba 100644 --- a/device/community/device-samsung-serranove/77-modem-samsung-serranove.rules +++ b/device/community/soc-qcom-msm8916/77-modem-samsung-msm8916.rules @@ -1,3 +1,3 @@ -# Tag wwan ports of device samsung-serranove to reduce the facility +# Tag wwan ports of some Samsung devices to reduce the facility # lock query by ModemManager, avoiding a QMI protocol error. SUBSYSTEM=="wwan", ENV{ID_MM_QMI_FACILITY_LOCK_QUERY_REDUCED}="1" diff --git a/device/community/soc-qcom-msm8916/APKBUILD b/device/community/soc-qcom-msm8916/APKBUILD index 66f3a09b8..67dafa246 100644 --- a/device/community/soc-qcom-msm8916/APKBUILD +++ b/device/community/soc-qcom-msm8916/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Nikita Travkin pkgname=soc-qcom-msm8916 pkgdesc="Common package for Qualcomm MSM8916 devices" -pkgver=15 +pkgver=16 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -14,11 +14,13 @@ subpackages=" $pkgname-rproc-none:rproc_none $pkgname-rproc-no-modem:rproc_no_modem $pkgname-rproc-all:rproc_all + soc-samsung-msm8916-modem-workaround:samsung_modem_workaround " _ucm_commit="23f9d6d4d12c13821d473d6f86908335d3a72026" source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz q6voiced.conf + 77-modem-samsung-msm8916.rules 90-feedbackd-pm8916.rules " @@ -73,8 +75,17 @@ rproc_all() { install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced } +samsung_modem_workaround() { + pkgdesc="Workaround for modem facility lock issue on some Samsung devices" + depends="" + + install -Dm644 "$srcdir"/77-modem-samsung-msm8916.rules \ + "$subpkgdir"/lib/udev/rules.d/77-modem-samsung-msm8916.rules +} + sha512sums=" 807499a7620a0a7d51aa29fea157cf12f46bf4dcb05e5150f6c2355bf18d1805610988ad98d181e8ba69c8c9844e4d9a51f1553438d167ade89a387eabafd8f9 soc-qcom-msm8916-23f9d6d4d12c13821d473d6f86908335d3a72026.tar.gz 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf +bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55 77-modem-samsung-msm8916.rules 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178 90-feedbackd-pm8916.rules "