On Mon, 2022-02-28 at 14:50 +0100, AngeloGioacchino Del Regno wrote: > Il 28/02/22 13:34, Joerg Roedel ha scritto: > > Hi Yong Wu, > > > > On Thu, Feb 17, 2022 at 07:34:19PM +0800, Yong Wu wrote: > > > Yong Wu (34): > > > dt-bindings: mediatek: mt8195: Add binding for MM IOMMU > > > dt-bindings: mediatek: mt8195: Add binding for infra IOMMU > > > iommu/mediatek: Fix 2 HW sharing pgtable issue > > > iommu/mediatek: Add list_del in mtk_iommu_remove > > > iommu/mediatek: Remove clk_disable in mtk_iommu_remove > > > iommu/mediatek: Add mutex for m4u_group and m4u_dom in data > > > iommu/mediatek: Add mutex for data in the mtk_iommu_domain > > > iommu/mediatek: Adapt sharing and non-sharing pgtable case > > > iommu/mediatek: Add 12G~16G support for multi domains > > > iommu/mediatek: Add a flag DCM_DISABLE > > > iommu/mediatek: Add a flag NON_STD_AXI > > > iommu/mediatek: Remove the granule in the tlb flush > > > iommu/mediatek: Always enable output PA over 32bits in isr > > > iommu/mediatek: Add SUB_COMMON_3BITS flag > > > iommu/mediatek: Add IOMMU_TYPE flag > > > iommu/mediatek: Contain MM IOMMU flow with the MM TYPE > > > iommu/mediatek: Adjust device link when it is sub-common > > > iommu/mediatek: Allow IOMMU_DOMAIN_UNMANAGED for PCIe VFIO > > > iommu/mediatek: Add a PM_CLK_AO flag for infra iommu > > > iommu/mediatek: Add infra iommu support > > > iommu/mediatek: Add PCIe support > > > iommu/mediatek: Add mt8195 support > > > iommu/mediatek: Only adjust code about register base > > > iommu/mediatek: Just move code position in hw_init > > > iommu/mediatek: Separate mtk_iommu_data for v1 and v2 > > > iommu/mediatek: Remove mtk_iommu.h > > > iommu/mediatek-v1: Just rename mtk_iommu to mtk_iommu_v1 > > > iommu/mediatek: Add mtk_iommu_bank_data structure > > > iommu/mediatek: Initialise bank HW for each a bank > > > iommu/mediatek: Change the domid to iova_region_id > > > iommu/mediatek: Get the proper bankid for multi banks > > > iommu/mediatek: Initialise/Remove for multi bank dev > > > iommu/mediatek: Backup/restore regsiters for multi banks > > > iommu/mediatek: mt8195: Enable multi banks for infra iommu > > > > This doesn't apply cleanly, can you please send a version rebased > > to > > v5.17-rc4? As in the cover letter, this patchset doesn't base on v5.17-rc4, it bases on next-20220216 which has contained [1] and Dafna's patchset below. By the way, It still conflicts with the latest next-20220228 which has just contained[2]. In this case, How should I do? Send a version base on the latest next? [1] https://lore.kernel.org/linux-iommu/20220117070510.17642-1-yong.wu@xxxxxxxxxxxx/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=next-20220228&qt=grep&q=component_compare Thanks. > > > > Thanks, > > > > Joerg > > Hello Joerg, > > this series depends on the following series: > https://patchwork.kernel.org/project/linux-mediatek/list/?series=592275 > > ...which is also well tested and ready to be merged in. > > Applying Yong's series without the mentioned series from Dafna would > not work. Yes. Thanks. > > > Thanks, > Angelo
