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 2/4] PCI: pciehp: Switch LED indicators with a single write
Date: Tue, 27 Aug 2019 15:36:53 -0700 [thread overview]
Message-ID: <20190827223653.GD28404@skuppusw-desk.amr.corp.intel.com> (raw)
In-Reply-To: <20190819160643.27998-3-efremov@linux.com>
On Mon, Aug 19, 2019 at 07:06:41PM +0300, Denis Efremov wrote:
> This patch replaces all consecutive switches of power and attention
> indicators with pciehp_set_indicators() call. Thus, performing only
> single write to a register.
>
> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> Reviewed-by: Lukas Wunner <lukas@wunner.de>
> Signed-off-by: Denis Efremov <efremov@linux.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> ---
> drivers/pci/hotplug/pciehp_ctrl.c | 19 ++++++++++---------
> drivers/pci/hotplug/pciehp_hpc.c | 4 ++--
> 2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
> index 631ced0ab28a..232f7bfcfce9 100644
> --- a/drivers/pci/hotplug/pciehp_ctrl.c
> +++ b/drivers/pci/hotplug/pciehp_ctrl.c
> @@ -42,8 +42,8 @@ static void set_slot_off(struct controller *ctrl)
> msleep(1000);
> }
>
> - pciehp_green_led_off(ctrl);
> - pciehp_set_attention_status(ctrl, 1);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
> + PCI_EXP_SLTCTL_ATTN_IND_ON);
> }
>
> /**
> @@ -90,8 +90,8 @@ static int board_added(struct controller *ctrl)
> }
> }
>
> - pciehp_green_led_on(ctrl);
> - pciehp_set_attention_status(ctrl, 0);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_ON,
> + PCI_EXP_SLTCTL_ATTN_IND_OFF);
> return 0;
>
> err_exit:
> @@ -172,8 +172,8 @@ void pciehp_handle_button_press(struct controller *ctrl)
> slot_name(ctrl));
> }
> /* blink green LED and turn off amber */
> - pciehp_green_led_blink(ctrl);
> - pciehp_set_attention_status(ctrl, 0);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK,
> + PCI_EXP_SLTCTL_ATTN_IND_OFF);
> schedule_delayed_work(&ctrl->button_work, 5 * HZ);
> break;
> case BLINKINGOFF_STATE:
> @@ -187,12 +187,13 @@ void pciehp_handle_button_press(struct controller *ctrl)
> cancel_delayed_work(&ctrl->button_work);
> if (ctrl->state == BLINKINGOFF_STATE) {
> ctrl->state = ON_STATE;
> - pciehp_green_led_on(ctrl);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_ON,
> + PCI_EXP_SLTCTL_ATTN_IND_OFF);
> } else {
> ctrl->state = OFF_STATE;
> - pciehp_green_led_off(ctrl);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
> + PCI_EXP_SLTCTL_ATTN_IND_OFF);
> }
> - pciehp_set_attention_status(ctrl, 0);
> ctrl_info(ctrl, "Slot(%s): Action canceled due to button press\n",
> slot_name(ctrl));
> break;
> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> index 5474b9854a7f..aa4252d11be2 100644
> --- a/drivers/pci/hotplug/pciehp_hpc.c
> +++ b/drivers/pci/hotplug/pciehp_hpc.c
> @@ -667,8 +667,8 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
> if ((events & PCI_EXP_SLTSTA_PFD) && !ctrl->power_fault_detected) {
> ctrl->power_fault_detected = 1;
> ctrl_err(ctrl, "Slot(%s): Power fault\n", slot_name(ctrl));
> - pciehp_set_attention_status(ctrl, 1);
> - pciehp_green_led_off(ctrl);
> + pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
> + PCI_EXP_SLTCTL_ATTN_IND_ON);
> }
>
> /*
> --
> 2.21.0
>
--
--
Sathyanarayanan Kuppuswamy
Linux kernel developer
next prev parent reply other threads:[~2019-08-27 22:39 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
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 [this message]
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=20190827223653.GD28404@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).