On Mon, May 22, 2023 at 04:40:51PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>
> Previously, pressing the Attention Button always logged two lines, the
> first from pciehp_ist() and the second from pciehp_handle_button_press():
>
> Attention button pressed
> Powering on due to button press
>
> Since pciehp_handle_button_press() always logs the more detailed message,
> remove the generic "Attention button pressed" message. Reword the
> pciehp_handle_button_press() to be of the form:
>
> Button press: powering on
> Button press: powering off
> Button press: canceling poweron
> Button press: canceling poweroff
> Button press: ignoring invalid state %#x
If nobody objects to this patch, I'd likely reorder it before your
patch, Rongguang, and update that commit log to mention the new
messages.
> ---
> drivers/pci/hotplug/pciehp_ctrl.c | 20 +++++++++-----------
> drivers/pci/hotplug/pciehp_hpc.c | 5 +----
> 2 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
> index 32baba1b7f13..ff725104bf2b 100644
> --- a/drivers/pci/hotplug/pciehp_ctrl.c
> +++ b/drivers/pci/hotplug/pciehp_ctrl.c
> @@ -164,15 +164,13 @@ void pciehp_handle_button_press(struct controller *ctrl)
> switch (ctrl->state) {
> case OFF_STATE:
> case ON_STATE:
> - if (ctrl->state == ON_STATE) {
> + if (ctrl->state == ON_STATE)
> ctrl->state = BLINKINGOFF_STATE;
> - ctrl_info(ctrl, "Slot(%s): Powering off due to button press\n",
> - slot_name(ctrl));
> - } else {
> + else
> ctrl->state = BLINKINGON_STATE;
> - ctrl_info(ctrl, "Slot(%s) Powering on due to button press\n",
> - slot_name(ctrl));
> - }
> + ctrl_info(ctrl, "Slot(%s): Button press: powering %s\n",
> + slot_name(ctrl),
> + ctrl->state == BLINKINGON_STATE ? "on" : "off");
> /* blink power indicator and turn off attention */
> pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_BLINK,
> PCI_EXP_SLTCTL_ATTN_IND_OFF);
> @@ -185,7 +183,6 @@ void pciehp_handle_button_press(struct controller *ctrl)
> * press the attention again before the 5 sec. limit
> * expires to cancel hot-add or hot-remove
> */
> - ctrl_info(ctrl, "Slot(%s): Button cancel\n", slot_name(ctrl));
> cancel_delayed_work(&ctrl->button_work);
> if (ctrl->state == BLINKINGOFF_STATE) {
> ctrl->state = ON_STATE;
> @@ -196,11 +193,12 @@ void pciehp_handle_button_press(struct controller *ctrl)
> pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
> PCI_EXP_SLTCTL_ATTN_IND_OFF);
> }
> - ctrl_info(ctrl, "Slot(%s): Action canceled due to button press\n",
> - slot_name(ctrl));
> + ctrl_info(ctrl, "Slot(%s): Button press: canceling power%s\n",
> + slot_name(ctrl),
> + ctrl->state == ON_STATE ? "off" : "on");
> break;
> default:
> - ctrl_err(ctrl, "Slot(%s): Ignoring invalid state %#x\n",
> + ctrl_err(ctrl, "Slot(%s): Button press: ignoring invalid state %#x\n",
> slot_name(ctrl), ctrl->state);
> break;
> }
> diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
> index f8c70115b691..379d2af5c51d 100644
> --- a/drivers/pci/hotplug/pciehp_hpc.c
> +++ b/drivers/pci/hotplug/pciehp_hpc.c
> @@ -722,11 +722,8 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
> }
>
> /* Check Attention Button Pressed */
> - if (events & PCI_EXP_SLTSTA_ABP) {
> - ctrl_info(ctrl, "Slot(%s): Attention button pressed\n",
> - slot_name(ctrl));
> + if (events & PCI_EXP_SLTSTA_ABP)
> pciehp_handle_button_press(ctrl);
> - }
>
> /* Check Power Fault Detected */
> if (events & PCI_EXP_SLTSTA_PFD) {
> --
> 2.34.1
>
