Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <307bfb9c-75e6-e0e1-4992-79f22671ca31@seco.com>
Date:   Tue, 3 Jan 2023 11:24:03 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.4.0
Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper
Content-Language: en-US
To:     Maxime Ripard <maxime@cerno.tech>,
        Robin Murphy <robin.murphy@arm.com>
Cc:     David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>,
        Joerg Roedel <joro@8bytes.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Takashi Iwai <tiwai@suse.com>, Will Deacon <will@kernel.org>,
        Yong Wu <yong.wu@mediatek.com>, alsa-devel@alsa-project.org,
        iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
        linux-mediatek@lists.infradead.org
References: <20221222233759.1934852-1-sean.anderson@seco.com>
 <20221222233759.1934852-3-sean.anderson@seco.com>
 <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com>
 <20230103161550.4tui3ihl65olvkd7@houat>
From:   Sean Anderson <sean.anderson@seco.com>
In-Reply-To: <20230103161550.4tui3ihl65olvkd7@houat>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NDFOc0RnV0FKM2V6THpLdDR1K3liVGlrdDB5TDFjNDB0aDdCUWoyZzFNQ1I2?=
 =?utf-8?B?cFFNQ0IvQlB4eXNQVnVxZUJuS1lwQ3A3UUg5d1ZCb1RlNjB3eGVrVWlUcHcz?=
 =?utf-8?B?SVpvbVlnS0IrRExVVlVEMFZDakpJMDY2c2h2TmhvOVA0OGhZaWF2SEJRN0JY?=
 =?utf-8?B?TDFsdDBEVEFzTTlBaVFXSEZ4RiszTTMwdVFnQXpzVXB6U2dEeGtXOUR4a3dx?=
 =?utf-8?B?ZlNtY0x5bzJ0UUFuWFlJSWxaSUwwbmd0bEFuUG5oUW5oM24zQjZCelRFTU9F?=
 =?utf-8?B?Tkg1LzFCT0ZzMXd4blBERW03S0ZJUnFyM2tFZnV5MjF6NUl4dWhSUlZhcG5O?=
 =?utf-8?B?OGxKamJUUlZ0OFBJak9EVERPc0IvT0hjUzRYVWpvV2tCWnhCTnY5emNFSUJK?=
 =?utf-8?B?cXFnNS9tRXlpOGtVc3BzNFlEQi9xQ2t6NFBwdlpHOWtKMEY2ZGp6bnJVMkRE?=
 =?utf-8?B?Qk1qc3kwT2JxbnlKTlRyai9URVJMOFJRRFFia3lOb2hFcUpaSEY1M2tTY2Rp?=
 =?utf-8?B?RjFsdnNic3dQbUZQMHNtalFSazh2VE44aGxvWWVwODdubjZVeEVKYjdsYkty?=
 =?utf-8?B?anplSlU4SjRSS3FIaFVMQ2FlQ3dGcGpPaG83QTI5ZWN6NEdXUmNqc0lSSVZy?=
 =?utf-8?B?YkJJeFFHaTM2M2ZFWGhhOTh4UGdXb2V0N1BtNy9BVXpsQUh4emVwcEhqR2Iy?=
 =?utf-8?B?VzFndVk1T3F6TnlWOXRvMWhJdDZEaGU2RGdnT3BxYlNiYUNxOU1OVmxLNGh2?=
 =?utf-8?B?ZzhjUTV0dTc2QytiNlEydUIrOUh5VTF5bWNydk41cXJPejJaQ3dRUjJKYkIr?=
 =?utf-8?B?TTd0WUlFSFd0Q2FQKzVzM2hETHBVTVRHRGtHMmFKdlVYMHlUaklJUWVGcjNQ?=
 =?utf-8?B?YWJzQzF0ZVBHT0J3YlVMcDk2Z29LeGdUQ1lneUVJMmhHazZTVm1leldQbW9v?=
 =?utf-8?B?MmlnY0JhanNsT240VW1TaVMwYXZIekNnTGxoNml0QXdRQXJOM0VEUVZWQjN1?=
 =?utf-8?B?OVJhUndpd205VkluSEFSVmk2eHNyZjRMY0dvS0RKc1VieVlabkczMFRDYkcv?=
 =?utf-8?B?eWVLTi9QQTF0aFZqcitKdUxMM3RjcW5wc0dDQndJVVZ5UDBRUGlCaDN4eVo2?=
 =?utf-8?B?VjNNVnAvdU1rdi8vYWFISTIwT0cwcEtSZkhzdWY2QmRIdVlOZThmakFIa2tF?=
 =?utf-8?B?aSt3Y2x6bHZLQ0hwR2RkV21yZGJCdkNhU1Y5ZjRjNFJPVzhvOHhOV0NnbUNj?=
 =?utf-8?B?Rk0zdCt4NDlWeE1yZWhBMk1leVFWQVR3NWM4TDZ4UXg0eWFEbk41eERwMEdn?=
 =?utf-8?B?UzlFK3F0VERlZGV6Q0V6cVg0b3FoNUpwMjZkWVhYVG5Pc2V6T3lSNlVWd1Jw?=
 =?utf-8?B?STFySjFDZjZIMnZKSjVhTUlMRVlQTXJVM3BsUnVxd1V6VkVzMzZldFNTTWE0?=
 =?utf-8?B?QnBrazBtRjBJekVQU1pGakZEMlpUaUV3YUFQNk9DTnV1K3RVa3JuSC9ObURK?=
 =?utf-8?B?NytQM2tOUU9jdW9BYXVBWjJ0NjdISEMrZDZDQk4xTk9paGJ3MStvMm5mM3VV?=
 =?utf-8?B?MjZkWENCOW05dHUwb29Cc25wb2xvSXhVL2dkUkVaWUV5bHJXOEpTcll0V3hr?=
 =?utf-8?B?Z2pSM0tsUHlsR0FOalk0dWRQYjM4NkNPd3pOU2M2M1VmTmJxeE5YN2lGRVoz?=
 =?utf-8?B?NHhRYmNOVXludE5GWlFJUGgzVEJsWWxsZS8xMHdySDVRMFNyVGJtb1EvR0pC?=
 =?utf-8?B?bHZzTFAvTnFZOUFuU1Axc0c4VzhSSStEQzh5aGxoVnRFbmlDdHU0ZHE3QkNm?=
 =?utf-8?B?dnNHc2txNlJqWVgzbWsxNFBkRnpaWmF6VmNOWGxMamxjV0lHbU5SemJJV1U4?=
 =?utf-8?B?bjF0TGxMcmNVZEVQMElsMWtvbDZjN1NHbjFDOEh4bmM0ejZ2bHB5K0s5eU9x?=
 =?utf-8?B?T2FLT3JmMzFZd1hHbFhla1BBUkNJSGtDMElORjZkYml0VS8vbnRQQnBidjlj?=
 =?utf-8?B?WXIwbEtHWVg4Ukh0NmVvT2xzT0gwZVZuKzNCQXpndzRBZW5ybFhYV0ZkdVBl?=
 =?utf-8?B?VHcvdXlLV2Y5bnpFOTZqZ1QxZ3JpZTgwRG1GUnJxRFdUZ01GYnFYNE91MHlY?=
 =?utf-8?B?QmRvRkhiUGVZY3c2Z0tSRVg5cUJ5bUtXK1M4aFlxMWI0S2lMdGRiWDJoREFW?=
 =?utf-8?B?T1E9PQ==?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b13ced10-b018-4dca-05d7-08daeda6f07c
X-MS-Exchange-CrossTenant-AuthSource: DB9PR03MB8847.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2023 16:24:08.3391
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6UI6dYUaJ/JITac/W9niyhDv9NJtFTVE1Ml6dCW+/kBGHnZGef14Jr1EAmlenCs9VyPCSax1E6KukBUGmDaRhQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9445
X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 1/3/23 11:15, Maxime Ripard wrote:
> Hi Robin,
> 
> On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote:
>> Hi Sean,
>> 
>> On 22/12/2022 11:37 pm, Sean Anderson wrote:
>> > Convert users of component_match_add_release with component_release_of
>> > and component_compare_of to component_match_add_of.
>> > 
>> > Signed-off-by: Sean Anderson <sean.anderson@seco.com>
>> > Acked-by: Mark Brown <broonie@kernel.org>
>> > ---
>> > 
>> > Changes in v2:
>> > - Split off from helper addition
>> > 
>> >   drivers/iommu/mtk_iommu.c    | 3 +--
>> >   drivers/iommu/mtk_iommu_v1.c | 3 +--
>> >   sound/soc/codecs/wcd938x.c   | 6 ++----
>> >   3 files changed, 4 insertions(+), 8 deletions(-)
>> > 
>> > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
>> > index 2ab2ecfe01f8..483b7a9e4410 100644
>> > --- a/drivers/iommu/mtk_iommu.c
>> > +++ b/drivers/iommu/mtk_iommu.c
>> > @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m
>> >   		}
>> >   		data->larb_imu[id].dev = &plarbdev->dev;
>> > -		component_match_add_release(dev, match, component_release_of,
>> > -					    component_compare_of, larbnode);
>> > +		component_match_add_of(dev, match, larbnode);
>> 
>> I've long since given up trying to make sense of how the DRM tree works, but
>> the conflicting change is definitely already in mainline:
>> 
>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7
> 
> As far as I can see, that patch doesn't affect DRM at all, and the
> commit you pointed to doesn't either, nor has it been merged through the
> DRM tree.
> 
> Can you expand a bit on how we're involved in this, what we should
> clarify or help with?

Patches 2 and 3 of this series depend on patch 1. Since patch 3 contains
the bulk of the changes, I based this series on the drm-next tree.
However, patch 2 has a conflict elswhere in the tree, which did not
appear until 6.2-rc1. At the time I sent out this series, drm-next did
not contain this commit, and I couldn't find it based on Robin's
description [1], so now we end up with a conflict. As this commit has
now been merged into drm-next, I can rebase and resend if there are no
other comments.

--Sean

[1] https://lore.kernel.org/linux-arm-kernel/56310773-a062-0e48-28f7-6d2c5d035fee@seco.com/