From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17884C433F5 for ; Mon, 4 Oct 2021 06:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0A5A6139F for ; Mon, 4 Oct 2021 06:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232790AbhJDGxh (ORCPT ); Mon, 4 Oct 2021 02:53:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:36544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232655AbhJDGxh (ORCPT ); Mon, 4 Oct 2021 02:53:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B89DD60FF2; Mon, 4 Oct 2021 06:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633330308; bh=hLohfQj/SZKfSem8PcIwS4tEbQ3Nmn7fsUifLBiUGSA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DGpIiU3/zV3jGRFT8xoUlyCOIYrSUDPoHpCZ9qOKpqXz/Jhy5TcueDuGkrUZa1Ges /BgtPbcquxOcRpFFhxfQGNCIJU7vt0JVRJoKDA4Z7MZh2kbreoo4yJR8Y1pa3vYdhL hmRA1oplPeBRzLjZq/7vyCEFJlrRRWszgjYqW3Tv2WXPhhr/zeRCvjk+pGT8xN0dk5 MpSn7TfrvAssMZGatAqg7zYoakZEgDw8RZuah9UKPJqcQCssHNcqC99y2dn/DoJGBU EZOw78FO8PT3W84cA1RkHlTQKR3NDAwJNtC0heZoc/5QamtcJI+l0MbqHsHAQEd7fR v1F59ojkCg7jg== Date: Mon, 4 Oct 2021 14:51:42 +0800 From: Peter Chen To: Frieder Schrempf , gregkh@linuxfoundation.org Cc: Fabio Estevam , shawnguo@kernel.org, marex@denx.de, linux-usb@vger.kernel.org, heiko.thiery@gmail.com, stable@vger.kernel.org Subject: Re: [PATCH v3] usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle Message-ID: <20211004065142.GA27151@Peter> References: <20210921113754.767631-1-festevam@gmail.com> <7f3b82ad-ff12-ce23-12a3-25b09c767759@kontron.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7f3b82ad-ff12-ce23-12a3-25b09c767759@kontron.de> Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On 21-09-30 16:36:51, Frieder Schrempf wrote: > On 21.09.21 13:37, Fabio Estevam wrote: > > When passing 'phys' in the devicetree to describe the USB PHY phandle > > (which is the recommended way according to > > Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt) the > > following NULL pointer dereference is observed on i.MX7 and i.MX8MM: > > > > [ 1.489344] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000098 > > [ 1.498170] Mem abort info: > > [ 1.500966] ESR = 0x96000044 > > [ 1.504030] EC = 0x25: DABT (current EL), IL = 32 bits > > [ 1.509356] SET = 0, FnV = 0 > > [ 1.512416] EA = 0, S1PTW = 0 > > [ 1.515569] FSC = 0x04: level 0 translation fault > > [ 1.520458] Data abort info: > > [ 1.523349] ISV = 0, ISS = 0x00000044 > > [ 1.527196] CM = 0, WnR = 1 > > [ 1.530176] [0000000000000098] user address but active_mm is swapper > > [ 1.536544] Internal error: Oops: 96000044 [#1] PREEMPT SMP > > [ 1.542125] Modules linked in: > > [ 1.545190] CPU: 3 PID: 7 Comm: kworker/u8:0 Not tainted 5.14.0-dirty #3 > > [ 1.551901] Hardware name: Kontron i.MX8MM N801X S (DT) > > [ 1.557133] Workqueue: events_unbound deferred_probe_work_func > > [ 1.562984] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO BTYPE=--) > > [ 1.568998] pc : imx7d_charger_detection+0x3f0/0x510 > > [ 1.573973] lr : imx7d_charger_detection+0x22c/0x510 > > > > This happens because the charger functions check for the phy presence > > inside the imx_usbmisc_data structure (data->usb_phy), but the chipidea > > core populates the usb_phy passed via 'phys' inside 'struct ci_hdrc' > > (ci->usb_phy) instead. > > > > This causes the NULL pointer dereference inside imx7d_charger_detection(). > > > > Fix it by also searching for 'phys' in case 'fsl,usbphy' is not found. > > > > Tested on a imx7s-warp board. > > > > Cc: stable@vger.kernel.org > > Fixes: 746f316b753a ("usb: chipidea: introduce imx7d USB charger detection") > > Reported-by: Heiko Thiery > > Signed-off-by: Fabio Estevam > > Reviewed-by: Frieder Schrempf > > Tested-by: Frieder Schrempf Acked-by: Peter Chen Greg, would you please help apply it? -- Thanks, Peter Chen