From 4609373b8b4dbaa5aa40a0aeddca43019f6f6cdb Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 15 Jan 2022 18:04:02 +0100 Subject: [PATCH 1/3] Move mGvmqPlatform from header file to cpp Fixes duplicate symbol when linking BootControl.o and libboot_control_qti.o. Change-Id: I387a6fc24ecaef2bd1f2326f0010688b8f63ec45 --- 1.1/libboot_control_qti/libboot_control_qti.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index f476e95..a1a033b 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp @@ -76,6 +76,8 @@ enum part_attr_type { ATTR_UNBOOTABLE, }; +bool mGvmqPlatform = false; + using ::android::bootable::GetMiscVirtualAbMergeStatus; using ::android::bootable::InitMiscVirtualAbMessageIfNeeded; using ::android::bootable::SetMiscVirtualAbMergeStatus; From a32814b18c475002b670af9e1f62b617e06df2ca Mon Sep 17 00:00:00 2001 From: Roopesh Nataraja Date: Tue, 13 Jul 2021 15:11:37 -0700 Subject: [PATCH 2/3] 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 --- .../libboot_control_qti.cpp | 24 +++ 1.1/libboot_control_qti/libboot_control_qti.h | 3 + 1.2/impl/Android.bp | 25 ++++ 1.2/impl/BootControl.cpp | 140 ++++++++++++++++++ 1.2/impl/BootControl.h | 78 ++++++++++ 5 files changed, 270 insertions(+) create mode 100644 1.2/impl/Android.bp create mode 100644 1.2/impl/BootControl.cpp create mode 100644 1.2/impl/BootControl.h diff --git a/1.1/libboot_control_qti/libboot_control_qti.cpp b/1.1/libboot_control_qti/libboot_control_qti.cpp index a1a033b..f3b99b1 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.cpp +++ b/1.1/libboot_control_qti/libboot_control_qti.cpp @@ -656,3 +656,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 b055a49..837be77 100644 --- a/1.1/libboot_control_qti/libboot_control_qti.h +++ b/1.1/libboot_control_qti/libboot_control_qti.h @@ -48,3 +48,6 @@ const char* get_suffix(unsigned slot); // IBootControl 1.1 methods bool set_snapshot_merge_status(MergeStatus status); MergeStatus get_snapshot_merge_status(); + +// IBootControl 1.2 methods +int get_active_boot_slot(); diff --git a/1.2/impl/Android.bp b/1.2/impl/Android.bp new file mode 100644 index 0000000..918f40f --- /dev/null +++ b/1.2/impl/Android.bp @@ -0,0 +1,25 @@ +filegroup { + name: "android.hardware.boot@1.2-impl-qti_src", + srcs: ["BootControl.cpp"], +} + +cc_defaults { + name: "android.hardware.boot@1.2-impl-qti_defaults", + defaults: [ + "hidl_defaults", + "libboot_control_qti_defaults", + ], + relative_install_path: "hw", + vendor: true, + recovery_available: true, + srcs: [":android.hardware.boot@1.2-impl-qti_src"], + shared_libs: [ + "liblog", + "libhidlbase", + "libhardware", + "libutils", + "android.hardware.boot@1.0", + "android.hardware.boot@1.1", + "android.hardware.boot@1.2", + ], +} 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 + +#include + +#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 BootControl::getNumberSlots() { + return get_number_slots(); +} + +Return BootControl::getCurrentSlot() { + return get_current_slot(); +} + +Return 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 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 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 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 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 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 BootControl::setSnapshotMergeStatus(MergeStatus status) { + return set_snapshot_merge_status(status); +} + +Return BootControl::getSnapshotMergeStatus() { + return get_snapshot_merge_status(); +} + +// Methods from ::android::hardware::boot::V1_2::IBootControl. +Return 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(); + 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 +#include +#include +#include + +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 getNumberSlots() override; + Return getCurrentSlot() override; + Return markBootSuccessful(markBootSuccessful_cb _hidl_cb) override; + Return setActiveBootSlot(uint32_t slot, setActiveBootSlot_cb _hidl_cb) override; + Return setSlotAsUnbootable(uint32_t slot, setSlotAsUnbootable_cb _hidl_cb) override; + Return isSlotBootable(uint32_t slot) override; + Return isSlotMarkedSuccessful(uint32_t slot) override; + Return getSuffix(uint32_t slot, getSuffix_cb _hidl_cb) override; + + // Methods from ::android::hardware::boot::V1_1::IBootControl. + Return setSnapshotMergeStatus(MergeStatus status) override; + Return getSnapshotMergeStatus() override; + + // Methods from ::android::hardware::boot::V1_2::IBootControl. + Return getActiveBootSlot() override; + +}; + +extern "C" IBootControl* HIDL_FETCH_IBootControl(const char* name); + +} // namespace implementation +} // namespace V1_2 +} // namespace boot +} // namespace hardware +} // namespace android From bbea79bbf26d71f466d3830a140207858052fcee Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 16 Jun 2022 18:08:56 +0530 Subject: [PATCH 3/3] Add .gitupstream file Change-Id: I4fbe058c23ed6ab726df2242bb4b1e26caecce8a --- .gitupstream | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitupstream diff --git a/.gitupstream b/.gitupstream new file mode 100644 index 0000000..77500c6 --- /dev/null +++ b/.gitupstream @@ -0,0 +1 @@ +https://git.codelinaro.org/clo/la/platform/hardware/qcom/bootctrl