Skip to content
Snippets Groups Projects

linux-postmarketos-qcom-msm8974: upgrade to 6.13.2

Merged Luca Weiss requested to merge msm8974-6.13 into master

Manual kconfig changes:

  • QCOM_RPMPD=y

Tested on:

  • Fairphone 2 (fairphone-fp2)
  • Google Nexus 5 (lg-hammerhead)
  • HTC One M8 (htc-m8) @amessier
  • OnePlus One (oneplus-bacon)
  • Samsung Galaxy Note 3 (samsung-hlte)
  • Samsung Galaxy S5 (samsung-klte) @alexeymin
  • Sony Xperia Z3 (sony-leo)
Edited by Alexey Minnekhanov

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Packages you maintain have been changed: @alexeymin

  • Luca Weiss added 8 commits

    added 8 commits

    Compare with previous version

  • Luca Weiss marked the checklist item Fairphone 2 (fairphone-fp2) as completed

    marked the checklist item Fairphone 2 (fairphone-fp2) as completed

  • Luca Weiss marked the checklist item Google Nexus 5 (lg-hammerhead) as completed

    marked the checklist item Google Nexus 5 (lg-hammerhead) as completed

  • boot test and wifi test on HTC One M8: all OK

  • Luca Weiss marked the checklist item HTC One M8 (htc-m8) @amessier as completed

    marked the checklist item HTC One M8 (htc-m8) @amessier as completed

  • Luca Weiss marked the checklist item OnePlus One (oneplus-bacon) as completed

    marked the checklist item OnePlus One (oneplus-bacon) as completed

  • Luca Weiss marked the checklist item Sony Xperia Z3 (sony-leo) as completed

    marked the checklist item Sony Xperia Z3 (sony-leo) as completed

  • Luca Weiss marked this merge request as ready

    marked this merge request as ready

  • Luca Weiss resolved all threads

    resolved all threads

  • Clayton Craft approved this merge request

    approved this merge request

  • Robert Eckelmann approved this merge request

    approved this merge request

  • added kernel label

  • Alexey Minnekhanov resolved all threads

    resolved all threads

  • It's very hard to test fully with BPO's armv7 queue stuck and locally pmbootrap wants to build ~10 packages for armv7 that are present in git repo, but not present in binary repo, and fails with

    $ pmbootstrap install --password=145863 --no-firewall --no-fde
    [19:43:55] WARNING: --no-fde is deprecated, as it is now the default.
    [19:43:55] *** (1/4) PREPARE NATIVE CHROOT ***
    [19:43:56] (native) Creating chroot
    [19:43:57] (native) install cryptsetup util-linux parted
    [19:43:58] *** (2/4) CREATE DEVICE ROOTFS ("samsung-klte") ***
    [19:43:59] (native) install qemu-arm
    [19:43:59] Register qemu binfmt (arm)
    [19:44:00] (rootfs_samsung-klte) Creating chroot
    [19:44:06] Building 3 packages
    [19:44:06]    * systemd-edge/polkit
    [19:44:06]    * systemd-edge/systemd-services
    [19:44:06]    * systemd-edge/postmarketos-base-systemd
    [19:44:06] => (1/3) systemd-edge/polkit: Installing dependencies
    [19:44:06] Initializing armv7 buildroot
    [19:44:06] (buildroot_armv7) Creating chroot
    [19:44:08] (buildroot_armv7) install abuild apk-tools build-base ccache git hexdump
    [19:44:12] (native) install ccache-cross-symlinks abuild gcc-armv7 g++-armv7 crossdirect
    [19:44:14] (buildroot_armv7) install dbus-dev duktape-dev expat-dev glib-dev gobject-introspection-dev linux-pam-dev meson perl systemd-dev
    [19:44:20] => systemd-edge/polkit: Building package
    [19:45:52] => systemd-edge/polkit: Done!
    [19:45:52] => (2/3) systemd-edge/systemd-services: Installing dependencies
    [19:45:52] => systemd-edge/systemd-services: Building package
    [19:49:43] => systemd-edge/systemd-services: Done!
    [19:49:43] => (3/3) systemd-edge/postmarketos-base-systemd: Installing dependencies
    [19:49:43] (buildroot_armv7) install kbd kmod less linux-pam-pmos login-utils polkit>9990 rtkit so:libkmod.so.2 systemd systemd-services systemd-timesyncd tzdata
    [19:49:45] => systemd-edge/postmarketos-base-systemd: Building package
    [19:49:50] => systemd-edge/postmarketos-base-systemd: Done!
    [19:49:50] => Finished building packages
    [19:49:50] (rootfs_samsung-klte) install postmarketos-base-systemd
    [19:49:55] WARNING: about to install linux-postmarketos-qcom-msm8974 6.13.2-r0 (local pmaports: 6.11.4-r2, consider 'pmbootstrap pull')
    [19:49:56] WARNING: cyclical build dependency: building phosh with binary package of phosh
    [19:49:56] Building 6 packages
    [19:49:56]    * systemd-edge/phosh
    [19:49:56]    * systemd-edge/upower
    [19:49:56]    * systemd-edge/mutter
    [19:49:56]    * systemd-edge/networkmanager
    [19:49:56]    * systemd-edge/gnome-shell
    [19:49:56]    * systemd-edge/wireplumber
    [19:49:56] => (1/7) systemd-edge/phosh: Installing dependencies
    [19:49:56] (native) install ccache-cross-symlinks abuild gcc-armv7 g++-armv7 crossdirect
    [19:49:56] (buildroot_armv7) install adwaita-icon-theme bash callaudiod-dev dbus-x11 dbus:org.freedesktop.Secrets desktop-file-utils evince-dev evolution-data-server-dev feedbackd-dev font-adobe-source-code-pro font-cantarell gcr-dev gettext-dev glib-dev gmobile-dev gnome-bluetooth-dev gnome-control-center gnome-desktop-dev gnome-session gnome-settings-daemon gnome-shell-schemas gsettings-desktop-schemas gtk+3.0-dev libadwaita-dev libgudev-dev libhandy1-dev libsecret-dev linux-pam-dev meson modemmanager-dev networkmanager-dev phoc phosh-keyboard polkit-dev pulseaudio-dev py3-docutils systemd-dev upower-dev wayland-dev wayland-protocols xwayland
    [19:50:46] => systemd-edge/phosh: Building package
    [19:55:11] NOTE: The failed command's output is above the ^^^ line in the log file: /home/lexx/.local/var/pmbootstrap/log.txt
    [19:55:11] ERROR: Couldn't build armv7/phosh-99990.44.1-r0.apk!

    pmbootstrap log:

     --extra-library=gnome-bluetooth-3.0 --extra-library=gnome-desktop-3 --extra-library=callaudio-0.1 --extra-library=handy-1 --extra-library=m --extra-library=rt --extra-library=gudev-1.0 --extra-library=feedback-0.0 --extra-library=pulse --extra-library=pulse-mainloop-glib --extra-library=nm --extra-library=polkit-agent-1 --extra-library=polkit-gobject-1 --extra-library=systemd --extra-library=mm-glib --extra-library=secret-1 --extra-library=upower-glib --extra-library=wayland-client --extra-library=pam --extra-library=girepository-1.0 --sources-top-dirs /home/pmos/build/src/phosh-0.44.1/ --sources-top-dirs /home/pmos/build/src/phosh-0.44.1/output/ --warn-error
    
    (process:2665298): GLib-GObject-CRITICAL **: 16:55:10.116: g_param_spec_double: assertion 'default_value >= minimum && default_value <= maximum' failed
    
    (process:2665298): GLib-GObject-CRITICAL **: 16:55:10.119: validate_pspec_to_install: assertion 'G_IS_PARAM_SPEC (pspec)' failed
    
    (process:2665298): GLib-GObject-CRITICAL **: 16:55:10.119: g_param_spec_ref_sink: assertion 'G_IS_PARAM_SPEC (pspec)' failed
    
    (process:2665298): GLib-GObject-CRITICAL **: 16:55:10.119: g_param_spec_unref: assertion 'G_IS_PARAM_SPEC (pspec)' failed
    qemu: uncaught target signal 11 (Segmentation fault) - core dumped
    Command '['/home/pmos/build/src/phosh-0.44.1/output/tmp-introspecta5s20nbu/Phosh-0', '--introspect-dump=/home/pmos/build/src/phosh-0.44.1/output/tmp-introspecta5s20nbu/functions.txt,/home/pmos/build/src/phosh-0.44.1/output/tmp-introspecta5s20nbu/dump.xml']' died with <Signals.SIGSEGV: 11>.
    ninja: subcommand failed
    >>> ERROR: phosh: build failed
    (2599295) [19:55:11] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    (2599295) [19:55:11] NOTE: The failed command's output is above the ^^^ line in the log file: /home/lexx/.local/var/pmbootstrap/log.txt
    (2599295) [19:55:11] ERROR: Couldn't build armv7/phosh-99990.44.1-r0.apk!

    Due to the same reasons I'm thinking there is absolutely no rush to test or merge this MR, as it will not be built into packages repo anyway, until the situation with BPO armv7 queue is resolved. ( build.postmarketos.org#152 (closed) )

  • samsung-klte hangs before phosh startup on pmos logo with jumping dots with no meaningful output on UART (not form linux, I suppose our kernel is built without uart_dm earlycon enabled)

    maybe phosh is still broken?

    
    Android Bootloader - UART_DM Initialized!!!
    [fuelgauge] init_fuel_gauge: battery type = 1
    [fuelgauge] init_fuel_gauge: fg_reset_soc = 0
    [fuelgauge] init_fuel_gauge: vcell=3756, soc=59, ocv=3917
    
    MODEL_NAME:{{SM-G900F}}
    eMMC_SERIAL_NUMBER:{{110100343030303733000cb01cc76200}}
    
    BOOTLOADER VERSION : G900FXXS1CQD1
    Get DATA success.
    Get DATA success.
    check_pit_integrity: invalid pit magic code.(0x0)
    AST_POWERON
    [eMMC] WP status = 0x00, addr = 0x0, (0x01: Temporary WP; 0x02: Power_on WP)
    [eMMC] WP status = 0x02, addr = 0x0, (0x01: Temporary WP; 0x02: Power_on WP)
    Android Bootloader - UART_DM Initialized!!!
    [0] welcome to lk
    
    [0] SCM call: 0x2000601 failed with :fffffffc
    [0] Failed to initialize SCM
    [10] platform_init()
    [10] target_init()
    [60] MMC card: 400073 (0.0, 02 2003), manufacturer: 11, OEM: 100, capacity: 15758000128 bytes
    [60] SDHC Running in HS400 mode
    [80] Done initialization of the card
    [80] lk2nd_init()
    [80] Booted @ 0x8000, r0=0x0, r1=0x0, r2=0x100
    [90] Found valid DTB with 3040 bytes total
    [90] Command line from previous bootloader: lk2nd androidboot.sec_atd.tty=/dev/ttyHSL0 sec_log=0x100000@0x10000008 sec_dbg=0x80000@0x10100008 sec_debug.reset_reason=0x8 mdss_mdp.panel=1:dsi:0:mdss_dsi_samsung_1080p_cmd_mag lcd_id=0x622872 Panelres=0 pmic_info=m
    [160] Detected device: Samsung Galaxy S5 (SM-G900F) (compatible: samsung,klte)
    [170] keys: 1 keymap overrides applied
    [180] MDP continuous splash detected: pipe RGB_0, base: 0x3200000, stride: 3240, src: 1080x1920 (0,0), img: 1080x1920, out: 1080x1920 (0,0), format: 0x2243f (bpp: 3)
    [200] Display refresh: cmd mode: 1, auto refresh: 0 (sel: 0x21f20)
    [210] Registering wrapper bio devices...
    [210] Registering mmc_sdhci bio devices...
    [220] SD card MMC is unavailable.
    [220] block devices:
    [220]  | dev        | label           | size       | Leaf |
    [230]  | wrp0p26    | lk2nd           |    512 KiB | Yes  |
    [230]  | wrp0p25p1  |                 |  11798 MiB | Yes  |
    [240]  | wrp0p25p0  |                 |    243 MiB | Yes  |
    [240]  | wrp0p25    | userdata        |  12042 MiB |      |
    [250]  | wrp0p24    | hidden          |    100 MiB | Yes  |
    [250]  | wrp0p23    | cache           |    200 MiB | Yes  |
    [260]  | wrp0p22    | system          |   2500 MiB | Yes  |
    [260]  | wrp0p21    | persdata        |      9 MiB | Yes  |
    [270]  | wrp0p20    | persist         |      8 MiB | Yes  |
    [270]  | wrp0p19    | ssd             |      8 KiB | Yes  |
    [280]  | wrp0p18    | fsc             |      1 KiB | Yes  |
    [280]  | wrp0p17    | backup          |      6 MiB | Yes  |
    [290]  | wrp0p16    | fota            |     13 MiB | Yes  |
    [300]  | wrp0p15    | recovery        |     15 MiB | Yes  |
    [300]  | wrp0p14    | boot            |     12 MiB | Yes  |
    [310]  | wrp0p13    | modemst2        |      3 MiB | Yes  |
    [310]  | wrp0p12    | modemst1        |      3 MiB | Yes  |
    [320]  | wrp0p11    | efs             |     14 MiB | Yes  |
    [320]  | wrp0p10    | param           |     10 MiB | Yes  |
    [330]  | wrp0p9     | pad             |      6 MiB | Yes  |
    [330]  | wrp0p8     | fsg             |      3 MiB | Yes  |
    [340]  | wrp0p7     | tz              |    512 KiB | Yes  |
    [340]  | wrp0p6     | rpm             |    512 KiB | Yes  |
    [350]  | wrp0p5     | aboot           |      2 MiB | Yes  |
    [350]  | wrp0p4     | ddr             |     32 KiB | Yes  |
    [360]  | wrp0p3     | dbi             |     64 KiB | Yes  |
    [360]  | wrp0p2     | sbl1            |    512 KiB | Yes  |
    [370]  | wrp0p1     | modem           |     57 MiB | Yes  |
    [370]  | wrp0p0     | apnhlos         |     15 MiB | Yes  |
    [380]  | wrp0       |                 |  15028 MiB |      |
    [390] boot: Trying to boot from the file system...
    [450] Updating device tree: start
    [450] Custom CPU enable-method detected, skipping SMP spin table
    [460] Updating device tree: done
    [460] booting linux @ 0x8000, ramdisk @ 0x2200000 (3097909), tags/device tree @ 0x2000000

    we need:

    CONFIG_DEBUG_LL=y
    CONFIG_DEBUG_QCOM_UARTDM=y
    CONFIG_DEBUG_UART_PHYS=0xf991e000
    CONFIG_DEBUG_UART_VIRT=0xfa71e000
    CONFIG_EARLY_PRINTK=y (maybe)

    and in cmdline console=ttyMSM0,115200,n8 earlyprintk ignore_loglevel

    Edited by Alexey Minnekhanov
  • OK, fbkeyboard + openrc works, bluetooth still doesn't ( dmesg )

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading