diff options
author | Roopesh Nataraja <roopeshr@codeaurora.org> | 2021-07-13 15:11:37 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-07-14 17:40:03 -0700 |
commit | 8a3b7981792e5b898115d49681908e23a8366690 (patch) | |
tree | bcaa2652b05b8d93afc69643d532c0d9af7504da | |
parent | e00cd720ab4e34c034955cc6cdc8ea63296f6a4a (diff) |
bootctrl: Add support for boot control hal V1.2
V1_2::IBootControl adds getActiveBootSlot() API.
Enhance libboot_control_qti library to implement this API.
Change-Id: I32aea39b319f6844d82bcc17bb636add36a1f659
-rw-r--r-- | 1.1/libboot_control_qti/libboot_control_qti.cpp | 24 | ||||
-rw-r--r-- | 1.1/libboot_control_qti/libboot_control_qti.h | 3 | ||||
-rw-r--r-- | 1.2/impl/Android.bp | 21 | ||||
-rw-r--r-- | 1.2/impl/BootControl.cpp | 140 | ||||
-rw-r--r-- | 1.2/impl/BootControl.h | 78 |
5 files changed, 266 insertions, 0 deletions
diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index 86887b9..b21a958 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp @@ -725,3 +725,27 @@ MergeStatus get_snapshot_merge_status() ALOGI("%s: Returning MergeStatus = %d\n", __func__, status); return status; } + +int get_active_boot_slot() +{ + int slot = 0; + char bootPartition[MAX_GPT_NAME_SIZE + 1] = {0}; + + for (int i = 0; slot_suffix_arr[i] != NULL; i++) { + snprintf(bootPartition, sizeof(bootPartition) - 1, + "boot%s", slot_suffix_arr[i]); + + if (get_partition_attribute(bootPartition, + ATTR_SLOT_ACTIVE) == 1) { + slot = i; + break; + } + } + + if (boot_control_check_slot_sanity(slot) != 0) { + ALOGE("%s: Failed to validate active slot configuration", __func__); + return -1; + } else { + return slot; + } +} diff --git a/1.1/libboot_control_qti/libboot_control_qti.h b/1.1/libboot_control_qti/libboot_control_qti.h index c669a0e..bc49d65 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.h +++ b/1.1/libboot_control_qti/libboot_control_qti.h @@ -49,4 +49,7 @@ const char* get_suffix(unsigned slot); bool set_snapshot_merge_status(MergeStatus status); MergeStatus get_snapshot_merge_status(); +// IBootControl 1.2 methods +int get_active_boot_slot(); + bool mGvmqPlatform = false; diff --git a/1.2/impl/Android.bp b/1.2/impl/Android.bp new file mode 100644 index 0000000..db5ed32 --- /dev/null +++ b/1.2/impl/Android.bp @@ -0,0 +1,21 @@ +cc_library_shared { + name: "android.hardware.boot@1.2-impl-qti", + stem: "android.hardware.boot@1.0-impl-1.2-qti", + defaults: [ + "hidl_defaults", + ], + relative_install_path: "hw", + vendor: true, + recovery_available: true, + srcs: ["BootControl.cpp"], + shared_libs: [ + "liblog", + "libhidlbase", + "libhardware", + "libutils", + "android.hardware.boot@1.0", + "android.hardware.boot@1.1", + "android.hardware.boot@1.2", + "libboot_control_qti", + ], +} diff --git a/1.2/impl/BootControl.cpp b/1.2/impl/BootControl.cpp new file mode 100644 index 0000000..9f5bc71 --- /dev/null +++ b/1.2/impl/BootControl.cpp @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2021, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define LOG_TAG "android.hardware.boot@1.2-impl-qti" + +#include <memory> + +#include <log/log.h> + +#include "BootControl.h" + +namespace android { +namespace hardware { +namespace boot { +namespace V1_2 { +namespace implementation { + +using ::android::hardware::boot::V1_0::CommandResult; + +bool BootControl::Init() { + return bootcontrol_init(); +} + +// Methods from ::android::hardware::boot::V1_0::IBootControl. +Return<uint32_t> BootControl::getNumberSlots() { + return get_number_slots(); +} + +Return<uint32_t> BootControl::getCurrentSlot() { + return get_current_slot(); +} + +Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) { + int ret = mark_boot_successful(); + struct CommandResult cr; + cr.success = (ret == 0); + cr.errMsg = strerror(-ret); + _hidl_cb(cr); + return Void(); +} + +Return<void> BootControl::setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) { + int ret = set_active_boot_slot(slot); + struct CommandResult cr; + cr.success = (ret == 0); + cr.errMsg = strerror(-ret); + _hidl_cb(cr); + return Void(); +} + +Return<void> BootControl::setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) { + int ret = set_slot_as_unbootable(slot); + struct CommandResult cr; + cr.success = (ret == 0); + cr.errMsg = strerror(-ret); + _hidl_cb(cr); + return Void(); +} + +Return<BoolResult> BootControl::isSlotBootable(uint32_t slot) { + int32_t ret = is_slot_bootable(slot); + if (ret < 0) { + return BoolResult::INVALID_SLOT; + } + return ret ? BoolResult::TRUE : BoolResult::FALSE; +} + +Return<BoolResult> BootControl::isSlotMarkedSuccessful(uint32_t slot) { + int32_t ret = is_slot_marked_successful(slot); + if (ret < 0) { + return BoolResult::INVALID_SLOT; + } + return ret ? BoolResult::TRUE : BoolResult::FALSE; +} + +Return<void> BootControl::getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) { + hidl_string ans; + const char* suffix = get_suffix(slot); + if (suffix) { + ans = suffix; + } + _hidl_cb(ans); + return Void(); +} + +// Methods from ::android::hardware::boot::V1_1::IBootControl. +Return<bool> BootControl::setSnapshotMergeStatus(MergeStatus status) { + return set_snapshot_merge_status(status); +} + +Return<MergeStatus> BootControl::getSnapshotMergeStatus() { + return get_snapshot_merge_status(); +} + +// Methods from ::android::hardware::boot::V1_2::IBootControl. +Return<uint32_t> BootControl::getActiveBootSlot() { + int32_t ret = get_active_boot_slot(); + return ret < 0 ? 0 : ret; +} + +IBootControl* HIDL_FETCH_IBootControl(const char* /* hal */) { + auto module = std::make_unique<BootControl>(); + if (!module->Init()) { + ALOGE("Could not initialize BootControl module"); + return nullptr; + } + return module.release(); +} + +} // namespace implementation +} // namespace V1_2 +} // namespace boot +} // namespace hardware +} // namespace android diff --git a/1.2/impl/BootControl.h b/1.2/impl/BootControl.h new file mode 100644 index 0000000..187152c --- /dev/null +++ b/1.2/impl/BootControl.h @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2021, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include <android/hardware/boot/1.2/IBootControl.h> +#include <hidl/MQDescriptor.h> +#include <hidl/Status.h> +#include <libboot_control_qti.h> + +namespace android { +namespace hardware { +namespace boot { +namespace V1_2 { +namespace implementation { + +using ::android::hardware::Return; +using ::android::hardware::Void; +using ::android::hardware::boot::V1_0::BoolResult; +using ::android::hardware::boot::V1_1::MergeStatus; +using ::android::hardware::boot::V1_2::IBootControl; + +class BootControl : public IBootControl { + public: + bool Init(); + + // Methods from ::android::hardware::boot::V1_0::IBootControl. + Return<uint32_t> getNumberSlots() override; + Return<uint32_t> getCurrentSlot() override; + Return<void> markBootSuccessful(markBootSuccessful_cb _hidl_cb) override; + Return<void> setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) override; + Return<void> setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) override; + Return<BoolResult> isSlotBootable(uint32_t slot) override; + Return<BoolResult> isSlotMarkedSuccessful(uint32_t slot) override; + Return<void> getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) override; + + // Methods from ::android::hardware::boot::V1_1::IBootControl. + Return<bool> setSnapshotMergeStatus(MergeStatus status) override; + Return<MergeStatus> getSnapshotMergeStatus() override; + + // Methods from ::android::hardware::boot::V1_2::IBootControl. + Return<uint32_t> getActiveBootSlot() override; + +}; + +extern "C" IBootControl* HIDL_FETCH_IBootControl(const char* name); + +} // namespace implementation +} // namespace V1_2 +} // namespace boot +} // namespace hardware +} // namespace android |