diff options
Diffstat (limited to 'meta-ampere/meta-common/recipes-ampere')
5 files changed, 28 insertions, 22 deletions
diff --git a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh index 7c5edbf68c..c24cc4a0be 100755 --- a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh +++ b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh @@ -122,7 +122,7 @@ function set_boot_progress() function log_redfish_biosboot_ok_event() { - logger-systemd --journald << EOF + logger --journald << EOF MESSAGE= PRIORITY=2 SEVERITY= @@ -135,7 +135,7 @@ function log_redfish_bios_panic_event() { boot_state_str=$(get_boot_stage_string "$1" "$2") - logger-systemd --journald << EOF + logger --journald << EOF MESSAGE= PRIORITY=2 SEVERITY= diff --git a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh index f1f64c1155..1a65647120 100644 --- a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh +++ b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh @@ -16,7 +16,7 @@ function log_ampere_oem_redfish_event() msgArgs1=$5 msgArgs2=$6 -logger-systemd --journald << EOF +logger --journald << EOF MESSAGE=${msg} PRIORITY=${priority} SEVERITY=${severity} diff --git a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service index 3499543258..461d423ad4 100644 --- a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service +++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere-usbnet.service @@ -1,12 +1,14 @@ [Unit] Description=Ampere Ethernet over USB gadget device -After=phosphor-ipmi-host.service +After=multi-user.target +StartLimitIntervalSec=20 +StartLimitBurst=3 [Service] -Type=oneshot -RemainAfterExit=yes ExecStart=/usr/sbin/ampere_usbnet.sh -ExecStop=/usr/bin/usb-ctrl ecm usbnet off +Restart=on-failure +RestartMode=direct +RestartSec=5 [Install] WantedBy=multi-user.target diff --git a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh index ca9357fa3a..fb886c2eab 100644 --- a/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh +++ b/meta-ampere/meta-common/recipes-ampere/network/ampere-usbnet/ampere_usbnet.sh @@ -1,18 +1,22 @@ #!/bin/bash -ENV_MAC_ADDR=$(fw_printenv ethaddr eth1addr) +# Get MAC Address from uboot, or fallback to a random +ENV_MAC_ADDR= +ENV_MAC_ADDR=${ENV_MAC_ADDR:-"$(fw_printenv -n ethaddr)"} +ENV_MAC_ADDR=${ENV_MAC_ADDR:-"$(fw_printenv -n eth1addr)"} +MAC_ADDR=${ENV_MAC_ADDR:-"F8:C2:49:A6:09:3B"} -MAC_ADDR=$(echo "$ENV_MAC_ADDR" | cut -d "=" -f 2) - -if [ -n "$MAC_ADDR" ]; then - # Generate MAC Address from eth1addr using locally administered MAC - # https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local_(U/L_bit - SUBMAC=$(echo "$MAC_ADDR" | cut -d ":" -f 2-6) - /usr/bin/usb-ctrl ecm usbnet on "06:$SUBMAC" "02:$SUBMAC" -else - /usr/bin/usb-ctrl ecm usbnet on -fi +# Generate MAC Address using locally administered MAC +# https://en.wikipedia.org/wiki/MAC_address#Universal_vs._local_(U/L_bit +SUBMAC=$(echo "$MAC_ADDR" | cut -d ":" -f 2-5) +/usr/bin/usb-ctrl ecm usbnet off +/usr/bin/usb-ctrl ecm usbnet on "06:$SUBMAC:01" "06:$SUBMAC:00" # Use NCM (Ethernet) Gadget instead of FunctionFS Gadget echo 0x0103 > /sys/kernel/config/usb_gadget/usbnet/idProduct echo "OpenBMC usbnet Device" > /sys/kernel/config/usb_gadget/usbnet/strings/0x409/product + +if [ "$MAC_ADDR" != "$ENV_MAC_ADDR" ]; then + # fail and wait for systemd to restart this service + exit 1 +fi diff --git a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh index 1170c6a7ca..ddbf8d7f84 100644 --- a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh +++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh @@ -9,15 +9,15 @@ if [ -z "$registry" ]; then exit fi -# Check if logger-systemd exist. Do nothing if not exists -if ! command -v logger-systemd; +# Check if logger exist. Do nothing if not exists +if ! logger --help | grep journald then - echo "logger-systemd does not exist. Skip log events for $registry $msgarg" + echo "logger does not support the journald option. Skip log events for $registry $msgarg" exit fi # Log events -logger-systemd --journald << EOF +logger --journald << EOF MESSAGE= PRIORITY= SEVERITY= |