Skip to contentSkip to conversation

ARM: dts: aspeed: amd-ethanolx: Update KCS nodes to use v2 binding

PATCH In review Konstantin Aladyshev 3 participants 12 messages Oct 27, 2020 – Oct 28, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: aspeed: amd-ethanolx: Update KCS nodes to use v2 binding

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -3
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
 	status = "okay";
-	kcs_addr = <0x60>;
+	aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
 	status = "okay";
-	kcs_addr = <0x62>;
+	aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
 	status = "okay";
-	kcs_addr = <0x97DE>;
+	aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 ARM: dts: aspeed: amd-ethanolx: Enable KCS channel 3

The KCS interface on the LPC channel 3 in the controller is used for the in-band BMC<->BIOS IPMI communication. 0xCA2 is a default host CPU LPC IO address for this interface.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +5 -0
index 89ddc3847222..2a86bda8afd8 100644
@@ -147,6 +147,11 @@
 	aspeed,lpc-io-reg = <0x62>;
 };
 
+&kcs3 {
+	status = "okay";
+	aspeed,lpc-io-reg = <0xCA2>;
+};
+
 &kcs4 {
 	status = "okay";
 	aspeed,lpc-io-reg = <0x97DE>;
Signature · 1 line
2.17.1
#4 lore raw

PATCH 3/3 ARM: dts: aspeed: amd-ethanolx: Enable devices for the iKVM functionality

In reply to Konstantin Aladyshev

Enable the USB 2.0 Virtual Hub Controller and
the Video Engine with it's reserved memory region for the implementation of the iKVM functionality in the BMC.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +22 -0
index 2a86bda8afd8..b93ed44eba0c 100644
@@ -13,6 +13,21 @@
 	memory at 80000000 {
 		reg = <0x80000000 0x20000000>;
 	};
+
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		video_engine_memory: jpegbuffer {
+			size = <0x02000000>;	/* 32M */
+			alignment = <0x01000000>;
+			compatible = "shared-dma-pool";
+			reusable;
+		};
+	};
+
+
 	aliases {
 		serial0 = &uart1;
 		serial4 = &uart5;
@@ -220,5 +235,12 @@
 	};
 };
 
+&video {
+	status = "okay";
+	memory-region = <&video_engine_memory>;
+};
 
+&vhub {
+	status = "okay";
+};
 
Signature · 1 line
2.17.1
Reviewed-by on v1 3/3
#5 lore raw

Re: [PATCH 3/3] ARM: dts: aspeed: amd-ethanolx: Enable devices for the iKVM functionality

Quoted 7 lines · Konstantin Aladyshev

[CAUTION: External Email]

Enable the USB 2.0 Virtual Hub Controller and
the Video Engine with it's reserved memory region for the implementation of the iKVM functionality in the BMC.

Quoted 46 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +22 -1
index 2a86bda8afd8..b93ed44eba0c 100644
@@ -13,6 +13,21 @@
        memory at 80000000 {
                reg = <0x80000000 0x20000000>;
        };
+
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               video_engine_memory: jpegbuffer {
+                       size = <0x02000000>;    /* 32M */
+                       alignment = <0x01000000>;
+                       compatible = "shared-dma-pool";
+                       reusable;
+               };
+       };
+
+
        aliases {
                serial0 = &uart1;
                serial4 = &uart5;
@@ -220,5 +235,12 @@
        };
 };
 
+&video {
+       status = "okay";
+       memory-region = <&video_engine_memory>;
+};
 
+&vhub {
+       status = "okay";
+};
 
--

2.17.1

#7 lore raw
In reply to Konstantin Aladyshev

These changes are already merged in https://github.com/openbmc/linux/blob/dev-5.8/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts by Joel. Please abandon these changes.

Thanks,
Supreeth

Quoted 41 lines · Konstantin Aladyshev

[CAUTION: External Email]

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -4
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
        status = "okay";
-       kcs_addr = <0x60>;
+       aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
        status = "okay";
-       kcs_addr = <0x62>;
+       aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
        status = "okay";
-       kcs_addr = <0x97DE>;
+       aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
--

2.17.1

#8 lore raw

These changes got picked up from my backport patch to the 'dev-5.8' branch of the OpenBMC Linux repository.
This patch also needed to be added to the main ASPEED Linux kernel, so it could get into subsequent branches of the OpenBMC Linux repository.

Best regards,
Konstantin Aladyshev

Quoted 49 lines · Supreeth Venkatesh

These changes are already merged in https://github.com/openbmc/linux/blob/dev-5.8/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts by Joel. Please abandon these changes.

Thanks,
Supreeth

Quoted 41 lines · Konstantin Aladyshev

[CAUTION: External Email]

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -4
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
        status = "okay";
-       kcs_addr = <0x60>;
+       aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
        status = "okay";
-       kcs_addr = <0x62>;
+       aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
        status = "okay";
-       kcs_addr = <0x97DE>;
+       aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
--

2.17.1

maintainer Reviewed-by on v1 1/3
#10 lore raw
In reply to Konstantin Aladyshev
Quoted 8 lines · Konstantin Aladyshev

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

Fixes 09f5f680707e ("ipmi: kcs: aspeed: Implement v2 bindings")
Quoted 32 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -4
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
        status = "okay";
-       kcs_addr = <0x60>;
+       aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
        status = "okay";
-       kcs_addr = <0x62>;
+       aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
        status = "okay";
-       kcs_addr = <0x97DE>;
+       aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
--

2.17.1

maintainer Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] ARM: dts: aspeed: amd-ethanolx: Enable KCS channel 3

In reply to Konstantin Aladyshev
Quoted 7 lines · Konstantin Aladyshev

The KCS interface on the LPC channel 3 in the controller is used for the in-band BMC<->BIOS IPMI communication. 0xCA2 is a default host CPU LPC IO address for this interface.

I don't have any docs on the platform so I'll wait for a review from Supreeth before applying this one.

It's a correct use of the bindings:

Quoted 23 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +5 -1
index 89ddc3847222..2a86bda8afd8 100644
@@ -147,6 +147,11 @@
        aspeed,lpc-io-reg = <0x62>;
 };
 
+&kcs3 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xCA2>;
+};
+
 &kcs4 {
        status = "okay";
        aspeed,lpc-io-reg = <0x97DE>;
--

2.17.1

maintainer Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] ARM: dts: aspeed: amd-ethanolx: Enable devices for the iKVM functionality

In reply to Konstantin Aladyshev
Quoted 6 lines · Konstantin Aladyshev

Enable the USB 2.0 Virtual Hub Controller and
the Video Engine with it's reserved memory region for the implementation of the iKVM functionality in the BMC.

Quoted 46 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +22 -1
index 2a86bda8afd8..b93ed44eba0c 100644
@@ -13,6 +13,21 @@
        memory at 80000000 {
                reg = <0x80000000 0x20000000>;
        };
+
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               video_engine_memory: jpegbuffer {
+                       size = <0x02000000>;    /* 32M */
+                       alignment = <0x01000000>;
+                       compatible = "shared-dma-pool";
+                       reusable;
+               };
+       };
+
+
        aliases {
                serial0 = &uart1;
                serial4 = &uart5;
@@ -220,5 +235,12 @@
        };
 };
 
+&video {
+       status = "okay";
+       memory-region = <&video_engine_memory>;
+};
 
+&vhub {
+       status = "okay";
+};
 
--

2.17.1

maintainer
#11 lore raw
In reply to Joel Stanley
Quoted 10 lines · Joel Stanley
Quoted 7 lines · Konstantin Aladyshev

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

Quoted 3 lines
Quoted 1 line
Fixes 09f5f680707e ("ipmi: kcs: aspeed: Implement v2 bindings")

Actually, this is probably better:

Fixes fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding")

I slightly reworked your commit message when applying.

Quoted 34 lines
Quoted 32 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -4
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
        status = "okay";
-       kcs_addr = <0x60>;
+       aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
        status = "okay";
-       kcs_addr = <0x62>;
+       aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
        status = "okay";
-       kcs_addr = <0x97DE>;
+       aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
--

2.17.1

maintainer
#9 lore raw
In reply to Supreeth Venkatesh
Quoted 3 lines · Supreeth Venkatesh

These changes are already merged in https://github.com/openbmc/linux/blob/dev-5.8/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts by Joel. Please abandon these changes.

That is the openbmc kernel tree, where we stage patches on their way to mainline. This submission is for mainline, where this patch has not been merged.

Cheers,

Joel

Quoted 46 lines

Thanks,
Supreeth

Quoted 41 lines · Konstantin Aladyshev

[CAUTION: External Email]

KCS nodes compatible property in the 'aspeed-g5.dtsi' file was changed to use v2 binding in the commit fa4c8ec6feaa ("ARM: dts: aspeed: Change KCS nodes to v2 binding"). For the proper initialization of /dev/ipmi-kcs* devices KCS node variables also need to be changed to use v2 binding.

---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +3 -4
index 60ba86f3e5bc..89ddc3847222 100644
@@ -139,17 +139,17 @@
 
 &kcs1 {
        status = "okay";
-       kcs_addr = <0x60>;
+       aspeed,lpc-io-reg = <0x60>;
 };
 
 &kcs2 {
        status = "okay";
-       kcs_addr = <0x62>;
+       aspeed,lpc-io-reg = <0x62>;
 };
 
 &kcs4 {
        status = "okay";
-       kcs_addr = <0x97DE>;
+       aspeed,lpc-io-reg = <0x97DE>;
 };
 
 &lpc_snoop {
--

2.17.1

Reviewed-by
#3 lore raw

Re: [PATCH 2/3] ARM: dts: aspeed: amd-ethanolx: Enable KCS channel 3

In reply to Joel Stanley

Thanks Konstantin for this patch.
Thanks Joel for reviewing this.

Quoted 10 lines · Joel Stanley

[CAUTION: External Email]

Quoted 6 lines · Konstantin Aladyshev

The KCS interface on the LPC channel 3 in the controller is used for the in-band BMC<->BIOS IPMI communication. 0xCA2 is a default host CPU LPC IO address for this interface.

Quoted 4 lines
Quoted 1 line

I don't have any docs on the platform so I'll wait for a review from Supreeth before applying this one.

Done.

Quoted 4 lines

It's a correct use of the bindings:

Quoted 24 lines
Quoted 24 lines
---
 arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts +5 -1
index 89ddc3847222..2a86bda8afd8 100644
@@ -147,6 +147,11 @@
        aspeed,lpc-io-reg = <0x62>;
 };
 
+&kcs3 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xCA2>;
+};
+
 &kcs4 {
        status = "okay";
        aspeed,lpc-io-reg = <0x97DE>;
--

2.17.1