tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic 'boot-control-hal'

Browse source 
* changes:
  Add android.hardware.boot_control@1.0 service.
  Add boot_control HIDL default implementation
  boot_control: Define the boot_control HIDL interface.
This commit is contained in:
Connor O'Brien 2016-10-20 01:35:04 +00:00 committed by Android (Google) Code Review
commit 5bcecaf0d9
10 changed files with 555 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.bp
View file

@ -5,6 +5,8 @@ subdirs = [
"audio/effect/2.0",
"benchmarks/msgq/1.0",
"biometrics/fingerprint/2.1",
"boot/1.0",
"boot/1.0/default",
"gnss/1.0",
"bluetooth/1.0",
"graphics/allocator/2.0",

46
boot/1.0/Android.bp Normal file
View file

@ -0,0 +1,46 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
genrule {
name: "android.hardware.boot@1.0_genc++",
tool: "hidl-gen",
cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
srcs: [
"types.hal",
"IBootControl.hal",
],
out: [
"android/hardware/boot/1.0/types.cpp",
"android/hardware/boot/1.0/BootControlAll.cpp",
],
}
genrule {
name: "android.hardware.boot@1.0_genc++_headers",
tool: "hidl-gen",
cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.boot@1.0",
srcs: [
"types.hal",
"IBootControl.hal",
],
out: [
"android/hardware/boot/1.0/types.h",
"android/hardware/boot/1.0/IBootControl.h",
"android/hardware/boot/1.0/IHwBootControl.h",
"android/hardware/boot/1.0/BnBootControl.h",
"android/hardware/boot/1.0/BpBootControl.h",
"android/hardware/boot/1.0/BsBootControl.h",
],
}
cc_library_shared {
name: "android.hardware.boot@1.0",
generated_sources: ["android.hardware.boot@1.0_genc++"],
generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"],
shared_libs: [
"libhidl",
"libhwbinder",
"libutils",
"libcutils",
],
}

136
boot/1.0/Android.mk Normal file
View file

@ -0,0 +1,136 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# Build types.hal (BoolResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::types.BoolResult
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (CommandResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::types.CommandResult
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBootControl.hal
#
GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::IBootControl
$(GEN): $(LOCAL_PATH)/IBootControl.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_JAVA_LIBRARY)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# Build types.hal (BoolResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::types.BoolResult
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (CommandResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::types.CommandResult
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBootControl.hal
#
GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.boot@1.0::IBootControl
$(GEN): $(LOCAL_PATH)/IBootControl.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

104
boot/1.0/IBootControl.hal Normal file
View file

@ -0,0 +1,104 @@
/*
* Copyright 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.boot@1.0;
/**
* The Boot Control HAL is designed to allow for managing sets of redundant
* partitions, called slots, that can be booted from independently. Slots
* are sets of partitions whose names differ only by a given suffix.
* They are identified here by a 0 indexed number and associated with their
* suffix, which is appended to the base name for any particular partition
* to find the one associated with that slot.
* The primary use of this set up is to allow for background updates while
* the device is running, and to provide a fallback in the event that the
* update fails.
*/
interface IBootControl {
/**
* getNumberSlots() returns the number of available slots.
* For instance, a system with a single set of partitions must return
* 1, a system with A/B must return 2, A/B/C -> 3 and so on. A system with
* less than two slots doesn't support background updates, for example if
* running from a virtual machine with only one copy of each partition for the
* purpose of testing.
*/
getNumberSlots() generates (uint32_t numSlots);
/**
* getCurrentSlot() returns the slot number of that the current boot is booted
* from, for example slot number 0 (Slot A). It is assumed that if the current
* slot is A, then the block devices underlying B can be accessed directly
* without any risk of corruption.
* The returned value is always guaranteed to be strictly less than the
* value returned by getNumberSlots. Slots start at 0 and finish at
* getNumberSlots() - 1. The value returned here must match the suffix passed
* from the bootloader, regardless of which slot is active or successful.
*/
getCurrentSlot() generates (Slot slot);
/**
* markBootSuccessful() marks the current slot as having booted successfully.
*
* Returns whether the command succeeded.
*/
markBootSuccessful() generates (CommandResult error);
/**
* setActiveBootSlot() marks the slot passed in parameter as the active boot
* slot (see getCurrentSlot for an explanation of the "slot" parameter). This
* overrides any previous call to setSlotAsUnbootable.
* Returns whether the command succeeded.
*/
setActiveBootSlot(Slot slot) generates (CommandResult error);
/**
* setSlotAsUnbootable() marks the slot passed in parameter as
* an unbootable. This can be used while updating the contents of the slot's
* partitions, so that the system must not attempt to boot a known bad set up.
* Returns whether the command succeeded.
*/
setSlotAsUnbootable(Slot slot) generates (CommandResult error);
/**
* isSlotBootable() returns if the slot passed in parameter is bootable. Note
* that slots can be made unbootable by both the bootloader and by the OS
* using setSlotAsUnbootable.
* Returns TRUE if the slot is bootable, FALSE if it's not, and INVALID_SLOT
* if slot does not exist.
*/
isSlotBootable(Slot slot) generates (BoolResult bootable);
/**
* isSlotMarkedSucessful() returns if the slot passed in parameter has been
* marked as successful using markBootSuccessful. Note that only the current
* slot can be marked as successful but any slot can be queried.
* Returns TRUE if the slot has been marked as successful, FALSE if it has
* not, and INVALID_SLOT if the slot does not exist.
*/
isSlotMarkedSuccessful(Slot slot) generates (BoolResult successful);
/**
* getSuffix() returns the string suffix used by partitions that correspond to
* the slot number passed in as a parameter. The bootloader must pass the
* suffix of the currently active slot either through a kernel command line
* property at androidboot.slot_suffix, or the device tree at
* /firmware/android/slot_suffix.
* Returns the empty string "" if slot does not match an existing slot.
*/
getSuffix(Slot slot) generates (string slotSuffix);
};

34
boot/1.0/default/Android.mk Normal file
View file

@ -0,0 +1,34 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.boot@1.0-impl
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
BootControl.cpp \
LOCAL_SHARED_LIBRARIES := \
liblog \
libhidl \
libhwbinder \
libhardware \
libutils \
android.hardware.boot@1.0 \
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE := android.hardware.boot@1.0-service
LOCAL_INIT_RC := android.hardware.boot@1.0-service.rc
LOCAL_SRC_FILES := \
service.cpp
LOCAL_SHARED_LIBRARIES := \
liblog \
libhwbinder \
libhardware \
libhidl \
libutils \
android.hardware.boot@1.0 \
include $(BUILD_EXECUTABLE)

98
boot/1.0/default/BootControl.cpp Normal file
View file

@ -0,0 +1,98 @@
#define LOG_TAG "android.hardware.boot@1.0-impl"
#include <utils/Log.h>
#include <hardware/hardware.h>
#include <hardware/boot_control.h>
#include "BootControl.h"
namespace android {
namespace hardware {
namespace boot {
namespace V1_0 {
namespace implementation {
BootControl::BootControl(boot_control_module_t *module) : mModule(module){
}
// Methods from ::android::hardware::boot::V1_0::IBootControl follow.
Return<uint32_t> BootControl::getNumberSlots() {
return mModule->getNumberSlots(mModule);
}
Return<uint32_t> BootControl::getCurrentSlot() {
return mModule->getCurrentSlot(mModule);
}
Return<void> BootControl::markBootSuccessful(markBootSuccessful_cb _hidl_cb) {
int ret = mModule->markBootSuccessful(mModule);
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 = mModule->setActiveBootSlot(mModule, 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 = mModule->setSlotAsUnbootable(mModule, 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 = mModule->isSlotBootable(mModule, slot);
if (ret < 0) {
return BoolResult::INVALID_SLOT;
}
return ret ? BoolResult::TRUE : BoolResult::FALSE;
}
Return<BoolResult> BootControl::isSlotMarkedSuccessful(uint32_t slot) {
int32_t ret = mModule->isSlotMarkedSuccessful(mModule, 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 = mModule->getSuffix(mModule, slot);
if (suffix) {
ans = suffix;
}
_hidl_cb(ans);
return Void();
}
IBootControl* HIDL_FETCH_IBootControl(const char* hal) {
int ret = 0;
boot_control_module_t* module = NULL;
hw_module_t **hwm = reinterpret_cast<hw_module_t**>(&module);
ret = hw_get_module(hal, const_cast<const hw_module_t**>(hwm));
if (ret)
{
ALOGE("hw_get_module %s failed: %d", hal, ret);
return nullptr;
}
module->init(module);
return new BootControl(module);
}
} // namespace implementation
} // namespace V1_0
} // namespace boot
} // namespace hardware
} // namespace android

46
boot/1.0/default/BootControl.h Normal file
View file

@ -0,0 +1,46 @@
#ifndef HIDL_GENERATED_android_hardware_boot_V1_0_BootControl_H_
#define HIDL_GENERATED_android_hardware_boot_V1_0_BootControl_H_
#include <android/hardware/boot/1.0/IBootControl.h>
#include <hidl/Status.h>
#include <hidl/MQDescriptor.h>
namespace android {
namespace hardware {
namespace boot {
namespace V1_0 {
namespace implementation {
using ::android::hardware::boot::V1_0::BoolResult;
using ::android::hardware::boot::V1_0::CommandResult;
using ::android::hardware::boot::V1_0::IBootControl;
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::hidl_vec;
using ::android::hardware::hidl_string;
using ::android::sp;
struct BootControl : public IBootControl {
BootControl(boot_control_module_t* module);
// Methods from ::android::hardware::boot::V1_0::IBootControl follow.
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;
private:
boot_control_module_t* mModule;
};
extern "C" IBootControl* HIDL_FETCH_IBootControl(const char* name);
} // namespace implementation
} // namespace V1_0
} // namespace boot
} // namespace hardware
} // namespace android
#endif // HIDL_GENERATED_android_hardware_boot_V1_0_BootControl_H_

4
boot/1.0/default/android.hardware.boot@1.0-service.rc Normal file
View file

@ -0,0 +1,4 @@
service boot-hal-1-0 /system/bin/hw/android.hardware.boot@1.0-service
class hal
user system
group system readproc

44
boot/1.0/default/service.cpp Normal file
View file

@ -0,0 +1,44 @@
#define LOG_TAG "android.hardware.boot@1.0-service"
#include <utils/Log.h>
#include <iostream>
#include <unistd.h>
#include <android/hardware/boot/1.0/IBootControl.h>
#include <hidl/IServiceManager.h>
#include <hwbinder/IPCThreadState.h>
#include <hwbinder/ProcessState.h>
#include <utils/Errors.h>
#include <utils/StrongPointer.h>
using android::sp;
using android::hardware::IPCThreadState;
using android::hardware::ProcessState;
using ::android::hardware::boot::V1_0::IBootControl;
int main (int /* argc */, char * /* argv */ []) {
ALOGI("Service is starting.");
const char instance[] = "bootctrl";
ALOGI("Retrieving default implementation of instance %s.",
instance);
sp<IBootControl> service = IBootControl::getService(instance, true /* getStub */);
if (service.get() == nullptr) {
ALOGE("IBootControl::getService returned NULL, exiting");
return -1;
}
LOG_FATAL_IF(service->isRemote(), "Implementation is REMOTE!");
ALOGI("Registering instance %s.", instance);
service->registerAsService(instance);
ALOGI("Ready.");
ProcessState::self()->setThreadPoolMaxThreadCount(0);
ProcessState::self()->startThreadPool();
IPCThreadState::self()->joinThreadPool();
}

41
boot/1.0/types.hal Normal file
View file

@ -0,0 +1,41 @@
/*
* Copyright 2016 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.boot@1.0;
/**
* A command result encapsulating whether the command succeeded and
* an error string.
*/
struct CommandResult {
bool success;
string errMsg;
};
/**
* An identifier for a slot number.
*/
typedef uint32_t Slot;
/**
* A result encapsulating whether a function returned true, false or
* failed due to an invalid slot number
*/
enum BoolResult : int32_t {
FALSE = 0,
TRUE = 1,
INVALID_SLOT = -1
};