From: Bjorn Helgaas <helgaas@kernel.org>
To: James Morse <james.morse@arm.com>
Cc: Rajat Jain <rajatja@google.com>,
Rajat Jain <rajatxjain@gmail.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Keith Busch <keith.busch@intel.com>,
Andreas Ziegler <andreas.ziegler@fau.de>,
Jonathan Yong <jonathan.yong@intel.com>,
Shawn Lin <shawn.lin@rock-chips.com>,
David Daney <david.daney@cavium.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Ram Amrani <Ram.Amrani@cavium.com>,
Doug Ledford <dledford@redhat.com>,
Wang Sheng-Hui <shhuiw@foxmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Brian Norris <briannorris@google.com>
Subject: Re: [PATCH 5/6] PCI/ASPM: Actually configure the L1 substate settings to the device
Date: Wed, 8 Mar 2017 16:39:38 -0600 [thread overview]
Message-ID: <20170308223938.GA28050@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <58C05114.5030202@arm.com>
Hi James,
On Wed, Mar 08, 2017 at 06:44:36PM +0000, James Morse wrote:
> Hi!
>
> On 03/01/17 06:34, Rajat Jain wrote:
> > Add code to actually configure the L1 substate settigns on the
> > upstream and downstream device, while taking care of the rules
> > dictated by the PCIe spec.
>
> While testing hibernate on an arm64 juno with v4.11-rc1, I get a NULL pointer
> dereference from pcie_config_aspm_link():
>
>
> > diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> > index a70afdf..6735f38 100644
> > --- a/drivers/pci/pcie/aspm.c
> > +++ b/drivers/pci/pcie/aspm.c
> > @@ -597,11 +683,23 @@ static void pcie_config_aspm_dev(struct pci_dev *pdev, u32 val)
> > static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
> > {
> > u32 upstream = 0, dwstream = 0;
> > - struct pci_dev *child, *parent = link->pdev;
> > + struct pci_dev *child = link->downstream, *parent = link->pdev;
>
>
> Here link->downstream is NULL,
Sorry about the breakage. Can you try also cherry-picking this
commit:
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=for-linus&id=3bd7db63a841e8c5297bb18ad801df67d5e38ad2
Yinghai tripped over a similar problem in a different way, but I
suspect his fix might also fix the problem you're seeing.
If that doesn't fix it, we'll have to look farther.
I'm planning to ask Linus to pull this fix for v4.11-rc2.
Bjorn
next prev parent reply other threads:[~2017-03-08 22:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-03 6:34 [PATCH 0/6] PCI/ASPM: Add PCIe L1 PM substate support Rajat Jain
2017-01-03 6:34 ` [PATCH 1/6] PCI: Add L1 substate capability structure register definitions Rajat Jain
2017-01-03 6:34 ` [PATCH 2/6] PCI/ASPM: Introduce L1 substates and a Kconfig for it Rajat Jain
2017-01-03 6:34 ` [PATCH 3/6] PCI/ASPM: Read and setup L1 substate capabilities Rajat Jain
2017-01-03 6:34 ` [PATCH 4/6] PCI/ASPM: Calculate and save the L1.2 timing parameters Rajat Jain
2017-01-03 6:34 ` [PATCH 5/6] PCI/ASPM: Actually configure the L1 substate settings to the device Rajat Jain
2017-03-08 18:44 ` James Morse
2017-03-08 22:39 ` Bjorn Helgaas [this message]
[not found] ` <CACK8Z6H7V=dM71LuUh7653qnLXJmGCNVcm3cG4_s4hwQKe58aA@mail.gmail.com>
2017-03-09 11:00 ` James Morse
2017-01-03 6:34 ` [PATCH 6/6] PCI/ASPM: Add comment about L1 substate latency Rajat Jain
2017-02-14 23:45 ` [PATCH 0/6] PCI/ASPM: Add PCIe L1 PM substate support Bjorn Helgaas
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=20170308223938.GA28050@bhelgaas-glaptop.roam.corp.google.com \
--to=helgaas@kernel.org \
--cc=Julia.Lawall@lip6.fr \
--cc=Ram.Amrani@cavium.com \
--cc=andreas.ziegler@fau.de \
--cc=bhelgaas@google.com \
--cc=briannorris@google.com \
--cc=david.daney@cavium.com \
--cc=dledford@redhat.com \
--cc=james.morse@arm.com \
--cc=jonathan.yong@intel.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rajatja@google.com \
--cc=rajatxjain@gmail.com \
--cc=shawn.lin@rock-chips.com \
--cc=shhuiw@foxmail.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).