From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Mathias Nyman <mathias.nyman@intel.com>,
oneukum@suse.com, sandeep.singh@amd.com,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] xhci: fix 'broken_suspend' placement in struct xchi_hcd
Date: Mon, 17 Dec 2018 15:11:42 +0100 [thread overview]
Message-ID: <20181217141142.GA26880@kroah.com> (raw)
In-Reply-To: <7ea44e0c-5268-b898-4d27-048921eaab69@linux.intel.com>
On Mon, Dec 17, 2018 at 03:59:28PM +0200, Mathias Nyman wrote:
> On 17.12.2018 15:37, Nicolas Saenz Julienne wrote:
> > As commented in the struct's definition there shouldn't be anything
> > underneath it's 'priv[0]' member as it would break some macros.
> >
> > The patch converts the broken_suspend into a bit-field and relocates it
> > next to to the rest of bit-fields.
> >
> > Fixes: a7d57abcc8a5 ("xhci: workaround CSS timeout on AMD SNPS 3.0 xHC")
> > Reported-by: Oliver Neukum <oneukum@suse.com>
> > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> > ---
> > drivers/usb/host/xhci.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
> > index c3515bad5dbb..011dd45f8718 100644
> > --- a/drivers/usb/host/xhci.h
> > +++ b/drivers/usb/host/xhci.h
> > @@ -1863,6 +1863,8 @@ struct xhci_hcd {
> > unsigned sw_lpm_support:1;
> > /* support xHCI 1.0 spec USB2 hardware LPM */
> > unsigned hw_lpm_support:1;
> > + /* Broken Suspend flag for SNPS Suspend resume issue */
> > + unsigned broken_suspend:1;
> > /* cached usb2 extened protocol capabilites */
> > u32 *ext_caps;
> > unsigned int num_ext_caps;
> > @@ -1880,8 +1882,6 @@ struct xhci_hcd {
> > void *dbc;
> > /* platform-specific data -- must come last */
> > unsigned long priv[0] __aligned(sizeof(s64));
> > - /* Broken Suspend flag for SNPS Suspend resume issue */
> > - u8 broken_suspend;
> > };
> > /* Platform specific overrides to generic XHCI hc_driver ops */
> >
>
> Thanks, not sure how I missed that.
>
> Greg, in case you want to pick this simple fix to 4.20 still:
> Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
I can queue it up, thanks!
greg k-h
prev parent reply other threads:[~2018-12-17 14:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-17 13:37 [PATCH] xhci: fix 'broken_suspend' placement in struct xchi_hcd Nicolas Saenz Julienne
2018-12-17 13:49 ` Felipe Balbi
2018-12-17 13:59 ` Mathias Nyman
2018-12-17 14:11 ` Greg Kroah-Hartman [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=20181217141142.GA26880@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=mathias.nyman@linux.intel.com \
--cc=nsaenzjulienne@suse.de \
--cc=oneukum@suse.com \
--cc=sandeep.singh@amd.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).