Age | Commit message (Collapse) | Author |
|
into android13-msm-pixelwatch-5.15-24Q1-release.
Change-Id: I7f69b8f56e8c390d9a1252ac7e8a20fe3e0cdef3
|
|
- Add 'enabled' sysfs node to gate HVDCP negotiation at runtime.
Default is 0 (disabled). Write 1 to the node to enable.
- For an HVDCP request, the state machine will now first transition to
a READY state. When in READY, the state machine will start
negotiation only if enabled is set.
Bug: 319005242
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:7d418969964edbc0ca6aceaf133b6c21b577c36c)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:62f5509d09c84eafcc101dac64596a332fbcfaeb)
Merged-In: I89933873cc50a3b1fe2617ff96a05ba78df6fed6
Change-Id: I89933873cc50a3b1fe2617ff96a05ba78df6fed6
|
|
'partner-android-review.googlesource.com/2692101', 'partner-android-review.googlesource.com/2692103', 'partner-android-review.googlesource.com/2692104', 'partner-android-review.googlesource.com/2692105', 'partner-android-review.googlesource.com/2692106', 'partner-android-review.googlesource.com/2696542'] into android13-msm-pixelwatch-5.15-24Q1-release.
Change-Id: I45c471d5f8704f0bcf36fbc38d5d05308d5636bf
|
|
Set the BCL (battery current limit) socd-trip to 100 which equates to 0% soc, effectively
disabling this functionality in the driver.
Bug: 293546868
Test: Verified /dev/thermal/tz-by-name/socd/trip_point_1_temp is 100.
Test: Verified no performance mitigations were applied below 10% SOC.
(cherry picked from commit 5303602db85fa38841be3fb6dab3bfccc6a8ce85)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:d4b31138f316099a902d14ff1b6305236899dff3)
Merged-In: Ia9e86b7d9392460ec3943aeab9d7d2c28446d470
Change-Id: Ia9e86b7d9392460ec3943aeab9d7d2c28446d470
|
|
Switch to using a separate work queue for controller work items. The
queue will be flushed if the system wants to suspend, ensuring that
pending work gets handled. New work would come in from alarms and
interrupts, which would cause suspend aborts, and result in a new call
to flush the queue once the system is ready to suspend again.
Also, instead of setting an alarm when the controller should rerun,
simply restart processing in the current controller_work() invocation.
Bug: 308351023
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:dd253e751980506087dda158a5df123a916571bd)
(cherry picked from commit 8fdd3aa31808356a9092f015213f019188f0a13c)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:6fd04ca759501b3601bf3a24cfa0d3fabba461b8)
Merged-In: I6fb2cf8c3eec7a8c22b19922f120c9ca72a92173
Change-Id: I6fb2cf8c3eec7a8c22b19922f120c9ca72a92173
|
|
The timeout is compared against the cumulative time spent in "active"
states, which are SUSPEND_WAIT, ENTER_IDLE_WAIT, NEGOTIATION, and
SETTLE_MONITOR.
Once the timeout is reached, the charger is forced to its base voltage
and the HVDCP controller exits.
Bug: 308351023
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:5f6d9c7816bd0fbc6bebe8705d7ca4513f4988fe)
(cherry picked from commit 7616c19406bd0c93ad1ed0595c52cc2df39ba193)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:90889f716e40d807e47e7c26ede92507e20bc327)
Merged-In: I6a863f58ebbfbadcf2d5152e5fed99a96f6aa30e
Change-Id: I6a863f58ebbfbadcf2d5152e5fed99a96f6aa30e
|
|
Pause state machine if PMIC enters boost mode. Resume once it exits
boost mode. However, only pause if the current state is one that sends
HVDCP commands, since such a state is the only one where the boost
matters.
For example, if during SETTLE_MONITOR audio starts playing, if the
voltage settle check passes, there is no need to pause the state
machine. However, if while in SETTLE_MONITOR, audio starts playing,
and the charger voltage rises over the configured ceiling, the state
machine must switch back to NEGOTIATION, at which point it must pause.
Pausing is encoded in the state machine as an explicit state.
Bug: 308351023
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:8d2188d5a3bbf91a83127fc2094dfa682c357ec4)
(cherry picked from commit ca1c4a0790b414b9e1e2924610b451b8fa74def3)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:dcb79e6aeaabcc62b4b8dc350a2f900eaaa7c9e1)
Merged-In: Iac24c3f3ca2ea4391c0d6c2c1d85508be593ab7c
Change-Id: Iac24c3f3ca2ea4391c0d6c2c1d85508be593ab7c
|
|
Add core functionality needed to perform HVDCP voltage boosting such
that the charger voltage stays below a voltage celing after the
boosting process is complete.
Bug: 308351023
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:09a2d44eeefbeeed688ebbc592a9527cf94de74e)
(cherry picked from commit 4ac20cd937e4de35374c58ea6ed834fb9071a84c)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:94c4bacad155ba3ffffdde31cb4f88900246d2c3)
Merged-In: I323225111c98dc8405a6297d8fc5f78d9c58e091
Change-Id: I323225111c98dc8405a6297d8fc5f78d9c58e091
|
|
The base version of this module contains supporting logic and plumbing,
controller logic to be added in follow-on commits.
Bug: 308351023
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:4c05eb3f8a81a8445914f530a1f384ecd435fe8c)
(cherry picked from commit 932ffb57ff89d8e76e91370ba19f9079c59c5ce8)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:382d3cb6019ad1bf5cc71bc1b2c8c61488d7e738)
Merged-In: Ie0cec2fffff15128dc62efccc8dd2acc9f6618f9
Change-Id: Ie0cec2fffff15128dc62efccc8dd2acc9f6618f9
|
|
Since healthd only waits 5s for a valid battery SoC reading, the retry
interval here should be lower, to give multiple chances for healthd to
get a valid reading before giving up and displaying (battery)?
The extra retries will produce more logspam, but this is not expected to
be significant.
Bug: 308427366
Test: manual
Signed-off-by: Kevin Wang <jingpgwan@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:528bdabf4e6a5c6bcbd433f27657c19bf0c28364)
Merged-In: If302e8b9860ec4f18e2894e6f45b7f5b760d7e3c
Change-Id: If302e8b9860ec4f18e2894e6f45b7f5b760d7e3c
|
|
'partner-android-review.googlesource.com/2544499'] into android13-msm-pixelwatch-5.15-24Q1-release.
Change-Id: Ibb80abc8a3a41d968b7a94411fdcd9504d9e9904
|
|
Bug: 286601976
Signed-off-by: Jenny Ho <hsiufangho@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:fcea38f11ad40d28e73afe5583d200cf6593d0ae)
Merged-In: Ibd371b7ac45d20926872152925c207d5b96734bf
Change-Id: Ibd371b7ac45d20926872152925c207d5b96734bf
|
|
This requires HW (e.g. EEPROM) support.
Bug: 286601976
Signed-off-by: Jenny Ho <hsiufangho@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:feeaa625bc195e562fec21f354ceeb183a129677)
Merged-In: I5c6dc71d84431e7a17dbbabba1fe0f190770b796
Change-Id: I5c6dc71d84431e7a17dbbabba1fe0f190770b796
|
|
'partner-android-review.googlesource.com/2623101', 'partner-android-review.googlesource.com/2623102', 'partner-android-review.googlesource.com/2623103', 'partner-android-review.googlesource.com/2623104', 'partner-android-review.googlesource.com/2623105'] into android13-msm-pixelwatch-5.15-eos-release.
Change-Id: Id30a7c92bef3e4d67da90ce01f1f28909af2a174
|
|
By moving the location where the bootloader adds the
"usb_force_disable_boot" parameter, we can remove the
"usb_disable_never" parameter that served as an override.
Now, to override, we can simply specify "usb_force_disable_boot" again,
using "fastboot oem cmdline add" (or "set").
Bug: 298708751
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:e40915b11257f84b50ccbe054ff989c735c09915)
Merged-In: I5f384f8a0d2952e5f86393cc4fdde794c3dd24c8
Change-Id: I5f384f8a0d2952e5f86393cc4fdde794c3dd24c8
|
|
Bug: 298708751
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:b8c9dd360bd91d96d4ec7d551f3749054c861ca6)
Merged-In: I1a21298581dd5e6d69e999e22d14ecdb9883fcfc
Change-Id: I1a21298581dd5e6d69e999e22d14ecdb9883fcfc
|
|
Bug: 298708751
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:f7dc822f13d9694bc7e10bd4e16fbe75294b9998)
Merged-In: Ib20e510c5a53b4fc650929b8667ba616cdbb6cee
Change-Id: Ib20e510c5a53b4fc650929b8667ba616cdbb6cee
|
|
Additionally, gating functionality now requires the dt property
"usb-gate-supported" to be set.
Bug: 298708751
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:610d08e969aa281fcad265ab7d78bcd61659f1a0)
Merged-In: Ice63e97ecbff8408a0f2440fa5884b5476c66371
Change-Id: Ice63e97ecbff8408a0f2440fa5884b5476c66371
|
|
The shim module sits in between a USB extcon (e.g. PMIC module) and
the destination for the extcon event (i.e. a USB phy module).
It can forward or prevent the event from making it to the destination,
thereby decoupling the modules.
For the shim module to be in the middle, use the devicetree. Set
the "extcon" property to the USB extcon's phandle, and replace the USB
extcon phandle in the destination's dt node with the shim module's
phandle.
Bug: 298708751
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:befc01d824fdcc01ba31477b62c2b96b3c4a0e19)
Merged-In: I8ff0b3f125b208d00db2d681912da79384191355
Change-Id: I8ff0b3f125b208d00db2d681912da79384191355
|
|
Sync state will remove the disp_cc device vote once the device
driver probe is complete. It removes the DSI clock vote early
for continuous splash usecase because DSI driver takes its vote
in component binding instead of device driver probe.
This change adds disp_cc vote for smmu_sde_unsec to
retain vote till bind_all API is called.
Bug: 274981265
Signed-off-by: Matt Stephenson <stephensonmatt@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:4978c6da045e1af3c79ccf84bd3446c118c21242)
Merged-In: Ia3f867616c90106528b75c07f30facb3f949c3c4
Change-Id: Ia3f867616c90106528b75c07f30facb3f949c3c4
|
|
into android13-msm-pixelwatch-5.15-eos-release.
Change-Id: I4a041db7f17a4c0e635075f85a7a4af6c06e1a77
|
|
Disable the fcc stepper functionality as its not necessary and
interferes with soft JEITA configuration via google_battery.c.
Bug: 245387484
Test: Confirm no observation of higher than expected charge current during soft JEITA.
Signed-off-by: Brandon Edens <brandonedens@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:9230e75fa96bed09554e26f782958ced25909b7d)
Merged-In: I4bbdee9ff19dc09cefeb6a92571e1ba2f181af7d
Change-Id: I4bbdee9ff19dc09cefeb6a92571e1ba2f181af7d
|
|
android13-msm-pixelwatch-5.15-eos-release
Change-Id: I1494c2f3e08afd8d29bff15a9ef441c230e55f32
|
|
All CPUs on the 5100 platform support running 32 bit tasks. The
allow_mismatched_32bit_el0 option is unnecessary and also harmful
as it imposes a performance penalty when resuming from suspend.
All userspace tasks end up being woken, regardless of whether they
were frozen.
Bug: 292148167
Change-Id: Icc9acbd89532373f0424184588243a02e14e9b43
Signed-off-by: Steve Muckle <smuckle@google.com>
|
|
into android13-msm-pixelwatch-5.15-eos-release.
Change-Id: Ifcedeefbe24af5eb0eb837b0f6467b080285bd05
|
|
The presence of the android_kmalloc_64_create command line parameter
causes 64 byte slab caches to be created, and consequently allows
kmalloc to return 64 byte aligned buffers. However, the kernel assumes
that buffers from kmalloc are actually 128 byte aligned, and this
assumption is used at compile time to attempt to optimize operations
on pointers from kmalloc (e.g. masking certain bits). This can lead
to scenarios where a pointer to a buffer is not manipulated correctly.
Consider the following case:
static void foo() {
unsigned long buf_offset;
u8 *data_buf = __kmalloc();
...
buf_offset = offset_in_page(data_buf)
}
Assuming a 4 KB page size, the offset_in_page() macro should compile to
just:
data_buf & 0xfff
However, an examination of the code that the Clang compiler emits
revealed that the offset_in_page() operation in this case evaluates to:
data_buf & 0xf80
This occurs because the code for offset_in_page() is inlined into the
body of foo, which obtains a pointer directly from invoking __kmalloc().
When deciding what constant to use to calculate the offset into the
page, the compiler can use its knowledge of the alignment of pointers
from __kmalloc() to generate a mask that may be more optimal for
further operations (note that the mask that is used--0xf80--is just
0xfff aligned to 128 bytes).
The scenario described above is problematic if a buffer that was
allocated through kmalloc is 64-byte aligned, as the offset of the
buffer into the page will be calculated incorrectly, which can cause
inconsistencies about where the start of the buffer is (e.g. when
DMA-mapping buffers for peripherals).
Thus, remove support for android_kmalloc_64_create to avoid creating
this mismatch in the behavior of __kmalloc().
Bug: 288214403
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
(cherry picked from commit 8a0f64261a1f824b6ebeb12ee981af9968fb9c81)
(cherry picked from https://partner-android-review.googlesource.com/q/commit:2e76e56fb1ebb3a3f22dae0c4914a2de830ca216)
Merged-In: I0d8f8d9c758ed2ac907d3ca22c840e80622c9fea
Change-Id: I0d8f8d9c758ed2ac907d3ca22c840e80622c9fea
|
|
The presence of the android_kmalloc_64_create command line parameter
causes 64 byte slab caches to be created, and consequently allows
kmalloc to return 64 byte aligned buffers. However, the kernel assumes
that buffers from kmalloc are actually 128 byte aligned, and this
assumption is used at compile time to attempt to optimize operations
on pointers from kmalloc (e.g. masking certain bits). This can lead
to scenarios where a pointer to a buffer is not manipulated correctly.
Consider the following case:
static void foo() {
unsigned long buf_offset;
u8 *data_buf = __kmalloc();
...
buf_offset = offset_in_page(data_buf)
}
Assuming a 4 KB page size, the offset_in_page() macro should compile to
just:
data_buf & 0xfff
However, an examination of the code that the Clang compiler emits
revealed that the offset_in_page() operation in this case evaluates to:
data_buf & 0xf80
This occurs because the code for offset_in_page() is inlined into the
body of foo, which obtains a pointer directly from invoking __kmalloc().
When deciding what constant to use to calculate the offset into the
page, the compiler can use its knowledge of the alignment of pointers
from __kmalloc() to generate a mask that may be more optimal for
further operations (note that the mask that is used--0xf80--is just
0xfff aligned to 128 bytes).
The scenario described above is problematic if a buffer that was
allocated through kmalloc is 64-byte aligned, as the offset of the
buffer into the page will be calculated incorrectly, which can cause
inconsistencies about where the start of the buffer is (e.g. when
DMA-mapping buffers for peripherals).
Thus, remove support for android_kmalloc_64_create to avoid creating
this mismatch in the behavior of __kmalloc().
Bug: 288214403
Change-Id: I0d8f8d9c758ed2ac907d3ca22c840e80622c9fea
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
|
|
These are for battery swelling data logging, which is disabled.
Bug: 286601976
Change-Id: Ic5f39461084bbfac734855d305523b0d5557364f
Signed-off-by: Jenny Ho <hsiufangho@google.com>
|
|
Will be used for seluna factory testing. May be used in future for
wake on crown or side button press.
Bug: 288478456
Test: Confirmed GPIO05 register values via SPMI debug sysfs
Change-Id: Ica464d57f0955920277d337f04507b43b52feeaa
Signed-off-by: Peter Carlson <petercarlson@google.com>
|
|
into android13-msm-pixelwatch-5.15-eos-release.
Change-Id: I32b86eb64e37baf93e9486ac1fcd9789a0d84e0e
|
|
Make the SOC scaling offset for shutdown configurable via device tree
rather than hard coded into the codebase.
Bug: 284989176
Test: Adjust google,soc_shutdown_offset then
cat /sys/class/power_supply/sw5100_bms/soc_shutdown_offset
Signed-off-by: Brandon Edens <brandonedens@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:9cbfbab86bd53a604a5afb635cbb4aaadd48020b)
Merged-In: I6f4637ea9d09d1257ffc365d4fc06035110d087e
Change-Id: I6f4637ea9d09d1257ffc365d4fc06035110d087e
|
|
android13-msm-pixelwatch-5.15
|
|
Make the SOC scaling offset for shutdown configurable via device tree
rather than hard coded into the codebase.
Bug: 284989176
Test: Adjust google,soc_shutdown_offset then
cat /sys/class/power_supply/sw5100_bms/soc_shutdown_offset
Signed-off-by: Brandon Edens <brandonedens@google.com>
Change-Id: I6f4637ea9d09d1257ffc365d4fc06035110d087e
|
|
Stackdepot is needed to let KASAN capture stacktraces for
paths that allocate and free memory. These stacktraces are
valuable to developers when using KASAN, so ensure that the
kernel build can build a kernel image that enables stackdepot
for KASAN builds.
This has the added benefit of not having to repackage the vendor_boot
image in the platform build to enable stackdepot, as KASAN kernel
builds will have stackdepot enabled by default.
Bug: 289439846
Change-Id: I7b3fa55c65e13ac40a5a0041f803a0565e63436b
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
|
|
ramdump may not always be available or enabled, in which case
having kernel panic stack would be useful for a diagnosis.
Bug: 289154073
Test: echo c > /proc/sysrq-trigger & monitor console/last_kmsg
Change-Id: I04371ad4b3e66a6bf499507b0239bc6b93d683b2
Signed-off-by: Zabi Khadri <zkhadri@google.com>
|
|
into android13-msm-pixelwatch-5.15-eos-release.
Change-Id: I4c177745b55adb5a9c7ebd4b50feb1908a555840
|
|
This enables RPM stats collection/surfacing in bugreports.
Bug: 272351038
Test: RPM sleep stats show up in ABT state residencies
Signed-off-by: Dwayne Barry <dwaynebarry@google.com>
Signed-off-by: Andrew Evans <andrewevans@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:a91f95f0b8e9d0fb73c87a1874e6c8b570017774)
Merged-In: I9b1d32758802f9a951b0f42f037545f17e7710d9
Change-Id: I9b1d32758802f9a951b0f42f037545f17e7710d9
|
|
Add the se2_4uart pinctrl and qupv3 configuration to device tree. Have
it disabled by default.
Bug: 283260046
Test: Confirm by dmesg | grep ttyHS1
Test: loopback test on ttyHS1
Change-Id: I440e11e8651c4e094147f1ce097327392d5efcb0
Signed-Off-By: Rishi Sikka <rishisikka@google.com>
|
|
This enables RPM stats collection/surfacing in bugreports.
Bug: 272351038
Test: RPM sleep stats show up in ABT state residencies
Change-Id: I9b1d32758802f9a951b0f42f037545f17e7710d9
Signed-off-by: Dwayne Barry <dwaynebarry@google.com>
Signed-off-by: Andrew Evans <andrewevans@google.com>
|
|
There are certain modules that only need to be loaded during first stage
init when booting into charger mode. Otherwise, they can be loaded
during second stage init. Thus, introduce
vendor_kernel_boot_charger_modules.sw5100 and point the
MODULES_CHARGER_LIST variable at that file. This ensures that the
modules in that file are loaded as part of first stage init when booting
into charger mode. Otherwise, they are loaded as part of second stage
init during normal boot.
Bug: 266752750
Change-Id: I3049fcc7d3759c2fc20b70a6807d352d948369b5
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
|
|
The wlan_mac kernel module reads the provisioned WLAN MAC address from
device-tree and sets it using Qualcomm's icnss API for use by the WLAN
driver.
Bug: 237754339
Bug: 268749749
Change-Id: I3367edb4562f74553f8527ae59bfc4c15834e68c
Signed-off-by: Andrew Evans <andrewevans@google.com>
|
|
This is very helpful for debugging and testing e.g. SPMI registers.
Bug: 275082505
Change-Id: I44d9c9c8f1ae37140aee7d7227ac4e2526e020a7
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
|
|
Test: Manual
Bug: 261941266
Bug: 267448761
Change-Id: I7674d866fb9e1097e2d966953c15881245ba7ca4
Signed-off-by: Florian Muller <mullerf@google.com>
|
|
Move eos/p11/seluna common config into new sw5100.fragment
Bug: 275631531
Test: generated .config files match before/after changes
Change-Id: I59c5a01a225008af2712e7bb035d683922f98e14
|
|
android13-msm-pixelwatch-5.15
|
|
into android13-msm-pixelwatch-5.15
|
|
1. Also strip debug_info out of the kernel modules when installing them to staging folder and copying them to dist folder
2. Add FAST_BUILD(refer to pa/2020551) to have shorter build time for local build
Bug: 280396049
Test: Found unstripped_modules.tar.gz under dist folder for eos/p11/seluna
Change-Id: I3fc03cd0830a5b879aac9d9aa0a1ca41964c5ce1
|
|
Test: Manual
Bug: 274187140
Change-Id: Ie1a4b765c6f328a5fb3cc854d6fa8285aadac21a
Signed-off-by: Florian Muller <mullerf@google.com>
|
|
android13-msm-pixelwatch-5.15
|
|
Bug: 282063309
Change-Id: I12bd254de9fc90a77b84685fd0f767cc828f2d72
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
|