linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuppuswamy Sathyanarayanan  <sathyanarayanan.kuppuswamy@linux.intel.com>
To: Denis Efremov <efremov@linux.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Lukas Wunner <lukas@wunner.de>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/4] PCI: pciehp: Add pciehp_set_indicators() to jointly set LED indicators
Date: Wed, 21 Aug 2019 16:58:24 -0700	[thread overview]
Message-ID: <20190821235824.GC28404@skuppusw-desk.amr.corp.intel.com> (raw)
In-Reply-To: <20190819160643.27998-2-efremov@linux.com>

On Mon, Aug 19, 2019 at 07:06:40PM +0300, Denis Efremov wrote:
> Add pciehp_set_indicators() to set power and attention indicators with a
> single register write. Thus, avoiding waiting twice for Command Complete.
> 
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
>  drivers/pci/hotplug/pciehp.h     |  1 +
>  drivers/pci/hotplug/pciehp_hpc.c | 29 +++++++++++++++++++++++++++++
>  include/uapi/linux/pci_regs.h    |  2 ++
>  3 files changed, 32 insertions(+)
> 
> diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
> index 8c51a04b8083..0e272bf3deb4 100644
> --- a/drivers/pci/hotplug/pciehp.h
> +++ b/drivers/pci/hotplug/pciehp.h
> @@ -167,6 +167,7 @@ int pciehp_power_on_slot(struct controller *ctrl);
>  void pciehp_power_off_slot(struct controller *ctrl);
>  void pciehp_get_power_status(struct controller *ctrl, u8 *status);
>  
> +void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn);
>  void pciehp_set_attention_status(struct controller *ctrl, u8 status);
>  void pciehp_get_latch_status(struct controller *ctrl, u8 *status);
>  int pciehp_query_power_fault(struct controller *ctrl);
> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> index bd990e3371e3..5474b9854a7f 100644
> --- a/drivers/pci/hotplug/pciehp_hpc.c
> +++ b/drivers/pci/hotplug/pciehp_hpc.c
> @@ -443,6 +443,35 @@ void pciehp_set_attention_status(struct controller *ctrl, u8 value)
>  		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);
>  }
>  
> +void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn)
> +{
> +	u16 cmd = 0, mask = 0;
> +
> +	if (PWR_LED(ctrl))
> +		switch (pwr) {
> +		case PCI_EXP_SLTCTL_PWR_IND_ON:
> +		case PCI_EXP_SLTCTL_PWR_IND_BLINK:
> +		case PCI_EXP_SLTCTL_PWR_IND_OFF:
> +			cmd |= pwr;
> +			mask |= PCI_EXP_SLTCTL_PIC;
> +		}
> +
> +	if (ATTN_LED(ctrl))
> +		switch (attn) {
> +		case PCI_EXP_SLTCTL_ATTN_IND_ON:
> +		case PCI_EXP_SLTCTL_ATTN_IND_BLINK:
> +		case PCI_EXP_SLTCTL_ATTN_IND_OFF:
> +			cmd |= attn;
> +			mask |= PCI_EXP_SLTCTL_AIC;
> +		}
> +
> +	if (cmd) {
> +		pcie_write_cmd_nowait(ctrl, cmd, mask);
> +		ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
> +			 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, cmd);
> +	}
> +}
> +
>  void pciehp_green_led_on(struct controller *ctrl)
>  {
>  	if (!PWR_LED(ctrl))
> diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
> index f28e562d7ca8..291788b58f3a 100644
> --- a/include/uapi/linux/pci_regs.h
> +++ b/include/uapi/linux/pci_regs.h
> @@ -591,10 +591,12 @@
>  #define  PCI_EXP_SLTCTL_CCIE	0x0010	/* Command Completed Interrupt Enable */
>  #define  PCI_EXP_SLTCTL_HPIE	0x0020	/* Hot-Plug Interrupt Enable */
>  #define  PCI_EXP_SLTCTL_AIC	0x00c0	/* Attention Indicator Control */
> +#define  PCI_EXP_SLTCTL_ATTN_IND_NONE  0x0    /* Attention Indicator noop */
>  #define  PCI_EXP_SLTCTL_ATTN_IND_ON    0x0040 /* Attention Indicator on */
>  #define  PCI_EXP_SLTCTL_ATTN_IND_BLINK 0x0080 /* Attention Indicator blinking */
>  #define  PCI_EXP_SLTCTL_ATTN_IND_OFF   0x00c0 /* Attention Indicator off */
>  #define  PCI_EXP_SLTCTL_PIC	0x0300	/* Power Indicator Control */
> +#define  PCI_EXP_SLTCTL_PWR_IND_NONE   0x0    /* Power Indicator noop */
Nitpick: Since the current patch does not use it, May be you can create a
new patch for these #defines ? or you could add some info about its
usage in comment section.
>  #define  PCI_EXP_SLTCTL_PWR_IND_ON     0x0100 /* Power Indicator on */
>  #define  PCI_EXP_SLTCTL_PWR_IND_BLINK  0x0200 /* Power Indicator blinking */
>  #define  PCI_EXP_SLTCTL_PWR_IND_OFF    0x0300 /* Power Indicator off */
> -- 
> 2.21.0
> 

-- 
-- 
Sathyanarayanan Kuppuswamy
Linux kernel developer

  parent reply	other threads:[~2019-08-22  0:01 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-19 16:06 [PATCH v3 0/4] Simplify PCIe hotplug indicator control Denis Efremov
2019-08-19 16:06 ` [PATCH v3 1/4] PCI: pciehp: Add pciehp_set_indicators() to jointly set LED indicators Denis Efremov
2019-08-19 16:16   ` Denis Efremov
2019-08-27 23:24     ` Oliver O'Halloran
2019-08-21 23:58   ` Kuppuswamy Sathyanarayanan [this message]
2019-08-27 23:41   ` Oliver O'Halloran
2019-08-19 16:06 ` [PATCH v3 2/4] PCI: pciehp: Switch LED indicators with a single write Denis Efremov
2019-08-27 22:36   ` Kuppuswamy Sathyanarayanan
2019-08-19 16:06 ` [PATCH v3 3/4] PCI: pciehp: Remove pciehp_set_attention_status() Denis Efremov
2019-08-27 22:47   ` Kuppuswamy Sathyanarayanan
2019-08-19 16:06 ` [PATCH v3 4/4] PCI: pciehp: Remove pciehp_green_led_{on,off,blink}() Denis Efremov
2019-08-27 22:49   ` Kuppuswamy Sathyanarayanan
2019-08-27 23:49   ` Oliver O'Halloran
2019-08-20 12:16 ` [PATCH v3 0/4] Simplify PCIe hotplug indicator control Denis Efremov
2019-08-27 22:32   ` Bjorn Helgaas
2019-08-27 22:50     ` Kuppuswamy Sathyanarayanan
2019-08-27 22:53     ` Bjorn Helgaas
2019-08-28  3:33       ` Lukas Wunner

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=20190821235824.GC28404@skuppusw-desk.amr.corp.intel.com \
    --to=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=efremov@linux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    /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).