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
This commit is contained in:
Minecrell 2022-03-23 19:46:24 +01:00 committed by Dylan Van Assche
parent a987568e07
commit 6c628d66ed
No known key found for this signature in database
GPG key ID: 8642571587897EA1
5 changed files with 19 additions and 12 deletions

View file

@ -4,14 +4,14 @@
# Co-Maintainer: Minecrell <minecrell@minecrell.net> # Co-Maintainer: Minecrell <minecrell@minecrell.net>
pkgname=device-samsung-a3 pkgname=device-samsung-a3
pkgdesc="Samsung Galaxy A3 (2015)" pkgdesc="Samsung Galaxy A3 (2015)"
pkgver=9 pkgver=10
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 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" makedepends="devicepkg-dev"
source=" source="
deviceinfo deviceinfo

View file

@ -3,14 +3,14 @@
# Co-Maintainer: Alexey Min <alexey.min@gmail.com> # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
pkgname=device-samsung-a5 pkgname=device-samsung-a5
pkgdesc="Samsung Galaxy A5 (2015)" pkgdesc="Samsung Galaxy A5 (2015)"
pkgver=9 pkgver=10
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 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" makedepends="devicepkg-dev"
source="deviceinfo" source="deviceinfo"
subpackages=" subpackages="

View file

@ -2,17 +2,16 @@
# Maintainer: Minecrell <minecrell@minecrell.net> # Maintainer: Minecrell <minecrell@minecrell.net>
pkgname=device-samsung-serranove pkgname=device-samsung-serranove
pkgdesc="Samsung Galaxy S4 Mini Value Edition" pkgdesc="Samsung Galaxy S4 Mini Value Edition"
pkgver=10 pkgver=11
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="armv7" arch="armv7"
options="!check !archcheck" options="!check !archcheck"
depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 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" makedepends="devicepkg-dev"
source=" source="
77-modem-samsung-serranove.rules
deviceinfo deviceinfo
rootston.ini rootston.ini
" "
@ -34,8 +33,6 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname devicepkg_package $startdir $pkgname
install -Dm644 "$srcdir"/77-modem-samsung-serranove.rules \
"$pkgdir"/lib/udev/rules.d/77-modem-samsung-serranove.rules
} }
nonfree_firmware() { nonfree_firmware() {
@ -55,7 +52,6 @@ phosh() {
} }
sha512sums=" sha512sums="
4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125 77-modem-samsung-serranove.rules
d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e deviceinfo d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e deviceinfo
94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea rootston.ini 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea rootston.ini
" "

View file

@ -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. # lock query by ModemManager, avoiding a QMI protocol error.
SUBSYSTEM=="wwan", ENV{ID_MM_QMI_FACILITY_LOCK_QUERY_REDUCED}="1" SUBSYSTEM=="wwan", ENV{ID_MM_QMI_FACILITY_LOCK_QUERY_REDUCED}="1"

View file

@ -2,7 +2,7 @@
# Co-Maintainer: Nikita Travkin <nikita@trvn.ru> # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
pkgname=soc-qcom-msm8916 pkgname=soc-qcom-msm8916
pkgdesc="Common package for Qualcomm MSM8916 devices" pkgdesc="Common package for Qualcomm MSM8916 devices"
pkgver=15 pkgver=16
pkgrel=0 pkgrel=0
url="https://postmarketos.org" url="https://postmarketos.org"
license="BSD-3-Clause" license="BSD-3-Clause"
@ -14,11 +14,13 @@ subpackages="
$pkgname-rproc-none:rproc_none $pkgname-rproc-none:rproc_none
$pkgname-rproc-no-modem:rproc_no_modem $pkgname-rproc-no-modem:rproc_no_modem
$pkgname-rproc-all:rproc_all $pkgname-rproc-all:rproc_all
soc-samsung-msm8916-modem-workaround:samsung_modem_workaround
" "
_ucm_commit="23f9d6d4d12c13821d473d6f86908335d3a72026" _ucm_commit="23f9d6d4d12c13821d473d6f86908335d3a72026"
source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
q6voiced.conf q6voiced.conf
77-modem-samsung-msm8916.rules
90-feedbackd-pm8916.rules 90-feedbackd-pm8916.rules
" "
@ -73,8 +75,17 @@ rproc_all() {
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced 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=" sha512sums="
807499a7620a0a7d51aa29fea157cf12f46bf4dcb05e5150f6c2355bf18d1805610988ad98d181e8ba69c8c9844e4d9a51f1553438d167ade89a387eabafd8f9 soc-qcom-msm8916-23f9d6d4d12c13821d473d6f86908335d3a72026.tar.gz 807499a7620a0a7d51aa29fea157cf12f46bf4dcb05e5150f6c2355bf18d1805610988ad98d181e8ba69c8c9844e4d9a51f1553438d167ade89a387eabafd8f9 soc-qcom-msm8916-23f9d6d4d12c13821d473d6f86908335d3a72026.tar.gz
3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98 q6voiced.conf
bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55 77-modem-samsung-msm8916.rules
90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178 90-feedbackd-pm8916.rules 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178 90-feedbackd-pm8916.rules
" "