diff options
Diffstat (limited to 'meta-quanta/meta-gsj')
16 files changed, 64 insertions, 28 deletions
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index e7dcbfeab..1da7654b5 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "thud warrior" +LAYERSERIES_COMPAT_gsj-layer = "warrior zeus" diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb index 86303c359..24ca38d8f 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb @@ -2,7 +2,7 @@ SUMMARY = "OpenBMC Quanta Detect Fan Fail Service" DESCRIPTION = "OpenBMC Quanta Detect Fan Fail Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb index 8d3fbf376..37e4e44cf 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb @@ -2,7 +2,7 @@ SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git" SRCREV = "${AUTOREV}" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit autotools pkgconfig inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb index ada2a6a36..887b50305 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb @@ -2,7 +2,7 @@ SUMMARY = "Phosphor OpenBMC Quanta NVME Power Control Service" DESCRIPTION = "Phosphor OpenBMC Quanta NVME Power Control Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" FILESEXTRAPATHS_append := "${THISDIR}/files:" diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service index 913f5fbee..81a4e4244 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service @@ -1,5 +1,6 @@ [Unit] Description=enable usb network +After=phosphor-ipmi-host.service [Service] Type=oneshot diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb index 591ca5afd..ad46c0b32 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "systemd" RDEPENDS_${PN} += "libsystemd" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json index c294a733a..694ea2a0b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json +++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-2ssd.json @@ -55,6 +55,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -64,6 +65,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -73,6 +75,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 } ], diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json index 430c3f4d2..f323219d1 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json +++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/config-8ssd.json @@ -55,6 +55,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -64,6 +65,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -73,6 +75,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -82,6 +85,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -91,6 +95,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -100,6 +105,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -109,6 +115,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -118,6 +125,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 }, { @@ -127,6 +135,7 @@ "writePath": "", "min": 0, "max": 0, + "ignoreDbusMinMax": true, "timeout": 0 } ], diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb index 340955c1a..c6061a23e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-fru-read-inventory-native.bb @@ -1,7 +1,7 @@ SUMMARY = "gsj inventory map for phosphor-ipmi-host" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb index db3aaf20e..d46a7abdd 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-inventory-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "gsj IPMI to DBus Inventory mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb index b716bf054..2389730e8 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Quanta gsj IPMI to DBus Sensor mapping." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf index a0d18b480..5eabef339 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host/gsj-ipmid-whitelist.conf @@ -6,26 +6,33 @@ 0x00:0x06 //<Chassis>:<Set Power Restore Policy> 0x00:0x08 //<Chassis>:<Set System Boot Options> 0x00:0x09 //<Chassis>:<Get System Boot Options> -0x00:0x0F //<Chassis>:<Get POH Counter Command> -0x04:0x02 //<Sensor/Event>:<Platform event> +0x04:0x20 //<Sensor/Event>:<Get Device SDR Info> +0x04:0x21 //<Sensor/Event>:<Get Device SDR> +0x04:0x22 //<Sensor/Event>:<Reserve Device SDR Repository> +0x04:0x27 //<Sensor/Event>:<Get Sensor Threshold> +0x04:0x29 //<Sensor/Event>:<Get Sensor Event Enable> +0x04:0x2B //<Sensor/Event>:<Get Sensor Event Status> 0x04:0x2D //<Sensor/Event>:<Get Sensor Reading> 0x04:0x2F //<Sensor/Event>:<Get Sensor Type> 0x04:0x30 //<Sensor/Event>:<Set Sensor Reading and Event Status> 0x06:0x01 //<App>:<Get Device ID> +0x06:0x02 //<App>:<Cold Reset> +0x06:0x03 //<App>:<Warm Reset> 0x06:0x04 //<App>:<Get Self Test Results> -0x06:0x06 //<App>:<Set ACPI Power State> -0x06:0x07 //<App>:<Get ACPI Power State> 0x06:0x08 //<App>:<Get Device GUID> -0x06:0x22 //<App>:<Reset Watchdog Timer> -0x06:0x24 //<App>:<Set Watchdog Timer> -0x06:0x25 //<App>:<Get Watchdog Timer> -0x06:0x2E //<App>:<Set BMC Global Enables> -0x06:0x2F //<App>:<Get BMC Global Enables> -0x06:0x31 //<App>:<Get Message Flags> 0x06:0x35 //<App>:<Read Event Message Buffer> -0x06:0x36 //<App>:<Get BT Interface Capabilities> -0x06:0x37 //<App>:<Get System GUID> -0x06:0x42 //<App>:<Get Channel Info Command> +0x06:0x40 //<App>:<Set Channel Access> +0x06:0x41 //<App>:<Get Channel Access> +0x06:0x42 //<App>:<Get Channel Info> +0x06:0x43 //<App>:<Set User Access> +0x06:0x44 //<App>:<Get User Access> +0x06:0x45 //<App>:<Set User Name> +0x06:0x46 //<App>:<Get User Name> +0x06:0x47 //<App>:<Set User Password> +0x06:0x48 //<App>:<Activate Payload> +0x06:0x49 //<App>:<Deactivate Payload> +0x06:0x4A //<App>:<Get Payload Activation Status> +0x06:0x4B //<App>:<Get Payload Instance Info> 0x06:0x54 //<App>:<Get Channel Cipher Suites> 0x0A:0x10 //<Storage>:<Get FRU Inventory Area Info> 0x0A:0x11 //<Storage>:<Read FRU Data> @@ -34,9 +41,12 @@ 0x0A:0x23 //<Storage>:<Get SDR> 0x0A:0x40 //<Storage>:<Get SEL Info> 0x0A:0x42 //<Storage>:<Reserve SEL> +0x0A:0x43 //<Storage>:<Get SEL Entry> 0x0A:0x44 //<Storage>:<Add SEL Entry> +0x0A:0x47 //<Storage>:<Clear SEL> 0x0A:0x48 //<Storage>:<Get SEL Time> 0x0A:0x49 //<Storage>:<Set SEL Time> +0x0C:0x01 //<Transport>:<Set LAN Configuration Parameters> 0x0C:0x02 //<Transport>:<Get LAN Configuration Parameters> 0x2C:0x00 //<Group Extension>:<Group Extension Command> 0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities> @@ -45,3 +55,7 @@ 0x2C:0x06 //<Group Extension>:<Get Asset Tag> 0x2C:0x07 //<Group Extension>:<Get Sensor Info> 0x2C:0x10 //<Group Extension>:<Get Temperature Readings> +0x2C:0x3E //<Group Extension>:<Get HPM.x Capabilities> +0x2E:0x02 //<Google OEM>:<I2C via Proxy Adapter> +0x2E:0x30 //<Google OEM>:<Ethernet Statistics> +0x2E:0x32 //<Google OEM>:<Sys Commands> diff --git a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb index c8a8291e1..a91420fe9 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb +++ b/meta-quanta/meta-gsj/recipes-phosphor/leds/gsj-led-manager-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Phosphor LED Group Management for gsj" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf index b1dc82192..c2060ccb9 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8b000/hotswap@15.conf @@ -8,13 +8,14 @@ MAXVALUE_temp1 = "127" EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_curr1= "P48V_HSC_Current" -WARNLO_curr1= "3" +WARNLO_curr1= "4" CRITLO_curr1= "0" -WARNHI_curr1= "13750" -CRITHI_curr1= "15000" +WARNHI_curr1= "17629" +CRITHI_curr1= "19231" MINVALUE_curr1 = "0" MAXVALUE_curr1 = "23" EVENT_curr1= "WARNHI,WARNLO,CRITHI,CRITLO" +GAIN_curr1= "0.78" LABEL_in3= "P48V_HSC_Vol" WARNLO_in3= "39500" @@ -26,10 +27,11 @@ MAXVALUE_in3 = "62" EVENT_in3= "WARNHI,WARNLO,CRITHI,CRITLO" LABEL_power1= "P48V_HSC_Power" -WARNLO_power1= "100000" +WARNLO_power1= "128205" CRITLO_power1= "0" -WARNHI_power1= "550000000" -CRITHI_power1= "600000000" +WARNHI_power1= "705128205" +CRITHI_power1= "769230770" MINVALUE_power1 = "0" MAXVALUE_power1 = "795" EVENT_power1= "WARNHI,WARNLO,CRITHI,CRITLO" +GAIN_power1= "0.78" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml new file mode 100644 index 000000000..b0de5dd1a --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager/restrictionmode-default-whitelist.override.yml @@ -0,0 +1,6 @@ +--- +/xyz/openbmc_project/control/host0/restriction_mode: + - Interface: xyz.openbmc_project.Control.Security.RestrictionMode + Properties: + RestrictionMode: + Default: RestrictionMode::Modes::Whitelist diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index da834423f..53db04d03 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${BPN}:" SRC_URI_append_gsj = " file://time-default.override.yml" +SRC_URI_append_gsj = " file://restrictionmode-default-whitelist.override.yml" |