yocto: update master

Summary: Update master at b0587b300 update-submodule: yocto/lf-master - Revert obmc-console patch (fixed upstream) - Rebase Yv4 entity-manager patches - Rebase Yv4 kernel patches Test Plan: CIT build passes. Reviewed By: amithash Differential Revision: D63902874 fbshipit-source-id: e3c18e9a2f1b20ed11b36b124a99fbbd011a081a
facebook · Oct 4, 2024 · 258681f · 258681f
1 parent 57e62f5
commit 258681f
Show file tree

Hide file tree

Showing 37 changed files with 223 additions and 886 deletions.
diff --git a/.../meta-yosemite4/recipes-kernel/linux/linux-aspeed/1000-add-meta-yv4-bmc-dts-setting.patch b/.../meta-yosemite4/recipes-kernel/linux/linux-aspeed/1000-add-meta-yv4-bmc-dts-setting.patch
diff --git a/...recipes-kernel/linux/linux-aspeed/1001-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch b/...recipes-kernel/linux/linux-aspeed/1001-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch
@@ -1,7 +1,7 @@
-From 4adbdc2a40a9b518f4a4ed5c196d28ea60b88d84 Mon Sep 17 00:00:00 2001
+From 85f92e6bc4efa5ddb6f7bf54f560e94e1723468b Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <[email protected]>
 Date: Mon, 11 Dec 2023 10:22:47 +0800
-Subject: [PATCH 1001/1024] ARM: dts: aspeed: yosemite4: support mux to cpld
+Subject: [PATCH 1001/1022] ARM: dts: aspeed: yosemite4: support mux to cpld
 
 Mux pca9544 to cpld was added on EVT HW schematic design,
 so add dts setting for devices behind mux pca9544 to cpld
@@ -15,7 +15,7 @@ Signed-off-by: Delphine CC Chiu <[email protected]>
  1 file changed, 12 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index c27ad5e14b0d..9831ac88037e 100644
+index e246f4e49a55..ffb7a961cbdd 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -38,6 +38,8 @@ aliases {
@@ -27,7 +27,7 @@ index c27ad5e14b0d..9831ac88037e 100644
  	};
 
  	chosen {
-@@ -1026,16 +1028,18 @@ imux35: i2c@1 {
+@@ -1053,16 +1055,18 @@ imux35: i2c@1 {
  			#address-cells = <1>;
  			#size-cells = <0>;
  		};

diff --git a/...e4/recipes-kernel/linux/linux-aspeed/1002-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch b/...e4/recipes-kernel/linux/linux-aspeed/1002-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch
@@ -1,7 +1,7 @@
-From 19b2b5a12e327962287d623b0626873a443a5720 Mon Sep 17 00:00:00 2001
+From 865e1ac4421fbc0fdf37a58ebe335e28049bfe5d Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <[email protected]>
 Date: Mon, 11 Dec 2023 10:29:27 +0800
-Subject: [PATCH 1002/1024] ARM: dts: aspeed: yosemite4: Revise gpio name
+Subject: [PATCH 1002/1022] ARM: dts: aspeed: yosemite4: Revise gpio name
 
 Revise gpio name for EVT schematic changes
 
@@ -14,10 +14,10 @@ Signed-off-by: Delphine CC Chiu <[email protected]>
  1 file changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 9831ac88037e..d101f6575a50 100644
+index ffb7a961cbdd..72f615c9d81b 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -1433,7 +1433,7 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
+@@ -1435,7 +1435,7 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
  	/*B0-B7*/       "FLT_HSC_SERVER_SLOT8_N","AC_ON_OFF_BTN_CPLD_SLOT5_N",
  			"PWRGD_SLOT1_STBY","PWRGD_SLOT2_STBY",
  			"PWRGD_SLOT3_STBY","PWRGD_SLOT4_STBY","","",
@@ -26,7 +26,7 @@ index 9831ac88037e..d101f6575a50 100644
  			"FM_NIC1_WAKE_N","","RST_PCIE_SLOT2_N",
  	/*D0-D7*/       "","","","","","","","",
  	/*E0-E7*/       "PRSNT_NIC1_N","PRSNT_NIC2_N","","RST_PCIE_SLOT1_N",
-@@ -1451,16 +1451,15 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
+@@ -1453,16 +1453,15 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
  	/*K0-K7*/       "","","","","","","","",
  	/*L0-L7*/       "","","","","","","ALT_MEDUSA_P12V_EFUSE_N","",
  	/*M0-M7*/       "EN_NIC0_POWER_BMC_R","EN_NIC1_POWER_BMC_R",
@@ -46,7 +46,7 @@ index 9831ac88037e..d101f6575a50 100644
  	/*P0-P7*/       "ALT_SMB_BMC_CPLD1_N","'BTN_BMC_R2_N",
  			"EN_P3V_BAT_SCALED_R","PWRGD_P5V_USB_BMC",
  			"FM_BMC_RTCRST_R","RST_USB_HUB_R_N",
-@@ -1478,9 +1477,8 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
+@@ -1480,9 +1479,8 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
  			"","ALT_P12V_AUX_N","FAST_PROCHOT_N",
  			"SPI_WP_DISABLE_STATUS_R_N",
  	/*T0-T7*/       "","","","","","","","",

diff --git a/.../meta-yosemite4/recipes-kernel/linux/linux-aspeed/1003-remove-pincontrol-on-GPIO-U5.patch b/.../meta-yosemite4/recipes-kernel/linux/linux-aspeed/1003-remove-pincontrol-on-GPIO-U5.patch
@@ -1,7 +1,7 @@
-From 81ffd1239acbdaeb6bcb4a60710d66a302200e01 Mon Sep 17 00:00:00 2001
+From 8721b3058a156e0ebfc5d4c95c0ed6058eebd873 Mon Sep 17 00:00:00 2001
 From: Chris Wang <[email protected]>
 Date: Wed, 20 Dec 2023 16:16:06 +0800
-Subject: [PATCH 1003/1024] remove pincontrol on GPIO U5
+Subject: [PATCH 1003/1022] remove pincontrol on GPIO U5
 
 Remove pincontrol on GPIO U5 to avoid kernel occupation, let programs at
 application layer can monitor the pin.
@@ -13,10 +13,10 @@ This commit depends on the patch below:
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index d101f6575a50..7b05c930ea6e 100644
+index 72f615c9d81b..8e8609626824 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -1426,8 +1426,7 @@ &sgpiom0 {
+@@ -1428,8 +1428,7 @@ &sgpiom0 {
  &gpio0 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&pinctrl_gpiu2_default &pinctrl_gpiu3_default

diff --git a/...semite4/recipes-kernel/linux/linux-aspeed/1004-Meta-yv4-dts-add-mac-config-property.patch b/...semite4/recipes-kernel/linux/linux-aspeed/1004-Meta-yv4-dts-add-mac-config-property.patch
@@ -1,7 +1,7 @@
-From 62070e8c66d54fdaf42c3e76ddadade4d9e420a6 Mon Sep 17 00:00:00 2001
+From e305f66cfea12b8da0b93f011c479ec38ad7d012 Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <[email protected]>
 Date: Wed, 3 Jan 2024 13:49:42 +0800
-Subject: [PATCH 1004/1024] Meta yv4 dts : add mac config property
+Subject: [PATCH 1004/1022] Meta yv4 dts : add mac config property
 
 To fix Mellanox cx7 cannot get IP after NIC re-plug.
 
@@ -12,7 +12,7 @@ This commit depends on the patch below:
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 7b05c930ea6e..79ea09fcf0a8 100644
+index 8e8609626824..abde25b017a4 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -137,6 +137,8 @@ &mac2 {

diff --git a/...a238-devicetree-config-for-EVT-sche.patch → ...a238-devicetree-config-for-EVT-sche.patch b/...a238-devicetree-config-for-EVT-sche.patch → ...a238-devicetree-config-for-EVT-sche.patch
@@ -1,18 +1,18 @@
-From d1668966f7096f5055d6b68318a363f767ec5aac Mon Sep 17 00:00:00 2001
+From 19cbc2734a376033c9b7824a4fcccd339f26433a Mon Sep 17 00:00:00 2001
 From: Eric <[email protected]>
 Date: Mon, 29 Jan 2024 16:59:19 +0800
-Subject: [PATCH 1006/1024] Add ina233 and ina238 devicetree config for EVT
+Subject: [PATCH 1005/1022] Add ina233 and ina238 devicetree config for EVT
  schematic change
 
 ---
  .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts    | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index f89788e1a0ff..d81c180769c2 100644
+index abde25b017a4..dbc6674c97bc 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -924,6 +924,19 @@ power-sensor@40 {
+@@ -951,6 +951,19 @@ power-sensor@40 {
  			reg = <0x40>;
  	};
 

diff --git a/...emite4/recipes-kernel/linux/linux-aspeed/1005-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch b/...emite4/recipes-kernel/linux/linux-aspeed/1005-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch
diff --git a/...alibration-for-matching-hardware-de.patch → ...alibration-for-matching-hardware-de.patch b/...alibration-for-matching-hardware-de.patch → ...alibration-for-matching-hardware-de.patch
@@ -1,7 +1,7 @@
-From 79b1fdadf63ed39b52245b291506ff7e149d8af8 Mon Sep 17 00:00:00 2001
+From a7bb7db16b1986392a7698424cd093ca24c6fd8a Mon Sep 17 00:00:00 2001
 From: PeterHo-wiwynn <[email protected]>
 Date: Tue, 5 Mar 2024 15:15:49 +0800
-Subject: [PATCH 1007/1024] Adjust resistor-calibration for matching hardware
+Subject: [PATCH 1006/1022] Adjust resistor-calibration for matching hardware
  design
 
 This patch is for hardware testing. According to the datasheet and
@@ -14,10 +14,10 @@ once we finish.
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index d81c180769c2..2a18dff44a4c 100644
+index dbc6674c97bc..15d1b9265749 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -1096,35 +1096,35 @@ adc@37 {
+@@ -1125,35 +1125,35 @@ adc@37 {
  	power-sensor@40 {
  		compatible = "ti,ina233";
  		reg = <0x40>;

diff --git a/...eed-yosemite4-Revise-i2c-duty-cycle.patch → ...eed-yosemite4-Revise-i2c-duty-cycle.patch b/...eed-yosemite4-Revise-i2c-duty-cycle.patch → ...eed-yosemite4-Revise-i2c-duty-cycle.patch
@@ -1,7 +1,7 @@
-From b46c212a4139f77af9055663724d70f012e1692c Mon Sep 17 00:00:00 2001
+From 185690fc97c1d216b8398f0af6ae99340b46d846 Mon Sep 17 00:00:00 2001
 From: Eric <[email protected]>
 Date: Tue, 5 Mar 2024 10:57:35 +0800
-Subject: [PATCH 1008/1024] ARM: dts: aspeed: yosemite4: Revise i2c duty cycle
+Subject: [PATCH 1007/1022] ARM: dts: aspeed: yosemite4: Revise i2c duty cycle
 
 To meet 400kHz-i2c clock low time spec (> 1.3 us)
 Revise duty cycle SMB11 and SMB16 to 40:60.
@@ -12,19 +12,19 @@ https://lore.kernel.org/all/[email protected]
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 2a18dff44a4c..8bd3855e71b3 100644
+index 15d1b9265749..42a96bc383dd 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -765,6 +765,7 @@ eeprom@54 {
- &i2c10 {
+@@ -789,6 +789,7 @@ &i2c10 {
+ 	#size-cells = <0>;
  	status = "okay";
  	bus-frequency = <400000>;
 +        i2c-clk-high-min-percent = <40>;
  	i2c-mux@74 {
  		compatible = "nxp,pca9544";
- 		i2c-mux-idle-disconnect;
-@@ -1327,6 +1328,7 @@ &i2c15 {
- 	mctp-controller;
+ 		reg = <0x74>;
+@@ -1311,6 +1312,7 @@ &i2c15 {
+ 	status = "okay";
  	multi-master;
  	bus-frequency = <400000>;
 +        i2c-clk-high-min-percent = <40>;

diff --git a/...semite4-disable-GPIO-internal-Pull-.patch → ...semite4-disable-GPIO-internal-Pull-.patch b/...semite4-disable-GPIO-internal-Pull-.patch → ...semite4-disable-GPIO-internal-Pull-.patch
@@ -1,7 +1,7 @@
-From 8e73f7d106267cdea5966bac601c6fdb145dd651 Mon Sep 17 00:00:00 2001
+From 111d4852b6d96bf2bd9cec500e4d9b1dd18e2e7f Mon Sep 17 00:00:00 2001
 From: RickyWu-wiwynn <[email protected]>
 Date: Mon, 4 Mar 2024 17:48:40 +0800
-Subject: [PATCH 1009/1024] ARM: dts: aspeed: yosemite4: disable GPIO internal
+Subject: [PATCH 1008/1022] ARM: dts: aspeed: yosemite4: disable GPIO internal
  Pull-Down
 
 Disable GPIO internal Pull-Down for hardware validation.
@@ -10,10 +10,10 @@ Disable GPIO internal Pull-Down for hardware validation.
  1 file changed, 44 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 8bd3855e71b3..4ac9e7602b51 100644
+index 42a96bc383dd..b289f5f95faf 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -1462,10 +1462,53 @@ &sgpiom0 {
+@@ -1444,10 +1444,53 @@ &sgpiom0 {
  	bus-frequency = <48000>;
  };
 

diff --git a/...10-yosemite4-Change-IOE-i2c-address.patch → ...09-yosemite4-Change-IOE-i2c-address.patch b/...10-yosemite4-Change-IOE-i2c-address.patch → ...09-yosemite4-Change-IOE-i2c-address.patch
@@ -1,7 +1,7 @@
-From d53b900ce9912bfc82f813a17b95c154a6c7ad2f Mon Sep 17 00:00:00 2001
+From f47ec0ca830513e152460ae7b2405e74cbab2eb7 Mon Sep 17 00:00:00 2001
 From: Sara Lin <[email protected]>
 Date: Wed, 20 Mar 2024 19:13:34 +0800
-Subject: [PATCH 1010/1024] yosemite4: Change IOE i2c address
+Subject: [PATCH 1009/1022] yosemite4: Change IOE i2c address
 
 Description
 1. Change CPLD IOE i2c address to avoid i2c address conflict.
@@ -21,7 +21,7 @@ Log
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 4ac9e7602b51..d96d2b1f5e98 100644
+index b289f5f95faf..b9c10526c2a2 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -183,9 +183,9 @@ mctp@10 {

diff --git a/...evise-duty-cycle-for-SMB9-and-SMB10.patch → ...evise-duty-cycle-for-SMB9-and-SMB10.patch b/...evise-duty-cycle-for-SMB9-and-SMB10.patch → ...evise-duty-cycle-for-SMB9-and-SMB10.patch
@@ -1,7 +1,7 @@
-From bae99a996fe30cbab23165b83a65656eb5e7ce4a Mon Sep 17 00:00:00 2001
+From a19b19b90e3aa95731c4f9b590363ab70a0da5f2 Mon Sep 17 00:00:00 2001
 From: EricYang-wiwynn <[email protected]>
 Date: Mon, 1 Apr 2024 15:05:58 +0800
-Subject: [PATCH 1011/1024] Revise duty cycle for SMB9 and SMB10
+Subject: [PATCH 1010/1022] Revise duty cycle for SMB9 and SMB10
 
 ARM: dts: aspeed: yosemite4:
 Revise duty cycle for SMB9 and SMB10 to 40:60
@@ -13,25 +13,25 @@ https://lore.kernel.org/all/[email protected]
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index d96d2b1f5e98..4201b28924d7 100644
+index b9c10526c2a2..b6966314f1e6 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-@@ -543,6 +543,7 @@ power-sensor@40 {
- &i2c8 {
+@@ -545,6 +545,7 @@ &i2c8 {
+ 	#size-cells = <0>;
  	status = "okay";
  	bus-frequency = <400000>;
 +        i2c-clk-high-min-percent = <40>;
  	i2c-mux@70 {
  		compatible = "nxp,pca9544";
- 		i2c-mux-idle-disconnect;
-@@ -654,6 +655,7 @@ eeprom@54 {
- &i2c9 {
+ 		reg = <0x70>;
+@@ -667,6 +668,7 @@ &i2c9 {
+ 	#size-cells = <0>;
  	status = "okay";
  	bus-frequency = <400000>;
 +        i2c-clk-high-min-percent = <40>;
  	i2c-mux@71 {
  		compatible = "nxp,pca9544";
- 		i2c-mux-idle-disconnect;
+ 		reg = <0x71>;
 -- 
 2.44.2