From: Felipe Balbi <balbi@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>,
Neil Armstrong <narmstrong@baylibre.com>
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-usb@vger.kernel.org, linux-amlogic@lists.infradead.org,
hanjie.lin@amlogic.com, yue.wang@amlogic.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"kernelci.org bot" <bot@kernelci.org>
Subject: Re: [PATCH for-5.8 2/2] usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs
Date: Wed, 27 May 2020 15:56:40 +0300 [thread overview]
Message-ID: <87y2pd1qpj.fsf@kernel.org> (raw)
In-Reply-To: <20200527085315.GA168054@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 2166 bytes --]
Greg KH <gregkh@linuxfoundation.org> writes:
> On Wed, May 27, 2020 at 10:17:31AM +0200, Neil Armstrong wrote:
>> Hi Martin,
>>
>> On 26/05/2020 22:29, Martin Blumenstingl wrote:
>> > dwc3_meson_g12a_usb2_init_phy() crashes with NULL pointer on an SM1
>> > board (which uses the same USB setup as G12A) dereference as reported
>> > by the Kernel CI bot. This is because of the following call flow:
>> > dwc3_meson_g12a_probe
>> > priv->drvdata->setup_regmaps
>> > dwc3_meson_g12a_setup_regmaps
>> > priv->usb2_ports is still 0 so priv->u2p_regmap[i] will be NULL
>> > dwc3_meson_g12a_get_phys
>> > initializes priv->usb2_ports
>> > priv->drvdata->usb_init
>> > dwc3_meson_g12a_usb_init
>> > dwc3_meson_g12a_usb_init_glue
>> > dwc3_meson_g12a_usb2_init
>> > priv->drvdata->usb2_init_phy
>> > dwc3_meson_g12a_usb2_init_phy
>> > dereferences priv->u2p_regmap[i]
>> >
>> > Call priv->drvdata->setup_regmaps only after dwc3_meson_g12a_get_phys so
>> > priv->usb2_ports is initialized and the regmaps will be set up
>> > correctly. This fixes the NULL dereference later on.
>> >
>> > Fixes: 013af227f58a97 ("usb: dwc3: meson-g12a: handle the phy and glue registers separately")
>> > Reported-by: "kernelci.org bot" <bot@kernelci.org>
>> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
>> > ---
>> > drivers/usb/dwc3/dwc3-meson-g12a.c | 8 ++++----
>> > 1 file changed, 4 insertions(+), 4 deletions(-)
>> >
>> > diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
>> > index ce5388338389..1f7f4d88ed9d 100644
>> > --- a/drivers/usb/dwc3/dwc3-meson-g12a.c
>> > +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
>>
>> [...]
>>
>> Fixes regression reported at [1] on SEI510 board based on Amlogic G12A.
>>
>> Felipe, Greg, can this be queued on uxb-next for 5.8 ?
>>
>> Acked-by: Neil Armstrong <narmstron@baylibre.com>
>
> I can take this and patch 1/2 here if Felipe acks them.
Sure thing, Greg. Thanks.
Acked-by: Felipe Balbi <balbi@kernel.org>
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
prev parent reply other threads:[~2020-05-27 12:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 20:29 [PATCH for-5.8 0/2] dwc3: meson-g12a: two fixes for v5.8 Martin Blumenstingl
2020-05-26 20:29 ` [PATCH for-5.8 1/2] usb: dwc3: meson-g12a: fix error path when fetching the reset line fails Martin Blumenstingl
2020-05-27 7:53 ` Neil Armstrong
2020-05-26 20:29 ` [PATCH for-5.8 2/2] usb: dwc3: meson-g12a: fix USB2 PHY initialization on G12A and A1 SoCs Martin Blumenstingl
2020-05-27 8:17 ` Neil Armstrong
2020-05-27 8:53 ` Greg KH
2020-05-27 12:56 ` Felipe Balbi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y2pd1qpj.fsf@kernel.org \
--to=balbi@kernel.org \
--cc=bot@kernelci.org \
--cc=gregkh@linuxfoundation.org \
--cc=hanjie.lin@amlogic.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=narmstrong@baylibre.com \
--cc=yue.wang@amlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).