* Does obmc-ikvm work with bmcweb?
@ 2019-03-14 2:21 xiuzhi
2019-03-14 17:53 ` Jae Hyun Yoo
0 siblings, 1 reply; 28+ messages in thread
From: xiuzhi @ 2019-03-14 2:21 UTC (permalink / raw)
To: jae.hyun.yoo, openbmc, ed, Eddie James
[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]
Hi Jae, Ed,
I updated the source to openbmc latest version which uses bmcweb instead of phosphor-rest.
It seemed that ikvm cannot work on bmcweb.
The websit error:
app.bundle.js:43 Refused to connect to 'wss://192.168.200.132/kvm/0' because it violates the following Content Security Policy directive: "default-src 'self'". Note that 'connect-src' was not explicitly set, so 'default-src' is used as a fallback.
Then I modify the bmcweb file include/security_headers_middleware.hpp L40:
// The KVM currently needs to load images from base64 encoded strings.
// img-src 'self' data: is used to allow that.
// https://stackoverflow.com/questions/18447970/content-security-policy-data-not-working-for-base64-images-in-chrome-28
res.addHeader("Content-Security-Policy",
"default-src 'self'; img-src 'self' data:");
to:
policy-data-not-working-for-base64-images-in-chrome-28
res.addHeader("Content-Security-Policy",
"script-src 'self'; img-src 'self' data:");
The website erro:
"app.bundle.js:43 WebSocket on-error event"
"WebSocket connection to 'wss://192.168.200.132/kvmws' failed: WebSocket opening handshake timed out"
What is wrong with it?
Best,
Xiuzhi
[-- Attachment #2: Type: text/html, Size: 1758 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: Does obmc-ikvm work with bmcweb? 2019-03-14 2:21 Does obmc-ikvm work with bmcweb? xiuzhi @ 2019-03-14 17:53 ` Jae Hyun Yoo 2019-03-15 7:18 ` xiuzhi 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-14 17:53 UTC (permalink / raw) To: xiuzhi, openbmc, ed, Eddie James Hi xiuzhi, These are my repo information: bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 Cherry picked https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a I can see working KVM through https://my.bmc.ip.addr/#/server-control/kvm -Jae On 3/13/2019 7:21 PM, xiuzhi wrote: > Hi Jae, Ed, > I updated the source to openbmc latest version which uses bmcweb > instead of phosphor-rest. > It seemed that ikvm cannot work on bmcweb. > The websit error: > app.bundle.js:43 Refused to connect to 'wss://192.168.200.132/kvm/0' > because it violates the following Content Security Policy directive: > "default-src 'self'". Note that 'connect-src' was not explicitly set, so > 'default-src' is used as a fallback. > Then I modify the bmcweb file include/security_headers_middleware.hpp L40: > // The KVM currently needs to load images from base64 encoded > strings. > // img-src 'self' data: is used to allow that. > // > https://stackoverflow.com/questions/18447970/content-security-policy-data-not-working-for-base64-images-in-chrome-28 > res.addHeader("Content-Security-Policy", > "default-src 'self'; img-src 'self' data:"); > to: > policy-data-not-working-for-base64-images-in-chrome-28 > res.addHeader("Content-Security-Policy", > "script-src 'self'; img-src 'self' data:"); > > The website erro: > "app.bundle.js:43 WebSocket on-error event" > "WebSocket connection to 'wss://192.168.200.132/kvmws' failed: WebSocket > opening handshake timed out" > What is wrong with it? > Best, > Xiuzhi > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-14 17:53 ` Jae Hyun Yoo @ 2019-03-15 7:18 ` xiuzhi 2019-03-15 17:11 ` Jae Hyun Yoo 2019-04-04 5:21 ` ikvm refresh failed on host screen 1680x1050 resolution xiuzhi 0 siblings, 2 replies; 28+ messages in thread From: xiuzhi @ 2019-03-15 7:18 UTC (permalink / raw) To: jae.hyun.yoo, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 2117 bytes --] Hi Jae, Thanks for giving me the source commit numbers related to the ikvm feature . But It didn't work after I updated them. Would you like to tell me your github.com/openbmc/openbmc commit number and the target machine of TEMPLATCONF? Best, Xiuzhi Hi xiuzhi, These are my repo information: bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 Cherry picked https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a I can see working KVM through https://my.bmc.ip.addr/#/server-control/kvm -Jae On 3/13/2019 7:21 PM, xiuzhi wrote: > Hi Jae, Ed, > I updated the source to openbmc latest version which uses bmcweb > instead of phosphor-rest. > It seemed that ikvm cannot work on bmcweb. > The websit error: > app.bundle.js:43 Refused to connect to 'wss://192.168.200.132/kvm/0' > because it violates the following Content Security Policy directive: > "default-src 'self'". Note that 'connect-src' was not explicitly set, so > 'default-src' is used as a fallback. > Then I modify the bmcweb file include/security_headers_middleware.hpp L40: > // The KVM currently needs to load images from base64 encoded > strings. > // img-src 'self' data: is used to allow that. > // > https://stackoverflow.com/questions/18447970/content-security-policy-data-not-working-for-base64-images-in-chrome-28 > res.addHeader("Content-Security-Policy", > "default-src 'self'; img-src 'self' data:"); > to: > policy-data-not-working-for-base64-images-in-chrome-28 > res.addHeader("Content-Security-Policy", > "script-src 'self'; img-src 'self' data:"); > > The website erro: > "app.bundle.js:43 WebSocket on-error event" > "WebSocket connection to 'wss://192.168.200.132/kvmws' failed: WebSocket > opening handshake timed out" > What is wrong with it? > Best, > Xiuzhi > [-- Attachment #2: Type: text/html, Size: 2734 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-15 7:18 ` xiuzhi @ 2019-03-15 17:11 ` Jae Hyun Yoo 2019-03-18 2:25 ` Lei YU 2019-04-04 5:21 ` ikvm refresh failed on host screen 1680x1050 resolution xiuzhi 1 sibling, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-15 17:11 UTC (permalink / raw) To: xiuzhi, openbmc, ed, Eddie James Hi Xiuzhi, openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 I'm using a custom build config for my machine. As you already know, for enabling the KVM feature, customization on kernel configs, adding a 'start-ipkvm' service, adding of libvncserver package and back-porting of aspeed video driver are also needed so there is no one-shot buildable TEMPLATECONF for KVM test. Cheers, Jae On 3/15/2019 12:18 AM, xiuzhi wrote: > Hi Jae, > Thanks for giving me the source commit numbers related to the ikvm > feature . > But It didn't work after I updated them. > Would you like to tell me your github.com/openbmc/openbmc commit > number and the target machine of TEMPLATCONF? > Best, > Xiuzhi > > Hi xiuzhi, > > These are my repo information: > bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 > phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 > Cherry picked > https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ > libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f > obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a > > I can see working KVM through https://my.bmc.ip.addr/#/server-control/kvm > > -Jae > > On 3/13/2019 7:21 PM, xiuzhi wrote: > > Hi Jae, Ed, > > I updated the source to openbmc latest version which uses bmcweb > > instead of phosphor-rest. > > It seemed that ikvm cannot work on bmcweb. > > The websit error: > > app.bundle.js:43 Refused to connect to 'wss://192.168.200.132/kvm/0' > > because it violates the following Content Security Policy directive: > > "default-src 'self'". Note that 'connect-src' was not explicitly set, so > > 'default-src' is used as a fallback. > > Then I modify the bmcweb file include/security_headers_middleware.hpp > L40: > > // The KVM currently needs to load images from base64 encoded > > strings. > > // img-src 'self' data: is used to allow that. > > // > > > https://stackoverflow.com/questions/18447970/content-security-policy-data-not-working-for-base64-images-in-chrome-28 > > res.addHeader("Content-Security-Policy", > > "default-src 'self'; img-src 'self' data:"); > > to: > > policy-data-not-working-for-base64-images-in-chrome-28 > > res.addHeader("Content-Security-Policy", > > "script-src 'self'; img-src 'self' data:"); > > > > The website erro: > > "app.bundle.js:43 WebSocket on-error event" > > "WebSocket connection to 'wss://192.168.200.132/kvmws' failed: WebSocket > > opening handshake timed out" > > What is wrong with it? > > Best, > > Xiuzhi > > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-15 17:11 ` Jae Hyun Yoo @ 2019-03-18 2:25 ` Lei YU 2019-03-18 17:21 ` Jae Hyun Yoo 0 siblings, 1 reply; 28+ messages in thread From: Lei YU @ 2019-03-18 2:25 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: xiuzhi, openbmc, ed, Eddie James > openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 > > I'm using a custom build config for my machine. As you already know, for > enabling the KVM feature, customization on kernel configs, adding a > 'start-ipkvm' service, adding of libvncserver package and back-porting > of aspeed video driver are also needed so there is no one-shot buildable > TEMPLATECONF for KVM test. Could you kindly put everything together on a branch so others could refer the branch to know what the changes are for KVM to work? Thanks a lot! ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-18 2:25 ` Lei YU @ 2019-03-18 17:21 ` Jae Hyun Yoo 2019-03-18 17:33 ` Jae Hyun Yoo 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-18 17:21 UTC (permalink / raw) To: Lei YU; +Cc: xiuzhi, openbmc, ed, Eddie James On 3/17/2019 7:25 PM, Lei YU wrote: >> openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 >> >> I'm using a custom build config for my machine. As you already know, for >> enabling the KVM feature, customization on kernel configs, adding a >> 'start-ipkvm' service, adding of libvncserver package and back-porting >> of aspeed video driver are also needed so there is no one-shot buildable >> TEMPLATECONF for KVM test. > > Could you kindly put everything together on a branch so others could refer the > branch to know what the changes are for KVM to work? > Thanks a lot! > Well, I've already shared SHAs that are relating to KVM in this email thread, I'm sharing it again with some more details. openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 Cherry picked https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f Need to remove 'x11' and 'gtk+' to reduce package size so I made: libvncserver_%.bbappend ---------------------------------------------------------------- PACKAGECONFIG_remove = "gcrypt gnutls png sdl zlib" TARGET_CXXFLAGS += " -Dflto" do_install_append() { rm -rf ${D}${libdir}/libvncclient* } inherit cmake # Use the latest to support obmc-ikvm DEPENDS += "openssl" SRC_URI = "git://github.com/LibVNC/libvncserver" SRCREV = "3348a7e42e86dfb98dd7458ad29def476cf6096f" S = "${WORKDIR}/git" # Remove x11 and gtk+ that cause big image size # Actually, these aren't needed to support obmc-ikvm REQUIRED_DISTRO_FEATURES_remove = "x11" DEPENDS_remove = "gtk+" RDEPENDS_${PN}_remove = "gtk+" ---------------------------------------------------------------- start-ipkvm: Cherry pick https://gerrit.openbmc-project.xyz/#/c/openbmc/meta-phosphor/+/13536/ After cherry picking it, I changed start-ipkvm.service file like below: start-ipkvm.service ---------------------------------------------------------------- [Unit] Description=OpenBMC ipKVM daemon StopWhenUnneeded=false [Service] Restart=always ExecStartPre=/usr/bin/create_usbhid.sh ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1 [Install] WantedBy=multi-user.target ----------------------------------------------------------------- obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a linux-aspeed: 7859d04be772a1d185de335a8e9d38ac03a89f3f Added these kernel configs: ----------------------------------------------------------------- CONFIG_FRAME_VECTOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ASPEED=y CONFIG_VIDEOBUF2_CORE=y CONFIG_VIDEOBUF2_V4L2=y CONFIG_VIDEOBUF2_MEMOPS=y CONFIG_VIDEOBUF2_DMA_CONTIG=y CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_USB_GADGET_VBUS_DRAW=2 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_LIBCOMPOSITE=y CONFIG_USB_F_HID=y CONFIG_USB_GADGET=y CONFIG_U_SERIAL_CONSOLE=y CONFIG_USB_ASPEED_VHUB=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_HID=y ------------------------------------------------------------------- Back ported Eddie's aspeed-video driver diff --git a/MAINTAINERS b/MAINTAINERS index b98a5763f6c1..cdd8f824b6da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2358,6 +2358,14 @@ S: Maintained F: Documentation/hwmon/asc7621 F: drivers/hwmon/asc7621.c +ASPEED VIDEO ENGINE DRIVER +M: Eddie James <eajames@linux.ibm.com> +L: linux-media@vger.kernel.org +L: openbmc@lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: drivers/media/platform/aspeed-video.c +F: Documentation/devicetree/bindings/media/aspeed-video.txt + ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary <corentin.chary@gmail.com> L: acpi4asus-user@lists.sourceforge.net diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index d8a9d20cc4e0..d6da0a29ced3 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -243,6 +243,17 @@ interrupts = <0x19>; }; + video: video@1e700000 { + compatible = "aspeed,ast2500-video-engine"; + reg = <0x1e700000 0x20000>; + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, + <&syscon ASPEED_CLK_GATE_ECLK>; + clock-names = "vclk", "eclk"; + resets = <&syscon ASPEED_RESET_VIDEO>; + interrupts = <7>; + status = "disabled"; + }; + adc: adc@1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>; diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index 596136793fc4..f16ce7dbd6ab 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -87,7 +87,7 @@ struct aspeed_clk_gate { /* TODO: ask Aspeed about the actual parent data */ static const struct aspeed_gate_data aspeed_gates[] = { /* clk rst name parent flags */ - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", "eclk", 0 }, /* Video Engine */ + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", "eclk", 0 }, /* Video Engine */ [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */ [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ @@ -113,6 +113,24 @@ static const struct aspeed_gate_data aspeed_gates[] = { [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ }; +static const char * const eclk_parent_names[] = { + "mpll", + "hpll", + "dpll", +}; + +static const struct clk_div_table ast2500_eclk_div_table[] = { + { 0x0, 2 }, + { 0x1, 2 }, + { 0x2, 3 }, + { 0x3, 4 }, + { 0x4, 5 }, + { 0x5, 6 }, + { 0x6, 7 }, + { 0x7, 8 }, + { 0 } +}; + static const struct clk_div_table ast2500_mac_div_table[] = { { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ { 0x1, 4 }, @@ -192,18 +210,21 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val) struct aspeed_clk_soc_data { const struct clk_div_table *div_table; + const struct clk_div_table *eclk_div_table; const struct clk_div_table *mac_div_table; struct clk_hw *(*calc_pll)(const char *name, u32 val); }; static const struct aspeed_clk_soc_data ast2500_data = { .div_table = ast2500_div_table, + .eclk_div_table = ast2500_eclk_div_table, .mac_div_table = ast2500_mac_div_table, .calc_pll = aspeed_ast2500_calc_pll, }; static const struct aspeed_clk_soc_data ast2400_data = { .div_table = ast2400_div_table, + .eclk_div_table = ast2400_div_table, .mac_div_table = ast2400_div_table, .calc_pll = aspeed_ast2400_calc_pll, }; @@ -317,6 +338,7 @@ static const u8 aspeed_resets[] = { [ASPEED_RESET_PECI] = 10, [ASPEED_RESET_I2C] = 2, [ASPEED_RESET_AHB] = 1, + [ASPEED_RESET_VIDEO] = 6, /* * SCUD4 resets start at an offset to separate them from @@ -522,6 +544,22 @@ static int aspeed_clk_probe(struct platform_device *pdev) return PTR_ERR(hw); aspeed_clk_data->hws[ASPEED_CLK_24M] = hw; + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names, + ARRAY_SIZE(eclk_parent_names), 0, + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; + + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0, + scu_base + ASPEED_CLK_SELECTION, 28, + 3, 0, soc_data->eclk_div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; + /* * TODO: There are a number of clocks that not included in this driver * as more information is required: @@ -531,7 +569,6 @@ static int aspeed_clk_probe(struct platform_device *pdev) * RGMII * RMII * UART[1..5] clock source mux - * Video Engine (ECLK) mux and clock divider */ for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 54fe90acb5b2..d6edf2d28f9b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -32,6 +32,15 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/omap/Kconfig" +config VIDEO_ASPEED + tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on VIDEO_V4L2 + select VIDEOBUF2_DMA_CONTIG + help + Support for the Aspeed Video Engine (VE) embedded in the Aspeed + AST2400 and AST2500 SOCs. The VE can capture and compress video data + from digital or analog sources. + config VIDEO_SH_VOU tristate "SuperH VOU video output driver" depends on MEDIA_CAMERA_SUPPORT diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 41322ab65802..205c33a004fc 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -3,6 +3,7 @@ # Makefile for the video capture/playback device drivers. # +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o obj-$(CONFIG_VIDEO_CADENCE) += cadence/ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h index f43738607d77..15a9059d0303 100644 --- a/include/dt-bindings/clock/aspeed-clock.h +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -50,5 +50,6 @@ #define ASPEED_RESET_I2C 7 #define ASPEED_RESET_AHB 8 #define ASPEED_RESET_CRT1 9 +#define ASPEED_RESET_VIDEO 10 #endif ------------------------------------------------------------------ These are all I did for testing KVM. Cheers, Jae ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-18 17:21 ` Jae Hyun Yoo @ 2019-03-18 17:33 ` Jae Hyun Yoo 2019-03-19 3:05 ` xiuzhi 2019-03-19 9:22 ` Lei YU 0 siblings, 2 replies; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-18 17:33 UTC (permalink / raw) To: Lei YU; +Cc: xiuzhi, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 12000 bytes --] Attaching a patch file for back porting of Eddie's aspeed-video driver. Diff in below doesn't include the newly created file so I'm attaching it as a patch. -Jae On 3/18/2019 10:21 AM, Jae Hyun Yoo wrote: > On 3/17/2019 7:25 PM, Lei YU wrote: >>> openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 >>> >>> I'm using a custom build config for my machine. As you already know, for >>> enabling the KVM feature, customization on kernel configs, adding a >>> 'start-ipkvm' service, adding of libvncserver package and back-porting >>> of aspeed video driver are also needed so there is no one-shot buildable >>> TEMPLATECONF for KVM test. >> >> Could you kindly put everything together on a branch so others could >> refer the >> branch to know what the changes are for KVM to work? >> Thanks a lot! >> > > Well, I've already shared SHAs that are relating to KVM in this email > thread, I'm sharing it again with some more details. > > openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 > > bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 > > phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 > Cherry picked > https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ > > libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f > Need to remove 'x11' and 'gtk+' to reduce package size so I made: > libvncserver_%.bbappend > ---------------------------------------------------------------- > PACKAGECONFIG_remove = "gcrypt gnutls png sdl zlib" > > TARGET_CXXFLAGS += " -Dflto" > > do_install_append() { > rm -rf ${D}${libdir}/libvncclient* > } > > inherit cmake > > # Use the latest to support obmc-ikvm > DEPENDS += "openssl" > SRC_URI = "git://github.com/LibVNC/libvncserver" > SRCREV = "3348a7e42e86dfb98dd7458ad29def476cf6096f" > S = "${WORKDIR}/git" > > # Remove x11 and gtk+ that cause big image size > # Actually, these aren't needed to support obmc-ikvm > REQUIRED_DISTRO_FEATURES_remove = "x11" > DEPENDS_remove = "gtk+" > RDEPENDS_${PN}_remove = "gtk+" > ---------------------------------------------------------------- > > start-ipkvm: Cherry pick > https://gerrit.openbmc-project.xyz/#/c/openbmc/meta-phosphor/+/13536/ > After cherry picking it, I changed start-ipkvm.service file like below: > start-ipkvm.service > ---------------------------------------------------------------- > [Unit] > Description=OpenBMC ipKVM daemon > StopWhenUnneeded=false > > [Service] > Restart=always > ExecStartPre=/usr/bin/create_usbhid.sh > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p > /dev/hidg1 > > [Install] > WantedBy=multi-user.target > ----------------------------------------------------------------- > > obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a > > linux-aspeed: 7859d04be772a1d185de335a8e9d38ac03a89f3f > Added these kernel configs: > ----------------------------------------------------------------- > CONFIG_FRAME_VECTOR=y > CONFIG_MEDIA_SUPPORT=y > CONFIG_MEDIA_CAMERA_SUPPORT=y > CONFIG_VIDEO_DEV=y > CONFIG_VIDEO_V4L2=y > CONFIG_V4L_PLATFORM_DRIVERS=y > CONFIG_VIDEO_ASPEED=y > CONFIG_VIDEOBUF2_CORE=y > CONFIG_VIDEOBUF2_V4L2=y > CONFIG_VIDEOBUF2_MEMOPS=y > CONFIG_VIDEOBUF2_DMA_CONTIG=y > CONFIG_MEDIA_SUBDRV_AUTOSELECT=y > CONFIG_USB_GADGET_VBUS_DRAW=2 > CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > CONFIG_USB_LIBCOMPOSITE=y > CONFIG_USB_F_HID=y > CONFIG_USB_GADGET=y > CONFIG_U_SERIAL_CONSOLE=y > CONFIG_USB_ASPEED_VHUB=y > CONFIG_USB_CONFIGFS=y > CONFIG_USB_CONFIGFS_MASS_STORAGE=y > CONFIG_USB_CONFIGFS_F_FS=y > CONFIG_USB_CONFIGFS_F_HID=y > ------------------------------------------------------------------- > Back ported Eddie's aspeed-video driver > > diff --git a/MAINTAINERS b/MAINTAINERS > index b98a5763f6c1..cdd8f824b6da 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2358,6 +2358,14 @@ S: Maintained > F: Documentation/hwmon/asc7621 > F: drivers/hwmon/asc7621.c > > +ASPEED VIDEO ENGINE DRIVER > +M: Eddie James <eajames@linux.ibm.com> > +L: linux-media@vger.kernel.org > +L: openbmc@lists.ozlabs.org (moderated for non-subscribers) > +S: Maintained > +F: drivers/media/platform/aspeed-video.c > +F: Documentation/devicetree/bindings/media/aspeed-video.txt > + > ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS > M: Corentin Chary <corentin.chary@gmail.com> > L: acpi4asus-user@lists.sourceforge.net > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi > b/arch/arm/boot/dts/aspeed-g5.dtsi > index d8a9d20cc4e0..d6da0a29ced3 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -243,6 +243,17 @@ > interrupts = <0x19>; > }; > > + video: video@1e700000 { > + compatible = "aspeed,ast2500-video-engine"; > + reg = <0x1e700000 0x20000>; > + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, > + <&syscon ASPEED_CLK_GATE_ECLK>; > + clock-names = "vclk", "eclk"; > + resets = <&syscon ASPEED_RESET_VIDEO>; > + interrupts = <7>; > + status = "disabled"; > + }; > + > adc: adc@1e6e9000 { > compatible = "aspeed,ast2500-adc"; > reg = <0x1e6e9000 0xb0>; > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > index 596136793fc4..f16ce7dbd6ab 100644 > --- a/drivers/clk/clk-aspeed.c > +++ b/drivers/clk/clk-aspeed.c > @@ -87,7 +87,7 @@ struct aspeed_clk_gate { > /* TODO: ask Aspeed about the actual parent data */ > static const struct aspeed_gate_data aspeed_gates[] = { > /* clk rst name parent flags */ > - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", > "eclk", 0 }, /* Video Engine */ > + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", > "eclk", 0 }, /* Video Engine */ > [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, > 0 }, /* 2D engine */ > [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", > CLK_IS_CRITICAL }, /* SDRAM */ > [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, > 0 }, /* Video Capture */ > @@ -113,6 +113,24 @@ static const struct aspeed_gate_data aspeed_gates[] > = { > [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", > "lhclk", 0 }, /* LPC master/LPC+ */ > }; > > +static const char * const eclk_parent_names[] = { > + "mpll", > + "hpll", > + "dpll", > +}; > + > +static const struct clk_div_table ast2500_eclk_div_table[] = { > + { 0x0, 2 }, > + { 0x1, 2 }, > + { 0x2, 3 }, > + { 0x3, 4 }, > + { 0x4, 5 }, > + { 0x5, 6 }, > + { 0x6, 7 }, > + { 0x7, 8 }, > + { 0 } > +}; > + > static const struct clk_div_table ast2500_mac_div_table[] = { > { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ > { 0x1, 4 }, > @@ -192,18 +210,21 @@ static struct clk_hw > *aspeed_ast2500_calc_pll(const char *name, u32 val) > > struct aspeed_clk_soc_data { > const struct clk_div_table *div_table; > + const struct clk_div_table *eclk_div_table; > const struct clk_div_table *mac_div_table; > struct clk_hw *(*calc_pll)(const char *name, u32 val); > }; > > static const struct aspeed_clk_soc_data ast2500_data = { > .div_table = ast2500_div_table, > + .eclk_div_table = ast2500_eclk_div_table, > .mac_div_table = ast2500_mac_div_table, > .calc_pll = aspeed_ast2500_calc_pll, > }; > > static const struct aspeed_clk_soc_data ast2400_data = { > .div_table = ast2400_div_table, > + .eclk_div_table = ast2400_div_table, > .mac_div_table = ast2400_div_table, > .calc_pll = aspeed_ast2400_calc_pll, > }; > @@ -317,6 +338,7 @@ static const u8 aspeed_resets[] = { > [ASPEED_RESET_PECI] = 10, > [ASPEED_RESET_I2C] = 2, > [ASPEED_RESET_AHB] = 1, > + [ASPEED_RESET_VIDEO] = 6, > > /* > * SCUD4 resets start at an offset to separate them from > @@ -522,6 +544,22 @@ static int aspeed_clk_probe(struct platform_device > *pdev) > return PTR_ERR(hw); > aspeed_clk_data->hws[ASPEED_CLK_24M] = hw; > > + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names, > + ARRAY_SIZE(eclk_parent_names), 0, > + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0, > + &aspeed_clk_lock); > + if (IS_ERR(hw)) > + return PTR_ERR(hw); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; > + > + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0, > + scu_base + ASPEED_CLK_SELECTION, 28, > + 3, 0, soc_data->eclk_div_table, > + &aspeed_clk_lock); > + if (IS_ERR(hw)) > + return PTR_ERR(hw); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; > + > /* > * TODO: There are a number of clocks that not included in this > driver > * as more information is required: > @@ -531,7 +569,6 @@ static int aspeed_clk_probe(struct platform_device > *pdev) > * RGMII > * RMII > * UART[1..5] clock source mux > - * Video Engine (ECLK) mux and clock divider > */ > > for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { > diff --git a/drivers/media/platform/Kconfig > b/drivers/media/platform/Kconfig > index 54fe90acb5b2..d6edf2d28f9b 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -32,6 +32,15 @@ source "drivers/media/platform/davinci/Kconfig" > > source "drivers/media/platform/omap/Kconfig" > > +config VIDEO_ASPEED > + tristate "Aspeed AST2400 and AST2500 Video Engine driver" > + depends on VIDEO_V4L2 > + select VIDEOBUF2_DMA_CONTIG > + help > + Support for the Aspeed Video Engine (VE) embedded in the Aspeed > + AST2400 and AST2500 SOCs. The VE can capture and compress video data > + from digital or analog sources. > + > config VIDEO_SH_VOU > tristate "SuperH VOU video output driver" > depends on MEDIA_CAMERA_SUPPORT > diff --git a/drivers/media/platform/Makefile > b/drivers/media/platform/Makefile > index 41322ab65802..205c33a004fc 100644 > --- a/drivers/media/platform/Makefile > +++ b/drivers/media/platform/Makefile > @@ -3,6 +3,7 @@ > # Makefile for the video capture/playback device drivers. > # > > +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o > obj-$(CONFIG_VIDEO_CADENCE) += cadence/ > obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o > obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ > diff --git a/include/dt-bindings/clock/aspeed-clock.h > b/include/dt-bindings/clock/aspeed-clock.h > index f43738607d77..15a9059d0303 100644 > --- a/include/dt-bindings/clock/aspeed-clock.h > +++ b/include/dt-bindings/clock/aspeed-clock.h > @@ -50,5 +50,6 @@ > #define ASPEED_RESET_I2C 7 > #define ASPEED_RESET_AHB 8 > #define ASPEED_RESET_CRT1 9 > +#define ASPEED_RESET_VIDEO 10 > > #endif > ------------------------------------------------------------------ > > These are all I did for testing KVM. > > Cheers, > Jae [-- Attachment #2: 0001-Add-Aspeed-Video-Engine-Driver.patch --] [-- Type: text/plain, Size: 62078 bytes --] From 58d948177be889762ec2277b7bfb8a60d02f445d Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Fri, 9 Nov 2018 11:32:27 -0800 Subject: [PATCH] Add Aspeed Video Engine Driver The Video Engine (VE) embedded in the Aspeed AST2400 and AST2500 SOCs can capture and compress video data from digital or analog sources. With the Aspeed chip acting a service processor, the Video Engine can capture the host processor graphics output. Add a V4L2 driver to capture video data and compress it to JPEG images. Make the video frames available through the V4L2 streaming interface. Signed-off-by: Eddie James <eajames@linux.ibm.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> --- .../devicetree/bindings/media/aspeed-video.txt | 26 + MAINTAINERS | 8 + arch/arm/boot/dts/aspeed-g5.dtsi | 11 + drivers/clk/clk-aspeed.c | 41 +- drivers/media/platform/Kconfig | 9 + drivers/media/platform/Makefile | 1 + drivers/media/platform/aspeed-video.c | 1729 ++++++++++++++++++++ include/dt-bindings/clock/aspeed-clock.h | 1 + 8 files changed, 1824 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/aspeed-video.txt create mode 100644 drivers/media/platform/aspeed-video.c diff --git a/Documentation/devicetree/bindings/media/aspeed-video.txt b/Documentation/devicetree/bindings/media/aspeed-video.txt new file mode 100644 index 000000000000..78b464ae2672 --- /dev/null +++ b/Documentation/devicetree/bindings/media/aspeed-video.txt @@ -0,0 +1,26 @@ +* Device tree bindings for Aspeed Video Engine + +The Video Engine (VE) embedded in the Aspeed AST2400 and AST2500 SOCs can +capture and compress video data from digital or analog sources. + +Required properties: + - compatible: "aspeed,ast2400-video-engine" or + "aspeed,ast2500-video-engine" + - reg: contains the offset and length of the VE memory region + - clocks: clock specifiers for the syscon clocks associated with + the VE (ordering must match the clock-names property) + - clock-names: "vclk" and "eclk" + - resets: reset specifier for the syscon reset associated with + the VE + - interrupts: the interrupt associated with the VE on this platform + +Example: + +video-engine@1e700000 { + compatible = "aspeed,ast2500-video-engine"; + reg = <0x1e700000 0x20000>; + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, <&syscon ASPEED_CLK_GATE_ECLK>; + clock-names = "vclk", "eclk"; + resets = <&syscon ASPEED_RESET_VIDEO>; + interrupts = <7>; +}; diff --git a/MAINTAINERS b/MAINTAINERS index b98a5763f6c1..cdd8f824b6da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2358,6 +2358,14 @@ S: Maintained F: Documentation/hwmon/asc7621 F: drivers/hwmon/asc7621.c +ASPEED VIDEO ENGINE DRIVER +M: Eddie James <eajames@linux.ibm.com> +L: linux-media@vger.kernel.org +L: openbmc@lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: drivers/media/platform/aspeed-video.c +F: Documentation/devicetree/bindings/media/aspeed-video.txt + ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS M: Corentin Chary <corentin.chary@gmail.com> L: acpi4asus-user@lists.sourceforge.net diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index d8a9d20cc4e0..d6da0a29ced3 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -243,6 +243,17 @@ interrupts = <0x19>; }; + video: video@1e700000 { + compatible = "aspeed,ast2500-video-engine"; + reg = <0x1e700000 0x20000>; + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, + <&syscon ASPEED_CLK_GATE_ECLK>; + clock-names = "vclk", "eclk"; + resets = <&syscon ASPEED_RESET_VIDEO>; + interrupts = <7>; + status = "disabled"; + }; + adc: adc@1e6e9000 { compatible = "aspeed,ast2500-adc"; reg = <0x1e6e9000 0xb0>; diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c index 596136793fc4..f16ce7dbd6ab 100644 --- a/drivers/clk/clk-aspeed.c +++ b/drivers/clk/clk-aspeed.c @@ -87,7 +87,7 @@ struct aspeed_clk_gate { /* TODO: ask Aspeed about the actual parent data */ static const struct aspeed_gate_data aspeed_gates[] = { /* clk rst name parent flags */ - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", "eclk", 0 }, /* Video Engine */ + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", "eclk", 0 }, /* Video Engine */ [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", CLK_IS_CRITICAL }, /* SDRAM */ [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ @@ -113,6 +113,24 @@ static const struct aspeed_gate_data aspeed_gates[] = { [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", "lhclk", 0 }, /* LPC master/LPC+ */ }; +static const char * const eclk_parent_names[] = { + "mpll", + "hpll", + "dpll", +}; + +static const struct clk_div_table ast2500_eclk_div_table[] = { + { 0x0, 2 }, + { 0x1, 2 }, + { 0x2, 3 }, + { 0x3, 4 }, + { 0x4, 5 }, + { 0x5, 6 }, + { 0x6, 7 }, + { 0x7, 8 }, + { 0 } +}; + static const struct clk_div_table ast2500_mac_div_table[] = { { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ { 0x1, 4 }, @@ -192,18 +210,21 @@ static struct clk_hw *aspeed_ast2500_calc_pll(const char *name, u32 val) struct aspeed_clk_soc_data { const struct clk_div_table *div_table; + const struct clk_div_table *eclk_div_table; const struct clk_div_table *mac_div_table; struct clk_hw *(*calc_pll)(const char *name, u32 val); }; static const struct aspeed_clk_soc_data ast2500_data = { .div_table = ast2500_div_table, + .eclk_div_table = ast2500_eclk_div_table, .mac_div_table = ast2500_mac_div_table, .calc_pll = aspeed_ast2500_calc_pll, }; static const struct aspeed_clk_soc_data ast2400_data = { .div_table = ast2400_div_table, + .eclk_div_table = ast2400_div_table, .mac_div_table = ast2400_div_table, .calc_pll = aspeed_ast2400_calc_pll, }; @@ -317,6 +338,7 @@ static const u8 aspeed_resets[] = { [ASPEED_RESET_PECI] = 10, [ASPEED_RESET_I2C] = 2, [ASPEED_RESET_AHB] = 1, + [ASPEED_RESET_VIDEO] = 6, /* * SCUD4 resets start at an offset to separate them from @@ -522,6 +544,22 @@ static int aspeed_clk_probe(struct platform_device *pdev) return PTR_ERR(hw); aspeed_clk_data->hws[ASPEED_CLK_24M] = hw; + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names, + ARRAY_SIZE(eclk_parent_names), 0, + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; + + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0, + scu_base + ASPEED_CLK_SELECTION, 28, + 3, 0, soc_data->eclk_div_table, + &aspeed_clk_lock); + if (IS_ERR(hw)) + return PTR_ERR(hw); + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; + /* * TODO: There are a number of clocks that not included in this driver * as more information is required: @@ -531,7 +569,6 @@ static int aspeed_clk_probe(struct platform_device *pdev) * RGMII * RMII * UART[1..5] clock source mux - * Video Engine (ECLK) mux and clock divider */ for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 54fe90acb5b2..d6edf2d28f9b 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -32,6 +32,15 @@ source "drivers/media/platform/davinci/Kconfig" source "drivers/media/platform/omap/Kconfig" +config VIDEO_ASPEED + tristate "Aspeed AST2400 and AST2500 Video Engine driver" + depends on VIDEO_V4L2 + select VIDEOBUF2_DMA_CONTIG + help + Support for the Aspeed Video Engine (VE) embedded in the Aspeed + AST2400 and AST2500 SOCs. The VE can capture and compress video data + from digital or analog sources. + config VIDEO_SH_VOU tristate "SuperH VOU video output driver" depends on MEDIA_CAMERA_SUPPORT diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 41322ab65802..205c33a004fc 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -3,6 +3,7 @@ # Makefile for the video capture/playback device drivers. # +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o obj-$(CONFIG_VIDEO_CADENCE) += cadence/ obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c new file mode 100644 index 000000000000..dfec813f50a9 --- /dev/null +++ b/drivers/media/platform/aspeed-video.c @@ -0,0 +1,1729 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <linux/atomic.h> +#include <linux/bitfield.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/dma-mapping.h> +#include <linux/interrupt.h> +#include <linux/jiffies.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_reserved_mem.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/sched.h> +#include <linux/spinlock.h> +#include <linux/string.h> +#include <linux/v4l2-controls.h> +#include <linux/videodev2.h> +#include <linux/wait.h> +#include <linux/workqueue.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-dev.h> +#include <media/v4l2-device.h> +#include <media/v4l2-dv-timings.h> +#include <media/v4l2-event.h> +#include <media/v4l2-ioctl.h> +#include <media/videobuf2-dma-contig.h> + +#define DEVICE_NAME "aspeed-video" + +#define ASPEED_VIDEO_JPEG_NUM_QUALITIES 12 +#define ASPEED_VIDEO_JPEG_HEADER_SIZE 10 +#define ASPEED_VIDEO_JPEG_QUANT_SIZE 116 +#define ASPEED_VIDEO_JPEG_DCT_SIZE 34 + +#define MAX_FRAME_RATE 60 +#define MAX_HEIGHT 1200 +#define MAX_WIDTH 1920 +#define MIN_HEIGHT 480 +#define MIN_WIDTH 640 + +#define NUM_POLARITY_CHECKS 10 +#define INVALID_RESOLUTION_RETRIES 2 +#define INVALID_RESOLUTION_DELAY msecs_to_jiffies(250) +#define RESOLUTION_CHANGE_DELAY msecs_to_jiffies(500) +#define MODE_DETECT_TIMEOUT msecs_to_jiffies(500) +#define STOP_TIMEOUT msecs_to_jiffies(1000) +#define DIRECT_FETCH_THRESHOLD 0x0c0000 /* 1024 * 768 */ + +#define VE_MAX_SRC_BUFFER_SIZE 0x8ca000 /* 1920 * 1200, 32bpp */ +#define VE_JPEG_HEADER_SIZE 0x006000 /* 512 * 12 * 4 */ + +#define VE_PROTECTION_KEY 0x000 +#define VE_PROTECTION_KEY_UNLOCK 0x1a038aa8 + +#define VE_SEQ_CTRL 0x004 +#define VE_SEQ_CTRL_TRIG_MODE_DET BIT(0) +#define VE_SEQ_CTRL_TRIG_CAPTURE BIT(1) +#define VE_SEQ_CTRL_FORCE_IDLE BIT(2) +#define VE_SEQ_CTRL_MULT_FRAME BIT(3) +#define VE_SEQ_CTRL_TRIG_COMP BIT(4) +#define VE_SEQ_CTRL_AUTO_COMP BIT(5) +#define VE_SEQ_CTRL_EN_WATCHDOG BIT(7) +#define VE_SEQ_CTRL_YUV420 BIT(10) +#define VE_SEQ_CTRL_COMP_FMT GENMASK(11, 10) +#define VE_SEQ_CTRL_HALT BIT(12) +#define VE_SEQ_CTRL_EN_WATCHDOG_COMP BIT(14) +#define VE_SEQ_CTRL_TRIG_JPG BIT(15) +#define VE_SEQ_CTRL_CAP_BUSY BIT(16) +#define VE_SEQ_CTRL_COMP_BUSY BIT(18) + +#ifdef CONFIG_MACH_ASPEED_G5 +#define VE_SEQ_CTRL_JPEG_MODE BIT(13) /* AST2500 */ +#else +#define VE_SEQ_CTRL_JPEG_MODE BIT(8) /* AST2400 */ +#endif /* CONFIG_MACH_ASPEED_G5 */ + +#define VE_CTRL 0x008 +#define VE_CTRL_HSYNC_POL BIT(0) +#define VE_CTRL_VSYNC_POL BIT(1) +#define VE_CTRL_SOURCE BIT(2) +#define VE_CTRL_INT_DE BIT(4) +#define VE_CTRL_DIRECT_FETCH BIT(5) +#define VE_CTRL_YUV BIT(6) +#define VE_CTRL_RGB BIT(7) +#define VE_CTRL_CAPTURE_FMT GENMASK(7, 6) +#define VE_CTRL_AUTO_OR_CURSOR BIT(8) +#define VE_CTRL_CLK_INVERSE BIT(11) +#define VE_CTRL_CLK_DELAY GENMASK(11, 9) +#define VE_CTRL_INTERLACE BIT(14) +#define VE_CTRL_HSYNC_POL_CTRL BIT(15) +#define VE_CTRL_FRC GENMASK(23, 16) + +#define VE_TGS_0 0x00c +#define VE_TGS_1 0x010 +#define VE_TGS_FIRST GENMASK(28, 16) +#define VE_TGS_LAST GENMASK(12, 0) + +#define VE_SCALING_FACTOR 0x014 +#define VE_SCALING_FILTER0 0x018 +#define VE_SCALING_FILTER1 0x01c +#define VE_SCALING_FILTER2 0x020 +#define VE_SCALING_FILTER3 0x024 + +#define VE_CAP_WINDOW 0x030 +#define VE_COMP_WINDOW 0x034 +#define VE_COMP_PROC_OFFSET 0x038 +#define VE_COMP_OFFSET 0x03c +#define VE_JPEG_ADDR 0x040 +#define VE_SRC0_ADDR 0x044 +#define VE_SRC_SCANLINE_OFFSET 0x048 +#define VE_SRC1_ADDR 0x04c +#define VE_COMP_ADDR 0x054 + +#define VE_STREAM_BUF_SIZE 0x058 +#define VE_STREAM_BUF_SIZE_N_PACKETS GENMASK(5, 3) +#define VE_STREAM_BUF_SIZE_P_SIZE GENMASK(2, 0) + +#define VE_COMP_CTRL 0x060 +#define VE_COMP_CTRL_VQ_DCT_ONLY BIT(0) +#define VE_COMP_CTRL_VQ_4COLOR BIT(1) +#define VE_COMP_CTRL_QUANTIZE BIT(2) +#define VE_COMP_CTRL_EN_BQ BIT(4) +#define VE_COMP_CTRL_EN_CRYPTO BIT(5) +#define VE_COMP_CTRL_DCT_CHR GENMASK(10, 6) +#define VE_COMP_CTRL_DCT_LUM GENMASK(15, 11) +#define VE_COMP_CTRL_EN_HQ BIT(16) +#define VE_COMP_CTRL_RSVD BIT(19) +#define VE_COMP_CTRL_ENCODE GENMASK(21, 20) +#define VE_COMP_CTRL_HQ_DCT_CHR GENMASK(26, 22) +#define VE_COMP_CTRL_HQ_DCT_LUM GENMASK(31, 27) + +#define VE_OFFSET_COMP_STREAM 0x078 + +#define VE_SRC_LR_EDGE_DET 0x090 +#define VE_SRC_LR_EDGE_DET_LEFT GENMASK(11, 0) +#define VE_SRC_LR_EDGE_DET_NO_V BIT(12) +#define VE_SRC_LR_EDGE_DET_NO_H BIT(13) +#define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14) +#define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15) +#define VE_SRC_LR_EDGE_DET_RT_SHF 16 +#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF) +#define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31) + +#define VE_SRC_TB_EDGE_DET 0x094 +#define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0) +#define VE_SRC_TB_EDGE_DET_BOT_SHF 16 +#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF) + +#define VE_MODE_DETECT_STATUS 0x098 +#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) +#define VE_MODE_DETECT_V_LINES_SHF 16 +#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF) +#define VE_MODE_DETECT_STATUS_VSYNC BIT(28) +#define VE_MODE_DETECT_STATUS_HSYNC BIT(29) + +#define VE_SYNC_STATUS 0x09c +#define VE_SYNC_STATUS_HSYNC GENMASK(11, 0) +#define VE_SYNC_STATUS_VSYNC_SHF 16 +#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) + +#define VE_INTERRUPT_CTRL 0x304 +#define VE_INTERRUPT_STATUS 0x308 +#define VE_INTERRUPT_MODE_DETECT_WD BIT(0) +#define VE_INTERRUPT_CAPTURE_COMPLETE BIT(1) +#define VE_INTERRUPT_COMP_READY BIT(2) +#define VE_INTERRUPT_COMP_COMPLETE BIT(3) +#define VE_INTERRUPT_MODE_DETECT BIT(4) +#define VE_INTERRUPT_FRAME_COMPLETE BIT(5) +#define VE_INTERRUPT_DECODE_ERR BIT(6) +#define VE_INTERRUPT_HALT_READY BIT(8) +#define VE_INTERRUPT_HANG_WD BIT(9) +#define VE_INTERRUPT_STREAM_DESC BIT(10) +#define VE_INTERRUPT_VSYNC_DESC BIT(11) + +#define VE_MODE_DETECT 0x30c +#define VE_MEM_RESTRICT_START 0x310 +#define VE_MEM_RESTRICT_END 0x314 + +enum { + VIDEO_MODE_DETECT_DONE, + VIDEO_RES_CHANGE, + VIDEO_RES_DETECT, + VIDEO_STREAMING, + VIDEO_FRAME_INPRG, + VIDEO_STOPPED, +}; + +struct aspeed_video_addr { + unsigned int size; + dma_addr_t dma; + void *virt; +}; + +struct aspeed_video_buffer { + struct vb2_v4l2_buffer vb; + struct list_head link; +}; + +#define to_aspeed_video_buffer(x) \ + container_of((x), struct aspeed_video_buffer, vb) + +struct aspeed_video { + void __iomem *base; + struct clk *eclk; + struct clk *vclk; + struct reset_control *rst; + + struct device *dev; + struct v4l2_ctrl_handler ctrl_handler; + struct v4l2_device v4l2_dev; + struct v4l2_pix_format pix_fmt; + struct v4l2_bt_timings active_timings; + struct v4l2_bt_timings detected_timings; + u32 v4l2_input_status; + struct vb2_queue queue; + struct video_device vdev; + struct mutex video_lock; /* v4l2 and videobuf2 lock */ + + wait_queue_head_t wait; + spinlock_t lock; /* buffer list lock */ + struct delayed_work res_work; + struct list_head buffers; + unsigned long flags; + unsigned int sequence; + + unsigned int max_compressed_size; + struct aspeed_video_addr srcs[2]; + struct aspeed_video_addr jpeg; + + bool yuv420; + unsigned int frame_rate; + unsigned int jpeg_quality; + + unsigned int frame_bottom; + unsigned int frame_left; + unsigned int frame_right; + unsigned int frame_top; +}; + +#define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev) + +static const u32 aspeed_video_jpeg_header[ASPEED_VIDEO_JPEG_HEADER_SIZE] = { + 0xe0ffd8ff, 0x464a1000, 0x01004649, 0x60000101, 0x00006000, 0x0f00feff, + 0x00002d05, 0x00000000, 0x00000000, 0x00dbff00 +}; + +static const u32 aspeed_video_jpeg_quant[ASPEED_VIDEO_JPEG_QUANT_SIZE] = { + 0x081100c0, 0x00000000, 0x00110103, 0x03011102, 0xc4ff0111, 0x00001f00, + 0x01010501, 0x01010101, 0x00000000, 0x00000000, 0x04030201, 0x08070605, + 0xff0b0a09, 0x10b500c4, 0x03010200, 0x03040203, 0x04040505, 0x7d010000, + 0x00030201, 0x12051104, 0x06413121, 0x07615113, 0x32147122, 0x08a19181, + 0xc1b14223, 0xf0d15215, 0x72623324, 0x160a0982, 0x1a191817, 0x28272625, + 0x35342a29, 0x39383736, 0x4544433a, 0x49484746, 0x5554534a, 0x59585756, + 0x6564635a, 0x69686766, 0x7574736a, 0x79787776, 0x8584837a, 0x89888786, + 0x9493928a, 0x98979695, 0xa3a29a99, 0xa7a6a5a4, 0xb2aaa9a8, 0xb6b5b4b3, + 0xbab9b8b7, 0xc5c4c3c2, 0xc9c8c7c6, 0xd4d3d2ca, 0xd8d7d6d5, 0xe2e1dad9, + 0xe6e5e4e3, 0xeae9e8e7, 0xf4f3f2f1, 0xf8f7f6f5, 0xc4fffaf9, 0x00011f00, + 0x01010103, 0x01010101, 0x00000101, 0x00000000, 0x04030201, 0x08070605, + 0xff0b0a09, 0x11b500c4, 0x02010200, 0x04030404, 0x04040507, 0x77020100, + 0x03020100, 0x21050411, 0x41120631, 0x71610751, 0x81322213, 0x91421408, + 0x09c1b1a1, 0xf0523323, 0xd1726215, 0x3424160a, 0x17f125e1, 0x261a1918, + 0x2a292827, 0x38373635, 0x44433a39, 0x48474645, 0x54534a49, 0x58575655, + 0x64635a59, 0x68676665, 0x74736a69, 0x78777675, 0x83827a79, 0x87868584, + 0x928a8988, 0x96959493, 0x9a999897, 0xa5a4a3a2, 0xa9a8a7a6, 0xb4b3b2aa, + 0xb8b7b6b5, 0xc3c2bab9, 0xc7c6c5c4, 0xd2cac9c8, 0xd6d5d4d3, 0xdad9d8d7, + 0xe5e4e3e2, 0xe9e8e7e6, 0xf4f3f2ea, 0xf8f7f6f5, 0xdafffaf9, 0x01030c00, + 0x03110200, 0x003f0011 +}; + +static const u32 aspeed_video_jpeg_dct[ASPEED_VIDEO_JPEG_NUM_QUALITIES] + [ASPEED_VIDEO_JPEG_DCT_SIZE] = { + { 0x0d140043, 0x0c0f110f, 0x11101114, 0x17141516, 0x1e20321e, + 0x3d1e1b1b, 0x32242e2b, 0x4b4c3f48, 0x44463f47, 0x61735a50, + 0x566c5550, 0x88644644, 0x7a766c65, 0x4d808280, 0x8c978d60, + 0x7e73967d, 0xdbff7b80, 0x1f014300, 0x272d2121, 0x3030582d, + 0x697bb958, 0xb8b9b97b, 0xb9b8a6a6, 0xb9b9b9b9, 0xb9b9b9b9, + 0xb9b9b9b9, 0xb9b9b9b9, 0xb9b9b9b9, 0xb9b9b9b9, 0xb9b9b9b9, + 0xb9b9b9b9, 0xb9b9b9b9, 0xb9b9b9b9, 0xffb9b9b9 }, + { 0x0c110043, 0x0a0d0f0d, 0x0f0e0f11, 0x14111213, 0x1a1c2b1a, + 0x351a1818, 0x2b1f2826, 0x4142373f, 0x3c3d373e, 0x55644e46, + 0x4b5f4a46, 0x77573d3c, 0x6b675f58, 0x43707170, 0x7a847b54, + 0x6e64836d, 0xdbff6c70, 0x1b014300, 0x22271d1d, 0x2a2a4c27, + 0x5b6ba04c, 0xa0a0a06b, 0xa0a0a0a0, 0xa0a0a0a0, 0xa0a0a0a0, + 0xa0a0a0a0, 0xa0a0a0a0, 0xa0a0a0a0, 0xa0a0a0a0, 0xa0a0a0a0, + 0xa0a0a0a0, 0xa0a0a0a0, 0xa0a0a0a0, 0xffa0a0a0 }, + { 0x090e0043, 0x090a0c0a, 0x0c0b0c0e, 0x110e0f10, 0x15172415, + 0x2c151313, 0x241a211f, 0x36372e34, 0x31322e33, 0x4653413a, + 0x3e4e3d3a, 0x62483231, 0x58564e49, 0x385d5e5d, 0x656d6645, + 0x5b536c5a, 0xdbff595d, 0x16014300, 0x1c201818, 0x22223f20, + 0x4b58853f, 0x85858558, 0x85858585, 0x85858585, 0x85858585, + 0x85858585, 0x85858585, 0x85858585, 0x85858585, 0x85858585, + 0x85858585, 0x85858585, 0x85858585, 0xff858585 }, + { 0x070b0043, 0x07080a08, 0x0a090a0b, 0x0d0b0c0c, 0x11121c11, + 0x23110f0f, 0x1c141a19, 0x2b2b2429, 0x27282428, 0x3842332e, + 0x313e302e, 0x4e392827, 0x46443e3a, 0x2c4a4a4a, 0x50565137, + 0x48425647, 0xdbff474a, 0x12014300, 0x161a1313, 0x1c1c331a, + 0x3d486c33, 0x6c6c6c48, 0x6c6c6c6c, 0x6c6c6c6c, 0x6c6c6c6c, + 0x6c6c6c6c, 0x6c6c6c6c, 0x6c6c6c6c, 0x6c6c6c6c, 0x6c6c6c6c, + 0x6c6c6c6c, 0x6c6c6c6c, 0x6c6c6c6c, 0xff6c6c6c }, + { 0x06090043, 0x05060706, 0x07070709, 0x0a09090a, 0x0d0e160d, + 0x1b0d0c0c, 0x16101413, 0x21221c20, 0x1e1f1c20, 0x2b332824, + 0x26302624, 0x3d2d1f1e, 0x3735302d, 0x22393a39, 0x3f443f2b, + 0x38334338, 0xdbff3739, 0x0d014300, 0x11130e0e, 0x15152613, + 0x2d355026, 0x50505035, 0x50505050, 0x50505050, 0x50505050, + 0x50505050, 0x50505050, 0x50505050, 0x50505050, 0x50505050, + 0x50505050, 0x50505050, 0x50505050, 0xff505050 }, + { 0x04060043, 0x03040504, 0x05040506, 0x07060606, 0x09090f09, + 0x12090808, 0x0f0a0d0d, 0x16161315, 0x14151315, 0x1d221b18, + 0x19201918, 0x281e1514, 0x2423201e, 0x17262726, 0x2a2d2a1c, + 0x25222d25, 0xdbff2526, 0x09014300, 0x0b0d0a0a, 0x0e0e1a0d, + 0x1f25371a, 0x37373725, 0x37373737, 0x37373737, 0x37373737, + 0x37373737, 0x37373737, 0x37373737, 0x37373737, 0x37373737, + 0x37373737, 0x37373737, 0x37373737, 0xff373737 }, + { 0x02030043, 0x01020202, 0x02020203, 0x03030303, 0x04040704, + 0x09040404, 0x07050606, 0x0b0b090a, 0x0a0a090a, 0x0e110d0c, + 0x0c100c0c, 0x140f0a0a, 0x1211100f, 0x0b131313, 0x1516150e, + 0x12111612, 0xdbff1213, 0x04014300, 0x05060505, 0x07070d06, + 0x0f121b0d, 0x1b1b1b12, 0x1b1b1b1b, 0x1b1b1b1b, 0x1b1b1b1b, + 0x1b1b1b1b, 0x1b1b1b1b, 0x1b1b1b1b, 0x1b1b1b1b, 0x1b1b1b1b, + 0x1b1b1b1b, 0x1b1b1b1b, 0x1b1b1b1b, 0xff1b1b1b }, + { 0x01020043, 0x01010101, 0x01010102, 0x02020202, 0x03030503, + 0x06030202, 0x05030404, 0x07070607, 0x06070607, 0x090b0908, + 0x080a0808, 0x0d0a0706, 0x0c0b0a0a, 0x070c0d0c, 0x0e0f0e09, + 0x0c0b0f0c, 0xdbff0c0c, 0x03014300, 0x03040303, 0x04040804, + 0x0a0c1208, 0x1212120c, 0x12121212, 0x12121212, 0x12121212, + 0x12121212, 0x12121212, 0x12121212, 0x12121212, 0x12121212, + 0x12121212, 0x12121212, 0x12121212, 0xff121212 }, + { 0x01020043, 0x01010101, 0x01010102, 0x02020202, 0x03030503, + 0x06030202, 0x05030404, 0x07070607, 0x06070607, 0x090b0908, + 0x080a0808, 0x0d0a0706, 0x0c0b0a0a, 0x070c0d0c, 0x0e0f0e09, + 0x0c0b0f0c, 0xdbff0c0c, 0x02014300, 0x03030202, 0x04040703, + 0x080a0f07, 0x0f0f0f0a, 0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, + 0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, + 0x0f0f0f0f, 0x0f0f0f0f, 0x0f0f0f0f, 0xff0f0f0f }, + { 0x01010043, 0x01010101, 0x01010101, 0x01010101, 0x02020302, + 0x04020202, 0x03020303, 0x05050405, 0x05050405, 0x07080606, + 0x06080606, 0x0a070505, 0x09080807, 0x05090909, 0x0a0b0a07, + 0x09080b09, 0xdbff0909, 0x02014300, 0x02030202, 0x03030503, + 0x07080c05, 0x0c0c0c08, 0x0c0c0c0c, 0x0c0c0c0c, 0x0c0c0c0c, + 0x0c0c0c0c, 0x0c0c0c0c, 0x0c0c0c0c, 0x0c0c0c0c, 0x0c0c0c0c, + 0x0c0c0c0c, 0x0c0c0c0c, 0x0c0c0c0c, 0xff0c0c0c }, + { 0x01010043, 0x01010101, 0x01010101, 0x01010101, 0x01010201, + 0x03010101, 0x02010202, 0x03030303, 0x03030303, 0x04050404, + 0x04050404, 0x06050303, 0x06050505, 0x03060606, 0x07070704, + 0x06050706, 0xdbff0606, 0x01014300, 0x01020101, 0x02020402, + 0x05060904, 0x09090906, 0x09090909, 0x09090909, 0x09090909, + 0x09090909, 0x09090909, 0x09090909, 0x09090909, 0x09090909, + 0x09090909, 0x09090909, 0x09090909, 0xff090909 }, + { 0x01010043, 0x01010101, 0x01010101, 0x01010101, 0x01010101, + 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x02020202, + 0x02020202, 0x03020101, 0x03020202, 0x01030303, 0x03030302, + 0x03020303, 0xdbff0403, 0x01014300, 0x01010101, 0x01010201, + 0x03040602, 0x06060604, 0x06060606, 0x06060606, 0x06060606, + 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, + 0x06060606, 0x06060606, 0x06060606, 0xff060606 } +}; + +static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = { + .type = V4L2_DV_BT_656_1120, + .bt = { + .min_width = MIN_WIDTH, + .max_width = MAX_WIDTH, + .min_height = MIN_HEIGHT, + .max_height = MAX_HEIGHT, + .min_pixelclock = 6574080, /* 640 x 480 x 24Hz */ + .max_pixelclock = 138240000, /* 1920 x 1200 x 60Hz */ + .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + V4L2_DV_BT_STD_CVT | V4L2_DV_BT_STD_GTF, + .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | + V4L2_DV_BT_CAP_REDUCED_BLANKING | + V4L2_DV_BT_CAP_CUSTOM, + }, +}; + +static void aspeed_video_init_jpeg_table(u32 *table, bool yuv420) +{ + int i; + unsigned int base; + + for (i = 0; i < ASPEED_VIDEO_JPEG_NUM_QUALITIES; i++) { + base = 256 * i; /* AST HW requires this header spacing */ + memcpy(&table[base], aspeed_video_jpeg_header, + sizeof(aspeed_video_jpeg_header)); + + base += ASPEED_VIDEO_JPEG_HEADER_SIZE; + memcpy(&table[base], aspeed_video_jpeg_dct[i], + sizeof(aspeed_video_jpeg_dct[i])); + + base += ASPEED_VIDEO_JPEG_DCT_SIZE; + memcpy(&table[base], aspeed_video_jpeg_quant, + sizeof(aspeed_video_jpeg_quant)); + + if (yuv420) + table[base + 2] = 0x00220103; + } +} + +static void aspeed_video_update(struct aspeed_video *video, u32 reg, u32 clear, + u32 bits) +{ + u32 t = readl(video->base + reg); + u32 before = t; + + t &= ~clear; + t |= bits; + writel(t, video->base + reg); + dev_dbg(video->dev, "update %03x[%08x -> %08x]\n", reg, before, + readl(video->base + reg)); +} + +static u32 aspeed_video_read(struct aspeed_video *video, u32 reg) +{ + u32 t = readl(video->base + reg); + + dev_dbg(video->dev, "read %03x[%08x]\n", reg, t); + return t; +} + +static void aspeed_video_write(struct aspeed_video *video, u32 reg, u32 val) +{ + writel(val, video->base + reg); + dev_dbg(video->dev, "write %03x[%08x]\n", reg, + readl(video->base + reg)); +} + +static int aspeed_video_start_frame(struct aspeed_video *video) +{ + dma_addr_t addr; + unsigned long flags; + struct aspeed_video_buffer *buf; + u32 seq_ctrl = aspeed_video_read(video, VE_SEQ_CTRL); + + if (video->v4l2_input_status) { + dev_dbg(video->dev, "No signal; don't start frame\n"); + return 0; + } + + if (!(seq_ctrl & VE_SEQ_CTRL_COMP_BUSY) || + !(seq_ctrl & VE_SEQ_CTRL_CAP_BUSY)) { + dev_err(video->dev, "Engine busy; don't start frame\n"); + return -EBUSY; + } + + spin_lock_irqsave(&video->lock, flags); + buf = list_first_entry_or_null(&video->buffers, + struct aspeed_video_buffer, link); + if (!buf) { + spin_unlock_irqrestore(&video->lock, flags); + dev_dbg(video->dev, "No buffers; don't start frame\n"); + return -EPROTO; + } + + set_bit(VIDEO_FRAME_INPRG, &video->flags); + addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0); + spin_unlock_irqrestore(&video->lock, flags); + + aspeed_video_write(video, VE_COMP_PROC_OFFSET, 0); + aspeed_video_write(video, VE_COMP_OFFSET, 0); + aspeed_video_write(video, VE_COMP_ADDR, addr); + + aspeed_video_update(video, VE_INTERRUPT_CTRL, 0, + VE_INTERRUPT_COMP_COMPLETE | + VE_INTERRUPT_CAPTURE_COMPLETE); + + aspeed_video_update(video, VE_SEQ_CTRL, 0, + VE_SEQ_CTRL_TRIG_CAPTURE | VE_SEQ_CTRL_TRIG_COMP); + + return 0; +} + +static void aspeed_video_enable_mode_detect(struct aspeed_video *video) +{ + /* Enable mode detect interrupts */ + aspeed_video_update(video, VE_INTERRUPT_CTRL, 0, + VE_INTERRUPT_MODE_DETECT); + + /* Trigger mode detect */ + aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_TRIG_MODE_DET); +} + +static void aspeed_video_reset(struct aspeed_video *video) +{ + /* Reset the engine */ + reset_control_assert(video->rst); + + /* Don't usleep here; function may be called in interrupt context */ + udelay(100); + reset_control_deassert(video->rst); +} + +static void aspeed_video_off(struct aspeed_video *video) +{ + aspeed_video_reset(video); + + /* Turn off the relevant clocks */ + clk_disable_unprepare(video->vclk); + clk_disable_unprepare(video->eclk); +} + +static void aspeed_video_on(struct aspeed_video *video) +{ + /* Turn on the relevant clocks */ + clk_prepare_enable(video->eclk); + clk_prepare_enable(video->vclk); + + aspeed_video_reset(video); +} + +static void aspeed_video_bufs_done(struct aspeed_video *video, + enum vb2_buffer_state state) +{ + unsigned long flags; + struct aspeed_video_buffer *buf; + + spin_lock_irqsave(&video->lock, flags); + list_for_each_entry(buf, &video->buffers, link) + vb2_buffer_done(&buf->vb.vb2_buf, state); + INIT_LIST_HEAD(&video->buffers); + spin_unlock_irqrestore(&video->lock, flags); +} + +static void aspeed_video_irq_res_change(struct aspeed_video *video) +{ + dev_dbg(video->dev, "Resolution changed; resetting\n"); + + set_bit(VIDEO_RES_CHANGE, &video->flags); + clear_bit(VIDEO_FRAME_INPRG, &video->flags); + + aspeed_video_off(video); + aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR); + + schedule_delayed_work(&video->res_work, RESOLUTION_CHANGE_DELAY); +} + +static irqreturn_t aspeed_video_irq(int irq, void *arg) +{ + struct aspeed_video *video = arg; + u32 sts = aspeed_video_read(video, VE_INTERRUPT_STATUS); + + /* + * Resolution changed or signal was lost; reset the engine and + * re-initialize + */ + if (sts & VE_INTERRUPT_MODE_DETECT_WD) { + aspeed_video_irq_res_change(video); + return IRQ_HANDLED; + } + + if (sts & VE_INTERRUPT_MODE_DETECT) { + if (test_bit(VIDEO_RES_DETECT, &video->flags)) { + aspeed_video_update(video, VE_INTERRUPT_CTRL, + VE_INTERRUPT_MODE_DETECT, 0); + aspeed_video_write(video, VE_INTERRUPT_STATUS, + VE_INTERRUPT_MODE_DETECT); + + set_bit(VIDEO_MODE_DETECT_DONE, &video->flags); + wake_up_interruptible_all(&video->wait); + } else { + /* + * Signal acquired while NOT doing resolution + * detection; reset the engine and re-initialize + */ + aspeed_video_irq_res_change(video); + return IRQ_HANDLED; + } + } + + if ((sts & VE_INTERRUPT_COMP_COMPLETE) && + (sts & VE_INTERRUPT_CAPTURE_COMPLETE)) { + struct aspeed_video_buffer *buf; + u32 frame_size = aspeed_video_read(video, + VE_OFFSET_COMP_STREAM); + + spin_lock(&video->lock); + clear_bit(VIDEO_FRAME_INPRG, &video->flags); + buf = list_first_entry_or_null(&video->buffers, + struct aspeed_video_buffer, + link); + if (buf) { + vb2_set_plane_payload(&buf->vb.vb2_buf, 0, frame_size); + + if (!list_is_last(&buf->link, &video->buffers)) { + buf->vb.vb2_buf.timestamp = ktime_get_ns(); + buf->vb.sequence = video->sequence++; + buf->vb.field = V4L2_FIELD_NONE; + vb2_buffer_done(&buf->vb.vb2_buf, + VB2_BUF_STATE_DONE); + list_del(&buf->link); + } + } + spin_unlock(&video->lock); + + aspeed_video_update(video, VE_SEQ_CTRL, + VE_SEQ_CTRL_TRIG_CAPTURE | + VE_SEQ_CTRL_FORCE_IDLE | + VE_SEQ_CTRL_TRIG_COMP, 0); + aspeed_video_update(video, VE_INTERRUPT_CTRL, + VE_INTERRUPT_COMP_COMPLETE | + VE_INTERRUPT_CAPTURE_COMPLETE, 0); + aspeed_video_write(video, VE_INTERRUPT_STATUS, + VE_INTERRUPT_COMP_COMPLETE | + VE_INTERRUPT_CAPTURE_COMPLETE); + + if (test_bit(VIDEO_STREAMING, &video->flags) && buf) + aspeed_video_start_frame(video); + } + + return IRQ_HANDLED; +} + +static void aspeed_video_check_and_set_polarity(struct aspeed_video *video) +{ + int i; + int hsync_counter = 0; + int vsync_counter = 0; + u32 sts; + + for (i = 0; i < NUM_POLARITY_CHECKS; ++i) { + sts = aspeed_video_read(video, VE_MODE_DETECT_STATUS); + if (sts & VE_MODE_DETECT_STATUS_VSYNC) + vsync_counter--; + else + vsync_counter++; + + if (sts & VE_MODE_DETECT_STATUS_HSYNC) + hsync_counter--; + else + hsync_counter++; + } + + if (hsync_counter < 0 || vsync_counter < 0) { + u32 ctrl; + + if (hsync_counter < 0) { + ctrl = VE_CTRL_HSYNC_POL; + video->detected_timings.polarities &= + ~V4L2_DV_HSYNC_POS_POL; + } else { + video->detected_timings.polarities |= + V4L2_DV_HSYNC_POS_POL; + } + + if (vsync_counter < 0) { + ctrl = VE_CTRL_VSYNC_POL; + video->detected_timings.polarities &= + ~V4L2_DV_VSYNC_POS_POL; + } else { + video->detected_timings.polarities |= + V4L2_DV_VSYNC_POS_POL; + } + + aspeed_video_update(video, VE_CTRL, 0, ctrl); + } +} + +static bool aspeed_video_alloc_buf(struct aspeed_video *video, + struct aspeed_video_addr *addr, + unsigned int size) +{ + addr->virt = dma_alloc_coherent(video->dev, size, &addr->dma, + GFP_KERNEL); + if (!addr->virt) + return false; + + addr->size = size; + return true; +} + +static void aspeed_video_free_buf(struct aspeed_video *video, + struct aspeed_video_addr *addr) +{ + dma_free_coherent(video->dev, addr->size, addr->virt, addr->dma); + addr->size = 0; + addr->dma = 0ULL; + addr->virt = NULL; +} + +/* + * Get the minimum HW-supported compression buffer size for the frame size. + * Assume worst-case JPEG compression size is 1/8 raw size. This should be + * plenty even for maximum quality; any worse and the engine will simply return + * incomplete JPEGs. + */ +static void aspeed_video_calc_compressed_size(struct aspeed_video *video, + unsigned int frame_size) +{ + int i, j; + u32 compression_buffer_size_reg = 0; + unsigned int size; + const unsigned int num_compression_packets = 4; + const unsigned int compression_packet_size = 1024; + const unsigned int max_compressed_size = frame_size / 2; /* 4bpp / 8 */ + + video->max_compressed_size = UINT_MAX; + + for (i = 0; i < 6; ++i) { + for (j = 0; j < 8; ++j) { + size = (num_compression_packets << i) * + (compression_packet_size << j); + if (size < max_compressed_size) + continue; + + if (size < video->max_compressed_size) { + compression_buffer_size_reg = (i << 3) | j; + video->max_compressed_size = size; + } + } + } + + aspeed_video_write(video, VE_STREAM_BUF_SIZE, + compression_buffer_size_reg); + + dev_dbg(video->dev, "Max compressed size: %x\n", + video->max_compressed_size); +} + +#define res_check(v) test_and_clear_bit(VIDEO_MODE_DETECT_DONE, &(v)->flags) + +static void aspeed_video_get_resolution(struct aspeed_video *video) +{ + bool invalid_resolution = true; + int rc; + int tries = 0; + u32 mds; + u32 src_lr_edge; + u32 src_tb_edge; + u32 sync; + struct v4l2_bt_timings *det = &video->detected_timings; + + det->width = MIN_WIDTH; + det->height = MIN_HEIGHT; + video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; + + /* + * Since we need max buffer size for detection, free the second source + * buffer first. + */ + if (video->srcs[1].size) + aspeed_video_free_buf(video, &video->srcs[1]); + + if (video->srcs[0].size < VE_MAX_SRC_BUFFER_SIZE) { + if (video->srcs[0].size) + aspeed_video_free_buf(video, &video->srcs[0]); + + if (!aspeed_video_alloc_buf(video, &video->srcs[0], + VE_MAX_SRC_BUFFER_SIZE)) { + dev_err(video->dev, + "Failed to allocate source buffers\n"); + return; + } + } + + aspeed_video_write(video, VE_SRC0_ADDR, video->srcs[0].dma); + + do { + if (tries) { + set_current_state(TASK_INTERRUPTIBLE); + if (schedule_timeout(INVALID_RESOLUTION_DELAY)) + return; + } + + set_bit(VIDEO_RES_DETECT, &video->flags); + aspeed_video_enable_mode_detect(video); + + rc = wait_event_interruptible_timeout(video->wait, + res_check(video), + MODE_DETECT_TIMEOUT); + if (!rc) { + dev_err(video->dev, "Timed out; first mode detect\n"); + clear_bit(VIDEO_RES_DETECT, &video->flags); + return; + } + + /* Disable mode detect in order to re-trigger */ + aspeed_video_update(video, VE_SEQ_CTRL, + VE_SEQ_CTRL_TRIG_MODE_DET, 0); + + aspeed_video_check_and_set_polarity(video); + + aspeed_video_enable_mode_detect(video); + + rc = wait_event_interruptible_timeout(video->wait, + res_check(video), + MODE_DETECT_TIMEOUT); + clear_bit(VIDEO_RES_DETECT, &video->flags); + if (!rc) { + dev_err(video->dev, "Timed out; second mode detect\n"); + return; + } + + src_lr_edge = aspeed_video_read(video, VE_SRC_LR_EDGE_DET); + src_tb_edge = aspeed_video_read(video, VE_SRC_TB_EDGE_DET); + mds = aspeed_video_read(video, VE_MODE_DETECT_STATUS); + sync = aspeed_video_read(video, VE_SYNC_STATUS); + + video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >> + VE_SRC_TB_EDGE_DET_BOT_SHF; + video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP; + det->vfrontporch = video->frame_top; + det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >> + VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom; + det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >> + VE_SYNC_STATUS_VSYNC_SHF; + if (video->frame_top > video->frame_bottom) + continue; + + video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >> + VE_SRC_LR_EDGE_DET_RT_SHF; + video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT; + det->hfrontporch = video->frame_left; + det->hbackporch = (mds & VE_MODE_DETECT_H_PIXELS) - + video->frame_right; + det->hsync = sync & VE_SYNC_STATUS_HSYNC; + if (video->frame_left > video->frame_right) + continue; + + invalid_resolution = false; + } while (invalid_resolution && (tries++ < INVALID_RESOLUTION_RETRIES)); + + if (invalid_resolution) { + dev_err(video->dev, "Invalid resolution detected\n"); + return; + } + + det->height = (video->frame_bottom - video->frame_top) + 1; + det->width = (video->frame_right - video->frame_left) + 1; + video->v4l2_input_status = 0; + + /* + * Enable mode-detect watchdog, resolution-change watchdog and + * automatic compression after frame capture. + */ + aspeed_video_update(video, VE_INTERRUPT_CTRL, 0, + VE_INTERRUPT_MODE_DETECT_WD); + aspeed_video_update(video, VE_SEQ_CTRL, 0, + VE_SEQ_CTRL_AUTO_COMP | VE_SEQ_CTRL_EN_WATCHDOG); + + dev_dbg(video->dev, "Got resolution: %dx%d\n", det->width, + det->height); +} + +static void aspeed_video_set_resolution(struct aspeed_video *video) +{ + struct v4l2_bt_timings *act = &video->active_timings; + unsigned int size = act->width * act->height; + + aspeed_video_calc_compressed_size(video, size); + + /* Don't use direct mode below 1024 x 768 (irqs don't fire) */ + if (size < DIRECT_FETCH_THRESHOLD) { + aspeed_video_write(video, VE_TGS_0, + FIELD_PREP(VE_TGS_FIRST, + video->frame_left - 1) | + FIELD_PREP(VE_TGS_LAST, + video->frame_right)); + aspeed_video_write(video, VE_TGS_1, + FIELD_PREP(VE_TGS_FIRST, video->frame_top) | + FIELD_PREP(VE_TGS_LAST, + video->frame_bottom + 1)); + aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_INT_DE); + } else { + aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_DIRECT_FETCH); + } + + /* Set capture/compression frame sizes */ + aspeed_video_write(video, VE_CAP_WINDOW, + act->width << 16 | act->height); + aspeed_video_write(video, VE_COMP_WINDOW, + act->width << 16 | act->height); + aspeed_video_write(video, VE_SRC_SCANLINE_OFFSET, act->width * 4); + + size *= 4; + + if (size == video->srcs[0].size / 2) { + aspeed_video_write(video, VE_SRC1_ADDR, + video->srcs[0].dma + size); + } else if (size == video->srcs[0].size) { + if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) + goto err_mem; + + aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma); + } else { + aspeed_video_free_buf(video, &video->srcs[0]); + + if (!aspeed_video_alloc_buf(video, &video->srcs[0], size)) + goto err_mem; + + if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) + goto err_mem; + + aspeed_video_write(video, VE_SRC0_ADDR, video->srcs[0].dma); + aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma); + } + + return; + +err_mem: + dev_err(video->dev, "Failed to allocate source buffers\n"); + + if (video->srcs[0].size) + aspeed_video_free_buf(video, &video->srcs[0]); +} + +static void aspeed_video_init_regs(struct aspeed_video *video) +{ + u32 comp_ctrl = VE_COMP_CTRL_RSVD | + FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | + FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); + u32 ctrl = VE_CTRL_AUTO_OR_CURSOR; + u32 seq_ctrl = VE_SEQ_CTRL_JPEG_MODE; + + if (video->frame_rate) + ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); + + if (video->yuv420) + seq_ctrl |= VE_SEQ_CTRL_YUV420; + + /* Unlock VE registers */ + aspeed_video_write(video, VE_PROTECTION_KEY, VE_PROTECTION_KEY_UNLOCK); + + /* Disable interrupts */ + aspeed_video_write(video, VE_INTERRUPT_CTRL, 0); + aspeed_video_write(video, VE_INTERRUPT_STATUS, 0xffffffff); + + /* Clear the offset */ + aspeed_video_write(video, VE_COMP_PROC_OFFSET, 0); + aspeed_video_write(video, VE_COMP_OFFSET, 0); + + aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma); + + /* Set control registers */ + aspeed_video_write(video, VE_SEQ_CTRL, seq_ctrl); + aspeed_video_write(video, VE_CTRL, ctrl); + aspeed_video_write(video, VE_COMP_CTRL, comp_ctrl); + + /* Don't downscale */ + aspeed_video_write(video, VE_SCALING_FACTOR, 0x10001000); + aspeed_video_write(video, VE_SCALING_FILTER0, 0x00200000); + aspeed_video_write(video, VE_SCALING_FILTER1, 0x00200000); + aspeed_video_write(video, VE_SCALING_FILTER2, 0x00200000); + aspeed_video_write(video, VE_SCALING_FILTER3, 0x00200000); + + /* Set mode detection defaults */ + aspeed_video_write(video, VE_MODE_DETECT, 0x22666500); +} + +static void aspeed_video_start(struct aspeed_video *video) +{ + aspeed_video_on(video); + + aspeed_video_init_regs(video); + + /* Resolution set to 640x480 if no signal found */ + aspeed_video_get_resolution(video); + + /* Set timings since the device is being opened for the first time */ + video->active_timings = video->detected_timings; + aspeed_video_set_resolution(video); + + video->pix_fmt.width = video->active_timings.width; + video->pix_fmt.height = video->active_timings.height; + video->pix_fmt.sizeimage = video->max_compressed_size; +} + +static void aspeed_video_stop(struct aspeed_video *video) +{ + set_bit(VIDEO_STOPPED, &video->flags); + cancel_delayed_work_sync(&video->res_work); + + aspeed_video_off(video); + + if (video->srcs[0].size) + aspeed_video_free_buf(video, &video->srcs[0]); + + if (video->srcs[1].size) + aspeed_video_free_buf(video, &video->srcs[1]); + + video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; + video->flags = 0; +} + +static int aspeed_video_querycap(struct file *file, void *fh, + struct v4l2_capability *cap) +{ + strscpy(cap->driver, DEVICE_NAME, sizeof(cap->driver)); + strscpy(cap->card, "Aspeed Video Engine", sizeof(cap->card)); + snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s", + DEVICE_NAME); + + return 0; +} + +static int aspeed_video_enum_format(struct file *file, void *fh, + struct v4l2_fmtdesc *f) +{ + if (f->index) + return -EINVAL; + + f->pixelformat = V4L2_PIX_FMT_JPEG; + + return 0; +} + +static int aspeed_video_get_format(struct file *file, void *fh, + struct v4l2_format *f) +{ + struct aspeed_video *video = video_drvdata(file); + + f->fmt.pix = video->pix_fmt; + + return 0; +} + +static int aspeed_video_enum_input(struct file *file, void *fh, + struct v4l2_input *inp) +{ + struct aspeed_video *video = video_drvdata(file); + + if (inp->index) + return -EINVAL; + + strscpy(inp->name, "Host VGA capture", sizeof(inp->name)); + inp->type = V4L2_INPUT_TYPE_CAMERA; + inp->capabilities = V4L2_IN_CAP_DV_TIMINGS; + inp->status = video->v4l2_input_status; + + return 0; +} + +static int aspeed_video_get_input(struct file *file, void *fh, unsigned int *i) +{ + *i = 0; + + return 0; +} + +static int aspeed_video_set_input(struct file *file, void *fh, unsigned int i) +{ + if (i) + return -EINVAL; + + return 0; +} + +static int aspeed_video_get_parm(struct file *file, void *fh, + struct v4l2_streamparm *a) +{ + struct aspeed_video *video = video_drvdata(file); + + a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; + a->parm.capture.readbuffers = 3; + a->parm.capture.timeperframe.numerator = 1; + if (!video->frame_rate) + a->parm.capture.timeperframe.denominator = MAX_FRAME_RATE; + else + a->parm.capture.timeperframe.denominator = video->frame_rate; + + return 0; +} + +static int aspeed_video_set_parm(struct file *file, void *fh, + struct v4l2_streamparm *a) +{ + unsigned int frame_rate = 0; + struct aspeed_video *video = video_drvdata(file); + + a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; + a->parm.capture.readbuffers = 3; + + if (a->parm.capture.timeperframe.numerator) + frame_rate = a->parm.capture.timeperframe.denominator / + a->parm.capture.timeperframe.numerator; + + if (!frame_rate || frame_rate > MAX_FRAME_RATE) { + frame_rate = 0; + a->parm.capture.timeperframe.denominator = MAX_FRAME_RATE; + a->parm.capture.timeperframe.numerator = 1; + } + + if (video->frame_rate != frame_rate) { + video->frame_rate = frame_rate; + aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, + FIELD_PREP(VE_CTRL_FRC, frame_rate)); + } + + return 0; +} + +static int aspeed_video_enum_framesizes(struct file *file, void *fh, + struct v4l2_frmsizeenum *fsize) +{ + struct aspeed_video *video = video_drvdata(file); + + if (fsize->index) + return -EINVAL; + + if (fsize->pixel_format != V4L2_PIX_FMT_JPEG) + return -EINVAL; + + fsize->discrete.width = video->pix_fmt.width; + fsize->discrete.height = video->pix_fmt.height; + fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; + + return 0; +} + +static int aspeed_video_enum_frameintervals(struct file *file, void *fh, + struct v4l2_frmivalenum *fival) +{ + struct aspeed_video *video = video_drvdata(file); + + if (fival->index) + return -EINVAL; + + if (fival->width != video->detected_timings.width || + fival->height != video->detected_timings.height) + return -EINVAL; + + if (fival->pixel_format != V4L2_PIX_FMT_JPEG) + return -EINVAL; + + fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS; + + fival->stepwise.min.denominator = MAX_FRAME_RATE; + fival->stepwise.min.numerator = 1; + fival->stepwise.max.denominator = 1; + fival->stepwise.max.numerator = 1; + fival->stepwise.step = fival->stepwise.max; + + return 0; +} + +static int aspeed_video_set_dv_timings(struct file *file, void *fh, + struct v4l2_dv_timings *timings) +{ + struct aspeed_video *video = video_drvdata(file); + + if (timings->bt.width == video->active_timings.width && + timings->bt.height == video->active_timings.height) + return 0; + + if (vb2_is_busy(&video->queue)) + return -EBUSY; + + video->active_timings = timings->bt; + + aspeed_video_set_resolution(video); + + video->pix_fmt.width = timings->bt.width; + video->pix_fmt.height = timings->bt.height; + video->pix_fmt.sizeimage = video->max_compressed_size; + + timings->type = V4L2_DV_BT_656_1120; + + return 0; +} + +static int aspeed_video_get_dv_timings(struct file *file, void *fh, + struct v4l2_dv_timings *timings) +{ + struct aspeed_video *video = video_drvdata(file); + + timings->type = V4L2_DV_BT_656_1120; + timings->bt = video->active_timings; + + return 0; +} + +static int aspeed_video_query_dv_timings(struct file *file, void *fh, + struct v4l2_dv_timings *timings) +{ + int rc; + struct aspeed_video *video = video_drvdata(file); + + /* + * This blocks only if the driver is currently in the process of + * detecting a new resolution; in the event of no signal or timeout + * this function is woken up. + */ + if (file->f_flags & O_NONBLOCK) { + if (test_bit(VIDEO_RES_CHANGE, &video->flags)) + return -EAGAIN; + } else { + rc = wait_event_interruptible(video->wait, + !test_bit(VIDEO_RES_CHANGE, + &video->flags)); + if (rc) + return -EINTR; + } + + timings->type = V4L2_DV_BT_656_1120; + timings->bt = video->detected_timings; + + return video->v4l2_input_status ? -ENOLINK : 0; +} + +static int aspeed_video_enum_dv_timings(struct file *file, void *fh, + struct v4l2_enum_dv_timings *timings) +{ + return v4l2_enum_dv_timings_cap(timings, &aspeed_video_timings_cap, + NULL, NULL); +} + +static int aspeed_video_dv_timings_cap(struct file *file, void *fh, + struct v4l2_dv_timings_cap *cap) +{ + *cap = aspeed_video_timings_cap; + + return 0; +} + +static int aspeed_video_sub_event(struct v4l2_fh *fh, + const struct v4l2_event_subscription *sub) +{ + switch (sub->type) { + case V4L2_EVENT_SOURCE_CHANGE: + return v4l2_src_change_event_subscribe(fh, sub); + } + + return v4l2_ctrl_subscribe_event(fh, sub); +} + +static const struct v4l2_ioctl_ops aspeed_video_ioctl_ops = { + .vidioc_querycap = aspeed_video_querycap, + + .vidioc_enum_fmt_vid_cap = aspeed_video_enum_format, + .vidioc_g_fmt_vid_cap = aspeed_video_get_format, + .vidioc_s_fmt_vid_cap = aspeed_video_get_format, + .vidioc_try_fmt_vid_cap = aspeed_video_get_format, + + .vidioc_reqbufs = vb2_ioctl_reqbufs, + .vidioc_querybuf = vb2_ioctl_querybuf, + .vidioc_qbuf = vb2_ioctl_qbuf, + .vidioc_expbuf = vb2_ioctl_expbuf, + .vidioc_dqbuf = vb2_ioctl_dqbuf, + .vidioc_create_bufs = vb2_ioctl_create_bufs, + .vidioc_prepare_buf = vb2_ioctl_prepare_buf, + .vidioc_streamon = vb2_ioctl_streamon, + .vidioc_streamoff = vb2_ioctl_streamoff, + + .vidioc_enum_input = aspeed_video_enum_input, + .vidioc_g_input = aspeed_video_get_input, + .vidioc_s_input = aspeed_video_set_input, + + .vidioc_g_parm = aspeed_video_get_parm, + .vidioc_s_parm = aspeed_video_set_parm, + .vidioc_enum_framesizes = aspeed_video_enum_framesizes, + .vidioc_enum_frameintervals = aspeed_video_enum_frameintervals, + + .vidioc_s_dv_timings = aspeed_video_set_dv_timings, + .vidioc_g_dv_timings = aspeed_video_get_dv_timings, + .vidioc_query_dv_timings = aspeed_video_query_dv_timings, + .vidioc_enum_dv_timings = aspeed_video_enum_dv_timings, + .vidioc_dv_timings_cap = aspeed_video_dv_timings_cap, + + .vidioc_subscribe_event = aspeed_video_sub_event, + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, +}; + +static void aspeed_video_update_jpeg_quality(struct aspeed_video *video) +{ + u32 comp_ctrl = FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | + FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); + + aspeed_video_update(video, VE_COMP_CTRL, + VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR, + comp_ctrl); +} + +static void aspeed_video_update_subsampling(struct aspeed_video *video) +{ + if (video->jpeg.virt) + aspeed_video_init_jpeg_table(video->jpeg.virt, video->yuv420); + + if (video->yuv420) + aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_YUV420); + else + aspeed_video_update(video, VE_SEQ_CTRL, VE_SEQ_CTRL_YUV420, 0); +} + +static int aspeed_video_set_ctrl(struct v4l2_ctrl *ctrl) +{ + struct aspeed_video *video = container_of(ctrl->handler, + struct aspeed_video, + ctrl_handler); + + switch (ctrl->id) { + case V4L2_CID_JPEG_COMPRESSION_QUALITY: + video->jpeg_quality = ctrl->val; + aspeed_video_update_jpeg_quality(video); + break; + case V4L2_CID_JPEG_CHROMA_SUBSAMPLING: + if (ctrl->val == V4L2_JPEG_CHROMA_SUBSAMPLING_420) { + video->yuv420 = true; + aspeed_video_update_subsampling(video); + } else { + video->yuv420 = false; + aspeed_video_update_subsampling(video); + } + break; + default: + return -EINVAL; + } + + return 0; +} + +static const struct v4l2_ctrl_ops aspeed_video_ctrl_ops = { + .s_ctrl = aspeed_video_set_ctrl, +}; + +static void aspeed_video_resolution_work(struct work_struct *work) +{ + struct delayed_work *dwork = to_delayed_work(work); + struct aspeed_video *video = container_of(dwork, struct aspeed_video, + res_work); + u32 input_status = video->v4l2_input_status; + + aspeed_video_on(video); + + /* Exit early in case no clients remain */ + if (test_bit(VIDEO_STOPPED, &video->flags)) + goto done; + + aspeed_video_init_regs(video); + + aspeed_video_get_resolution(video); + + if (video->detected_timings.width != video->active_timings.width || + video->detected_timings.height != video->active_timings.height || + input_status != video->v4l2_input_status) { + static const struct v4l2_event ev = { + .type = V4L2_EVENT_SOURCE_CHANGE, + .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION, + }; + + v4l2_event_queue(&video->vdev, &ev); + } else if (test_bit(VIDEO_STREAMING, &video->flags)) { + /* No resolution change so just restart streaming */ + aspeed_video_start_frame(video); + } + +done: + clear_bit(VIDEO_RES_CHANGE, &video->flags); + wake_up_interruptible_all(&video->wait); +} + +static int aspeed_video_open(struct file *file) +{ + int rc; + struct aspeed_video *video = video_drvdata(file); + + mutex_lock(&video->video_lock); + + rc = v4l2_fh_open(file); + if (rc) { + mutex_unlock(&video->video_lock); + return rc; + } + + if (v4l2_fh_is_singular_file(file)) + aspeed_video_start(video); + + mutex_unlock(&video->video_lock); + + return 0; +} + +static int aspeed_video_release(struct file *file) +{ + int rc; + struct aspeed_video *video = video_drvdata(file); + + mutex_lock(&video->video_lock); + + if (v4l2_fh_is_singular_file(file)) + aspeed_video_stop(video); + + rc = _vb2_fop_release(file, NULL); + + mutex_unlock(&video->video_lock); + + return rc; +} + +static const struct v4l2_file_operations aspeed_video_v4l2_fops = { + .owner = THIS_MODULE, + .read = vb2_fop_read, + .poll = vb2_fop_poll, + .unlocked_ioctl = video_ioctl2, + .mmap = vb2_fop_mmap, + .open = aspeed_video_open, + .release = aspeed_video_release, +}; + +static int aspeed_video_queue_setup(struct vb2_queue *q, + unsigned int *num_buffers, + unsigned int *num_planes, + unsigned int sizes[], + struct device *alloc_devs[]) +{ + struct aspeed_video *video = vb2_get_drv_priv(q); + + if (*num_planes) { + if (sizes[0] < video->max_compressed_size) + return -EINVAL; + + return 0; + } + + *num_planes = 1; + sizes[0] = video->max_compressed_size; + + return 0; +} + +static int aspeed_video_buf_prepare(struct vb2_buffer *vb) +{ + struct aspeed_video *video = vb2_get_drv_priv(vb->vb2_queue); + + if (vb2_plane_size(vb, 0) < video->max_compressed_size) + return -EINVAL; + + return 0; +} + +static int aspeed_video_start_streaming(struct vb2_queue *q, + unsigned int count) +{ + int rc; + struct aspeed_video *video = vb2_get_drv_priv(q); + + video->sequence = 0; + + rc = aspeed_video_start_frame(video); + if (rc) { + aspeed_video_bufs_done(video, VB2_BUF_STATE_QUEUED); + return rc; + } + + set_bit(VIDEO_STREAMING, &video->flags); + return 0; +} + +static void aspeed_video_stop_streaming(struct vb2_queue *q) +{ + int rc; + struct aspeed_video *video = vb2_get_drv_priv(q); + + clear_bit(VIDEO_STREAMING, &video->flags); + + rc = wait_event_timeout(video->wait, + !test_bit(VIDEO_FRAME_INPRG, &video->flags), + STOP_TIMEOUT); + if (!rc) { + dev_err(video->dev, "Timed out when stopping streaming\n"); + + /* + * Need to force stop any DMA and try and get HW into a good + * state for future calls to start streaming again. + */ + aspeed_video_reset(video); + aspeed_video_init_regs(video); + + aspeed_video_get_resolution(video); + } + + aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR); +} + +static void aspeed_video_buf_queue(struct vb2_buffer *vb) +{ + bool empty; + struct aspeed_video *video = vb2_get_drv_priv(vb->vb2_queue); + struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb); + struct aspeed_video_buffer *avb = to_aspeed_video_buffer(vbuf); + unsigned long flags; + + spin_lock_irqsave(&video->lock, flags); + empty = list_empty(&video->buffers); + list_add_tail(&avb->link, &video->buffers); + spin_unlock_irqrestore(&video->lock, flags); + + if (test_bit(VIDEO_STREAMING, &video->flags) && + !test_bit(VIDEO_FRAME_INPRG, &video->flags) && empty) + aspeed_video_start_frame(video); +} + +static const struct vb2_ops aspeed_video_vb2_ops = { + .queue_setup = aspeed_video_queue_setup, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, + .buf_prepare = aspeed_video_buf_prepare, + .start_streaming = aspeed_video_start_streaming, + .stop_streaming = aspeed_video_stop_streaming, + .buf_queue = aspeed_video_buf_queue, +}; + +static int aspeed_video_setup_video(struct aspeed_video *video) +{ + const u64 mask = ~(BIT(V4L2_JPEG_CHROMA_SUBSAMPLING_444) | + BIT(V4L2_JPEG_CHROMA_SUBSAMPLING_420)); + struct v4l2_device *v4l2_dev = &video->v4l2_dev; + struct vb2_queue *vbq = &video->queue; + struct video_device *vdev = &video->vdev; + int rc; + + video->pix_fmt.pixelformat = V4L2_PIX_FMT_JPEG; + video->pix_fmt.field = V4L2_FIELD_NONE; + video->pix_fmt.colorspace = V4L2_COLORSPACE_SRGB; + video->pix_fmt.quantization = V4L2_QUANTIZATION_FULL_RANGE; + video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL; + + rc = v4l2_device_register(video->dev, v4l2_dev); + if (rc) { + dev_err(video->dev, "Failed to register v4l2 device\n"); + return rc; + } + + v4l2_ctrl_handler_init(&video->ctrl_handler, 2); + v4l2_ctrl_new_std(&video->ctrl_handler, &aspeed_video_ctrl_ops, + V4L2_CID_JPEG_COMPRESSION_QUALITY, 0, + ASPEED_VIDEO_JPEG_NUM_QUALITIES - 1, 1, 0); + v4l2_ctrl_new_std_menu(&video->ctrl_handler, &aspeed_video_ctrl_ops, + V4L2_CID_JPEG_CHROMA_SUBSAMPLING, + V4L2_JPEG_CHROMA_SUBSAMPLING_420, mask, + V4L2_JPEG_CHROMA_SUBSAMPLING_444); + + if (video->ctrl_handler.error) { + v4l2_ctrl_handler_free(&video->ctrl_handler); + v4l2_device_unregister(v4l2_dev); + + dev_err(video->dev, "Failed to init controls: %d\n", + video->ctrl_handler.error); + return rc; + } + + v4l2_dev->ctrl_handler = &video->ctrl_handler; + + vbq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + vbq->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF; + vbq->dev = v4l2_dev->dev; + vbq->lock = &video->video_lock; + vbq->ops = &aspeed_video_vb2_ops; + vbq->mem_ops = &vb2_dma_contig_memops; + vbq->drv_priv = video; + vbq->buf_struct_size = sizeof(struct aspeed_video_buffer); + vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + vbq->min_buffers_needed = 3; + + rc = vb2_queue_init(vbq); + if (rc) { + v4l2_ctrl_handler_free(&video->ctrl_handler); + v4l2_device_unregister(v4l2_dev); + + dev_err(video->dev, "Failed to init vb2 queue\n"); + return rc; + } + + vdev->queue = vbq; + vdev->fops = &aspeed_video_v4l2_fops; + vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | + V4L2_CAP_STREAMING; + vdev->v4l2_dev = v4l2_dev; + strscpy(vdev->name, DEVICE_NAME, sizeof(vdev->name)); + vdev->vfl_type = VFL_TYPE_GRABBER; + vdev->vfl_dir = VFL_DIR_RX; + vdev->release = video_device_release_empty; + vdev->ioctl_ops = &aspeed_video_ioctl_ops; + vdev->lock = &video->video_lock; + + video_set_drvdata(vdev, video); + rc = video_register_device(vdev, VFL_TYPE_GRABBER, 0); + if (rc) { + vb2_queue_release(vbq); + v4l2_ctrl_handler_free(&video->ctrl_handler); + v4l2_device_unregister(v4l2_dev); + + dev_err(video->dev, "Failed to register video device\n"); + return rc; + } + + return 0; +} + +static int aspeed_video_init(struct aspeed_video *video) +{ + int irq; + int rc; + struct device *dev = video->dev; + + irq = irq_of_parse_and_map(dev->of_node, 0); + if (!irq) { + dev_err(dev, "Unable to find IRQ\n"); + return -ENODEV; + } + + rc = devm_request_irq(dev, irq, aspeed_video_irq, IRQF_SHARED, + DEVICE_NAME, video); + if (rc < 0) { + dev_err(dev, "Unable to request IRQ %d\n", irq); + return rc; + } + + video->eclk = devm_clk_get(dev, "eclk"); + if (IS_ERR(video->eclk)) { + dev_err(dev, "Unable to get ECLK\n"); + return PTR_ERR(video->eclk); + } + + video->vclk = devm_clk_get(dev, "vclk"); + if (IS_ERR(video->vclk)) { + dev_err(dev, "Unable to get VCLK\n"); + return PTR_ERR(video->vclk); + } + + video->rst = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(video->rst)) { + dev_err(dev, "Unable to get VE reset\n"); + return PTR_ERR(video->rst); + } + + rc = of_reserved_mem_device_init(dev); + if (rc) { + dev_err(dev, "Unable to reserve memory\n"); + return rc; + } + + rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); + if (rc) { + dev_err(dev, "Failed to set DMA mask\n"); + of_reserved_mem_device_release(dev); + return rc; + } + + if (!aspeed_video_alloc_buf(video, &video->jpeg, + VE_JPEG_HEADER_SIZE)) { + dev_err(dev, "Failed to allocate DMA for JPEG header\n"); + of_reserved_mem_device_release(dev); + return rc; + } + + aspeed_video_init_jpeg_table(video->jpeg.virt, video->yuv420); + + return 0; +} + +static int aspeed_video_probe(struct platform_device *pdev) +{ + int rc; + struct resource *res; + struct aspeed_video *video = kzalloc(sizeof(*video), GFP_KERNEL); + + if (!video) + return -ENOMEM; + + video->frame_rate = 30; + video->dev = &pdev->dev; + mutex_init(&video->video_lock); + init_waitqueue_head(&video->wait); + INIT_DELAYED_WORK(&video->res_work, aspeed_video_resolution_work); + INIT_LIST_HEAD(&video->buffers); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + video->base = devm_ioremap_resource(video->dev, res); + + if (IS_ERR(video->base)) + return PTR_ERR(video->base); + + rc = aspeed_video_init(video); + if (rc) + return rc; + + rc = aspeed_video_setup_video(video); + if (rc) + return rc; + + return 0; +} + +static int aspeed_video_remove(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); + struct aspeed_video *video = to_aspeed_video(v4l2_dev); + + video_unregister_device(&video->vdev); + + vb2_queue_release(&video->queue); + + v4l2_ctrl_handler_free(&video->ctrl_handler); + + v4l2_device_unregister(v4l2_dev); + + dma_free_coherent(video->dev, VE_JPEG_HEADER_SIZE, video->jpeg.virt, + video->jpeg.dma); + + of_reserved_mem_device_release(dev); + + return 0; +} + +static const struct of_device_id aspeed_video_of_match[] = { + { .compatible = "aspeed,ast2400-video-engine" }, + { .compatible = "aspeed,ast2500-video-engine" }, + {} +}; +MODULE_DEVICE_TABLE(of, aspeed_video_of_match); + +static struct platform_driver aspeed_video_driver = { + .driver = { + .name = DEVICE_NAME, + .of_match_table = aspeed_video_of_match, + }, + .probe = aspeed_video_probe, + .remove = aspeed_video_remove, +}; + +module_platform_driver(aspeed_video_driver); + +MODULE_DESCRIPTION("ASPEED Video Engine Driver"); +MODULE_AUTHOR("Eddie James"); +MODULE_LICENSE("GPL v2"); diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h index f43738607d77..15a9059d0303 100644 --- a/include/dt-bindings/clock/aspeed-clock.h +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -50,5 +50,6 @@ #define ASPEED_RESET_I2C 7 #define ASPEED_RESET_AHB 8 #define ASPEED_RESET_CRT1 9 +#define ASPEED_RESET_VIDEO 10 #endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-18 17:33 ` Jae Hyun Yoo @ 2019-03-19 3:05 ` xiuzhi 2019-03-19 18:04 ` Jae Hyun Yoo 2019-03-19 9:22 ` Lei YU 1 sibling, 1 reply; 28+ messages in thread From: xiuzhi @ 2019-03-19 3:05 UTC (permalink / raw) To: jae.hyun.yoo, Lei YU; +Cc: openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 12026 bytes --] Hi Joe, The ikvm works now, thanks very much. One issue, the right button of mouse operation has no response on bmc ikvm website page. Best, xiuzhi ------------------ Original ------------------ From: "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; Send time: Tuesday, Mar 19, 2019 1:33 AM To: "Lei YU"<mine260309@gmail.com>; Cc: "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; Subject: Re: Does obmc-ikvm work with bmcweb? Attaching a patch file for back porting of Eddie's aspeed-video driver. Diff in below doesn't include the newly created file so I'm attaching it as a patch. -Jae On 3/18/2019 10:21 AM, Jae Hyun Yoo wrote: > On 3/17/2019 7:25 PM, Lei YU wrote: >>> openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 >>> >>> I'm using a custom build config for my machine. As you already know, for >>> enabling the KVM feature, customization on kernel configs, adding a >>> 'start-ipkvm' service, adding of libvncserver package and back-porting >>> of aspeed video driver are also needed so there is no one-shot buildable >>> TEMPLATECONF for KVM test. >> >> Could you kindly put everything together on a branch so others could >> refer the >> branch to know what the changes are for KVM to work? >> Thanks a lot! >> > > Well, I've already shared SHAs that are relating to KVM in this email > thread, I'm sharing it again with some more details. > > openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 > > bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 > > phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 > Cherry picked > https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ > > libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f > Need to remove 'x11' and 'gtk+' to reduce package size so I made: > libvncserver_%.bbappend > ---------------------------------------------------------------- > PACKAGECONFIG_remove = "gcrypt gnutls png sdl zlib" > > TARGET_CXXFLAGS += " -Dflto" > > do_install_append() { > rm -rf ${D}${libdir}/libvncclient* > } > > inherit cmake > > # Use the latest to support obmc-ikvm > DEPENDS += "openssl" > SRC_URI = "git://github.com/LibVNC/libvncserver" > SRCREV = "3348a7e42e86dfb98dd7458ad29def476cf6096f" > S = "${WORKDIR}/git" > > # Remove x11 and gtk+ that cause big image size > # Actually, these aren't needed to support obmc-ikvm > REQUIRED_DISTRO_FEATURES_remove = "x11" > DEPENDS_remove = "gtk+" > RDEPENDS_${PN}_remove = "gtk+" > ---------------------------------------------------------------- > > start-ipkvm: Cherry pick > https://gerrit.openbmc-project.xyz/#/c/openbmc/meta-phosphor/+/13536/ > After cherry picking it, I changed start-ipkvm.service file like below: > start-ipkvm.service > ---------------------------------------------------------------- > [Unit] > Description=OpenBMC ipKVM daemon > StopWhenUnneeded=false > > [Service] > Restart=always > ExecStartPre=/usr/bin/create_usbhid.sh > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p > /dev/hidg1 > > [Install] > WantedBy=multi-user.target > ----------------------------------------------------------------- > > obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a > > linux-aspeed: 7859d04be772a1d185de335a8e9d38ac03a89f3f > Added these kernel configs: > ----------------------------------------------------------------- > CONFIG_FRAME_VECTOR=y > CONFIG_MEDIA_SUPPORT=y > CONFIG_MEDIA_CAMERA_SUPPORT=y > CONFIG_VIDEO_DEV=y > CONFIG_VIDEO_V4L2=y > CONFIG_V4L_PLATFORM_DRIVERS=y > CONFIG_VIDEO_ASPEED=y > CONFIG_VIDEOBUF2_CORE=y > CONFIG_VIDEOBUF2_V4L2=y > CONFIG_VIDEOBUF2_MEMOPS=y > CONFIG_VIDEOBUF2_DMA_CONTIG=y > CONFIG_MEDIA_SUBDRV_AUTOSELECT=y > CONFIG_USB_GADGET_VBUS_DRAW=2 > CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > CONFIG_USB_LIBCOMPOSITE=y > CONFIG_USB_F_HID=y > CONFIG_USB_GADGET=y > CONFIG_U_SERIAL_CONSOLE=y > CONFIG_USB_ASPEED_VHUB=y > CONFIG_USB_CONFIGFS=y > CONFIG_USB_CONFIGFS_MASS_STORAGE=y > CONFIG_USB_CONFIGFS_F_FS=y > CONFIG_USB_CONFIGFS_F_HID=y > ------------------------------------------------------------------- > Back ported Eddie's aspeed-video driver > > diff --git a/MAINTAINERS b/MAINTAINERS > index b98a5763f6c1..cdd8f824b6da 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2358,6 +2358,14 @@ S: Maintained > F: Documentation/hwmon/asc7621 > F: drivers/hwmon/asc7621.c > > +ASPEED VIDEO ENGINE DRIVER > +M: Eddie James <eajames@linux.ibm.com> > +L: linux-media@vger.kernel.org > +L: openbmc@lists.ozlabs.org (moderated for non-subscribers) > +S: Maintained > +F: drivers/media/platform/aspeed-video.c > +F: Documentation/devicetree/bindings/media/aspeed-video.txt > + > ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS > M: Corentin Chary <corentin.chary@gmail.com> > L: acpi4asus-user@lists.sourceforge.net > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi > b/arch/arm/boot/dts/aspeed-g5.dtsi > index d8a9d20cc4e0..d6da0a29ced3 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -243,6 +243,17 @@ > interrupts = <0x19>; > }; > > + video: video@1e700000 { > + compatible = "aspeed,ast2500-video-engine"; > + reg = <0x1e700000 0x20000>; > + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, > + <&syscon ASPEED_CLK_GATE_ECLK>; > + clock-names = "vclk", "eclk"; > + resets = <&syscon ASPEED_RESET_VIDEO>; > + interrupts = <7>; > + status = "disabled"; > + }; > + > adc: adc@1e6e9000 { > compatible = "aspeed,ast2500-adc"; > reg = <0x1e6e9000 0xb0>; > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > index 596136793fc4..f16ce7dbd6ab 100644 > --- a/drivers/clk/clk-aspeed.c > +++ b/drivers/clk/clk-aspeed.c > @@ -87,7 +87,7 @@ struct aspeed_clk_gate { > /* TODO: ask Aspeed about the actual parent data */ > static const struct aspeed_gate_data aspeed_gates[] = { > /* clk rst name parent flags */ > - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", > "eclk", 0 }, /* Video Engine */ > + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", > "eclk", 0 }, /* Video Engine */ > [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, > 0 }, /* 2D engine */ > [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", > CLK_IS_CRITICAL }, /* SDRAM */ > [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, > 0 }, /* Video Capture */ > @@ -113,6 +113,24 @@ static const struct aspeed_gate_data aspeed_gates[] > = { > [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", > "lhclk", 0 }, /* LPC master/LPC+ */ > }; > > +static const char * const eclk_parent_names[] = { > + "mpll", > + "hpll", > + "dpll", > +}; > + > +static const struct clk_div_table ast2500_eclk_div_table[] = { > + { 0x0, 2 }, > + { 0x1, 2 }, > + { 0x2, 3 }, > + { 0x3, 4 }, > + { 0x4, 5 }, > + { 0x5, 6 }, > + { 0x6, 7 }, > + { 0x7, 8 }, > + { 0 } > +}; > + > static const struct clk_div_table ast2500_mac_div_table[] = { > { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ > { 0x1, 4 }, > @@ -192,18 +210,21 @@ static struct clk_hw > *aspeed_ast2500_calc_pll(const char *name, u32 val) > > struct aspeed_clk_soc_data { > const struct clk_div_table *div_table; > + const struct clk_div_table *eclk_div_table; > const struct clk_div_table *mac_div_table; > struct clk_hw *(*calc_pll)(const char *name, u32 val); > }; > > static const struct aspeed_clk_soc_data ast2500_data = { > .div_table = ast2500_div_table, > + .eclk_div_table = ast2500_eclk_div_table, > .mac_div_table = ast2500_mac_div_table, > .calc_pll = aspeed_ast2500_calc_pll, > }; > > static const struct aspeed_clk_soc_data ast2400_data = { > .div_table = ast2400_div_table, > + .eclk_div_table = ast2400_div_table, > .mac_div_table = ast2400_div_table, > .calc_pll = aspeed_ast2400_calc_pll, > }; > @@ -317,6 +338,7 @@ static const u8 aspeed_resets[] = { > [ASPEED_RESET_PECI] = 10, > [ASPEED_RESET_I2C] = 2, > [ASPEED_RESET_AHB] = 1, > + [ASPEED_RESET_VIDEO] = 6, > > /* > * SCUD4 resets start at an offset to separate them from > @@ -522,6 +544,22 @@ static int aspeed_clk_probe(struct platform_device > *pdev) > return PTR_ERR(hw); > aspeed_clk_data->hws[ASPEED_CLK_24M] = hw; > > + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names, > + ARRAY_SIZE(eclk_parent_names), 0, > + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0, > + &aspeed_clk_lock); > + if (IS_ERR(hw)) > + return PTR_ERR(hw); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; > + > + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0, > + scu_base + ASPEED_CLK_SELECTION, 28, > + 3, 0, soc_data->eclk_div_table, > + &aspeed_clk_lock); > + if (IS_ERR(hw)) > + return PTR_ERR(hw); > + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; > + > /* > * TODO: There are a number of clocks that not included in this > driver > * as more information is required: > @@ -531,7 +569,6 @@ static int aspeed_clk_probe(struct platform_device > *pdev) > * RGMII > * RMII > * UART[1..5] clock source mux > - * Video Engine (ECLK) mux and clock divider > */ > > for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { > diff --git a/drivers/media/platform/Kconfig > b/drivers/media/platform/Kconfig > index 54fe90acb5b2..d6edf2d28f9b 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -32,6 +32,15 @@ source "drivers/media/platform/davinci/Kconfig" > > source "drivers/media/platform/omap/Kconfig" > > +config VIDEO_ASPEED > + tristate "Aspeed AST2400 and AST2500 Video Engine driver" > + depends on VIDEO_V4L2 > + select VIDEOBUF2_DMA_CONTIG > + help > + Support for the Aspeed Video Engine (VE) embedded in the Aspeed > + AST2400 and AST2500 SOCs. The VE can capture and compress video data > + from digital or analog sources. > + > config VIDEO_SH_VOU > tristate "SuperH VOU video output driver" > depends on MEDIA_CAMERA_SUPPORT > diff --git a/drivers/media/platform/Makefile > b/drivers/media/platform/Makefile > index 41322ab65802..205c33a004fc 100644 > --- a/drivers/media/platform/Makefile > +++ b/drivers/media/platform/Makefile > @@ -3,6 +3,7 @@ > # Makefile for the video capture/playback device drivers. > # > > +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o > obj-$(CONFIG_VIDEO_CADENCE) += cadence/ > obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o > obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ > diff --git a/include/dt-bindings/clock/aspeed-clock.h > b/include/dt-bindings/clock/aspeed-clock.h > index f43738607d77..15a9059d0303 100644 > --- a/include/dt-bindings/clock/aspeed-clock.h > +++ b/include/dt-bindings/clock/aspeed-clock.h > @@ -50,5 +50,6 @@ > #define ASPEED_RESET_I2C 7 > #define ASPEED_RESET_AHB 8 > #define ASPEED_RESET_CRT1 9 > +#define ASPEED_RESET_VIDEO 10 > > #endif > ------------------------------------------------------------------ > > These are all I did for testing KVM. > > Cheers, > Jae [-- Attachment #2: Type: text/html, Size: 18694 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-19 3:05 ` xiuzhi @ 2019-03-19 18:04 ` Jae Hyun Yoo 0 siblings, 0 replies; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-19 18:04 UTC (permalink / raw) To: xiuzhi, Lei YU; +Cc: openbmc, ed, Eddie James Hi Xiuzhi, Good to hear that. :) For the mouse button mapping issue, try this patch: https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 Cheers, Jae On 3/18/2019 8:05 PM, xiuzhi wrote: > Hi Joe, > The ikvm works now, thanks very much. > One issue, the right button of mouse operation has no response on bmc > ikvm website page. > Best, > xiuzhi > > ------------------ Original ------------------ > *From: * "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; > *Send time:* Tuesday, Mar 19, 2019 1:33 AM > *To:* "Lei YU"<mine260309@gmail.com>; > *Cc:* "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; > "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; > *Subject: * Re: Does obmc-ikvm work with bmcweb? > > Attaching a patch file for back porting of Eddie's aspeed-video driver. > Diff in below doesn't include the newly created file so I'm attaching it > as a patch. > > -Jae > > On 3/18/2019 10:21 AM, Jae Hyun Yoo wrote: > > On 3/17/2019 7:25 PM, Lei YU wrote: > >>> openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 > >>> > >>> I'm using a custom build config for my machine. As you already > know, for > >>> enabling the KVM feature, customization on kernel configs, adding a > >>> 'start-ipkvm' service, adding of libvncserver package and back-porting > >>> of aspeed video driver are also needed so there is no one-shot > buildable > >>> TEMPLATECONF for KVM test. > >> > >> Could you kindly put everything together on a branch so others could > >> refer the > >> branch to know what the changes are for KVM to work? > >> Thanks a lot! > >> > > > > Well, I've already shared SHAs that are relating to KVM in this email > > thread, I'm sharing it again with some more details. > > > > openbmc: ae29d00f227e55192a69f66c87633e1b53fc6e68 > > > > bmcweb: 9474b3788017bddd70e493e2b9b7674be30abc87 > > > > phosphor-webui: 511a2bbc5540fccb883b8d0005c2b387a23c9d05 > > Cherry picked > > https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-webui/+/10268/ > > > > libvncserver: 3348a7e42e86dfb98dd7458ad29def476cf6096f > > Need to remove 'x11' and 'gtk+' to reduce package size so I made: > > libvncserver_%.bbappend > > ---------------------------------------------------------------- > > PACKAGECONFIG_remove = "gcrypt gnutls png sdl zlib" > > > > TARGET_CXXFLAGS += " -Dflto" > > > > do_install_append() { > > rm -rf ${D}${libdir}/libvncclient* > > } > > > > inherit cmake > > > > # Use the latest to support obmc-ikvm > > DEPENDS += "openssl" > > SRC_URI = "git://github.com/LibVNC/libvncserver" > > SRCREV = "3348a7e42e86dfb98dd7458ad29def476cf6096f" > > S = "${WORKDIR}/git" > > > > # Remove x11 and gtk+ that cause big image size > > # Actually, these aren't needed to support obmc-ikvm > > REQUIRED_DISTRO_FEATURES_remove = "x11" > > DEPENDS_remove = "gtk+" > > RDEPENDS_${PN}_remove = "gtk+" > > ---------------------------------------------------------------- > > > > start-ipkvm: Cherry pick > > https://gerrit.openbmc-project.xyz/#/c/openbmc/meta-phosphor/+/13536/ > > After cherry picking it, I changed start-ipkvm.service file like below: > > start-ipkvm.service > > ---------------------------------------------------------------- > > [Unit] > > Description=OpenBMC ipKVM daemon > > StopWhenUnneeded=false > > > > [Service] > > Restart=always > > ExecStartPre=/usr/bin/create_usbhid.sh > > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p > > /dev/hidg1 > > > > [Install] > > WantedBy=multi-user.target > > ----------------------------------------------------------------- > > > > obmc-ikvm: 2bc661d34abd1fda92a9d2b256ed88ca0e90d09a > > > > linux-aspeed: 7859d04be772a1d185de335a8e9d38ac03a89f3f > > Added these kernel configs: > > ----------------------------------------------------------------- > > CONFIG_FRAME_VECTOR=y > > CONFIG_MEDIA_SUPPORT=y > > CONFIG_MEDIA_CAMERA_SUPPORT=y > > CONFIG_VIDEO_DEV=y > > CONFIG_VIDEO_V4L2=y > > CONFIG_V4L_PLATFORM_DRIVERS=y > > CONFIG_VIDEO_ASPEED=y > > CONFIG_VIDEOBUF2_CORE=y > > CONFIG_VIDEOBUF2_V4L2=y > > CONFIG_VIDEOBUF2_MEMOPS=y > > CONFIG_VIDEOBUF2_DMA_CONTIG=y > > CONFIG_MEDIA_SUBDRV_AUTOSELECT=y > > CONFIG_USB_GADGET_VBUS_DRAW=2 > > CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 > > CONFIG_USB_LIBCOMPOSITE=y > > CONFIG_USB_F_HID=y > > CONFIG_USB_GADGET=y > > CONFIG_U_SERIAL_CONSOLE=y > > CONFIG_USB_ASPEED_VHUB=y > > CONFIG_USB_CONFIGFS=y > > CONFIG_USB_CONFIGFS_MASS_STORAGE=y > > CONFIG_USB_CONFIGFS_F_FS=y > > CONFIG_USB_CONFIGFS_F_HID=y > > ------------------------------------------------------------------- > > Back ported Eddie's aspeed-video driver > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index b98a5763f6c1..cdd8f824b6da 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -2358,6 +2358,14 @@ S: Maintained > > F: Documentation/hwmon/asc7621 > > F: drivers/hwmon/asc7621.c > > > > +ASPEED VIDEO ENGINE DRIVER > > +M: Eddie James <eajames@linux.ibm.com> > > +L: linux-media@vger.kernel.org > > +L: openbmc@lists.ozlabs.org (moderated for non-subscribers) > > +S: Maintained > > +F: drivers/media/platform/aspeed-video.c > > +F: Documentation/devicetree/bindings/media/aspeed-video.txt > > + > > ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS > > M: Corentin Chary <corentin.chary@gmail.com> > > L: acpi4asus-user@lists.sourceforge.net > > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi > > b/arch/arm/boot/dts/aspeed-g5.dtsi > > index d8a9d20cc4e0..d6da0a29ced3 100644 > > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > > @@ -243,6 +243,17 @@ > > interrupts = <0x19>; > > }; > > > > + video: video@1e700000 { > > + compatible = "aspeed,ast2500-video-engine"; > > + reg = <0x1e700000 0x20000>; > > + clocks = <&syscon ASPEED_CLK_GATE_VCLK>, > > + <&syscon ASPEED_CLK_GATE_ECLK>; > > + clock-names = "vclk", "eclk"; > > + resets = <&syscon ASPEED_RESET_VIDEO>; > > + interrupts = <7>; > > + status = "disabled"; > > + }; > > + > > adc: adc@1e6e9000 { > > compatible = "aspeed,ast2500-adc"; > > reg = <0x1e6e9000 0xb0>; > > diff --git a/drivers/clk/clk-aspeed.c b/drivers/clk/clk-aspeed.c > > index 596136793fc4..f16ce7dbd6ab 100644 > > --- a/drivers/clk/clk-aspeed.c > > +++ b/drivers/clk/clk-aspeed.c > > @@ -87,7 +87,7 @@ struct aspeed_clk_gate { > > /* TODO: ask Aspeed about the actual parent data */ > > static const struct aspeed_gate_data aspeed_gates[] = { > > /* clk rst name parent flags */ > > - [ASPEED_CLK_GATE_ECLK] = { 0, -1, "eclk-gate", > > "eclk", 0 }, /* Video Engine */ > > + [ASPEED_CLK_GATE_ECLK] = { 0, 6, "eclk-gate", > > "eclk", 0 }, /* Video Engine */ > > [ASPEED_CLK_GATE_GCLK] = { 1, 7, "gclk-gate", NULL, > > 0 }, /* 2D engine */ > > [ASPEED_CLK_GATE_MCLK] = { 2, -1, "mclk-gate", "mpll", > > CLK_IS_CRITICAL }, /* SDRAM */ > > [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, > > 0 }, /* Video Capture */ > > @@ -113,6 +113,24 @@ static const struct aspeed_gate_data aspeed_gates[] > > = { > > [ASPEED_CLK_GATE_LHCCLK] = { 28, -1, "lhclk-gate", > > "lhclk", 0 }, /* LPC master/LPC+ */ > > }; > > > > +static const char * const eclk_parent_names[] = { > > + "mpll", > > + "hpll", > > + "dpll", > > +}; > > + > > +static const struct clk_div_table ast2500_eclk_div_table[] = { > > + { 0x0, 2 }, > > + { 0x1, 2 }, > > + { 0x2, 3 }, > > + { 0x3, 4 }, > > + { 0x4, 5 }, > > + { 0x5, 6 }, > > + { 0x6, 7 }, > > + { 0x7, 8 }, > > + { 0 } > > +}; > > + > > static const struct clk_div_table ast2500_mac_div_table[] = { > > { 0x0, 4 }, /* Yep, really. Aspeed confirmed this is correct */ > > { 0x1, 4 }, > > @@ -192,18 +210,21 @@ static struct clk_hw > > *aspeed_ast2500_calc_pll(const char *name, u32 val) > > > > struct aspeed_clk_soc_data { > > const struct clk_div_table *div_table; > > + const struct clk_div_table *eclk_div_table; > > const struct clk_div_table *mac_div_table; > > struct clk_hw *(*calc_pll)(const char *name, u32 val); > > }; > > > > static const struct aspeed_clk_soc_data ast2500_data = { > > .div_table = ast2500_div_table, > > + .eclk_div_table = ast2500_eclk_div_table, > > .mac_div_table = ast2500_mac_div_table, > > .calc_pll = aspeed_ast2500_calc_pll, > > }; > > > > static const struct aspeed_clk_soc_data ast2400_data = { > > .div_table = ast2400_div_table, > > + .eclk_div_table = ast2400_div_table, > > .mac_div_table = ast2400_div_table, > > .calc_pll = aspeed_ast2400_calc_pll, > > }; > > @@ -317,6 +338,7 @@ static const u8 aspeed_resets[] = { > > [ASPEED_RESET_PECI] = 10, > > [ASPEED_RESET_I2C] = 2, > > [ASPEED_RESET_AHB] = 1, > > + [ASPEED_RESET_VIDEO] = 6, > > > > /* > > * SCUD4 resets start at an offset to separate them from > > @@ -522,6 +544,22 @@ static int aspeed_clk_probe(struct platform_device > > *pdev) > > return PTR_ERR(hw); > > aspeed_clk_data->hws[ASPEED_CLK_24M] = hw; > > > > + hw = clk_hw_register_mux(dev, "eclk-mux", eclk_parent_names, > > + ARRAY_SIZE(eclk_parent_names), 0, > > + scu_base + ASPEED_CLK_SELECTION, 2, 0x3, 0, > > + &aspeed_clk_lock); > > + if (IS_ERR(hw)) > > + return PTR_ERR(hw); > > + aspeed_clk_data->hws[ASPEED_CLK_ECLK_MUX] = hw; > > + > > + hw = clk_hw_register_divider_table(dev, "eclk", "eclk-mux", 0, > > + scu_base + ASPEED_CLK_SELECTION, 28, > > + 3, 0, soc_data->eclk_div_table, > > + &aspeed_clk_lock); > > + if (IS_ERR(hw)) > > + return PTR_ERR(hw); > > + aspeed_clk_data->hws[ASPEED_CLK_ECLK] = hw; > > + > > /* > > * TODO: There are a number of clocks that not included in this > > driver > > * as more information is required: > > @@ -531,7 +569,6 @@ static int aspeed_clk_probe(struct platform_device > > *pdev) > > * RGMII > > * RMII > > * UART[1..5] clock source mux > > - * Video Engine (ECLK) mux and clock divider > > */ > > > > for (i = 0; i < ARRAY_SIZE(aspeed_gates); i++) { > > diff --git a/drivers/media/platform/Kconfig > > b/drivers/media/platform/Kconfig > > index 54fe90acb5b2..d6edf2d28f9b 100644 > > --- a/drivers/media/platform/Kconfig > > +++ b/drivers/media/platform/Kconfig > > @@ -32,6 +32,15 @@ source "drivers/media/platform/davinci/Kconfig" > > > > source "drivers/media/platform/omap/Kconfig" > > > > +config VIDEO_ASPEED > > + tristate "Aspeed AST2400 and AST2500 Video Engine driver" > > + depends on VIDEO_V4L2 > > + select VIDEOBUF2_DMA_CONTIG > > + help > > + Support for the Aspeed Video Engine (VE) embedded in the Aspeed > > + AST2400 and AST2500 SOCs. The VE can capture and compress > video data > > + from digital or analog sources. > > + > > config VIDEO_SH_VOU > > tristate "SuperH VOU video output driver" > > depends on MEDIA_CAMERA_SUPPORT > > diff --git a/drivers/media/platform/Makefile > > b/drivers/media/platform/Makefile > > index 41322ab65802..205c33a004fc 100644 > > --- a/drivers/media/platform/Makefile > > +++ b/drivers/media/platform/Makefile > > @@ -3,6 +3,7 @@ > > # Makefile for the video capture/playback device drivers. > > # > > > > +obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o > > obj-$(CONFIG_VIDEO_CADENCE) += cadence/ > > obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o > > obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/ > > diff --git a/include/dt-bindings/clock/aspeed-clock.h > > b/include/dt-bindings/clock/aspeed-clock.h > > index f43738607d77..15a9059d0303 100644 > > --- a/include/dt-bindings/clock/aspeed-clock.h > > +++ b/include/dt-bindings/clock/aspeed-clock.h > > @@ -50,5 +50,6 @@ > > #define ASPEED_RESET_I2C 7 > > #define ASPEED_RESET_AHB 8 > > #define ASPEED_RESET_CRT1 9 > > +#define ASPEED_RESET_VIDEO 10 > > > > #endif > > ------------------------------------------------------------------ > > > > These are all I did for testing KVM. > > > > Cheers, > > Jae > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-18 17:33 ` Jae Hyun Yoo 2019-03-19 3:05 ` xiuzhi @ 2019-03-19 9:22 ` Lei YU 2019-03-19 18:09 ` Jae Hyun Yoo 1 sibling, 1 reply; 28+ messages in thread From: Lei YU @ 2019-03-19 9:22 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: xiuzhi, openbmc, ed, Eddie James Hi Jae, Thanks for sharing the detailed information. I managed to do a build on Romulus and see the KVM partially working: * I can see the video output in the KVM page; * I am unable to do any operation, e.g. pressing a key does not seem to be sent to host * When I browse to another page and browse back to KVM page, it displays a small black block, instead of showing correct KVM view. Did you meet such issue before and do you happen to know how to fix this? Thanks a lot! On Tue, Mar 19, 2019 at 1:33 AM Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> wrote: > > Attaching a patch file for back porting of Eddie's aspeed-video driver. > Diff in below doesn't include the newly created file so I'm attaching it > as a patch. > > -Jae ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-19 9:22 ` Lei YU @ 2019-03-19 18:09 ` Jae Hyun Yoo 2019-03-20 5:30 ` Lei YU 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-19 18:09 UTC (permalink / raw) To: Lei YU; +Cc: xiuzhi, openbmc, ed, Eddie James Hi Lei, On 3/19/2019 2:22 AM, Lei YU wrote: > Hi Jae, > > Thanks for sharing the detailed information. > I managed to do a build on Romulus and see the KVM partially working: > * I can see the video output in the KVM page; > * I am unable to do any operation, e.g. pressing a key does not seem to be > sent to host Check if there are /dev/hidg0 and /dev/hidg1. If not, check kernel configs again. Also, check 'start-ipkvm.service' file whether that launches obmc-ikvm using this options: ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1 > * When I browse to another page and browse back to KVM page, it displays a > small black block, instead of showing correct KVM view. Try this patch: https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 Cheers, Jae > Did you meet such issue before and do you happen to know how to fix this? > > Thanks a lot! > > On Tue, Mar 19, 2019 at 1:33 AM Jae Hyun Yoo > <jae.hyun.yoo@linux.intel.com> wrote: >> >> Attaching a patch file for back porting of Eddie's aspeed-video driver. >> Diff in below doesn't include the newly created file so I'm attaching it >> as a patch. >> >> -Jae ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-19 18:09 ` Jae Hyun Yoo @ 2019-03-20 5:30 ` Lei YU 2019-03-20 11:12 ` Thaju 0 siblings, 1 reply; 28+ messages in thread From: Lei YU @ 2019-03-20 5:30 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: xiuzhi, openbmc, ed, Eddie James > Check if there are /dev/hidg0 and /dev/hidg1. If not, check kernel > configs again. > Also, check 'start-ipkvm.service' file whether that launches obmc-ikvm > using this options: > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p > /dev/hidg1 Confirmed that both /dev/hidg0 and /dev/hidg1 are created, and the service is started with obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1. > > Try this patch: > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 Unfortunately, the patch does not fix the issue, the KVM page still shows a small black block when browsed to another page and back. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-20 5:30 ` Lei YU @ 2019-03-20 11:12 ` Thaju 2019-03-20 17:43 ` Jae Hyun Yoo 0 siblings, 1 reply; 28+ messages in thread From: Thaju @ 2019-03-20 11:12 UTC (permalink / raw) To: Lei YU; +Cc: Jae Hyun Yoo, xiuzhi, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 2526 bytes --] Hi Jae/Xiuzhi, I have tried enabling KVM as mentioned in the mail thread. But unable to get the video in the web. Also tried using vnc viewer, but connection refused. I see the following: # obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1 26/02/2019 09:41:04 Unable to establish connection with systemd socket 26/02/2019 09:41:04 Listening for VNC connections on TCP port 5900 26/02/2019 09:41:04 Listening for VNC connections on TCP6 port 5900 26/02/2019 09:42:17 Got connection from client 127.0.0.1 26/02/2019 09:42:17 other clients: 26/02/2019 09:42:17 Normal socket connection # dmesg | grep video [ 18.921547] aspeed-video 1e700000.video: assigned reserved memory node framebuffer [ 59.799015] aspeed-video 1e700000.video: Timed out; first mode detect obmc-ikvm recipe: SUMMARY = "obmc kvm application" DESCRIPTION = "Interfaces video device and USB HID device on BMC" FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" inherit systemd inherit obmc-phosphor-systemd inherit autotools pkgconfig LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/obmc-ikvm \ file://Fix_video_restarting_sync_issue.patch \ " SRCREV = "2bc661d34abd1fda92a9d2b256ed88ca0e90d09a" DEPENDS += "autoconf-archive" DEPENDS += "libvncserver" DEPENDS += "sdbusplus" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "systemd" S = "${WORKDIR}/git" SERVICE_FILE = "start-ipkvm.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" SYSTEMD_DEFAULT_TARGET ?= "${SYSTEMD_DEFAULT_TARGET}" What am I doing wrong here? Do we need to set "-DBMCWEB_ENABLE_KVM=ON" in bmcweb? Regards, Thaj On Wed, Mar 20, 2019 at 11:01 AM Lei YU <mine260309@gmail.com> wrote: > > Check if there are /dev/hidg0 and /dev/hidg1. If not, check kernel > > configs again. > > Also, check 'start-ipkvm.service' file whether that launches obmc-ikvm > > using this options: > > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p > > /dev/hidg1 > > Confirmed that both /dev/hidg0 and /dev/hidg1 are created, and the service > is > started with obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1. > > > > > Try this patch: > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > Unfortunately, the patch does not fix the issue, the KVM page still shows a > small black block when browsed to another page and back. > [-- Attachment #2: Type: text/html, Size: 4038 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-20 11:12 ` Thaju @ 2019-03-20 17:43 ` Jae Hyun Yoo 2019-03-21 7:02 ` Lei YU 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-20 17:43 UTC (permalink / raw) To: Thaju, Lei YU; +Cc: xiuzhi, ed, openbmc, Eddie James Hi Thaju/Lei, Check journal (journalctl -f) while you're testing KVM if there is any suspicious error. In normal opration, you should see logs like below: Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Got connection from client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 other clients: Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Normal socket connection Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Client Protocol Version 3.8 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Protocol version sent 3.8, using 3.8 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientSecurityType: executing handler for type 1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientSecurityType: returning securityResult for client rfb version >= 3.8 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Pixel format for client 127.0.0.1: Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 32 bpp, depth 24, little endian Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 true colour: max r 255 g 255 b 255, shift r 16 g 8 b 0 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Using image quality level 6 for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Using JPEG subsampling 0, Q79 for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Using compression level 2 for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Enabling NewFBSize protocol extension for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Enabling LastRect protocol extension for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientNormalMessage: ignoring unsupported encoding type Enc(0xFFFFFEFE) Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientNormalMessage: ignoring unsupported encoding type Enc(0xFFFFFECC) Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientNormalMessage: ignoring unsupported encoding type Enc(0xFFFFFEC8) Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 rfbProcessClientNormalMessage: ignoring unsupported encoding type Enc(0xFFFFFEC7) Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Enabling full-color cursor updates for client 127.0.0.1 Mar 19 16:17:12 wolfpass env[1331]: 19/03/2019 16:17:12 Using tight encoding for client 127.0.0.1 Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 Client 127.0.0.1 gone Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 Statistics events Transmit/ RawEquiv ( saved) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 FramebufferUpdate : 1 | 0/ 0 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 LastRect : 58 | 696/ 696 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 tight : 58 | 1831655/182452920 ( 99.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 RichCursor : 1 | 1684/ 1684 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 TOTALS : 118 | 1834035/182455300 ( 99.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 Statistics events Received/ RawEquiv ( saved) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 PointerEvent : 3 | 18/ 18 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 FramebufferUpdate : 59 | 590/ 590 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 SetEncodings : 1 | 68/ 68 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 SetPixelFormat : 1 | 20/ 20 ( 0.0%) Mar 19 16:17:19 wolfpass env[1331]: 19/03/2019 16:17:19 TOTALS : 64 | 696/ 696 ( 0.0%) Also, try these two patches. I added one more patch. https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 If it doesn't make help, try external connection using Tight VNC viewer. Currently, external connection is disabled by libvncserver's listening ip setting so apply below patch if you are going to enable external connection. In obmc-ikvm package: ----------------------- diff --git a/ikvm_server.cpp b/ikvm_server.cpp index 35310da292be..b7bd5344ed0d 100644 --- a/ikvm_server.cpp +++ b/ikvm_server.cpp @@ -44,7 +44,7 @@ Server::Server(const Args& args, Input& i, Video& v) : server->cursor->xhot = 1; server->cursor->yhot = 1; - rfbStringToAddr(&ip[0], &server->listenInterface); + //rfbStringToAddr(&ip[0], &server->listenInterface); rfbInitServer(server); ------------------------- Make sure that it's just for test purpose. We intentionally disabled external connection because of security issue. Also, you might need to use Tight VNC viewer only. I checked that other VNC viewers don't support tight encoding properly. Regards, Jae On 3/20/2019 4:12 AM, Thaju wrote: > Hi Jae/Xiuzhi, > > I have tried enabling KVM as mentioned in the mail thread. But unable to > get the video in the web. Also tried using vnc viewer, but connection > refused. > > I see the following: > > # obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1 > 26/02/2019 09:41:04 Unable to establish connection with systemd socket > 26/02/2019 09:41:04 Listening for VNC connections on TCP port 5900 > 26/02/2019 09:41:04 Listening for VNC connections on TCP6 port 5900 > 26/02/2019 09:42:17 Got connection from client 127.0.0.1 > 26/02/2019 09:42:17 other clients: > 26/02/2019 09:42:17 Normal socket connection > > # dmesg | grep video > [ 18.921547] aspeed-video 1e700000.video: assigned reserved memory > node framebuffer > [ 59.799015] aspeed-video 1e700000.video: Timed out; first mode detect > > obmc-ikvm recipe: > > SUMMARY = "obmc kvm application" > DESCRIPTION = "Interfaces video device and USB HID device on BMC" > > FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" > > inherit systemd > inherit obmc-phosphor-systemd > inherit autotools pkgconfig > > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" > > PV = "1.0+git${SRCPV}" > > SRC_URI = "git://github.com/openbmc/obmc-ikvm > <http://github.com/openbmc/obmc-ikvm> \ > file://Fix_video_restarting_sync_issue.patch \ > " > SRCREV = "2bc661d34abd1fda92a9d2b256ed88ca0e90d09a" > > DEPENDS += "autoconf-archive" > DEPENDS += "libvncserver" > DEPENDS += "sdbusplus" > DEPENDS += "sdeventplus" > DEPENDS += "phosphor-logging" > DEPENDS += "phosphor-dbus-interfaces" > DEPENDS += "systemd" > > S = "${WORKDIR}/git" > > SERVICE_FILE = "start-ipkvm.service" > SYSTEMD_PACKAGES = "${PN}" > SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" > SYSTEMD_DEFAULT_TARGET ?= "${SYSTEMD_DEFAULT_TARGET}" > > What am I doing wrong here? > Do we need to set "-DBMCWEB_ENABLE_KVM=ON" in bmcweb? > > Regards, > Thaj > > On Wed, Mar 20, 2019 at 11:01 AM Lei YU <mine260309@gmail.com > <mailto:mine260309@gmail.com>> wrote: > > > Check if there are /dev/hidg0 and /dev/hidg1. If not, check kernel > > configs again. > > Also, check 'start-ipkvm.service' file whether that launches > obmc-ikvm > > using this options: > > ExecStart=/usr/bin/env obmc-ikvm -v /dev/video0 -f 10 -k > /dev/hidg0 -p > > /dev/hidg1 > > Confirmed that both /dev/hidg0 and /dev/hidg1 are created, and the > service is > started with obmc-ikvm -v /dev/video0 -f 10 -k /dev/hidg0 -p /dev/hidg1. > > > > > Try this patch: > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > Unfortunately, the patch does not fix the issue, the KVM page still > shows a > small black block when browsed to another page and back. > ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-20 17:43 ` Jae Hyun Yoo @ 2019-03-21 7:02 ` Lei YU 2019-03-21 16:19 ` Jae Hyun Yoo 0 siblings, 1 reply; 28+ messages in thread From: Lei YU @ 2019-03-21 7:02 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: Thaju, xiuzhi, ed, openbmc, Eddie James > Check journal (journalctl -f) while you're testing KVM if there is any > suspicious error. In normal opration, you should see logs like below: I see the same logs as Thaj, only below logs show when the issue occurs. Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to establish connection with systemd socket Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for VNC connections on TCP port 5900 Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for VNC connections on TCP6 port 5900 Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got connection from client 127.0.0.1 Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other clients: Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal socket connection And sometimes it works, then I see logs like: Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal socket connection Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client Protocol Version 3.8 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol version sent 3.8, using 3.8 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 rfbProcessClientSecurityType: executing handler for type 1 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 rfbProcessClientSecurityType: returning securityResult for client rfb version >= 3.8 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel format for client 192.168.10.11: Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, depth 24, little endian Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true colour: max r 255 g 255 b 255, shift r 16 g 8 b 0 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using compression level 1 for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image quality level 6 for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG subsampling 0, Q79 for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling X-style cursor updates for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling full-color cursor updates for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling cursor position updates for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling LastRect protocol extension for client 192.168.10.11 Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight encoding for client 192.168.10.11 It's found that the VNC server may work when the screen is changed, e.g. reboot the OS, or enter the OS. When OS is in idle, usually it will not work. > Also, try these two patches. I added one more patch. > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 Tried the patches, still the same issue as above. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-21 7:02 ` Lei YU @ 2019-03-21 16:19 ` Jae Hyun Yoo 2019-03-21 16:27 ` Thaju 2019-03-22 3:34 ` Lei YU 0 siblings, 2 replies; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-21 16:19 UTC (permalink / raw) To: Lei YU; +Cc: xiuzhi, openbmc, ed, Eddie James, Thaju Hi Lei, Are you using a web browser from Windows OS? It seems that there is an issue of Windows websockify/novnc. Use a browser from OS other than Windows til the issue is resolved. Did you test it using Tight VNC viewer after enabling external connection? The reason why I suggested that is to identify whether this issue comes from KVM web proxy or from KVM server. Need more information of your test environment. Server platform: BMC SoC: Host OS: Regards, Jae On 3/21/2019 12:02 AM, Lei YU wrote: >> Check journal (journalctl -f) while you're testing KVM if there is any >> suspicious error. In normal opration, you should see logs like below: > > I see the same logs as Thaj, only below logs show when the issue occurs. > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > establish connection with systemd socket > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > VNC connections on TCP port 5900 > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > VNC connections on TCP6 port 5900 > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got connection > from client 127.0.0.1 > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other clients: > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal socket connection > > And sometimes it works, then I see logs like: > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal socket connection > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client Protocol > Version 3.8 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > version sent 3.8, using 3.8 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > rfbProcessClientSecurityType: executing handler for type 1 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > rfbProcessClientSecurityType: returning securityResult for client rfb > version >= 3.8 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel format > for client 192.168.10.11: > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, depth > 24, little endian > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true colour: > max r 255 g 255 b 255, shift r 16 g 8 b 0 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > compression level 1 for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > quality level 6 for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > subsampling 0, Q79 for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > X-style cursor updates for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > full-color cursor updates for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling cursor > position updates for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > LastRect protocol extension for client 192.168.10.11 > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > encoding for client 192.168.10.11 > > It's found that the VNC server may work when the screen is changed, e.g. > reboot the OS, or enter the OS. > When OS is in idle, usually it will not work. > >> Also, try these two patches. I added one more patch. >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > Tried the patches, still the same issue as above. > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-21 16:19 ` Jae Hyun Yoo @ 2019-03-21 16:27 ` Thaju 2019-03-21 21:31 ` Jae Hyun Yoo 2019-03-22 3:34 ` Lei YU 1 sibling, 1 reply; 28+ messages in thread From: Thaju @ 2019-03-21 16:27 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: Lei YU, xiuzhi, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 5884 bytes --] Hi Jae, It works. Found one issue which is explained below. I have applied below 3 patches: https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 I can confirm that: 1. KVM video appears fine in webui 2. All keyboard characters works fine. 3. Both mouse buttons works fine (with patch) Now the issue is when host OS ( RHEL 7.5 in my case ) goes to power saving mode (black screen) after some N mins (depends on OS settings), looks like it does not accept the KVM HID events, it doesn't wake up from power saving mode through KVM. I see below error when this happens. Mar 21 09:31:43 obmc-ikvm[1408]: Failed to query timings Mar 21 09:31:43 kernel: aspeed-video 1e700000.video: Timed out; first mode detect Mar 21 09:31:44 kernel: aspeed-video 1e700000.video: Timed out when stopping streaming Mar 21 09:31:45 kernel: aspeed-video 1e700000.video: Timed out; first mode detect Mar 21 09:31:46 kernel: aspeed-video 1e700000.video: Timed out; first mode detect Mar 21 09:31:47 env[1408]: 21/03/2019 09:31:47 Sending rfbEncodingNewFBSize for resize to (640x480) Mar 21 09:31:48 obmc-ikvm[1408]: Failed to query timings Mar 21 09:31:49 kernel: aspeed-video 1e700000.video: Timed out; first mode detect Mar 21 09:31:50 obmc-ikvm[1408]: Failed to query timings Mar 21 09:31:51 kernel: aspeed-video 1e700000.video: Timed out; first mode detect Mar 21 09:31:52 obmc-ikvm[1408]: Failed to query timings Mar 21 09:31:53 kernel: aspeed-video 1e700000.video: Timed out; first mode detect On this state, I used physical keyboard on the host OS to bring it back from power saving mode and I see KVM also comes back. I have also tried setting the power saving timeout to "never". It works fine. To recreate this issue 1. Set power saving timeout to 1 min. (In RHEL 7.5, Settings > Power > Blank Screen) 2. Leave the host OS to idle for 1 min. 3. You will see screen goes black after 1 min and KVM stops responding. Hope you understood the issue. Thanks for your support. Regards, Thaj On Thu, Mar 21, 2019 at 9:49 PM Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> wrote: > Hi Lei, > > Are you using a web browser from Windows OS? It seems that there is an > issue of Windows websockify/novnc. Use a browser from OS other than > Windows til the issue is resolved. > > Did you test it using Tight VNC viewer after enabling external > connection? The reason why I suggested that is to identify whether > this issue comes from KVM web proxy or from KVM server. > > Need more information of your test environment. > Server platform: > BMC SoC: > Host OS: > > Regards, > Jae > > On 3/21/2019 12:02 AM, Lei YU wrote: > >> Check journal (journalctl -f) while you're testing KVM if there is any > >> suspicious error. In normal opration, you should see logs like below: > > > > I see the same logs as Thaj, only below logs show when the issue occurs. > > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > > establish connection with systemd socket > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP port 5900 > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP6 port 5900 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got connection > > from client 127.0.0.1 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other clients: > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal socket > connection > > > > And sometimes it works, then I see logs like: > > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal socket > connection > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client Protocol > > Version 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > > version sent 3.8, using 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: executing handler for type 1 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: returning securityResult for client rfb > > version >= 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel format > > for client 192.168.10.11: > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, depth > > 24, little endian > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true colour: > > max r 255 g 255 b 255, shift r 16 g 8 b 0 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > > compression level 1 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > > quality level 6 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > > subsampling 0, Q79 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > X-style cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > full-color cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling cursor > > position updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > LastRect protocol extension for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > > encoding for client 192.168.10.11 > > > > It's found that the VNC server may work when the screen is changed, e.g. > > reboot the OS, or enter the OS. > > When OS is in idle, usually it will not work. > > > >> Also, try these two patches. I added one more patch. > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > > > Tried the patches, still the same issue as above. > > > [-- Attachment #2: Type: text/html, Size: 7667 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-21 16:27 ` Thaju @ 2019-03-21 21:31 ` Jae Hyun Yoo 2019-04-14 7:12 ` xiuzhi 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-03-21 21:31 UTC (permalink / raw) To: Thaju; +Cc: xiuzhi, openbmc, ed, Eddie James Hi Thaju, It's really good to hear that you can see the working KVM in your machine. Thanks for sharing the result. I saw the video waking up issue on Ubuntu 18 too. Need debugging on it. I'll share if I find something. Regards, Jae On 3/21/2019 9:27 AM, Thaju wrote: > Hi Jae, > > It works. Found one issue which is explained below. > > I have applied below 3 patches: > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 > > I can confirm that: > 1. KVM video appears fine in webui > 2. All keyboard characters works fine. > 3. Both mouse buttons works fine (with patch) > > Now the issue is when host OS ( RHEL 7.5 in my case ) goes to power > saving mode (black screen) after some N mins (depends on OS settings), > looks like it does not accept the KVM HID events, it doesn't wake up > from power saving mode through KVM. I see below error when this happens. > > Mar 21 09:31:43 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:43 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:44 kernel: aspeed-video 1e700000.video: Timed out when > stopping streaming > Mar 21 09:31:45 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:46 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:47 env[1408]: 21/03/2019 09:31:47 Sending > rfbEncodingNewFBSize for resize to (640x480) > Mar 21 09:31:48 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:49 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:50 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:51 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:52 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:53 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > > On this state, I used physical keyboard on the host OS to bring it back > from power saving mode and I see KVM also comes back. I have also tried > setting the power saving timeout to "never". It works fine. > > To recreate this issue > 1. Set power saving timeout to 1 min. (In RHEL 7.5, Settings > Power > > Blank Screen) > 2. Leave the host OS to idle for 1 min. > 3. You will see screen goes black after 1 min and KVM stops responding. > > Hope you understood the issue. Thanks for your support. > > Regards, > Thaj > > On Thu, Mar 21, 2019 at 9:49 PM Jae Hyun Yoo > <jae.hyun.yoo@linux.intel.com <mailto:jae.hyun.yoo@linux.intel.com>> wrote: > > Hi Lei, > > Are you using a web browser from Windows OS? It seems that there is an > issue of Windows websockify/novnc. Use a browser from OS other than > Windows til the issue is resolved. > > Did you test it using Tight VNC viewer after enabling external > connection? The reason why I suggested that is to identify whether > this issue comes from KVM web proxy or from KVM server. > > Need more information of your test environment. > Server platform: > BMC SoC: > Host OS: > > Regards, > Jae > > On 3/21/2019 12:02 AM, Lei YU wrote: > >> Check journal (journalctl -f) while you're testing KVM if there > is any > >> suspicious error. In normal opration, you should see logs like > below: > > > > I see the same logs as Thaj, only below logs show when the issue > occurs. > > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > > establish connection with systemd socket > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP port 5900 > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP6 port 5900 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got connection > > from client 127.0.0.1 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other > clients: > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal > socket connection > > > > And sometimes it works, then I see logs like: > > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal > socket connection > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client > Protocol > > Version 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > > version sent 3.8, using 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: executing handler for type 1 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: returning securityResult for client rfb > > version >= 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel format > > for client 192.168.10.11 <http://192.168.10.11>: > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, > depth > > 24, little endian > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true colour: > > max r 255 g 255 b 255, shift r 16 g 8 b 0 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > > compression level 1 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > > quality level 6 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > > subsampling 0, Q79 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > X-style cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > full-color cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > cursor > > position updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > LastRect protocol extension for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > > encoding for client 192.168.10.11 > > > > It's found that the VNC server may work when the screen is > changed, e.g. > > reboot the OS, or enter the OS. > > When OS is in idle, usually it will not work. > > > >> Also, try these two patches. I added one more patch. > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > > > Tried the patches, still the same issue as above. > > > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-21 21:31 ` Jae Hyun Yoo @ 2019-04-14 7:12 ` xiuzhi 2019-04-15 19:26 ` Jae Hyun Yoo 0 siblings, 1 reply; 28+ messages in thread From: xiuzhi @ 2019-04-14 7:12 UTC (permalink / raw) To: jae.hyun.yoo, Thaju; +Cc: openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 7395 bytes --] Hi Jae, Ed, Are there any updates for the video waking up issue? Best, Xiuzhi ------------------ Original ------------------ From: "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; Send time: Friday, Mar 22, 2019 5:31 AM To: "Thaju"<tajudheenk@gmail.com>; Cc: "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; Subject: Re: Does obmc-ikvm work with bmcweb? Hi Thaju, It's really good to hear that you can see the working KVM in your machine. Thanks for sharing the result. I saw the video waking up issue on Ubuntu 18 too. Need debugging on it. I'll share if I find something. Regards, Jae On 3/21/2019 9:27 AM, Thaju wrote: > Hi Jae, > > It works. Found one issue which is explained below. > > I have applied below 3 patches: > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 > > I can confirm that: > 1. KVM video appears fine in webui > 2. All keyboard characters works fine. > 3. Both mouse buttons works fine (with patch) > > Now the issue is when host OS ( RHEL 7.5 in my case ) goes to power > saving mode (black screen) after some N mins (depends on OS settings), > looks like it does not accept the KVM HID events, it doesn't wake up > from power saving mode through KVM. I see below error when this happens. > > Mar 21 09:31:43 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:43 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:44 kernel: aspeed-video 1e700000.video: Timed out when > stopping streaming > Mar 21 09:31:45 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:46 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:47 env[1408]: 21/03/2019 09:31:47 Sending > rfbEncodingNewFBSize for resize to (640x480) > Mar 21 09:31:48 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:49 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:50 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:51 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > Mar 21 09:31:52 obmc-ikvm[1408]: Failed to query timings > Mar 21 09:31:53 kernel: aspeed-video 1e700000.video: Timed out; first > mode detect > > On this state, I used physical keyboard on the host OS to bring it back > from power saving mode and I see KVM also comes back. I have also tried > setting the power saving timeout to "never". It works fine. > > To recreate this issue > 1. Set power saving timeout to 1 min. (In RHEL 7.5, Settings > Power > > Blank Screen) > 2. Leave the host OS to idle for 1 min. > 3. You will see screen goes black after 1 min and KVM stops responding. > > Hope you understood the issue. Thanks for your support. > > Regards, > Thaj > > On Thu, Mar 21, 2019 at 9:49 PM Jae Hyun Yoo > <jae.hyun.yoo@linux.intel.com <mailto:jae.hyun.yoo@linux.intel.com>> wrote: > > Hi Lei, > > Are you using a web browser from Windows OS? It seems that there is an > issue of Windows websockify/novnc. Use a browser from OS other than > Windows til the issue is resolved. > > Did you test it using Tight VNC viewer after enabling external > connection? The reason why I suggested that is to identify whether > this issue comes from KVM web proxy or from KVM server. > > Need more information of your test environment. > Server platform: > BMC SoC: > Host OS: > > Regards, > Jae > > On 3/21/2019 12:02 AM, Lei YU wrote: > >> Check journal (journalctl -f) while you're testing KVM if there > is any > >> suspicious error. In normal opration, you should see logs like > below: > > > > I see the same logs as Thaj, only below logs show when the issue > occurs. > > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > > establish connection with systemd socket > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP port 5900 > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Listening for > > VNC connections on TCP6 port 5900 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got connection > > from client 127.0.0.1 > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other > clients: > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal > socket connection > > > > And sometimes it works, then I see logs like: > > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal > socket connection > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client > Protocol > > Version 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > > version sent 3.8, using 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: executing handler for type 1 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > rfbProcessClientSecurityType: returning securityResult for client rfb > > version >= 3.8 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel format > > for client 192.168.10.11 <http://192.168.10.11>: > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, > depth > > 24, little endian > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true colour: > > max r 255 g 255 b 255, shift r 16 g 8 b 0 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > > compression level 1 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > > quality level 6 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > > subsampling 0, Q79 for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > X-style cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > full-color cursor updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > cursor > > position updates for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > LastRect protocol extension for client 192.168.10.11 > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > > encoding for client 192.168.10.11 > > > > It's found that the VNC server may work when the screen is > changed, e.g. > > reboot the OS, or enter the OS. > > When OS is in idle, usually it will not work. > > > >> Also, try these two patches. I added one more patch. > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > > > Tried the patches, still the same issue as above. > > > [-- Attachment #2: Type: text/html, Size: 10893 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-04-14 7:12 ` xiuzhi @ 2019-04-15 19:26 ` Jae Hyun Yoo 2019-04-16 1:53 ` xiuzhi 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-04-15 19:26 UTC (permalink / raw) To: xiuzhi, Thaju; +Cc: openbmc, ed, Eddie James Hi Xiuzhi, Please try this patch: https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/20593 Thanks, Jae On 4/14/2019 12:12 AM, xiuzhi wrote: > Hi Jae, Ed, > Are there any updates for the video waking up issue? > Best, > Xiuzhi > > > ------------------ Original ------------------ > *From: * "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; > *Send time:* Friday, Mar 22, 2019 5:31 AM > *To:* "Thaju"<tajudheenk@gmail.com>; > *Cc:* "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; > "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; > *Subject: * Re: Does obmc-ikvm work with bmcweb? > > Hi Thaju, > > It's really good to hear that you can see the working KVM in your > machine. Thanks for sharing the result. > > I saw the video waking up issue on Ubuntu 18 too. Need debugging on it. > I'll share if I find something. > > Regards, > Jae > > On 3/21/2019 9:27 AM, Thaju wrote: > > Hi Jae, > > > > It works. Found one issue which is explained below. > > > > I have applied below 3 patches: > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 > > > > I can confirm that: > > 1. KVM video appears fine in webui > > 2. All keyboard characters works fine. > > 3. Both mouse buttons works fine (with patch) > > > > Now the issue is when host OS ( RHEL 7.5 in my case ) goes to power > > saving mode (black screen) after some N mins (depends on OS settings), > > looks like it does not accept the KVM HID events, it doesn't wake up > > from power saving mode through KVM. I see below error when this happens. > > > > Mar 21 09:31:43 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:43 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:44 kernel: aspeed-video 1e700000.video: Timed out when > > stopping streaming > > Mar 21 09:31:45 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:46 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:47 env[1408]: 21/03/2019 09:31:47 Sending > > rfbEncodingNewFBSize for resize to (640x480) > > Mar 21 09:31:48 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:49 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:50 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:51 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:52 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:53 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > > > On this state, I used physical keyboard on the host OS to bring it back > > from power saving mode and I see KVM also comes back. I have also tried > > setting the power saving timeout to "never". It works fine. > > > > To recreate this issue > > 1. Set power saving timeout to 1 min. (In RHEL 7.5, Settings > Power > > > Blank Screen) > > 2. Leave the host OS to idle for 1 min. > > 3. You will see screen goes black after 1 min and KVM stops responding. > > > > Hope you understood the issue. Thanks for your support. > > > > Regards, > > Thaj > > > > On Thu, Mar 21, 2019 at 9:49 PM Jae Hyun Yoo > > <jae.hyun.yoo@linux.intel.com <mailto:jae.hyun.yoo@linux.intel.com>> > wrote: > > > > Hi Lei, > > > > Are you using a web browser from Windows OS? It seems that there > is an > > issue of Windows websockify/novnc. Use a browser from OS other than > > Windows til the issue is resolved. > > > > Did you test it using Tight VNC viewer after enabling external > > connection? The reason why I suggested that is to identify whether > > this issue comes from KVM web proxy or from KVM server. > > > > Need more information of your test environment. > > Server platform: > > BMC SoC: > > Host OS: > > > > Regards, > > Jae > > > > On 3/21/2019 12:02 AM, Lei YU wrote: > > >> Check journal (journalctl -f) while you're testing KVM if there > > is any > > >> suspicious error. In normal opration, you should see logs like > > below: > > > > > > I see the same logs as Thaj, only below logs show when the issue > > occurs. > > > > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > > > establish connection with systemd socket > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 > Listening for > > > VNC connections on TCP port 5900 > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 > Listening for > > > VNC connections on TCP6 port 5900 > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got > connection > > > from client 127.0.0.1 > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other > > clients: > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal > > socket connection > > > > > > And sometimes it works, then I see logs like: > > > > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal > > socket connection > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client > > Protocol > > > Version 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > > > version sent 3.8, using 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > > rfbProcessClientSecurityType: executing handler for type 1 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > > rfbProcessClientSecurityType: returning securityResult for > client rfb > > > version >= 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel > format > > > for client 192.168.10.11 <http://192.168.10.11>: > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, > > depth > > > 24, little endian > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true > colour: > > > max r 255 g 255 b 255, shift r 16 g 8 b 0 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > > > compression level 1 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > > > quality level 6 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > > > subsampling 0, Q79 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > X-style cursor updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > full-color cursor updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > cursor > > > position updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > LastRect protocol extension for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > > > encoding for client 192.168.10.11 > > > > > > It's found that the VNC server may work when the screen is > > changed, e.g. > > > reboot the OS, or enter the OS. > > > When OS is in idle, usually it will not work. > > > > > >> Also, try these two patches. I added one more patch. > > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > > > > > Tried the patches, still the same issue as above. > > > > > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-04-15 19:26 ` Jae Hyun Yoo @ 2019-04-16 1:53 ` xiuzhi 0 siblings, 0 replies; 28+ messages in thread From: xiuzhi @ 2019-04-16 1:53 UTC (permalink / raw) To: jae.hyun.yoo, Thaju; +Cc: openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 8120 bytes --] Hi Jae, The patch works very well. Thanks. Best, Xiuzhi Hi Xiuzhi, Please try this patch: https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/20593 Thanks, Jae On 4/14/2019 12:12 AM, xiuzhi wrote: > Hi Jae, Ed, > Are there any updates for the video waking up issue? > Best, > Xiuzhi > > > ------------------ Original ------------------ > *From: * "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; > *Send time:* Friday, Mar 22, 2019 5:31 AM > *To:* "Thaju"<tajudheenk@gmail.com>; > *Cc:* "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; > "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; > *Subject: * Re: Does obmc-ikvm work with bmcweb? > > Hi Thaju, > > It's really good to hear that you can see the working KVM in your > machine. Thanks for sharing the result. > > I saw the video waking up issue on Ubuntu 18 too. Need debugging on it. > I'll share if I find something. > > Regards, > Jae > > On 3/21/2019 9:27 AM, Thaju wrote: > > Hi Jae, > > > > It works. Found one issue which is explained below. > > > > I have applied below 3 patches: > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19393 > > > > I can confirm that: > > 1. KVM video appears fine in webui > > 2. All keyboard characters works fine. > > 3. Both mouse buttons works fine (with patch) > > > > Now the issue is when host OS ( RHEL 7.5 in my case ) goes to power > > saving mode (black screen) after some N mins (depends on OS settings), > > looks like it does not accept the KVM HID events, it doesn't wake up > > from power saving mode through KVM. I see below error when this happens. > > > > Mar 21 09:31:43 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:43 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:44 kernel: aspeed-video 1e700000.video: Timed out when > > stopping streaming > > Mar 21 09:31:45 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:46 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:47 env[1408]: 21/03/2019 09:31:47 Sending > > rfbEncodingNewFBSize for resize to (640x480) > > Mar 21 09:31:48 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:49 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:50 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:51 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > Mar 21 09:31:52 obmc-ikvm[1408]: Failed to query timings > > Mar 21 09:31:53 kernel: aspeed-video 1e700000.video: Timed out; first > > mode detect > > > > On this state, I used physical keyboard on the host OS to bring it back > > from power saving mode and I see KVM also comes back. I have also tried > > setting the power saving timeout to "never". It works fine. > > > > To recreate this issue > > 1. Set power saving timeout to 1 min. (In RHEL 7.5, Settings > Power > > > Blank Screen) > > 2. Leave the host OS to idle for 1 min. > > 3. You will see screen goes black after 1 min and KVM stops responding. > > > > Hope you understood the issue. Thanks for your support. > > > > Regards, > > Thaj > > > > On Thu, Mar 21, 2019 at 9:49 PM Jae Hyun Yoo > > <jae.hyun.yoo@linux.intel.com <mailto:jae.hyun.yoo@linux.intel.com>> > wrote: > > > > Hi Lei, > > > > Are you using a web browser from Windows OS? It seems that there > is an > > issue of Windows websockify/novnc. Use a browser from OS other than > > Windows til the issue is resolved. > > > > Did you test it using Tight VNC viewer after enabling external > > connection? The reason why I suggested that is to identify whether > > this issue comes from KVM web proxy or from KVM server. > > > > Need more information of your test environment. > > Server platform: > > BMC SoC: > > Host OS: > > > > Regards, > > Jae > > > > On 3/21/2019 12:02 AM, Lei YU wrote: > > >> Check journal (journalctl -f) while you're testing KVM if there > > is any > > >> suspicious error. In normal opration, you should see logs like > > below: > > > > > > I see the same logs as Thaj, only below logs show when the issue > > occurs. > > > > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 Unable to > > > establish connection with systemd socket > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 > Listening for > > > VNC connections on TCP port 5900 > > > Mar 21 05:26:02 romulus env[1564]: 21/03/2019 05:26:02 > Listening for > > > VNC connections on TCP6 port 5900 > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Got > connection > > > from client 127.0.0.1 > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 other > > clients: > > > Mar 21 05:26:06 romulus env[1564]: 21/03/2019 05:26:06 Normal > > socket connection > > > > > > And sometimes it works, then I see logs like: > > > > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Normal > > socket connection > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Client > > Protocol > > > Version 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Protocol > > > version sent 3.8, using 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > > rfbProcessClientSecurityType: executing handler for type 1 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 > > > rfbProcessClientSecurityType: returning securityResult for > client rfb > > > version >= 3.8 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Pixel > format > > > for client 192.168.10.11 <http://192.168.10.11>: > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 32 bpp, > > depth > > > 24, little endian > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 true > colour: > > > max r 255 g 255 b 255, shift r 16 g 8 b 0 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using > > > compression level 1 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using image > > > quality level 6 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using JPEG > > > subsampling 0, Q79 for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > X-style cursor updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > full-color cursor updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > cursor > > > position updates for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Enabling > > > LastRect protocol extension for client 192.168.10.11 > > > Mar 21 06:54:12 romulus env[1957]: 21/03/2019 06:54:12 Using tight > > > encoding for client 192.168.10.11 > > > > > > It's found that the VNC server may work when the screen is > > changed, e.g. > > > reboot the OS, or enter the OS. > > > When OS is in idle, usually it will not work. > > > > > >> Also, try these two patches. I added one more patch. > > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19392 > > >> https://gerrit.openbmc-project.xyz/c/openbmc/obmc-ikvm/+/19433 > > > > > > Tried the patches, still the same issue as above. > > > > > [-- Attachment #2: Type: text/html, Size: 12725 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-21 16:19 ` Jae Hyun Yoo 2019-03-21 16:27 ` Thaju @ 2019-03-22 3:34 ` Lei YU 2019-03-22 15:21 ` Eddie James 1 sibling, 1 reply; 28+ messages in thread From: Lei YU @ 2019-03-22 3:34 UTC (permalink / raw) To: Jae Hyun Yoo; +Cc: xiuzhi, openbmc, ed, Eddie James, Thaju > Are you using a web browser from Windows OS? It seems that there is an > issue of Windows websockify/novnc. Use a browser from OS other than > Windows til the issue is resolved. It's Ubuntu 18.04's Firefox and Chrome. > Did you test it using Tight VNC viewer after enabling external > connection? The reason why I suggested that is to identify whether > this issue comes from KVM web proxy or from KVM server. Yes, TightVNC behaves the same as the KVM in browser. > Need more information of your test environment. > Server platform: > BMC SoC: > Host OS: Server platform: OpenPOWER Romulus BMC SoC: AST2500 with OpenBMC master + patches needed for KVM Host OS: Ubuntu 18.04 server There is an update from my testing: 1. If the host is in Peitiboot (this is an OpenPOWER's thing), or in OS without X, KVM sometimes works, sometimes does not work, as the log shown above; 2. If the host is in OS with X (e.g. lightdm), then KVM always works well. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Does obmc-ikvm work with bmcweb? 2019-03-22 3:34 ` Lei YU @ 2019-03-22 15:21 ` Eddie James 0 siblings, 0 replies; 28+ messages in thread From: Eddie James @ 2019-03-22 15:21 UTC (permalink / raw) To: Lei YU, Jae Hyun Yoo; +Cc: xiuzhi, openbmc, ed, Eddie James, Thaju On 3/21/19 10:34 PM, Lei YU wrote: >> Are you using a web browser from Windows OS? It seems that there is an >> issue of Windows websockify/novnc. Use a browser from OS other than >> Windows til the issue is resolved. > It's Ubuntu 18.04's Firefox and Chrome. > >> Did you test it using Tight VNC viewer after enabling external >> connection? The reason why I suggested that is to identify whether >> this issue comes from KVM web proxy or from KVM server. > Yes, TightVNC behaves the same as the KVM in browser. > >> Need more information of your test environment. >> Server platform: >> BMC SoC: >> Host OS: > Server platform: OpenPOWER Romulus > BMC SoC: AST2500 with OpenBMC master + patches needed for KVM > Host OS: Ubuntu 18.04 server > > There is an update from my testing: > 1. If the host is in Peitiboot (this is an OpenPOWER's thing), or in OS > without X, KVM sometimes works, sometimes does not work, as the log shown > above; I have seen this too; I think it's a VGA or VGA driver problem more than KVM. Not sure we will be able to find a fix. Thanks, Eddie > 2. If the host is in OS with X (e.g. lightdm), then KVM always works well. > ^ permalink raw reply [flat|nested] 28+ messages in thread
* ikvm refresh failed on host screen 1680x1050 resolution 2019-03-15 7:18 ` xiuzhi 2019-03-15 17:11 ` Jae Hyun Yoo @ 2019-04-04 5:21 ` xiuzhi 2019-04-04 17:16 ` Jae Hyun Yoo 1 sibling, 1 reply; 28+ messages in thread From: xiuzhi @ 2019-04-04 5:21 UTC (permalink / raw) To: jae.hyun.yoo, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 257 bytes --] Hi Jae, Ed, The ikvm screen cann't refresh on ikvm webui screen when setting the host screen resolution to 1680*1050 . I must click the "Refresh" button to get the new host screen. Other resolutions works very well. Please check it. Best, xiuzhi [-- Attachment #2: Type: text/html, Size: 335 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: ikvm refresh failed on host screen 1680x1050 resolution 2019-04-04 5:21 ` ikvm refresh failed on host screen 1680x1050 resolution xiuzhi @ 2019-04-04 17:16 ` Jae Hyun Yoo 2019-04-08 1:14 ` xiuzhi 0 siblings, 1 reply; 28+ messages in thread From: Jae Hyun Yoo @ 2019-04-04 17:16 UTC (permalink / raw) To: xiuzhi, openbmc, ed, Eddie James On 4/3/2019 10:21 PM, xiuzhi wrote: > Hi Jae, Ed, > The ikvm screen cann't refresh on ikvm webui screen when setting > the host screen resolution to 1680*1050 . I must click the "Refresh" > button to get the new host screen. Other resolutions works very well. > Please check it. Hi Xiuzhi, I can't see the resolution option in Ubuntu 18.03. What host OS did you use for the test? Let me clarify one more. Do you mean the "Refresh" button in KVM web page, or reload button of the web browser? Thanks, Jae > Best, > xiuzhi ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: ikvm refresh failed on host screen 1680x1050 resolution 2019-04-04 17:16 ` Jae Hyun Yoo @ 2019-04-08 1:14 ` xiuzhi 0 siblings, 0 replies; 28+ messages in thread From: xiuzhi @ 2019-04-08 1:14 UTC (permalink / raw) To: jae.hyun.yoo, openbmc, ed, Eddie James [-- Attachment #1: Type: text/plain, Size: 1056 bytes --] Hi Jae, My host OS is RedHat7. Both "Refresh" button on ikvm web Page and "View--Reload This Page" or reload button on chrome browser menu works. Xiuzhi ------------------ Original ------------------ From: "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; Date: Apr 5, 2019 To: "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; Subject: Re: ikvm refresh failed on host screen 1680x1050 resolution On 4/3/2019 10:21 PM, xiuzhi wrote: > Hi Jae, Ed, > The ikvm screen cann't refresh on ikvm webui screen when setting > the host screen resolution to 1680*1050 . I must click the "Refresh" > button to get the new host screen. Other resolutions works very well. > Please check it. Hi Xiuzhi, I can't see the resolution option in Ubuntu 18.03. What host OS did you use for the test? Let me clarify one more. Do you mean the "Refresh" button in KVM web page, or reload button of the web browser? Thanks, Jae > Best, > xiuzhi [-- Attachment #2: Type: text/html, Size: 1512 bytes --] ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: ikvm refresh failed on host screen 1680x1050 resolution
@ 2019-04-30 1:30 xiuzhi
2019-04-30 17:32 ` Jae Hyun Yoo
0 siblings, 1 reply; 28+ messages in thread
From: xiuzhi @ 2019-04-30 1:30 UTC (permalink / raw)
To: jae.hyun.yoo, openbmc, ed, Eddie James
[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]
Hi Jae,
Did you reproduce the resolution issue? CentOS7 or RedHat7 has this resolution.
Bets,
Xiuzhi
Hi Jae,
My host OS is RedHat7.
Both "Refresh" button on ikvm web Page and "View--Reload This Page" or reload button on chrome browser menu works.
Xiuzhi
------------------ Original ------------------
From: "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>;
Date: Apr 5, 2019
To: "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>;
Subject: Re: ikvm refresh failed on host screen 1680x1050 resolution
On 4/3/2019 10:21 PM, xiuzhi wrote:
> Hi Jae, Ed,
> The ikvm screen cann't refresh on ikvm webui screen when setting
> the host screen resolution to 1680*1050 . I must click the "Refresh"
> button to get the new host screen. Other resolutions works very well.
> Please check it.
Hi Xiuzhi,
I can't see the resolution option in Ubuntu 18.03. What host OS did you
use for the test? Let me clarify one more. Do you mean the "Refresh"
button in KVM web page, or reload button of the web browser?
Thanks,
Jae
> Best,
> xiuzhi
[-- Attachment #2: Type: text/html, Size: 1659 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: ikvm refresh failed on host screen 1680x1050 resolution 2019-04-30 1:30 xiuzhi @ 2019-04-30 17:32 ` Jae Hyun Yoo 0 siblings, 0 replies; 28+ messages in thread From: Jae Hyun Yoo @ 2019-04-30 17:32 UTC (permalink / raw) To: xiuzhi, openbmc, ed, Eddie James On 4/29/2019 6:30 PM, xiuzhi wrote: > Hi Jae, > Did you reproduce the resolution issue? CentOS7 or RedHat7 has this > resolution. I saw this issue too. Looks like it happens when height of resolution is not a multiple of 8 which makes frame updating very slow. Not sure why it happens. Need more debugging. -Jae > Bets, > Xiuzhi > Hi Jae, > My host OS is RedHat7. > Both "Refresh" button on ikvm web Page and "View--Reload This Page" or > reload button on chrome browser menu works. > Xiuzhi > > ------------------ Original ------------------ > *From: * "jae.hyun.yoo";<jae.hyun.yoo@linux.intel.com>; > *Date: * Apr 5, 2019 > *To: * "xiuzhi"<1450335857@qq.com>; "openbmc"<openbmc@lists.ozlabs.org>; > "ed"<ed@tanous.net>; "Eddie James"<eajames@linux.vnet.ibm.com>; > *Subject: * Re: ikvm refresh failed on host screen 1680x1050 resolution > > On 4/3/2019 10:21 PM, xiuzhi wrote: > > Hi Jae, Ed, > > The ikvm screen cann't refresh on ikvm webui screen when setting > > the host screen resolution to 1680*1050 . I must click the "Refresh" > > button to get the new host screen. Other resolutions works very well. > > Please check it. > > Hi Xiuzhi, > > I can't see the resolution option in Ubuntu 18.03. What host OS did you > use for the test? Let me clarify one more. Do you mean the "Refresh" > button in KVM web page, or reload button of the web browser? > > Thanks, > Jae > > > Best, > > xiuzhi ^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2019-04-30 17:32 UTC | newest] Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-03-14 2:21 Does obmc-ikvm work with bmcweb? xiuzhi 2019-03-14 17:53 ` Jae Hyun Yoo 2019-03-15 7:18 ` xiuzhi 2019-03-15 17:11 ` Jae Hyun Yoo 2019-03-18 2:25 ` Lei YU 2019-03-18 17:21 ` Jae Hyun Yoo 2019-03-18 17:33 ` Jae Hyun Yoo 2019-03-19 3:05 ` xiuzhi 2019-03-19 18:04 ` Jae Hyun Yoo 2019-03-19 9:22 ` Lei YU 2019-03-19 18:09 ` Jae Hyun Yoo 2019-03-20 5:30 ` Lei YU 2019-03-20 11:12 ` Thaju 2019-03-20 17:43 ` Jae Hyun Yoo 2019-03-21 7:02 ` Lei YU 2019-03-21 16:19 ` Jae Hyun Yoo 2019-03-21 16:27 ` Thaju 2019-03-21 21:31 ` Jae Hyun Yoo 2019-04-14 7:12 ` xiuzhi 2019-04-15 19:26 ` Jae Hyun Yoo 2019-04-16 1:53 ` xiuzhi 2019-03-22 3:34 ` Lei YU 2019-03-22 15:21 ` Eddie James 2019-04-04 5:21 ` ikvm refresh failed on host screen 1680x1050 resolution xiuzhi 2019-04-04 17:16 ` Jae Hyun Yoo 2019-04-08 1:14 ` xiuzhi 2019-04-30 1:30 xiuzhi 2019-04-30 17:32 ` Jae Hyun Yoo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.