diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-02 22:28:38 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-08 18:54:33 +0300 |
commit | 0c4b9f222e7450de1f6325c5947d153e3350b76f (patch) | |
tree | afa72b011859723c5cdfba7a69396bf78b7ed37d | |
parent | b1009646e7d2b5426ea3450bd9e51a570bab0f6c (diff) | |
download | openbmc-0c4b9f222e7450de1f6325c5947d153e3350b76f.tar.xz |
openpower: Remove hostboot-settings
With the resolution of CVE-2019-6260 the SuperIO scratch registers that
hostboot-settings uses cannot be read from the host.
This means it is not being used, so we can remove it from the build.
(From meta-openpower rev: d6124f416c014e1710c17b5d7c2fd90f85a2d0ca)
Change-Id: I508555ba063fa08f322f66ee2ce88bd15e500d97
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 0 insertions, 140 deletions
diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb deleted file mode 100644 index 772a51462..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenPower Hostboot Boot settings tool" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-systemd -inherit allarch - -SRC_URI = "file://hb_settings" -SYSTEMD_SERVICE_${PN} += "hostboot-settings.service" - -do_fetch[noexec] = "1" -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/hb_settings ${D}${bindir} -} diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings b/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings deleted file mode 100644 index d75d4b74d..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# Copyright 2018 IBM Corp -# SPDX-License-Identifier: Apache-2.0 -# Authored May 2018, Joel Stanley <joel@jms.id.au> -# -# This script sets the SIO scratch registers 0x2D in order to configure -# hostboot. It supports boot flags v1 as defined in hostboot source: -# src/usr/initservice/bootconfig/bootconfig_ast2400.C -# src/usr/console/ast2400.C -# -# BOOT_FLAGS_VERSION_REG = 0x28, -# Serial config reg: 0x2d -# Serial config mask: 0xc0 -# -# NONE = 0x00, // No output selected -# SELECT_SUART = 0x40, // SIO Uart -# SELECT_VUART = 0x80, // SOL virtual uart -# RESERVED = 0xc0, // Reserved - - -SYSFS_SIO=/sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789080.lpc-host/1e789080.lpc-host:regs -SYSFS_SIO28=$SYSFS_SIO/sio_28 -SYSFS_SIO2D=$SYSFS_SIO/sio_2d - -FLAGS_VERSION1=$((0x42)) - -usage() -{ - echo "usage: hb_settings [[-u|--uart vuart|suart|none] | [-s|--show] | [-h]]" -} - -show_regs() -{ - SIO28=$(cat $SYSFS_SIO28) - SIO2D=$(cat $SYSFS_SIO2D) - - case $SIO28 in - $FLAGS_VERSION1) - echo "Boot flags version 1" - ;; - * ) - echo "Unknown boot flags version" - ;; - esac - - case $(($SIO2D >> 6)) in - 0) - echo "Hostboot serial output disabled" - ;; - 1) - echo "Hostboot serial output on SUART" - ;; - 2) - echo "Hostboot serial output on VUART" - ;; - 3) - echo "Reserved value" - ;; - * ) - echo "Invalid uart value" - ;; - esac -} - -set_regs() -{ - case $uart in - suart) - echo "Hostboot serial output on SUART" - VAL=0x40 - ;; - vuart) - echo "Hostboot serial output on VUART" - VAL=0x80 - ;; - none) - echo "Hostboot serial output disabled" - VAL=0x00 - ;; - * ) - echo "Invalid uart value" - usage - exit 1 - esac - - echo $FLAGS_VERSION1 > $SYSFS_SIO28 - echo $VAL > $SYSFS_SIO2D -} - -while [ "$1" != "" ]; do - case $1 in - -u | --uart) shift - uart=$1 - set_regs - exit - ;; - -s | --show ) show_regs - exit - ;; - -h | --help ) usage - exit - ;; - * ) usage - exit 1 - esac - shift -done - -usage -exit 0 diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service b/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service deleted file mode 100644 index 9ce81d79b..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Hostboot Boot Settings - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/bin/hb_settings --uart vuart - -[Install] -WantedBy=multi-user.target |