Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

3 participants
2908 discussions

Re: [Linaro-mm-sig] [PATCH 2/4] i2c: stm32f4: Fix stmpe811 get xyz data timeout issue

by Dillon Min

Hi Patrice, Pierre-Yves, Alain On Tue, Jun 1, 2021 at 7:43 PM Patrice CHOTARD <patrice.chotard(a)foss.st.com> wrote: > > Hi Dillon > > On 5/14/21 1:02 PM, dillon.minfei(a)gmail.com wrote: > > From: Dillon Min <dillon.minfei(a)gmail.com> > > > > As stm32f429's internal flash is 2Mbytes and compiled kernel > > image bigger than 2Mbytes, so we have to load kernel image > > to sdram on stm32f429-disco board which has 8Mbytes sdram space. > > > > based on above context, as you knows kernel running on external > > sdram is more slower than internal flash. besides, we need read 4 > > bytes to get touch screen xyz(x, y, pressure) coordinate data in > > stmpe811 interrupt. > > > > so, in stm32f4_i2c_handle_rx_done, as i2c read slower than running > > in xip mode, have to adjust 'STOP/START bit set position' from last > > two bytes to last one bytes. else, will get i2c timeout in reading > > touch screen coordinate. > > > > to not bring in side effect, introduce IIC_LAST_BYTE_POS to support xip > > kernel or zImage. > > > > Fixes: 62817fc8d282 ("i2c: stm32f4: add driver") > > Link: https://lore.kernel.org/lkml/1591709203-12106-5-git-send-email-dillon.minfe… > > Signed-off-by: Dillon Min <dillon.minfei(a)gmail.com> > > --- > > drivers/i2c/busses/i2c-stm32f4.c | 12 +++++++++--- > > 1 file changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c > > index 4933fc8ce3fd..2e41231b9037 100644 > > --- a/drivers/i2c/busses/i2c-stm32f4.c > > +++ b/drivers/i2c/busses/i2c-stm32f4.c > > @@ -93,6 +93,12 @@ > > #define STM32F4_I2C_MAX_FREQ 46U > > #define HZ_TO_MHZ 1000000 > > > > +#if !defined(CONFIG_MMU) && !defined(CONFIG_XIP_KERNEL) > > +#define IIC_LAST_BYTE_POS 1 > > +#else > > +#define IIC_LAST_BYTE_POS 2 > > +#endif > > + > > /** > > * struct stm32f4_i2c_msg - client specific data > > * @addr: 8-bit slave addr, including r/w bit > > @@ -439,7 +445,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) > > int i; > > > > switch (msg->count) { > > - case 2: > > + case IIC_LAST_BYTE_POS: > > /* > > * In order to correctly send the Stop or Repeated Start > > * condition on the I2C bus, the STOP/START bit has to be set > > @@ -454,7 +460,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) > > else > > stm32f4_i2c_set_bits(reg, STM32F4_I2C_CR1_START); > > > > - for (i = 2; i > 0; i--) > > + for (i = IIC_LAST_BYTE_POS; i > 0; i--) > > stm32f4_i2c_read_msg(i2c_dev); > > > > reg = i2c_dev->base + STM32F4_I2C_CR2; > > @@ -463,7 +469,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) > > > > complete(&i2c_dev->complete); > > break; > > - case 3: > > + case (IIC_LAST_BYTE_POS+1): > > /* > > * In order to correctly generate the NACK pulse after the last > > * received data byte, we have to enable NACK before reading N-2 > > > > I tested this patch on STM32F429-Disco, it fixes the issue described by Dillon. > But i think it's not a good idea to make usage of #if !defined(CONFIG_MMU) && !defined(CONFIG_XIP_KERNEL) > inside the driver code. Hi Patrice, Thanks for your time. How about introducing a dts node for this purpose. like stm32-i2c,last-byte-pos = <1>; or stm32-i2c,last-byte-pos = <2>; if not set, the default value is 2 Best Regards Dillon > > Pierre-Yves, Alain, as i am not I2C expert, can you have a look at this patch and propose another solution > to fix the original issue described by Dillon ? > > Thanks > Patrice

4 years, 1 month

Re: [Linaro-mm-sig] [PATCH 0/4] Fix the i2c/clk bug of stm32 mcu platform

by Dillon Min

Hi Patrice On Mon, May 31, 2021 at 10:58 PM Patrice CHOTARD <patrice.chotard(a)foss.st.com> wrote: > > Hi Dillon > > On 5/31/21 4:29 PM, Dillon Min wrote: > > Hi Patrice > > > > On Mon, May 31, 2021 at 9:51 PM Patrice CHOTARD > > <patrice.chotard(a)foss.st.com> wrote: > >> > >> > >> > >> On 5/31/21 3:38 PM, Dillon Min wrote: > >>> Hi Patrice > >>> > >>> Thanks for your time to test my patch. > >>> > >>> On Mon, May 31, 2021 at 9:20 PM Patrice CHOTARD > >>> <patrice.chotard(a)foss.st.com> wrote: > >>>> > >>>> Hi Dillon > >>>> > >>>> > >>>> > >>>> On 5/14/21 1:02 PM, dillon.minfei(a)gmail.com wrote: > >>>>> From: Dillon Min <dillon.minfei(a)gmail.com> > >>>>> > >>>>> This seriese fix three i2c/clk bug for stm32 f4/f7 > >>>>> - kernel runing in sdram, i2c driver get data timeout > >>>>> - ltdc clk turn off after kernel console active > >>>>> - kernel hang in set ltdc clock rate > >>>>> > >>>>> clk bug found on stm32f429/f469-disco board > >>>>> > >>>>> Hi Patrice: > >>>>> below is the guide to verify the patch: > >>>>> > >>>>> setup test env with following files(link at below 'files link'): > >>>>> [1] u-boot-dtb.bin > >>>>> [2] rootfs zip file (used in kernel initramfs) > >>>>> [3] u-boot's mkimage to create itb file > >>>>> [4] kernel config file > >>>>> [5] my itb with-or-without i2c patch > >>>>> > >>>>> This patch based on kernel commit: > >>>>> 88b06399c9c766c283e070b022b5ceafa4f63f19 > >>>>> > >>>>> Note: > >>>>> panel-ilitek-ili9341.c is the driver which was submitted last year, but not > >>>>> get accepted. it's used to setup touch screen calibration, then test i2c. > >>>>> > >>>>> create itb file(please correct path of 'data'): > >>>>> ./mkimage -f stm32.its stm32.itb > >>>>> > >>>>> HW setup: > >>>>> console: > >>>>> PA9, PA10 > >>>>> usart0 > >>>>> serial@40011000 > >>>>> 115200 8n1 > >>>>> > >>>>> -- flash u-boot.bin to stm32f429-disco on PC > >>>>> $ sudo openocd -f board/stm32f429discovery.cfg -c \ > >>>>> '{PATH-TO-YOUR-UBOOT}/u-boot-dtb.bin 0x08000000 exit reset' > >>>>> > >>>>> -- setup kernel load bootargs at u-boot > >>>>> U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 > >>>>> root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' > >>>>> U-Boot > loady;bootm > >>>>> (download stm32.dtb or your kernel with itb format, or download zImage, dtb) > >>>>> > >>>> > >>>> > >>>> Thanks for these informations > >>>> I was able to load and boot DTB and uImage directly in SDRAM as you suggested, > >>>> i saw Linux logo and kernel log on the STM32F429-disco display, > >>>> but i can't reach the login. > >>>> > >>>> The last kernel log i got is : > >>>> > >>>> Starting kernel ... > >>>> > >>>> [ 0.000000] Booting Linux on physical CPU 0x0 > >>>> [ 0.000000] Linux version 5.13.0-rc1-00082-g9dbbd5cb6240-dirty (nxp11987(a)lmecxl0573.lme1 > >>>> [ 0.000000] CPU: ARMv7-M [410fc241] revision 1 (ARMv7M), cr=00000000 > >>>> [ 0.000000] CPU: unknown data cache, unknown instruction cache > >>>> [ 0.000000] OF: fdt: Machine model: STMicroelectronics STM32F429i-DISCO board > >>>> [ 0.000000] Zone ranges: > >>>> [ 0.000000] Normal [mem 0x0000000090000000-0x00000000907fffff] > >>>> [ 0.000000] Movable zone start for each node > >>>> [ 0.000000] Early memory node ranges > >>>> > >>>> [...] > >>>> > >>>> [ 2.637564] printk: console [ttySTM0] enabled > >>>> [ 2.747984] panel-ilitek-ili9341 spi0.1: get optional vcc failed > >>>> [ 2.758986] spi_stm32 40015000.spi: driver initialized > >>>> [ 2.795733] i2c /dev entries driver > >>>> [ 2.849955] stmpe-i2c 0-0041: stmpe811 detected, chip id: 0x811 > >>>> [ 2.922030] stmpe-ts stmpe-ts: DMA mask not set > >>>> [ 2.965729] input: stmpe-ts as /devices/platform/soc/40005c00.i2c/i2c-0/0-0041/stmpe-ts0 > >>>> [ 2.991570] stm32f4-i2c 40005c00.i2c: STM32F4 I2C driver registered > >>>> [ 3.058262] [drm] Initialized stm 1.0.0 20170330 for 40016800.display-controller on min0 > >>>> [ 3.665951] panel-ilitek-ili9341 spi0.1: initialized display rgb interface > >>>> [ 3.765208] Console: switching to colour frame buffer device 30x40 > >>>> [ 4.014269] stm32-display 40016800.display-controller: [drm] fb0: stmdrmfb frame buffere > >>>> [ 4.212737] Freeing unused kernel memory: 324K > >>>> [ 4.287300] This architecture does not have kernel memory protection. > >>>> [ 4.401202] Run /linuxrc as init process > >>>> [ 4.478622] with arguments: > >>>> [ 4.555069] /linuxrc > >>>> [ 4.595406] with environment: > >>>> [ 4.672213] HOME=/ > >>>> [ 4.712511] TERM=linux > >>>> [ 206.785289] random: crng init done > >>> > >>> I guess you didn't add the rootfs to uImage I sent you. > >> > >> I do use your rootfs > >> > >>> Could you post all the logs from u-boot startup to kernel log end. > >> > >> > >> U-Boot 2021.07-rc2 (May 28 2021 - 17:05:35 +0200) > >> > >> DRAM: 8 MiB > >> Flash: 2 MiB > >> Loading Environment from Flash... OK > >> In: serial@40011000 > >> Out: serial@40011000 > >> Err: serial@40011000 > >> Hit any key to stop autoboot: 0 > >> U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 root=/dev/ram rdinit=/lin' > > > > It seems bootargs are broken here. > > should be setenv bootargs 'console=tty0 console=ttySTM0,115200 > > root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' > > It's just a copy/paste issue from my minicom window to my mailer, > but the bootargs is correct ;-) > > See a correct U-boot/kernel log in attached. Yes, your log is ok. I tried to follow your way(dtb + uImage) to figure out why your kernel was hanging there, but no luck. You can find my log from [1] . (since my uImage is bigger than yours, i change the loadaddr to 0x90300000, 0x90306000) but there are some points we can check: - kernel config, you can find my config in [2], could you share yours to me as well, i can based on your configs to test. - uImage size (yours 1593664 bytes is quite smaller than mine, 2072864 bytes the difference based on kernel config and rootfs size) - cross tool chain (upload my toolchain to google drive [3]) - could you add initcall_debug to your bootargs, to see more log at kernel startup [1] kernel log based on dtb + uImage https://drive.google.com/file/d/1wnA5b3B_6MIb4PWZXn-3DlBbxpi41uSA/view?usp=… [2] kernel config https://drive.google.com/file/d/1oOJt3NRYor3-Uzjpzrujv3uvWguxYQQp/view?usp=… [3] arm-none-eabi- toolchain https://drive.google.com/file/d/1Aq0sF2Gi4y4qaDPnM2S0xCOowFSLZYJm/view?usp=… Best Regards Dillon > > > > > >> U-Boot > > >> U-Boot > > >> U-Boot > setenv loadaddr 0x90400000 > >> U-Boot > loady > >> ## Ready for binary (ymodem) download to 0x90400000 at 115200 bps... > >> CxyzModem - CRC mode, 156(SOH)/0(STX)/0(CAN) packets, 7 retries > >> ## Total Size = 0x00004cad = 19629 Bytes > >> U-Boot > setenv loadaddr 0x90406000 > >> U-Boot > loady > >> ## Ready for binary (ymodem) download to 0x90406000 at 115200 bps... > >> C- CRC mode, 12453(SOH)/0(STX)/0(CAN) packets, 4 retries > >> ## Total Size = 0x00185140 = 1593664 Bytes > >> U-Boot > bootm 0x90406000 - 0x90400000 > >> ## Booting kernel from Legacy Image at 90406000 ... > >> Image Name: Linux-5.13.0-rc1-00082-g9dbbd5cb > >> Image Type: ARM Linux Kernel Image (uncompressed) > >> Data Size: 1593600 Bytes = 1.5 MiB > >> Load Address: 90008000 > >> Entry Point: 90008000 > >> Verifying Checksum ... OK > >> ## Flattened Device Tree blob at 90400000 > >> Booting using the fdt blob at 0x90400000 > >> Loading Kernel Image > >> Loading Device Tree to 905b9000, end 905c0cac ... OK > >> > >> Starting kernel ... > >> > >> [ 0.000000] Booting Linux on physical CPU 0x0 > >> [ 0.000000] Linux version 5.13.0-rc1-00082-g9dbbd5cb6240-dirty (nxp11987(a)lmecxl0573.lme1 > >> [ 0.000000] CPU: ARMv7-M [410fc241] revision 1 (ARMv7M), cr=00000000 > >> [ 0.000000] CPU: unknown data cache, unknown instruction cache > >> [ 0.000000] OF: fdt: Machine model: STMicroelectronics STM32F429i-DISCO board > >> [ 0.000000] Zone ranges: > >> [ 0.000000] Normal [mem 0x0000000090000000-0x00000000907fffff] > >> [ 0.000000] Movable zone start for each node > >> [ 0.000000] Early memory node ranges > >> [ 0.000000] node 0: [mem 0x0000000090000000-0x00000000907fffff] > >> [ 0.000000] Initmem setup node 0 [mem 0x0000000090000000-0x00000000907fffff] > >> [ 0.000000] On node 0 totalpages: 2048 > >> [ 0.000000] Normal zone: 16 pages used for memmap > >> [ 0.000000] Normal zone: 0 pages reserved > >> [ 0.000000] Normal zone: 2048 pages, LIFO batch:0 > >> [ 0.000000] pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768 > >> [ 0.000000] pcpu-alloc: [0] 0 > >> [ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2032 > >> [ 0.000000] Kernel command line: console=tty0 console=ttySTM0,115200 root=/dev/ram rdin2 > > > > ditto > > same explanation as above, the command line displayed is truncated, but it is the one expected. > > > > > >> [ 0.000000] Dentry cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > >> [ 0.000000] Inode-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > >> [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > >> [ 0.000000] Memory: 5264K/8192K available (1372K kernel code, 302K rwdata, 516K rodata,) > >> [ 0.000000] SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 > >> [ 0.000000] rcu: Preemptible hierarchical RCU implementation. > >> [ 0.000000] rcu: RCU event tracing is enabled. > >> [ 0.000000] Trampoline variant of Tasks RCU enabled. > >> [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies. > >> [ 0.000000] NR_IRQS: 16, nr_irqs: 16, preallocated irqs: 16 > >> [ 0.000000] /soc/interrupt-controller@40013c00: bank0 > >> [ 0.000000] random: get_random_bytes called from start_kernel+0x203/0x370 with crng_ini0 > >> [ 0.000000] clocksource: arm_system_timer: mask: 0xffffff max_cycles: 0xffffff, max_idls > >> [ 0.000000] ARM System timer initialized as clocksource > >> [ 0.000026] sched_clock: 32 bits at 90MHz, resolution 11ns, wraps every 23860929530ns > >> [ 0.000665] timer@40000c00: STM32 sched_clock registered > >> [ 0.001275] Switching to timer-based delay loop, resolution 11ns > >> [ 0.001712] timer@40000c00: STM32 delay timer registered > >> [ 0.002253] clocksource: timer@40000c00: mask: 0xffffffff max_cycles: 0xffffffff, max_is > >> [ 0.003076] /soc/timer@40000c00: STM32 clockevent driver initialized (32 bits) > >> [ 0.014135] Console: colour dummy device 80x30 > >> [ 0.062375] printk: console [tty0] enabled > >> [ 0.063843] Calibrating delay loop (skipped), value calculated using timer frequency.. ) > >> [ 0.066453] pid_max: default: 4096 minimum: 301 > >> [ 0.071393] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > >> [ 0.073734] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > >> [ 0.104759] rcu: Hierarchical SRCU implementation. > >> [ 0.111552] devtmpfs: initialized > >> [ 0.339332] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns:s > >> [ 0.341835] pinctrl core: initialized pinctrl subsystem > >> [ 0.658423] stm32f429-pinctrl soc:pin-controller: No package detected, use default one > >> [ 0.680505] stm32f429-pinctrl soc:pin-controller: GPIOA bank added > >> [ 0.689824] stm32f429-pinctrl soc:pin-controller: GPIOB bank added > >> [ 0.699409] stm32f429-pinctrl soc:pin-controller: GPIOC bank added > >> [ 0.708775] stm32f429-pinctrl soc:pin-controller: GPIOD bank added > >> [ 0.718094] stm32f429-pinctrl soc:pin-controller: GPIOE bank added > >> [ 0.727535] stm32f429-pinctrl soc:pin-controller: GPIOF bank added > >> [ 0.736953] stm32f429-pinctrl soc:pin-controller: GPIOG bank added > >> [ 0.746404] stm32f429-pinctrl soc:pin-controller: GPIOH bank added > >> [ 0.756098] stm32f429-pinctrl soc:pin-controller: GPIOI bank added > >> [ 0.765436] stm32f429-pinctrl soc:pin-controller: GPIOJ bank added > >> [ 0.774870] stm32f429-pinctrl soc:pin-controller: GPIOK bank added > >> [ 0.776730] stm32f429-pinctrl soc:pin-controller: Pinctrl STM32 initialized > >> [ 0.997446] stm32-dma 40026000.dma-controller: STM32 DMA driver registered > >> [ 1.029604] stm32-dma 40026400.dma-controller: STM32 DMA driver registered > >> [ 1.043098] clocksource: Switched to clocksource timer@40000c00 > >> [ 1.358086] workingset: timestamp_bits=30 max_order=11 bucket_order=0 > >> [ 1.632751] io scheduler mq-deadline registered > >> [ 1.634287] io scheduler kyber registered > >> [ 1.650574] STM32 USART driver initialized > >> [ 1.661272] 40011000.serial: ttySTM0 at MMIO 0x40011000 (irq = 34, base_baud = 5625000)t > >> [ 2.603317] random: fast init done > >> [ 2.637564] printk: console [ttySTM0] enabled > >> [ 2.747984] panel-ilitek-ili9341 spi0.1: get optional vcc failed > >> [ 2.758986] spi_stm32 40015000.spi: driver initialized > >> [ 2.795733] i2c /dev entries driver > >> [ 2.849955] stmpe-i2c 0-0041: stmpe811 detected, chip id: 0x811 > >> [ 2.922030] stmpe-ts stmpe-ts: DMA mask not set > >> [ 2.965729] input: stmpe-ts as /devices/platform/soc/40005c00.i2c/i2c-0/0-0041/stmpe-ts0 > >> [ 2.991570] stm32f4-i2c 40005c00.i2c: STM32F4 I2C driver registered > >> [ 3.058262] [drm] Initialized stm 1.0.0 20170330 for 40016800.display-controller on min0 > >> [ 3.665951] panel-ilitek-ili9341 spi0.1: initialized display rgb interface > >> [ 3.765208] Console: switching to colour frame buffer device 30x40 > >> [ 4.014269] stm32-display 40016800.display-controller: [drm] fb0: stmdrmfb frame buffere > >> [ 4.212737] Freeing unused kernel memory: 324K > >> [ 4.287300] This architecture does not have kernel memory protection. > >> [ 4.401202] Run /linuxrc as init process > >> [ 4.478622] with arguments: > >> [ 4.555069] /linuxrc > >> [ 4.595406] with environment: > >> [ 4.672213] HOME=/ > >> [ 4.712511] TERM=linux > >> [ 206.785289] random: crng init done > >> > >> > >>> > >>> If possible, you can try my suggestion. > >>> - tar -jxf stm32_rootfs.tar.bz2 > >>> - add stm32_rootfs to your kernel config( enable initramfs) > >> > >> As explained above, that's what i did > >> > >>> - make O=YOUR_KERNEL_OUT zImage dtbs LOADADDR=0x90008000 > >> > >> > >> > >>> - create itb file (combine dtb and kernel, initramfs) by mkimage > >>> ./mkimage -f stm32.its stm32.itb > >> > >> I didn't use .itb file, but directly uImage loaded @0x90406000 and stm32f429-disco.dtb loaded @0x90400000 > > > > It's fine with manual load dtb and uImage. > > > >> > >> How do you generate .its file ? > > > > I refer to u-boot doc , U-BOOT-SOURCE/doc/uImage.FIT/kernel.its > > you can just change the PATH('data = ' filed) of my stm32.its. > > you can correct bootargs in u-boot, try again > > > > good luck. > > > > Thanks > > > > Best Regards > > Dillon > > > >> > >> > >>> (before above command, make sure you correct stm32.its adapt to your env) > >>> > >>> This process will make u-boot to load the kernel more simple. > >>> > >>> Thanks. > >>> > >>> Best Regards. > >>> Dillon > >>> > >>> > >>>> > >>>> > >>>> I can't test your I2C patch. > >>>> > >>>> Patrice > >>>> > >>>> > >>>>> -- setup ts_calibrate running env on stm32f429-disco > >>>>> / # export TSLIB_CONFFILE=/etc/ts.conf > >>>>> / # export TSLIB_TSDEVICE=/dev/input/event0 > >>>>> / # export TSLIB_CONSOLEDEVICE=none > >>>>> / # export TSLIB_FBDEVICE=/dev/fb0 > >>>>> > >>>>> -- clear screen > >>>>> / # ./fb > >>>>> > >>>>> -- run ts_calibrate > >>>>> / # ts_calibrate > >>>>> (you can calibrate touchscreen now, and get below errors) > >>>>> > >>>>> [ 113.942087] stmpe-i2c0-0041: failed to read regs 0x52: -110 > >>>>> [ 114.063598] stmpe-i2c 0-0041: failed to read reg 0x4b: -16 > >>>>> [ 114.185629] stmpe-i2c 0-0041: failed to read reg 0x40: -16 > >>>>> [ 114.307257] stmpe-i2c 0-0041: failed to write reg 0xb: -16 > >>>>> > >>>>> ... > >>>>> with i2c patch applied, you will find below logs: > >>>>> > >>>>> RAW---------------------> 3164 908 183 118.110884 > >>>>> TS_READ_RAW----> x = 3164, y =908, pressure = 183 > >>>>> RAW---------------------> 3166 922 126 118.138946 > >>>>> TS_READ_RAW----> x = 3166, y = 922, pressure = 126 > >>>>> .... > >>>>> > >>>>> files link: > >>>>> https://drive.google.com/drive/folders/1qNbjChcB6UGtKzne2F5x9_WG_sZFyo3o?us… > >>>>> > >>>>> > >>>>> > >>>>> > >>>>> Dillon Min (4): > >>>>> drm/panel: Add ilitek ili9341 panel driver > >>>>> i2c: stm32f4: Fix stmpe811 get xyz data timeout issue > >>>>> clk: stm32: Fix stm32f429's ltdc driver hang in set clock rate > >>>>> clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after > >>>>> kernel startup > >>>>> > >>>>> drivers/clk/clk-stm32f4.c | 10 +- > >>>>> drivers/gpu/drm/panel/Kconfig | 12 + > >>>>> drivers/gpu/drm/panel/Makefile | 1 + > >>>>> drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1285 ++++++++++++++++++++++++++ > >>>>> drivers/i2c/busses/i2c-stm32f4.c | 12 +- > >>>>> 5 files changed, 1310 insertions(+), 10 deletions(-) > >>>>> create mode 100755 drivers/gpu/drm/panel/panel-ilitek-ili9341.c > >>>>>

4 years, 1 month

Re: [Linaro-mm-sig] [PATCH 0/4] Fix the i2c/clk bug of stm32 mcu platform

by Dillon Min

Hi Patrice On Mon, May 31, 2021 at 9:51 PM Patrice CHOTARD <patrice.chotard(a)foss.st.com> wrote: > > > > On 5/31/21 3:38 PM, Dillon Min wrote: > > Hi Patrice > > > > Thanks for your time to test my patch. > > > > On Mon, May 31, 2021 at 9:20 PM Patrice CHOTARD > > <patrice.chotard(a)foss.st.com> wrote: > >> > >> Hi Dillon > >> > >> > >> > >> On 5/14/21 1:02 PM, dillon.minfei(a)gmail.com wrote: > >>> From: Dillon Min <dillon.minfei(a)gmail.com> > >>> > >>> This seriese fix three i2c/clk bug for stm32 f4/f7 > >>> - kernel runing in sdram, i2c driver get data timeout > >>> - ltdc clk turn off after kernel console active > >>> - kernel hang in set ltdc clock rate > >>> > >>> clk bug found on stm32f429/f469-disco board > >>> > >>> Hi Patrice: > >>> below is the guide to verify the patch: > >>> > >>> setup test env with following files(link at below 'files link'): > >>> [1] u-boot-dtb.bin > >>> [2] rootfs zip file (used in kernel initramfs) > >>> [3] u-boot's mkimage to create itb file > >>> [4] kernel config file > >>> [5] my itb with-or-without i2c patch > >>> > >>> This patch based on kernel commit: > >>> 88b06399c9c766c283e070b022b5ceafa4f63f19 > >>> > >>> Note: > >>> panel-ilitek-ili9341.c is the driver which was submitted last year, but not > >>> get accepted. it's used to setup touch screen calibration, then test i2c. > >>> > >>> create itb file(please correct path of 'data'): > >>> ./mkimage -f stm32.its stm32.itb > >>> > >>> HW setup: > >>> console: > >>> PA9, PA10 > >>> usart0 > >>> serial@40011000 > >>> 115200 8n1 > >>> > >>> -- flash u-boot.bin to stm32f429-disco on PC > >>> $ sudo openocd -f board/stm32f429discovery.cfg -c \ > >>> '{PATH-TO-YOUR-UBOOT}/u-boot-dtb.bin 0x08000000 exit reset' > >>> > >>> -- setup kernel load bootargs at u-boot > >>> U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 > >>> root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' > >>> U-Boot > loady;bootm > >>> (download stm32.dtb or your kernel with itb format, or download zImage, dtb) > >>> > >> > >> > >> Thanks for these informations > >> I was able to load and boot DTB and uImage directly in SDRAM as you suggested, > >> i saw Linux logo and kernel log on the STM32F429-disco display, > >> but i can't reach the login. > >> > >> The last kernel log i got is : > >> > >> Starting kernel ... > >> > >> [ 0.000000] Booting Linux on physical CPU 0x0 > >> [ 0.000000] Linux version 5.13.0-rc1-00082-g9dbbd5cb6240-dirty (nxp11987(a)lmecxl0573.lme1 > >> [ 0.000000] CPU: ARMv7-M [410fc241] revision 1 (ARMv7M), cr=00000000 > >> [ 0.000000] CPU: unknown data cache, unknown instruction cache > >> [ 0.000000] OF: fdt: Machine model: STMicroelectronics STM32F429i-DISCO board > >> [ 0.000000] Zone ranges: > >> [ 0.000000] Normal [mem 0x0000000090000000-0x00000000907fffff] > >> [ 0.000000] Movable zone start for each node > >> [ 0.000000] Early memory node ranges > >> > >> [...] > >> > >> [ 2.637564] printk: console [ttySTM0] enabled > >> [ 2.747984] panel-ilitek-ili9341 spi0.1: get optional vcc failed > >> [ 2.758986] spi_stm32 40015000.spi: driver initialized > >> [ 2.795733] i2c /dev entries driver > >> [ 2.849955] stmpe-i2c 0-0041: stmpe811 detected, chip id: 0x811 > >> [ 2.922030] stmpe-ts stmpe-ts: DMA mask not set > >> [ 2.965729] input: stmpe-ts as /devices/platform/soc/40005c00.i2c/i2c-0/0-0041/stmpe-ts0 > >> [ 2.991570] stm32f4-i2c 40005c00.i2c: STM32F4 I2C driver registered > >> [ 3.058262] [drm] Initialized stm 1.0.0 20170330 for 40016800.display-controller on min0 > >> [ 3.665951] panel-ilitek-ili9341 spi0.1: initialized display rgb interface > >> [ 3.765208] Console: switching to colour frame buffer device 30x40 > >> [ 4.014269] stm32-display 40016800.display-controller: [drm] fb0: stmdrmfb frame buffere > >> [ 4.212737] Freeing unused kernel memory: 324K > >> [ 4.287300] This architecture does not have kernel memory protection. > >> [ 4.401202] Run /linuxrc as init process > >> [ 4.478622] with arguments: > >> [ 4.555069] /linuxrc > >> [ 4.595406] with environment: > >> [ 4.672213] HOME=/ > >> [ 4.712511] TERM=linux > >> [ 206.785289] random: crng init done > > > > I guess you didn't add the rootfs to uImage I sent you. > > I do use your rootfs > > > Could you post all the logs from u-boot startup to kernel log end. > > > U-Boot 2021.07-rc2 (May 28 2021 - 17:05:35 +0200) > > DRAM: 8 MiB > Flash: 2 MiB > Loading Environment from Flash... OK > In: serial@40011000 > Out: serial@40011000 > Err: serial@40011000 > Hit any key to stop autoboot: 0 > U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 root=/dev/ram rdinit=/lin' It seems bootargs are broken here. should be setenv bootargs 'console=tty0 console=ttySTM0,115200 root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' > U-Boot > > U-Boot > > U-Boot > setenv loadaddr 0x90400000 > U-Boot > loady > ## Ready for binary (ymodem) download to 0x90400000 at 115200 bps... > CxyzModem - CRC mode, 156(SOH)/0(STX)/0(CAN) packets, 7 retries > ## Total Size = 0x00004cad = 19629 Bytes > U-Boot > setenv loadaddr 0x90406000 > U-Boot > loady > ## Ready for binary (ymodem) download to 0x90406000 at 115200 bps... > C- CRC mode, 12453(SOH)/0(STX)/0(CAN) packets, 4 retries > ## Total Size = 0x00185140 = 1593664 Bytes > U-Boot > bootm 0x90406000 - 0x90400000 > ## Booting kernel from Legacy Image at 90406000 ... > Image Name: Linux-5.13.0-rc1-00082-g9dbbd5cb > Image Type: ARM Linux Kernel Image (uncompressed) > Data Size: 1593600 Bytes = 1.5 MiB > Load Address: 90008000 > Entry Point: 90008000 > Verifying Checksum ... OK > ## Flattened Device Tree blob at 90400000 > Booting using the fdt blob at 0x90400000 > Loading Kernel Image > Loading Device Tree to 905b9000, end 905c0cac ... OK > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0 > [ 0.000000] Linux version 5.13.0-rc1-00082-g9dbbd5cb6240-dirty (nxp11987(a)lmecxl0573.lme1 > [ 0.000000] CPU: ARMv7-M [410fc241] revision 1 (ARMv7M), cr=00000000 > [ 0.000000] CPU: unknown data cache, unknown instruction cache > [ 0.000000] OF: fdt: Machine model: STMicroelectronics STM32F429i-DISCO board > [ 0.000000] Zone ranges: > [ 0.000000] Normal [mem 0x0000000090000000-0x00000000907fffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > [ 0.000000] node 0: [mem 0x0000000090000000-0x00000000907fffff] > [ 0.000000] Initmem setup node 0 [mem 0x0000000090000000-0x00000000907fffff] > [ 0.000000] On node 0 totalpages: 2048 > [ 0.000000] Normal zone: 16 pages used for memmap > [ 0.000000] Normal zone: 0 pages reserved > [ 0.000000] Normal zone: 2048 pages, LIFO batch:0 > [ 0.000000] pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768 > [ 0.000000] pcpu-alloc: [0] 0 > [ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2032 > [ 0.000000] Kernel command line: console=tty0 console=ttySTM0,115200 root=/dev/ram rdin2 ditto > [ 0.000000] Dentry cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > [ 0.000000] Inode-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off > [ 0.000000] Memory: 5264K/8192K available (1372K kernel code, 302K rwdata, 516K rodata,) > [ 0.000000] SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 > [ 0.000000] rcu: Preemptible hierarchical RCU implementation. > [ 0.000000] rcu: RCU event tracing is enabled. > [ 0.000000] Trampoline variant of Tasks RCU enabled. > [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies. > [ 0.000000] NR_IRQS: 16, nr_irqs: 16, preallocated irqs: 16 > [ 0.000000] /soc/interrupt-controller@40013c00: bank0 > [ 0.000000] random: get_random_bytes called from start_kernel+0x203/0x370 with crng_ini0 > [ 0.000000] clocksource: arm_system_timer: mask: 0xffffff max_cycles: 0xffffff, max_idls > [ 0.000000] ARM System timer initialized as clocksource > [ 0.000026] sched_clock: 32 bits at 90MHz, resolution 11ns, wraps every 23860929530ns > [ 0.000665] timer@40000c00: STM32 sched_clock registered > [ 0.001275] Switching to timer-based delay loop, resolution 11ns > [ 0.001712] timer@40000c00: STM32 delay timer registered > [ 0.002253] clocksource: timer@40000c00: mask: 0xffffffff max_cycles: 0xffffffff, max_is > [ 0.003076] /soc/timer@40000c00: STM32 clockevent driver initialized (32 bits) > [ 0.014135] Console: colour dummy device 80x30 > [ 0.062375] printk: console [tty0] enabled > [ 0.063843] Calibrating delay loop (skipped), value calculated using timer frequency.. ) > [ 0.066453] pid_max: default: 4096 minimum: 301 > [ 0.071393] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > [ 0.073734] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes, linear) > [ 0.104759] rcu: Hierarchical SRCU implementation. > [ 0.111552] devtmpfs: initialized > [ 0.339332] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns:s > [ 0.341835] pinctrl core: initialized pinctrl subsystem > [ 0.658423] stm32f429-pinctrl soc:pin-controller: No package detected, use default one > [ 0.680505] stm32f429-pinctrl soc:pin-controller: GPIOA bank added > [ 0.689824] stm32f429-pinctrl soc:pin-controller: GPIOB bank added > [ 0.699409] stm32f429-pinctrl soc:pin-controller: GPIOC bank added > [ 0.708775] stm32f429-pinctrl soc:pin-controller: GPIOD bank added > [ 0.718094] stm32f429-pinctrl soc:pin-controller: GPIOE bank added > [ 0.727535] stm32f429-pinctrl soc:pin-controller: GPIOF bank added > [ 0.736953] stm32f429-pinctrl soc:pin-controller: GPIOG bank added > [ 0.746404] stm32f429-pinctrl soc:pin-controller: GPIOH bank added > [ 0.756098] stm32f429-pinctrl soc:pin-controller: GPIOI bank added > [ 0.765436] stm32f429-pinctrl soc:pin-controller: GPIOJ bank added > [ 0.774870] stm32f429-pinctrl soc:pin-controller: GPIOK bank added > [ 0.776730] stm32f429-pinctrl soc:pin-controller: Pinctrl STM32 initialized > [ 0.997446] stm32-dma 40026000.dma-controller: STM32 DMA driver registered > [ 1.029604] stm32-dma 40026400.dma-controller: STM32 DMA driver registered > [ 1.043098] clocksource: Switched to clocksource timer@40000c00 > [ 1.358086] workingset: timestamp_bits=30 max_order=11 bucket_order=0 > [ 1.632751] io scheduler mq-deadline registered > [ 1.634287] io scheduler kyber registered > [ 1.650574] STM32 USART driver initialized > [ 1.661272] 40011000.serial: ttySTM0 at MMIO 0x40011000 (irq = 34, base_baud = 5625000)t > [ 2.603317] random: fast init done > [ 2.637564] printk: console [ttySTM0] enabled > [ 2.747984] panel-ilitek-ili9341 spi0.1: get optional vcc failed > [ 2.758986] spi_stm32 40015000.spi: driver initialized > [ 2.795733] i2c /dev entries driver > [ 2.849955] stmpe-i2c 0-0041: stmpe811 detected, chip id: 0x811 > [ 2.922030] stmpe-ts stmpe-ts: DMA mask not set > [ 2.965729] input: stmpe-ts as /devices/platform/soc/40005c00.i2c/i2c-0/0-0041/stmpe-ts0 > [ 2.991570] stm32f4-i2c 40005c00.i2c: STM32F4 I2C driver registered > [ 3.058262] [drm] Initialized stm 1.0.0 20170330 for 40016800.display-controller on min0 > [ 3.665951] panel-ilitek-ili9341 spi0.1: initialized display rgb interface > [ 3.765208] Console: switching to colour frame buffer device 30x40 > [ 4.014269] stm32-display 40016800.display-controller: [drm] fb0: stmdrmfb frame buffere > [ 4.212737] Freeing unused kernel memory: 324K > [ 4.287300] This architecture does not have kernel memory protection. > [ 4.401202] Run /linuxrc as init process > [ 4.478622] with arguments: > [ 4.555069] /linuxrc > [ 4.595406] with environment: > [ 4.672213] HOME=/ > [ 4.712511] TERM=linux > [ 206.785289] random: crng init done > > > > > > If possible, you can try my suggestion. > > - tar -jxf stm32_rootfs.tar.bz2 > > - add stm32_rootfs to your kernel config( enable initramfs) > > As explained above, that's what i did > > > - make O=YOUR_KERNEL_OUT zImage dtbs LOADADDR=0x90008000 > > > > > - create itb file (combine dtb and kernel, initramfs) by mkimage > > ./mkimage -f stm32.its stm32.itb > > I didn't use .itb file, but directly uImage loaded @0x90406000 and stm32f429-disco.dtb loaded @0x90400000 It's fine with manual load dtb and uImage. > > How do you generate .its file ? I refer to u-boot doc , U-BOOT-SOURCE/doc/uImage.FIT/kernel.its you can just change the PATH('data = ' filed) of my stm32.its. you can correct bootargs in u-boot, try again good luck. Thanks Best Regards Dillon > > > > (before above command, make sure you correct stm32.its adapt to your env) > > > > This process will make u-boot to load the kernel more simple. > > > > Thanks. > > > > Best Regards. > > Dillon > > > > > >> > >> > >> I can't test your I2C patch. > >> > >> Patrice > >> > >> > >>> -- setup ts_calibrate running env on stm32f429-disco > >>> / # export TSLIB_CONFFILE=/etc/ts.conf > >>> / # export TSLIB_TSDEVICE=/dev/input/event0 > >>> / # export TSLIB_CONSOLEDEVICE=none > >>> / # export TSLIB_FBDEVICE=/dev/fb0 > >>> > >>> -- clear screen > >>> / # ./fb > >>> > >>> -- run ts_calibrate > >>> / # ts_calibrate > >>> (you can calibrate touchscreen now, and get below errors) > >>> > >>> [ 113.942087] stmpe-i2c0-0041: failed to read regs 0x52: -110 > >>> [ 114.063598] stmpe-i2c 0-0041: failed to read reg 0x4b: -16 > >>> [ 114.185629] stmpe-i2c 0-0041: failed to read reg 0x40: -16 > >>> [ 114.307257] stmpe-i2c 0-0041: failed to write reg 0xb: -16 > >>> > >>> ... > >>> with i2c patch applied, you will find below logs: > >>> > >>> RAW---------------------> 3164 908 183 118.110884 > >>> TS_READ_RAW----> x = 3164, y =908, pressure = 183 > >>> RAW---------------------> 3166 922 126 118.138946 > >>> TS_READ_RAW----> x = 3166, y = 922, pressure = 126 > >>> .... > >>> > >>> files link: > >>> https://drive.google.com/drive/folders/1qNbjChcB6UGtKzne2F5x9_WG_sZFyo3o?us… > >>> > >>> > >>> > >>> > >>> Dillon Min (4): > >>> drm/panel: Add ilitek ili9341 panel driver > >>> i2c: stm32f4: Fix stmpe811 get xyz data timeout issue > >>> clk: stm32: Fix stm32f429's ltdc driver hang in set clock rate > >>> clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after > >>> kernel startup > >>> > >>> drivers/clk/clk-stm32f4.c | 10 +- > >>> drivers/gpu/drm/panel/Kconfig | 12 + > >>> drivers/gpu/drm/panel/Makefile | 1 + > >>> drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1285 ++++++++++++++++++++++++++ > >>> drivers/i2c/busses/i2c-stm32f4.c | 12 +- > >>> 5 files changed, 1310 insertions(+), 10 deletions(-) > >>> create mode 100755 drivers/gpu/drm/panel/panel-ilitek-ili9341.c > >>>

4 years, 1 month

Re: [Linaro-mm-sig] [PATCH 0/4] Fix the i2c/clk bug of stm32 mcu platform

by Dillon Min

Hi Patrice Thanks for your time to test my patch. On Mon, May 31, 2021 at 9:20 PM Patrice CHOTARD <patrice.chotard(a)foss.st.com> wrote: > > Hi Dillon > > > > On 5/14/21 1:02 PM, dillon.minfei(a)gmail.com wrote: > > From: Dillon Min <dillon.minfei(a)gmail.com> > > > > This seriese fix three i2c/clk bug for stm32 f4/f7 > > - kernel runing in sdram, i2c driver get data timeout > > - ltdc clk turn off after kernel console active > > - kernel hang in set ltdc clock rate > > > > clk bug found on stm32f429/f469-disco board > > > > Hi Patrice: > > below is the guide to verify the patch: > > > > setup test env with following files(link at below 'files link'): > > [1] u-boot-dtb.bin > > [2] rootfs zip file (used in kernel initramfs) > > [3] u-boot's mkimage to create itb file > > [4] kernel config file > > [5] my itb with-or-without i2c patch > > > > This patch based on kernel commit: > > 88b06399c9c766c283e070b022b5ceafa4f63f19 > > > > Note: > > panel-ilitek-ili9341.c is the driver which was submitted last year, but not > > get accepted. it's used to setup touch screen calibration, then test i2c. > > > > create itb file(please correct path of 'data'): > > ./mkimage -f stm32.its stm32.itb > > > > HW setup: > > console: > > PA9, PA10 > > usart0 > > serial@40011000 > > 115200 8n1 > > > > -- flash u-boot.bin to stm32f429-disco on PC > > $ sudo openocd -f board/stm32f429discovery.cfg -c \ > > '{PATH-TO-YOUR-UBOOT}/u-boot-dtb.bin 0x08000000 exit reset' > > > > -- setup kernel load bootargs at u-boot > > U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 > > root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' > > U-Boot > loady;bootm > > (download stm32.dtb or your kernel with itb format, or download zImage, dtb) > > > > > Thanks for these informations > I was able to load and boot DTB and uImage directly in SDRAM as you suggested, > i saw Linux logo and kernel log on the STM32F429-disco display, > but i can't reach the login. > > The last kernel log i got is : > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0 > [ 0.000000] Linux version 5.13.0-rc1-00082-g9dbbd5cb6240-dirty (nxp11987(a)lmecxl0573.lme1 > [ 0.000000] CPU: ARMv7-M [410fc241] revision 1 (ARMv7M), cr=00000000 > [ 0.000000] CPU: unknown data cache, unknown instruction cache > [ 0.000000] OF: fdt: Machine model: STMicroelectronics STM32F429i-DISCO board > [ 0.000000] Zone ranges: > [ 0.000000] Normal [mem 0x0000000090000000-0x00000000907fffff] > [ 0.000000] Movable zone start for each node > [ 0.000000] Early memory node ranges > > [...] > > [ 2.637564] printk: console [ttySTM0] enabled > [ 2.747984] panel-ilitek-ili9341 spi0.1: get optional vcc failed > [ 2.758986] spi_stm32 40015000.spi: driver initialized > [ 2.795733] i2c /dev entries driver > [ 2.849955] stmpe-i2c 0-0041: stmpe811 detected, chip id: 0x811 > [ 2.922030] stmpe-ts stmpe-ts: DMA mask not set > [ 2.965729] input: stmpe-ts as /devices/platform/soc/40005c00.i2c/i2c-0/0-0041/stmpe-ts0 > [ 2.991570] stm32f4-i2c 40005c00.i2c: STM32F4 I2C driver registered > [ 3.058262] [drm] Initialized stm 1.0.0 20170330 for 40016800.display-controller on min0 > [ 3.665951] panel-ilitek-ili9341 spi0.1: initialized display rgb interface > [ 3.765208] Console: switching to colour frame buffer device 30x40 > [ 4.014269] stm32-display 40016800.display-controller: [drm] fb0: stmdrmfb frame buffere > [ 4.212737] Freeing unused kernel memory: 324K > [ 4.287300] This architecture does not have kernel memory protection. > [ 4.401202] Run /linuxrc as init process > [ 4.478622] with arguments: > [ 4.555069] /linuxrc > [ 4.595406] with environment: > [ 4.672213] HOME=/ > [ 4.712511] TERM=linux > [ 206.785289] random: crng init done I guess you didn't add the rootfs to uImage I sent you. Could you post all the logs from u-boot startup to kernel log end. If possible, you can try my suggestion. - tar -jxf stm32_rootfs.tar.bz2 - add stm32_rootfs to your kernel config( enable initramfs) - make O=YOUR_KERNEL_OUT zImage dtbs LOADADDR=0x90008000 - create itb file (combine dtb and kernel, initramfs) by mkimage ./mkimage -f stm32.its stm32.itb (before above command, make sure you correct stm32.its adapt to your env) This process will make u-boot to load the kernel more simple. Thanks. Best Regards. Dillon > > > I can't test your I2C patch. > > Patrice > > > > -- setup ts_calibrate running env on stm32f429-disco > > / # export TSLIB_CONFFILE=/etc/ts.conf > > / # export TSLIB_TSDEVICE=/dev/input/event0 > > / # export TSLIB_CONSOLEDEVICE=none > > / # export TSLIB_FBDEVICE=/dev/fb0 > > > > -- clear screen > > / # ./fb > > > > -- run ts_calibrate > > / # ts_calibrate > > (you can calibrate touchscreen now, and get below errors) > > > > [ 113.942087] stmpe-i2c0-0041: failed to read regs 0x52: -110 > > [ 114.063598] stmpe-i2c 0-0041: failed to read reg 0x4b: -16 > > [ 114.185629] stmpe-i2c 0-0041: failed to read reg 0x40: -16 > > [ 114.307257] stmpe-i2c 0-0041: failed to write reg 0xb: -16 > > > > ... > > with i2c patch applied, you will find below logs: > > > > RAW---------------------> 3164 908 183 118.110884 > > TS_READ_RAW----> x = 3164, y =908, pressure = 183 > > RAW---------------------> 3166 922 126 118.138946 > > TS_READ_RAW----> x = 3166, y = 922, pressure = 126 > > .... > > > > files link: > > https://drive.google.com/drive/folders/1qNbjChcB6UGtKzne2F5x9_WG_sZFyo3o?us… > > > > > > > > > > Dillon Min (4): > > drm/panel: Add ilitek ili9341 panel driver > > i2c: stm32f4: Fix stmpe811 get xyz data timeout issue > > clk: stm32: Fix stm32f429's ltdc driver hang in set clock rate > > clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after > > kernel startup > > > > drivers/clk/clk-stm32f4.c | 10 +- > > drivers/gpu/drm/panel/Kconfig | 12 + > > drivers/gpu/drm/panel/Makefile | 1 + > > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1285 ++++++++++++++++++++++++++ > > drivers/i2c/busses/i2c-stm32f4.c | 12 +- > > 5 files changed, 1310 insertions(+), 10 deletions(-) > > create mode 100755 drivers/gpu/drm/panel/panel-ilitek-ili9341.c > >

4 years, 1 month

[RFC] Add DMA_RESV_USAGE flags

by Christian König

We had a long outstanding problem in amdgpu that buffers exported to user drivers by DMA-buf serialize all command submissions using them. In other words we can't compose the buffer with different engines and then send it to another driver for display further processing. This was added to work around the fact that i915 didn't wanted to wait for shared fences in the dma_resv objects before displaying a buffer. Since this problem is now causing issues with Vulkan we need to find a better solution for that. The patch set here tries to do this by adding an usage flag to the shared fences noting when and how they should participate in implicit synchronization. Please review and/or comment, Christian.

4 years, 1 month

[PATCH 0/4] Fix the i2c/clk bug of stm32 mcu platform

by dillon.minfei＠gmail.com

From: Dillon Min <dillon.minfei(a)gmail.com> This seriese fix three i2c/clk bug for stm32 f4/f7 - kernel runing in sdram, i2c driver get data timeout - ltdc clk turn off after kernel console active - kernel hang in set ltdc clock rate clk bug found on stm32f429/f469-disco board Hi Patrice: below is the guide to verify the patch: setup test env with following files(link at below 'files link'): [1] u-boot-dtb.bin [2] rootfs zip file (used in kernel initramfs) [3] u-boot's mkimage to create itb file [4] kernel config file [5] my itb with-or-without i2c patch This patch based on kernel commit: 88b06399c9c766c283e070b022b5ceafa4f63f19 Note: panel-ilitek-ili9341.c is the driver which was submitted last year, but not get accepted. it's used to setup touch screen calibration, then test i2c. create itb file(please correct path of 'data'): ./mkimage -f stm32.its stm32.itb HW setup: console: PA9, PA10 usart0 serial@40011000 115200 8n1 -- flash u-boot.bin to stm32f429-disco on PC $ sudo openocd -f board/stm32f429discovery.cfg -c \ '{PATH-TO-YOUR-UBOOT}/u-boot-dtb.bin 0x08000000 exit reset' -- setup kernel load bootargs at u-boot U-Boot > setenv bootargs 'console=tty0 console=ttySTM0,115200 root=/dev/ram rdinit=/linuxrc loglevel=8 fbcon=rotate:2' U-Boot > loady;bootm (download stm32.dtb or your kernel with itb format, or download zImage, dtb) -- setup ts_calibrate running env on stm32f429-disco / # export TSLIB_CONFFILE=/etc/ts.conf / # export TSLIB_TSDEVICE=/dev/input/event0 / # export TSLIB_CONSOLEDEVICE=none / # export TSLIB_FBDEVICE=/dev/fb0 -- clear screen / # ./fb -- run ts_calibrate / # ts_calibrate (you can calibrate touchscreen now, and get below errors) [ 113.942087] stmpe-i2c0-0041: failed to read regs 0x52: -110 [ 114.063598] stmpe-i2c 0-0041: failed to read reg 0x4b: -16 [ 114.185629] stmpe-i2c 0-0041: failed to read reg 0x40: -16 [ 114.307257] stmpe-i2c 0-0041: failed to write reg 0xb: -16 ... with i2c patch applied, you will find below logs: RAW---------------------> 3164 908 183 118.110884 TS_READ_RAW----> x = 3164, y =908, pressure = 183 RAW---------------------> 3166 922 126 118.138946 TS_READ_RAW----> x = 3166, y = 922, pressure = 126 .... files link: https://drive.google.com/drive/folders/1qNbjChcB6UGtKzne2F5x9_WG_sZFyo3o?us… Dillon Min (4): drm/panel: Add ilitek ili9341 panel driver i2c: stm32f4: Fix stmpe811 get xyz data timeout issue clk: stm32: Fix stm32f429's ltdc driver hang in set clock rate clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after kernel startup drivers/clk/clk-stm32f4.c | 10 +- drivers/gpu/drm/panel/Kconfig | 12 + drivers/gpu/drm/panel/Makefile | 1 + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1285 ++++++++++++++++++++++++++ drivers/i2c/busses/i2c-stm32f4.c | 12 +- 5 files changed, 1310 insertions(+), 10 deletions(-) create mode 100755 drivers/gpu/drm/panel/panel-ilitek-ili9341.c -- 2.7.4

4 years, 1 month

[PATCH 1/4] dma-buf: Require VM_PFNMAP vma for mmap

by Daniel Vetter

tldr; DMA buffers aren't normal memory, expecting that you can use them like that (like calling get_user_pages works, or that they're accounting like any other normal memory) cannot be guaranteed. Since some userspace only runs on integrated devices, where all buffers are actually all resident system memory, there's a huge temptation to assume that a struct page is always present and useable like for any more pagecache backed mmap. This has the potential to result in a uapi nightmare. To stop this gap require that DMA buffer mmaps are VM_PFNMAP, which blocks get_user_pages and all the other struct page based infrastructure for everyone. In spirit this is the uapi counterpart to the kernel-internal CONFIG_DMABUF_DEBUG. Motivated by a recent patch which wanted to swich the system dma-buf heap to vm_insert_page instead of vm_insert_pfn. v2: Jason brought up that we also want to guarantee that all ptes have the pte_special flag set, to catch fast get_user_pages (on architectures that support this). Allowing VM_MIXEDMAP (like VM_SPECIAL does) would still allow vm_insert_page, but limiting to VM_PFNMAP will catch that. >From auditing the various functions to insert pfn pte entires (vm_insert_pfn_prot, remap_pfn_range and all it's callers like dma_mmap_wc) it looks like VM_PFNMAP is already required anyway, so this should be the correct flag to check for. References: https://lore.kernel.org/lkml/CAKMK7uHi+mG0z0HUmNt13QCCvutuRVjpcR0NjRL12k-Wb… Acked-by: Christian König <christian.koenig(a)amd.com> Cc: Jason Gunthorpe <jgg(a)ziepe.ca> Cc: Suren Baghdasaryan <surenb(a)google.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: John Stultz <john.stultz(a)linaro.org> Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: "Christian König" <christian.koenig(a)amd.com> Cc: linux-media(a)vger.kernel.org Cc: linaro-mm-sig(a)lists.linaro.org -- Resending this so I can test the next two patches for vgem/shmem in intel-gfx-ci. Last round failed somehow, but I can't repro that at all locally here. No immediate plans to merge this patch here since ttm isn't addressed yet (and there we have the hugepte issue, for which I don't think we have a clear consensus yet). -Daniel --- drivers/dma-buf/dma-buf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index eadd1eaa2fb5..dda583fb1f03 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -127,6 +127,7 @@ static struct file_system_type dma_buf_fs_type = { static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) { struct dma_buf *dmabuf; + int ret; if (!is_dma_buf_file(file)) return -EINVAL; @@ -142,7 +143,11 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) dmabuf->size >> PAGE_SHIFT) return -EINVAL; - return dmabuf->ops->mmap(dmabuf, vma); + ret = dmabuf->ops->mmap(dmabuf, vma); + + WARN_ON(!(vma->vm_flags & VM_PFNMAP)); + + return ret; } static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) @@ -1244,6 +1249,8 @@ EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access); int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, unsigned long pgoff) { + int ret; + if (WARN_ON(!dmabuf || !vma)) return -EINVAL; @@ -1264,7 +1271,11 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, vma_set_file(vma, dmabuf->file); vma->vm_pgoff = pgoff; - return dmabuf->ops->mmap(dmabuf, vma); + ret = dmabuf->ops->mmap(dmabuf, vma); + + WARN_ON(!(vma->vm_flags & VM_PFNMAP)); + + return ret; } EXPORT_SYMBOL_GPL(dma_buf_mmap); -- 2.31.0

4 years, 1 month

[PATCH 00/34] Rid W=1 warnings from GPU

by Lee Jones

This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings. Lee Jones (34): drm/amd/pm/inc/smu_v13_0: Move table into the only source file that uses it drm/amd/pm/swsmu/smu13/aldebaran_ppt: Remove unused variable 'ret' drm/amd/pm/powerplay/hwmgr/smu7_thermal: Provide function name for 'smu7_fan_ctrl_set_default_mode()' drm/amd/pm/powerplay/hwmgr/vega12_thermal: Provide function name drm/amd/pm/powerplay/hwmgr/vega12_hwmgr: Provide 'vega12_init_smc_table()' function name drm/amd/pm/powerplay/hwmgr/vega10_hwmgr: Kernel-doc headers must contain function names drm/amd/pm/powerplay/hwmgr/vega20_hwmgr: Provide function name 'vega20_init_smc_table()' drm/amd/display/dc/bios/command_table_helper: Fix function name for 'dal_cmd_table_helper_transmitter_bp_to_atom()' drm/amd/display/dc/bios/command_table_helper2: Fix function name 'dal_cmd_table_helper_transmitter_bp_to_atom2()' drm/amd/display/dc/bios/bios_parser: Fix formatting and misnaming issues drm/nouveau/nvkm/subdev/mc/tu102: Make functions called by reference static drm/amd/display/amdgpu_dm/amdgpu_dm: Functions must directly follow their headers drm/amd/display/dc/dce/dmub_outbox: Convert over to kernel-doc drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version,environment} types drm/amd/display/dc/dce110/dce110_hw_sequencer: Include our own header drm/amd/display/dc/dce/dce_transform: Remove superfluous re-initialisation of DCFE_MEM_LIGHT_SLEEP_CNTL, drm/amd/display/dc/dce/dce_mem_input: Remove duplicate initialisation of GRPH_CONTROL__GRPH_NUM_BANKS_{SHIFT,MASK} drm/amd/display/dc/dce/dce_mem_input: Remove duplicate initialisation of GRPH_CONTROL__GRPH_NUM_BANKS_{SHIFT,MASK drm/amd/amdgpu/amdgpu_device: Make local function static drm/amd/display/amdgpu_dm/amdgpu_dm: Fix kernel-doc formatting issue drm/amd/display/dc/dce110/dce110_hw_sequencer: Include header containing our prototypes drm/amd/display/dc/core/dc: Convert function headers to kernel-doc drm/amd/display/dmub/src/dmub_srv_stat: Convert function header to kernel-doc drm/amd/display/modules/hdcp/hdcp_psp: Remove unused function 'mod_hdcp_hdcp1_get_link_encryption_status()' drm/xlnx/zynqmp_disp: Fix incorrectly named enum 'zynqmp_disp_layer_id' drm/xlnx/zynqmp_dp: Fix incorrectly name function 'zynqmp_dp_train()' drm/ttm/ttm_tt: Demote non-conformant kernel-doc header drm/panel/panel-raspberrypi-touchscreen: Demote kernel-doc abuse drm/panel/panel-sitronix-st7701: Demote kernel-doc abuse drm/vgem/vgem_drv: Standard comment blocks should not use kernel-doc format drm/exynos/exynos7_drm_decon: Fix incorrect naming of 'decon_shadow_protect_win()' drm/exynos/exynos_drm_ipp: Fix documentation for 'exynos_drm_ipp_get_{caps,res}_ioctl()' drm/vboxvideo/hgsmi_base: Place function names into headers drm/vboxvideo/modesetting: Provide function names for prototype headers drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +-- .../display/dc/bios/command_table_helper.c | 2 +- .../display/dc/bios/command_table_helper2.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 46 +++++-------------- .../drm/amd/display/dc/dce/dce_mem_input.h | 2 - .../drm/amd/display/dc/dce/dce_transform.h | 3 +- .../gpu/drm/amd/display/dc/dce/dmub_outbox.c | 17 ++----- .../display/dc/dce110/dce110_hw_sequencer.c | 3 ++ .../drm/amd/display/dc/gpio/gpio_service.c | 12 ++--- .../drm/amd/display/dmub/src/dmub_srv_stat.c | 19 +++----- .../display/include/gpio_service_interface.h | 4 +- .../drm/amd/display/modules/hdcp/hdcp_psp.c | 13 ------ drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 6 --- .../drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 8 ++-- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 26 ++++++----- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- .../amd/pm/powerplay/hwmgr/vega12_thermal.c | 3 +- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 9 +++- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 4 +- .../gpu/drm/nouveau/nvkm/subdev/mc/tu102.c | 6 +-- .../drm/panel/panel-raspberrypi-touchscreen.c | 2 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- drivers/gpu/drm/ttm/ttm_tt.c | 2 +- drivers/gpu/drm/vboxvideo/hgsmi_base.c | 19 +++++--- drivers/gpu/drm/vboxvideo/modesetting.c | 20 ++++---- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_disp.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- 32 files changed, 107 insertions(+), 147 deletions(-) Cc: Adam Jackson <ajax(a)redhat.com> Cc: Ajay Kumar <ajaykumar.rs(a)samsung.com> Cc: Akshu Agarwal <akshua(a)gmail.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Alistair Popple <apopple(a)nvidia.com> Cc: amd-gfx(a)lists.freedesktop.org Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Ben Widawsky <ben(a)bwidawsk.net> Cc: Christian Koenig <christian.koenig(a)amd.com> Cc: "Christian König" <christian.koenig(a)amd.com> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: David Airlie <airlied(a)linux.ie> Cc: dri-devel(a)lists.freedesktop.org Cc: Eric Anholt <eric(a)anholt.net> Cc: Evan Quan <evan.quan(a)amd.com> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Huang Rui <ray.huang(a)amd.com> Cc: Hyun Kwon <hyun.kwon(a)xilinx.com> Cc: Inki Dae <inki.dae(a)samsung.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Joonyoung Shim <jy0922.shim(a)samsung.com> Cc: Jun Lei <Jun.Lei(a)amd.com> Cc: Kevin Wang <kevin1.wang(a)amd.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> Cc: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Leo Li <sunpeng.li(a)amd.com> Cc: linaro-mm-sig(a)lists.linaro.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-media(a)vger.kernel.org Cc: linux-samsung-soc(a)vger.kernel.org Cc: Marek Szyprowski <m.szyprowski(a)samsung.com> Cc: Mauro Rossi <issor.oruam(a)gmail.com> Cc: Meenakshikumar Somasundaram <meenakshikumar.somasundaram(a)amd.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: nouveau(a)lists.freedesktop.org Cc: Philipp Zabel <p.zabel(a)pengutronix.de> Cc: Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Seung-Woo Kim <sw0312.kim(a)samsung.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> -- 2.31.1

4 years, 1 month

[PATCH 1/3] dma-buf: Require VM_PFNMAP vma for mmap

by Daniel Vetter

4 years, 1 month

[PATCH 01/11] drm/amdgpu: Comply with implicit fencing rules

by Daniel Vetter

Docs for struct dma_resv are fairly clear: "A reservation object can have attached one exclusive fence (normally associated with write operations) or N shared fences (read operations)." https://dri.freedesktop.org/docs/drm/driver-api/dma-buf.html#reservation-ob… Furthermore a review across all of upstream. First of render drivers and how they set implicit fences: - nouveau follows this contract, see in validate_fini_no_ticket() nouveau_bo_fence(nvbo, fence, !!b->write_domains); and that last boolean controls whether the exclusive or shared fence slot is used. - radeon follows this contract by setting p->relocs[i].tv.num_shared = !r->write_domain; in radeon_cs_parser_relocs(), which ensures that the call to ttm_eu_fence_buffer_objects() in radeon_cs_parser_fini() will do the right thing. - vmwgfx seems to follow this contract with the shotgun approach of always setting ttm_val_buf->num_shared = 0, which means ttm_eu_fence_buffer_objects() will only use the exclusive slot. - etnaviv follows this contract, as can be trivially seen by looking at submit_attach_object_fences() - i915 is a bit a convoluted maze with multiple paths leading to i915_vma_move_to_active(). Which sets the exclusive flag if EXEC_OBJECT_WRITE is set. This can either come as a buffer flag for softpin mode, or through the write_domain when using relocations. It follows this contract. - lima follows this contract, see lima_gem_submit() which sets the exclusive fence when the LIMA_SUBMIT_BO_WRITE flag is set for that bo - msm follows this contract, see msm_gpu_submit() which sets the exclusive flag when the MSM_SUBMIT_BO_WRITE is set for that buffer - panfrost follows this contract with the shotgun approach of just always setting the exclusive fence, see panfrost_attach_object_fences(). Benefits of a single engine I guess - v3d follows this contract with the same shotgun approach in v3d_attach_fences_and_unlock_reservation(), but it has at least an XXX comment that maybe this should be improved - v4c uses the same shotgun approach of always setting an exclusive fence, see vc4_update_bo_seqnos() - vgem also follows this contract, see vgem_fence_attach_ioctl() and the VGEM_FENCE_WRITE. This is used in some igts to validate prime sharing with i915.ko without the need of a 2nd gpu - vritio follows this contract again with the shotgun approach of always setting an exclusive fence, see virtio_gpu_array_add_fence() This covers the setting of the exclusive fences when writing. Synchronizing against the exclusive fence is a lot more tricky, and I only spot checked a few: - i915 does it, with the optional EXEC_OBJECT_ASYNC to skip all implicit dependencies (which is used by vulkan) - etnaviv does this. Implicit dependencies are collected in submit_fence_sync(), again with an opt-out flag ETNA_SUBMIT_NO_IMPLICIT. These are then picked up in etnaviv_sched_dependency which is the drm_sched_backend_ops->dependency callback. - v4c seems to not do much here, maybe gets away with it by not having a scheduler and only a single engine. Since all newer broadcom chips than the OG vc4 use v3d for rendering, which follows this contract, the impact of this issue is fairly small. - v3d does this using the drm_gem_fence_array_add_implicit() helper, which then it's drm_sched_backend_ops->dependency callback v3d_job_dependency() picks up. - panfrost is nice here and tracks the implicit fences in panfrost_job->implicit_fences, which again the drm_sched_backend_ops->dependency callback panfrost_job_dependency() picks up. It is mildly questionable though since it only picks up exclusive fences in panfrost_acquire_object_fences(), but not buggy in practice because it also always sets the exclusive fence. It should pick up both sets of fences, just in case there's ever going to be a 2nd gpu in a SoC with a mali gpu. Or maybe a mali SoC with a pcie port and a real gpu, which might actually happen eventually. A bug, but easy to fix. Should probably use the drm_gem_fence_array_add_implicit() helper. - lima is nice an easy, uses drm_gem_fence_array_add_implicit() and the same schema as v3d. - msm is mildly entertaining. It also supports MSM_SUBMIT_NO_IMPLICIT, but because it doesn't use the drm/scheduler it handles fences from the wrong context with a synchronous dma_fence_wait. See submit_fence_sync() leading to msm_gem_sync_object(). Investing into a scheduler might be a good idea. - all the remaining drivers are ttm based, where I hope they do appropriately obey implicit fences already. I didn't do the full audit there because a) not follow the contract would confuse ttm quite well and b) reading non-standard scheduler and submit code which isn't based on drm/scheduler is a pain. Onwards to the display side. - Any driver using the drm_gem_plane_helper_prepare_fb() helper will correctly. Overwhelmingly most drivers get this right, except a few totally dont. I'll follow up with a patch to make this the default and avoid a bunch of bugs. - I didn't audit the ttm drivers, but given that dma_resv started there I hope they get this right. In conclusion this IS the contract, both as documented and overwhelmingly implemented, specically as implemented by all render drivers except amdgpu. Amdgpu tried to fix this already in commit 049aca4363d8af87cab8d53de5401602db3b9999 Author: Christian König <christian.koenig(a)amd.com> Date: Wed Sep 19 16:54:35 2018 +0200 drm/amdgpu: fix using shared fence for exported BOs v2 but this fix falls short on a number of areas: - It's racy, by the time the buffer is shared it might be too late. To make sure there's definitely never a problem we need to set the fences correctly for any buffer that's potentially exportable. - It's breaking uapi, dma-buf fds support poll() and differentitiate between, which was introduced in commit 9b495a5887994a6d74d5c261d012083a92b94738 Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Tue Jul 1 12:57:43 2014 +0200 dma-buf: add poll support, v3 - Christian König wants to nack new uapi building further on this dma_resv contract because it breaks amdgpu, quoting "Yeah, and that is exactly the reason why I will NAK this uAPI change. "This doesn't works for amdgpu at all for the reasons outlined above." https://lore.kernel.org/dri-devel/f2eb6751-2f82-9b23-f57e-548de5b729de@gmai… Rejecting new development because your own driver is broken and violates established cross driver contracts and uapi is really not how upstream works. Now this patch will have a severe performance impact on anything that runs on multiple engines. So we can't just merge it outright, but need a bit a plan: - amdgpu needs a proper uapi for handling implicit fencing. The funny thing is that to do it correctly, implicit fencing must be treated as a very strange IPC mechanism for transporting fences, where both setting the fence and dependency intercepts must be handled explicitly. Current best practices is a per-bo flag to indicate writes, and a per-bo flag to to skip implicit fencing in the CS ioctl as a new chunk. - Since amdgpu has been shipping with broken behaviour we need an opt-out flag from the butchered implicit fencing model to enable the proper explicit implicit fencing model. - for kernel memory fences due to bo moves at least the i915 idea is to use ttm_bo->moving. amdgpu probably needs the same. - since the current p2p dma-buf interface assumes the kernel memory fence is in the exclusive dma_resv fence slot we need to add a new fence slot for kernel fences, which must never be ignored. Since currently only amdgpu supports this there's no real problem here yet, until amdgpu gains a NO_IMPLICIT CS flag. - New userspace needs to ship in enough desktop distros so that users wont notice the perf impact. I think we can ignore LTS distros who upgrade their kernels but not their mesa3d snapshot. - Then when this is all in place we can merge this patch here. What is not a solution to this problem here is trying to make the dma_resv rules in the kernel more clever. The fundamental issue here is that the amdgpu CS uapi is the least expressive one across all drivers (only equalled by panfrost, which has an actual excuse) by not allowing any userspace control over how implicit sync is conducted. Until this is fixed it's completely pointless to make the kernel more clever to improve amdgpu, because all we're doing is papering over this uapi design issue. amdgpu needs to attain the status quo established by other drivers first, once that's achieved we can tackle the remaining issues in a consistent way across drivers. Cc: mesa-dev(a)lists.freedesktop.org Cc: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> Cc: Dave Airlie <airlied(a)gmail.com> Cc: Rob Clark <robdclark(a)chromium.org> Cc: Kristian H. Kristensen <hoegsberg(a)google.com> Cc: Michel Dänzer <michel(a)daenzer.net> Cc: Daniel Stone <daniels(a)collabora.com> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: "Christian König" <christian.koenig(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Deepak R Varma <mh12gx2825(a)gmail.com> Cc: Chen Li <chenli(a)uniontech.com> Cc: Kevin Wang <kevin1.wang(a)amd.com> Cc: Dennis Li <Dennis.Li(a)amd.com> Cc: Luben Tuikov <luben.tuikov(a)amd.com> Cc: linaro-mm-sig(a)lists.linaro.org Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 88a24a0b5691..cc8426e1e8a8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -617,8 +617,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, amdgpu_bo_list_for_each_entry(e, p->bo_list) { struct amdgpu_bo *bo = ttm_to_amdgpu_bo(e->tv.bo); - /* Make sure we use the exclusive slot for shared BOs */ - if (bo->prime_shared_count) + /* Make sure we use the exclusive slot for all potentially shared BOs */ + if (!(bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID)) e->tv.num_shared = 0; e->bo_va = amdgpu_vm_bo_find(vm, bo); } -- 2.31.0

4 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig