Skip to content

Commit 18f97fa

Browse files
dheerajpdskdheerajpdsk
committed
Update to internal 1-0.91
Signed-off-by: P Dheeraj Srujan Kumar <[email protected]>
1 parent 2af35ee commit 18f97fa

File tree

119 files changed

+2820
-3129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+2820
-3129
lines changed

‎meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From d06d0a8fabd699fc1cab4fbd6e4572ce0b22a905 Mon Sep 17 00:00:00 2001
1+
From 8f6c6f3a23c002f5247c407205f3a62dcd0e0c8c Mon Sep 17 00:00:00 2001
22
From: James Feist <[email protected]>
33
Date: Thu, 23 Apr 2020 14:01:38 -0700
4-
Subject: [PATCH 1/1] Only allow drive sensors on bus 2 for ast2500
4+
Subject: [PATCH] Only allow drive sensors on bus 2 for ast2500
55

66
CPLD doesn't allow multi-master, so readings wont work.
77
Put in a work-around to only allow bus 2 transactions.
@@ -15,22 +15,22 @@ Signed-off-by: James Feist <[email protected]>
1515
1 file changed, 6 insertions(+)
1616

1717
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
18-
index 1858ea9..844f061 100644
18+
index 8eaeb57..25edf01 100644
1919
--- a/src/NVMeSensorMain.cpp
2020
+++ b/src/NVMeSensorMain.cpp
21-
@@ -111,6 +111,12 @@ void createSensors(boost::asio::io_service& io,
22-
rootBus = std::stoi(rootName.substr(0, dash));
23-
}
21+
@@ -154,6 +154,12 @@ static void handleSensorConfigurations(
22+
<< "\n";
23+
}
2424

25-
+ // HACK: cpld on current products doesn't allow multi-master
26-
+ if (rootBus != 2)
27-
+ {
28-
+ continue;
29-
+ }
25+
+ // HACK: cpld on current products doesn't allow multi-master
26+
+ if (rootBus != 2)
27+
+ {
28+
+ continue;
29+
+ }
3030
+
31-
std::shared_ptr<NVMeContext> context;
32-
auto findRoot = nvmeDeviceMap.find(rootBus);
33-
if (findRoot != nvmeDeviceMap.end())
31+
std::shared_ptr<NVMeSensor> sensorPtr =
32+
std::make_shared<NVMeSensor>(
33+
objectServer, io, dbusConnection, *sensorName,
3434
--
3535
2.17.1
3636

‎meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0038-Disabling-serial-console-if-FFUJ-is-enabled.patch

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From a9f5d0357701c817106cd158d377ef645309ccc2 Mon Sep 17 00:00:00 2001
2+
From: gokulsanker <[email protected]>
3+
Date: Wed, 8 Dec 2021 01:44:19 +0530
4+
Subject: [PATCH] If FFUJ is enabled serial console must be disabled
5+
6+
FFUJ mode user is not allowed to enter uboot command
7+
line interface. Serial console is disabled by creating
8+
an indefinite sleep if FFUJ is enabled, same
9+
functionality is used in whitely platforms
10+
11+
Tested:
12+
Serial console is disabled in FFUJ mode
13+
14+
Signed-off-by: gokulsanker <[email protected]>
15+
---
16+
common/autoboot.c | 12 +++++++++---
17+
1 file changed, 9 insertions(+), 3 deletions(-)
18+
19+
diff --git a/common/autoboot.c b/common/autoboot.c
20+
index 8a99780423..21e59feea7 100644
21+
--- a/common/autoboot.c
22+
+++ b/common/autoboot.c
23+
@@ -19,6 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
24+
25+
#define MAX_DELAY_STOP_STR 32
26+
27+
+#define WAIT_STATE_TIMEOUT 10000
28+
#ifndef DEBUG_BOOTKEYS
29+
#define DEBUG_BOOTKEYS 0
30+
#endif
31+
@@ -271,9 +272,14 @@ static int abortboot(int bootdelay)
32+
{
33+
int abort = 0;
34+
35+
- abort = gpio_abort();
36+
- if (abort)
37+
- goto exit;
38+
+ if (gpio_abort())
39+
+ {
40+
+ printf("#### BMC is in disabled state(FFU Jumper is asserted), "
41+
+ "So BMC serial console disabled. ####\n");
42+
+ while (1) {
43+
+ mdelay(WAIT_STATE_TIMEOUT);
44+
+ }
45+
+ }
46+
47+
if (bootdelay >= 0)
48+
abort = __abortboot(bootdelay);
49+
--
50+
2.17.1
51+

‎meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ SRC_URI:append:intel-ast2600 = " \
4141
file://0034-Implement-the-IPMI-commands-in-FFUJ-mode-in-u-boot.patch \
4242
file://0036-Disable-BMC-MMIO-Decode-on-VGA-SCU-register-bit.patch \
4343
file://0037-Enable-I2C-clock-stretching-and-multi-master-support.patch \
44+
file://0038-Disabling-serial-console-if-FFUJ-is-enabled.patch \
4445
"
4546

4647
# CVE-2020-10648 vulnerability fix

‎meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed/0005-Add-sample-i3c-slave-driver.patch

+150
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
From 4987202965423fafd5c704d4e68a51a4167a4414 Mon Sep 17 00:00:00 2001
2+
From: Oleksandr Shulzhenko <[email protected]>
3+
Date: Thu, 30 Sep 2021 16:28:26 +0200
4+
Subject: [PATCH] Add sample i3c slave driver
5+
6+
The aim of the driver is to debug various i3c solutions implemented
7+
for DesignWare master I3C driver.
8+
The driver is bound to the I3C device that corresponds to I3C slave
9+
emulated by Prodigy with manufacturer ID 0xAC and part ID 0x55AA.
10+
It is enough to fill the I3C_DEVICE macro with the corresponding data
11+
to adjust the driver with another I3C slave device
12+
13+
Signed-off-by: Oleksandr Shulzhenko <[email protected]>
14+
---
15+
drivers/i3c/Kconfig | 2 +
16+
drivers/i3c/Makefile | 1 +
17+
drivers/i3c/sample/Kconfig | 7 +++
18+
drivers/i3c/sample/Makefile | 2 +
19+
drivers/i3c/sample/dw-i3c-sample.c | 75 ++++++++++++++++++++++++++++++
20+
5 files changed, 87 insertions(+)
21+
create mode 100644 drivers/i3c/sample/Kconfig
22+
create mode 100644 drivers/i3c/sample/Makefile
23+
create mode 100644 drivers/i3c/sample/dw-i3c-sample.c
24+
25+
diff --git a/drivers/i3c/Kconfig b/drivers/i3c/Kconfig
26+
index 01642768ab5f..202b0d091631 100644
27+
--- a/drivers/i3c/Kconfig
28+
+++ b/drivers/i3c/Kconfig
29+
@@ -36,4 +36,6 @@ config I3CDEV
30+
and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes.
31+
32+
source "drivers/i3c/master/Kconfig"
33+
+
34+
+source "drivers/i3c/sample/Kconfig"
35+
endif # I3C
36+
diff --git a/drivers/i3c/Makefile b/drivers/i3c/Makefile
37+
index 606d422841b2..8048a9a793c6 100644
38+
--- a/drivers/i3c/Makefile
39+
+++ b/drivers/i3c/Makefile
40+
@@ -3,3 +3,4 @@ i3c-y := device.o master.o
41+
obj-$(CONFIG_I3C) += i3c.o
42+
obj-$(CONFIG_I3CDEV) += i3cdev.o
43+
obj-$(CONFIG_I3C) += master/
44+
+obj-$(CONFIG_I3C) += sample/
45+
diff --git a/drivers/i3c/sample/Kconfig b/drivers/i3c/sample/Kconfig
46+
new file mode 100644
47+
index 000000000000..6376c9891795
48+
--- /dev/null
49+
+++ b/drivers/i3c/sample/Kconfig
50+
@@ -0,0 +1,7 @@
51+
+# SPDX-License-Identifier: GPL-2.0-only
52+
+config DW_I3C_SAMPLE
53+
+ tristate "Synopsys DesignWare I3C sample driver"
54+
+ depends on I3C
55+
+help
56+
+ Say yes here to enable the driver for DesignWare
57+
+ I3C Sample driver.
58+
diff --git a/drivers/i3c/sample/Makefile b/drivers/i3c/sample/Makefile
59+
new file mode 100644
60+
index 000000000000..c73bb34fce0e
61+
--- /dev/null
62+
+++ b/drivers/i3c/sample/Makefile
63+
@@ -0,0 +1,2 @@
64+
+# SPDX-License-Identifier: GPL-2.0-only
65+
+obj-$(CONFIG_DW_I3C_SAMPLE) += dw-i3c-sample.o
66+
\ No newline at end of file
67+
diff --git a/drivers/i3c/sample/dw-i3c-sample.c b/drivers/i3c/sample/dw-i3c-sample.c
68+
new file mode 100644
69+
index 000000000000..1993b9fdb32b
70+
--- /dev/null
71+
+++ b/drivers/i3c/sample/dw-i3c-sample.c
72+
@@ -0,0 +1,75 @@
73+
+// SPDX-License-Identifier: GPL-2.0
74+
+/* Copyright (C) 2021 Intel Corporation.*/
75+
+
76+
+#include <linux/i3c/device.h>
77+
+#include <linux/module.h>
78+
+
79+
+#define IBI_QUEUE_STATUS_IBI_ID(x) (((x) & GENMASK(15, 8)) >> 8)
80+
+#define IBI_QUEUE_IBI_ADDR(x) (IBI_QUEUE_STATUS_IBI_ID(x) >> 1)
81+
+#define IBI_QUEUE_STATUS_DATA_LEN(x) ((x) & GENMASK(7, 0))
82+
+
83+
+static void ibi_handler(struct i3c_device *dev,
84+
+ const struct i3c_ibi_payload *payload)
85+
+{
86+
+ unsigned int i = 0;
87+
+ u32 ibi_status;
88+
+ u8 addr;
89+
+ const u8 *buf;
90+
+
91+
+ dev_info(i3cdev_to_dev(dev), "%s:%d\n", __func__, __LINE__);
92+
+ if (payload) {
93+
+ ibi_status = *((u32 *)payload->data);
94+
+ addr = IBI_QUEUE_IBI_ADDR(ibi_status);
95+
+ dev_info(i3cdev_to_dev(dev), "%s, dynamic address = 0x%02x\n",
96+
+ __func__, addr);
97+
+ /* We need to read only IBI Paylod data - so shift for IBI_QUEUE_STATUS
98+
+ * length which is 32 bits
99+
+ */
100+
+ buf = payload->data + sizeof(u32);
101+
+ for (i = 0; i < IBI_QUEUE_STATUS_DATA_LEN(ibi_status); i++)
102+
+ dev_info(i3cdev_to_dev(dev), "%s payload[%d] = 0x%02x\n",
103+
+ __func__, i, *(buf + sizeof(u8) * i));
104+
+ }
105+
+}
106+
+
107+
+static int dw_i3c_sample_probe(struct i3c_device *i3cdev)
108+
+{
109+
+ int ret;
110+
+ struct i3c_ibi_setup ibireq = {
111+
+ .handler = ibi_handler,
112+
+ .max_payload_len = 2,
113+
+ .num_slots = 10,
114+
+ };
115+
+
116+
+ ret = i3c_device_request_ibi(i3cdev, &ibireq);
117+
+ if (ret)
118+
+ return ret;
119+
+ ret = i3c_device_enable_ibi(i3cdev);
120+
+ if (ret)
121+
+ i3c_device_free_ibi(i3cdev);
122+
+
123+
+ return ret;
124+
+}
125+
+
126+
+static void dw_i3c_sample_remove(struct i3c_device *i3cdev)
127+
+{
128+
+ i3c_device_disable_ibi(i3cdev);
129+
+ i3c_device_free_ibi(i3cdev);
130+
+}
131+
+
132+
+static const struct i3c_device_id dw_i3c_sample_ids[] = {
133+
+ I3C_DEVICE(0x2AC /*manufid*/, 0x55AA /*partid*/, NULL /*driver-data*/),
134+
+ { /* sentinel */ },
135+
+};
136+
+
137+
+static struct i3c_driver dw_i3c_sample = {
138+
+ .driver.name = "dw-i3c-sample",
139+
+ .id_table = dw_i3c_sample_ids,
140+
+ .probe = dw_i3c_sample_probe,
141+
+ .remove = dw_i3c_sample_remove,
142+
+};
143+
+
144+
+module_i3c_driver(dw_i3c_sample);
145+
+MODULE_AUTHOR("Oleksandr Shulzhenko <[email protected]>");
146+
+MODULE_DESCRIPTION("DesignWare I3C sample driver");
147+
+MODULE_LICENSE("GPL");
148+
--
149+
2.25.1
150+

‎meta-openbmc-mods/meta-ast2600/recipes-kernel/linux/linux-aspeed_%.bbappend

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ SRC_URI += " \
77
file://0002-serial-8250-Fix-RX-DMA-time-out-property.patch \
88
file://0003-serial-8250_aspeed-Make-port-type-fixed.patch \
99
file://0004-Add-a-workaround-to-cover-UART-interrupt-bug-in-AST2.patch \
10+
file://0005-Add-sample-i3c-slave-driver.patch \
1011
"

‎meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors/0001-ADCSensor-Fix-for-P3V3-sensor.patch

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From 9923811a2880ad4a8289af666b63adfd1807b5bd Mon Sep 17 00:00:00 2001
2+
From: Jayaprakash Mutyala <[email protected]>
3+
Date: Mon, 22 Nov 2021 22:12:00 +0000
4+
Subject: [PATCH] ADCSensor: Fix for P3V3 sensor
5+
6+
Issue: As part of adapting to upstream ADC driver change for all the
7+
platforms of AST2600, ADC scale factor settings in board configurations
8+
is adjusted.
9+
Patch: https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/47086
10+
Due to this change set sensor threshold is not updating for critical
11+
threshold value of P3V3 sensor.
12+
13+
Fix: Updating pre sensor scaling of "maxVoltageReading" to 2.5 can fix
14+
this issue.
15+
16+
Tested:
17+
Verified using IPMI set sensor threshold command for P3V3 sensor and for
18+
other sensors as well.
19+
Before fix:
20+
//Get sensor threshold for P3V3 sensor
21+
Command : ipmitool raw 0x04 0x27 0x83
22+
Response: 1b d6 d0 00 f8 ff 00
23+
//Set sensor threshold for P3V3 sensor
24+
Command : ipmitool raw 0x04 0x26 0x83 0x10 0x00 0x00 0x00 0x00 0xfd 0x00
25+
Response: //Success
26+
Command : ipmitool raw 0x04 0x27 0x83
27+
Response: 1b d8 d1 00 f9 ff 00
28+
29+
After fix:
30+
//Get sensor threshold for P3V3 sensor
31+
Command : ipmitool raw 0x04 0x27 0x81
32+
Response: 1b b2 ad 00 ce d4 00
33+
//Set sensor threshold for P3V3 sensor
34+
Command : ipmitool raw 0x04 0x26 0x81 0x10 0x00 0x00 0x00 0x00 0xfd 0x00
35+
Response: //Success
36+
Command : ipmitool raw 0x04 0x27 0x81
37+
Response: 1b b2 ad 00 ce fd 00
38+
39+
Signed-off-by: Jayaprakash Mutyala <[email protected]>
40+
---
41+
src/ADCSensor.cpp | 2 +-
42+
1 file changed, 1 insertion(+), 1 deletion(-)
43+
44+
diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
45+
index 9758168..2f3c66f 100644
46+
--- a/src/ADCSensor.cpp
47+
+++ b/src/ADCSensor.cpp
48+
@@ -37,7 +37,7 @@
49+
static constexpr unsigned int sensorScaleFactor = 1000;
50+
51+
static constexpr double roundFactor = 10000; // 3 decimal places
52+
-static constexpr double maxVoltageReading = 1.8; // pre sensor scaling
53+
+static constexpr double maxVoltageReading = 2.5; // pre sensor scaling
54+
static constexpr double minVoltageReading = 0;
55+
56+
ADCSensor::ADCSensor(const std::string& path,
57+
--
58+
2.17.1
59+

‎meta-openbmc-mods/meta-ast2600/recipes-phosphor/sensors/dbus-sensors_%.bbappend

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
2+
3+
SRC_URI += "file://0001-ADCSensor-Fix-for-P3V3-sensor.patch"

‎meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ DEPENDS = "sdbusplus openssl libpam libgpiod safec"
1212

1313
do_configure[depends] += "virtual/kernel:do_shared_workdir"
1414

15-
SRC_URI = "git://github.com/Intel-BMC/asd;protocol=git"
16-
SRCREV = "1.4.6"
15+
SRC_URI = "git://github.com/Intel-BMC/asd;protocol=https"
16+
SRCREV = "1.4.7"
17+
18+
SRC_URI += "file://0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch"
1719

1820
inherit useradd
1921

‎meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/files/0001-ASD-Fix-sprintf_s-compilation-issue-for-safec-3.5.1.patch

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From efd1373e7c4a7a89609184aa0b5e1c3edcb8be6a Mon Sep 17 00:00:00 2001
2+
From: Ernesto Corona <[email protected]>
3+
Date: Fri, 19 Nov 2021 09:11:03 -0800
4+
Subject: [PATCH] ASD Fix sprintf_s compilation issue for safec 3.5.1
5+
6+
A missing macro was defined to ensure sprintf_s macro defintion is
7+
set when safe_str_lib.h is included.
8+
9+
Test:
10+
Remove openbmc-meta-intel/meta-common/recipes-core/safec/safec_3.4.bb
11+
Compile at-scale-debug using devtool
12+
ASD Sanity finished successfully(SPR).
13+
14+
Signed-off-by: Ernesto Corona <[email protected]>
15+
Change-Id: Idd94b4ba9ff8b4194317a045b140ce90db2ee860
16+
---
17+
CMakeLists.txt | 2 ++
18+
1 file changed, 2 insertions(+)
19+
20+
diff --git a/CMakeLists.txt b/CMakeLists.txt
21+
index 59ff03c..d6239a4 100644
22+
--- a/CMakeLists.txt
23+
+++ b/CMakeLists.txt
24+
@@ -4,6 +4,8 @@ project(at-scale-debug C)
25+
find_package (PkgConfig REQUIRED)
26+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/sysroot/include)
27+
pkg_check_modules (SAFEC REQUIRED libsafec)
28+
+# Define HAVE_C99 to include sprintf_s macro in safec library
29+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_C99")
30+
include_directories (${SAFEC_INCLUDE_DIRS})
31+
link_directories (${SAFEC_LIBRARY_DIRS})
32+
33+
--
34+
2.25.1
35+

‎meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUMMARY = "libmctp"
22
DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)"
33

44
SRC_URI = "git://github.com/openbmc/libmctp.git"
5-
SRCREV = "663ec39ea107c2a736f9bcb20cbfdfa623092ab1"
5+
SRCREV = "983cc3fa49dcac2e640e814500221c6acc177eff"
66

77
PV = "0.1+git${SRCPV}"
88

‎meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF
22
EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}"
33
EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF"
44
SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git"
5-
SRCREV = "9e58cfe1ba5ca5bcd5263b50730c5a231eabdd4f"
5+
SRCREV = "d2d60ab5b325c4630c8e794e861b88cf3c9337bf"
66

77
FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
88

0 commit comments

Comments
 (0)