From: Stuart Hayes <stuart.w.hayes@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Austin Bolen <austin_bolen@dell.com>,
Keith Busch <keith.busch@intel.com>,
Alexandru Gagniuc <mr.nuke.me@gmail.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
"Gustavo A . R . Silva" <gustavo@embeddedor.com>,
Sinan Kaya <okaya@kernel.org>,
Oza Pawandeep <poza@codeaurora.org>,
linux-pci@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lukas Wunner <lukas@wunner.de>
Subject: Re: [PATCH v4 1/3] PCI: pciehp: Add support for disabling in-band presence
Date: Tue, 26 Nov 2019 20:19:07 -0600 [thread overview]
Message-ID: <CAL5oW00Lh4v2YpX2GcDoRS2fFJjvHRsdhNjtvyYGpWOpgL=TCg@mail.gmail.com> (raw)
In-Reply-To: <20191127013613.GA233706@google.com>
On Tue, Nov 26, 2019 at 7:36 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Fri, Oct 25, 2019 at 03:00:45PM -0400, Stuart Hayes wrote:
> > From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
> >
> > The presence detect state (PDS) is normally a logical or of in-band and
> > out-of-band presence. As of PCIe 4.0, there is the option to disable
> > in-band presence so that the PDS bit always reflects the state of the
> > out-of-band presence.
> >
> > The recommendation of the PCIe spec is to disable in-band presence
> > whenever supported.
>
> I think I'm fine with this patch, but I would like to include the
> specific reference for this recommendation. If you have it handy, I
> can just insert it.
>
The PCI Express Base Specification Revision 5.0, Version 1.0, in the
implementation note under Appendix I ("Async Hot-Plug Reference
Model"), it says "If OOB PD is being used and the associated DSP
supports In-Band PD Disable, it is recommended that the In-Band PD
Disable bit be Set, ..."
> > Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
> > ---
> > drivers/pci/hotplug/pciehp.h | 1 +
> > drivers/pci/hotplug/pciehp_hpc.c | 9 ++++++++-
> > include/uapi/linux/pci_regs.h | 2 ++
> > 3 files changed, 11 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
> > index 654c972b8ea0..27e4cd6529b0 100644
> > --- a/drivers/pci/hotplug/pciehp.h
> > +++ b/drivers/pci/hotplug/pciehp.h
> > @@ -83,6 +83,7 @@ struct controller {
> > struct pcie_device *pcie;
> >
> > u32 slot_cap; /* capabilities and quirks */
> > + unsigned int inband_presence_disabled:1;
> >
> > u16 slot_ctrl; /* control register access */
> > struct mutex ctrl_lock;
> > diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> > index 1a522c1c4177..dc109d521f30 100644
> > --- a/drivers/pci/hotplug/pciehp_hpc.c
> > +++ b/drivers/pci/hotplug/pciehp_hpc.c
> > @@ -811,7 +811,7 @@ static inline void dbg_ctrl(struct controller *ctrl)
> > struct controller *pcie_init(struct pcie_device *dev)
> > {
> > struct controller *ctrl;
> > - u32 slot_cap, link_cap;
> > + u32 slot_cap, slot_cap2, link_cap;
> > u8 poweron;
> > struct pci_dev *pdev = dev->port;
> > struct pci_bus *subordinate = pdev->subordinate;
> > @@ -869,6 +869,13 @@ struct controller *pcie_init(struct pcie_device *dev)
> > FLAG(link_cap, PCI_EXP_LNKCAP_DLLLARC),
> > pdev->broken_cmd_compl ? " (with Cmd Compl erratum)" : "");
> >
> > + pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP2, &slot_cap2);
> > + if (slot_cap2 & PCI_EXP_SLTCAP2_IBPD) {
> > + pcie_write_cmd_nowait(ctrl, PCI_EXP_SLTCTL_IBPD_DISABLE,
> > + PCI_EXP_SLTCTL_IBPD_DISABLE);
> > + ctrl->inband_presence_disabled = 1;
> > + }
> > +
> > /*
> > * If empty slot's power status is on, turn power off. The IRQ isn't
> > * requested yet, so avoid triggering a notification with this command.
> > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> > index 29d6e93fd15e..ea1cf9546e4d 100644
> > --- a/include/uapi/linux/pci_regs.h
> > +++ b/include/uapi/linux/pci_regs.h
> > @@ -604,6 +604,7 @@
> > #define PCI_EXP_SLTCTL_PWR_OFF 0x0400 /* Power Off */
> > #define PCI_EXP_SLTCTL_EIC 0x0800 /* Electromechanical Interlock Control */
> > #define PCI_EXP_SLTCTL_DLLSCE 0x1000 /* Data Link Layer State Changed Enable */
> > +#define PCI_EXP_SLTCTL_IBPD_DISABLE 0x4000 /* In-band PD disable */
> > #define PCI_EXP_SLTSTA 26 /* Slot Status */
> > #define PCI_EXP_SLTSTA_ABP 0x0001 /* Attention Button Pressed */
> > #define PCI_EXP_SLTSTA_PFD 0x0002 /* Power Fault Detected */
> > @@ -676,6 +677,7 @@
> > #define PCI_EXP_LNKSTA2 50 /* Link Status 2 */
> > #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52 /* v2 endpoints with link end here */
> > #define PCI_EXP_SLTCAP2 52 /* Slot Capabilities 2 */
> > +#define PCI_EXP_SLTCAP2_IBPD 0x0001 /* In-band PD Disable Supported */
> > #define PCI_EXP_SLTCTL2 56 /* Slot Control 2 */
> > #define PCI_EXP_SLTSTA2 58 /* Slot Status 2 */
> >
> > --
> > 2.18.1
> >
next prev parent reply other threads:[~2019-11-27 2:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 19:00 [PATCH v4 0/3] PCI: pciehp: Do not turn off slot if presence comes up after link Stuart Hayes
2019-10-25 19:00 ` [PATCH v4 1/3] PCI: pciehp: Add support for disabling in-band presence Stuart Hayes
2019-10-25 19:15 ` Andy Shevchenko
2019-11-27 1:36 ` Bjorn Helgaas
2019-11-27 2:19 ` Stuart Hayes [this message]
2019-12-31 22:06 ` Stuart Hayes
2020-01-29 13:15 ` Libor Pechacek
2019-10-25 19:00 ` [PATCH v4 2/3] PCI: pciehp: Wait for PDS if in-band presence is disabled Stuart Hayes
2019-10-25 19:16 ` Andy Shevchenko
2019-10-25 19:00 ` [PATCH v4 3/3] PCI: pciehp: Add dmi table for in-band presence disabled Stuart Hayes
2019-10-25 19:18 ` Andy Shevchenko
2020-02-21 5:21 ` Bjorn Helgaas
2020-02-21 17:46 ` Stuart Hayes
2019-10-28 11:31 ` [PATCH v4 0/3] PCI: pciehp: Do not turn off slot if presence comes up after link Mika Westerberg
2020-02-08 20:22 ` Lukas Wunner
2020-02-11 0:08 ` Bjorn Helgaas
2020-02-11 4:49 ` Lukas Wunner
2020-02-11 14:14 ` Bjorn Helgaas
2020-02-11 14:32 ` Lukas Wunner
2020-02-11 19:31 ` Bjorn Helgaas
2020-02-18 17:32 ` 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='CAL5oW00Lh4v2YpX2GcDoRS2fFJjvHRsdhNjtvyYGpWOpgL=TCg@mail.gmail.com' \
--to=stuart.w.hayes@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=austin_bolen@dell.com \
--cc=gustavo@embeddedor.com \
--cc=helgaas@kernel.org \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mika.westerberg@linux.intel.com \
--cc=mr.nuke.me@gmail.com \
--cc=okaya@kernel.org \
--cc=poza@codeaurora.org \
--cc=rafael.j.wysocki@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.