Add initial support for HTC One (M8) #12
Conversation
|
I'm assuming you checked all the regulator voltages against downstream? Generally looks good, just added some small comments. I'm also encouraging you to send this dts upstream quite soon, I don't want this dts to get stuck in this repo only :) |
Yes indeed, I matched the regulator voltages against the vendor device trees.
That was part of my next steps :) I tried this series on top of 6.8-rc but I did not a valid boot (no ssh access). 6.7 did work though, so maybe it's something small. I will re-verify with 6.9-rc when it's released. |
…SR-IOV When kdump kernel tries to copy dump data over SR-IOV, LPAR panics due to NULL pointer exception: Kernel attempted to read user page (0) - exploit attempt? (uid: 0) BUG: Kernel NULL pointer dereference on read at 0x00000000 Faulting instruction address: 0xc000000020847ad4 Oops: Kernel access of bad area, sig: 11 [#1] LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries Modules linked in: mlx5_core(+) vmx_crypto pseries_wdt papr_scm libnvdimm mlxfw tls psample sunrpc fuse overlay squashfs loop CPU: 12 PID: 315 Comm: systemd-udevd Not tainted 6.4.0-Test102+ #12 Hardware name: IBM,9080-HEX POWER10 (raw) 0x800200 0xf000006 of:IBM,FW1060.00 (NH1060_008) hv:phyp pSeries NIP: c000000020847ad4 LR: c00000002083b2dc CTR: 00000000006cd18c REGS: c000000029162ca0 TRAP: 0300 Not tainted (6.4.0-Test102+) MSR: 800000000280b033 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI,LE> CR: 48288244 XER: 00000008 CFAR: c00000002083b2d8 DAR: 0000000000000000 DSISR: 40000000 IRQMASK: 1 ... NIP _find_next_zero_bit+0x24/0x110 LR bitmap_find_next_zero_area_off+0x5c/0xe0 Call Trace: dev_printk_emit+0x38/0x48 (unreliable) iommu_area_alloc+0xc4/0x180 iommu_range_alloc+0x1e8/0x580 iommu_alloc+0x60/0x130 iommu_alloc_coherent+0x158/0x2b0 dma_iommu_alloc_coherent+0x3c/0x50 dma_alloc_attrs+0x170/0x1f0 mlx5_cmd_init+0xc0/0x760 [mlx5_core] mlx5_function_setup+0xf0/0x510 [mlx5_core] mlx5_init_one+0x84/0x210 [mlx5_core] probe_one+0x118/0x2c0 [mlx5_core] local_pci_probe+0x68/0x110 pci_call_probe+0x68/0x200 pci_device_probe+0xbc/0x1a0 really_probe+0x104/0x540 __driver_probe_device+0xb4/0x230 driver_probe_device+0x54/0x130 __driver_attach+0x158/0x2b0 bus_for_each_dev+0xa8/0x130 driver_attach+0x34/0x50 bus_add_driver+0x16c/0x300 driver_register+0xa4/0x1b0 __pci_register_driver+0x68/0x80 mlx5_init+0xb8/0x100 [mlx5_core] do_one_initcall+0x60/0x300 do_init_module+0x7c/0x2b0 At the time of LPAR dump, before kexec hands over control to kdump kernel, DDWs (Dynamic DMA Windows) are scanned and added to the FDT. For the SR-IOV case, default DMA window "ibm,dma-window" is removed from the FDT and DDW added, for the device. Now, kexec hands over control to the kdump kernel. When the kdump kernel initializes, PCI busses are scanned and IOMMU group/tables created, in pci_dma_bus_setup_pSeriesLP(). For the SR-IOV case, there is no "ibm,dma-window". The original commit: b1fc44e, fixes the path where memory is pre-mapped (direct mapped) to the DDW. When TCEs are direct mapped, there is no need to initialize IOMMU tables. iommu_table_setparms_lpar() only considers "ibm,dma-window" property when initiallizing IOMMU table. In the scenario where TCEs are dynamically allocated for SR-IOV, newly created IOMMU table is not initialized. Later, when the device driver tries to enter TCEs for the SR-IOV device, NULL pointer execption is thrown from iommu_area_alloc(). The fix is to initialize the IOMMU table with DDW property stored in the FDT. There are 2 points to remember: 1. For the dedicated adapter, kdump kernel would encounter both default and DDW in FDT. In this case, DDW property is used to initialize the IOMMU table. 2. A DDW could be direct or dynamic mapped. kdump kernel would initialize IOMMU table and mark the existing DDW as "dynamic". This works fine since, at the time of table initialization, iommu_table_clear() makes some space in the DDW, for some predefined number of TCEs which are needed for kdump to succeed. Fixes: b1fc44e ("pseries/iommu/ddw: Fix kdump to work in absence of ibm,dma-window") Signed-off-by: Gaurav Batra <[email protected]> Reviewed-by: Brian King <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/[email protected]
|
You can rebase on top of |
I rebased on top of I also updated the device tree a bit:
|
|
Thanks, pushed a tiny fixup on top. But one major thing is still pending, I'm thinking M8 is actually based on msm8974pro, can you run this command on mainline and post the output? |
You are correct, it's a Here is the output as requested: Indeed, I originally thought of using In the vendor kernel those clocks are not used and even So I don't think we can use |
|
Nope, MSM8974PRO-AC a.k.a MSM8974AB-AC (or basically whatever identifier was chosen that includes -AC) is another thing again (https://github.com/torvalds/linux/blob/master/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts#L190). But true, the clock driver seems to handle PRO-AA/PRO-AB and PRO-AC the same way which is probably not what's correct(?) torvalds/linux@c685841 But still, please rename your dtb to msm8974pro-htc-* and use msm8974pro.dtsi include. Also add msm8974pro compatible to the compatible list of the board, see other boards for example. Because it's definitely a PRO chip. I honestly don't think you'll see any problems because of this since we're using msm8974pro.dtsi for a while for also PRO-AA and PRO-AB devices. |
|
((Not sure, why pronto is needed at first glance...)) |
|
https://matrix.to/#/#msm8974-mainline:postmarketos.org - if joining through that doesn't work (let me know if it doesn't), you can try https://matrix.to/#/#msm8974-mainline:z3ntu.xyz which hopefully works. |
|
Sorry for the delay, I agree that the M8 is a 8974pro, the correct fix would maybe to introduce a new dtsi for the AB (like In any case, I tried with the current situation, and the phone still boots and works, but you get a kernel warning splat: In any case, if there isn't anything else, this should be good to go. For the Matrix chatroom, I don't currently have an account, when I get one I'll join, thanks! |
Add a compatible for the HTC One (M8), which is based on the msm8974pro. Signed-off-by: Alexandre Messier <[email protected]>
Add initial device tree for the HTC One (M8) smartphone. Initial support includes: - eMMC - Power button - USB - Vibrator - Volume buttons (GPIO) - Wi-Fi Signed-off-by: Alexandre Messier <[email protected]>
|
This warning is (unfortunately) normal, so no worries about that. Shouldn't cause any functional issues I believe. Please also send your patch upstream, if you need any help with that please let me know! |
|
Hi @amessier , any progress on sending the patches upstream? |
|
Great to hear! |
Add initial support for the HTC One (M8).
UART support is TBD, for now USB Networking can be used to access the Linux console.
Initial hardware supported: