PCI: pciehp: Simplify Attention Button logging

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: will power on in 5 sec
  Button press: will power off in 5 sec
  Button press: canceling request to power on
  Button press: canceling request to power off
  Button press: ignoring invalid state %#x

Link: https://lore.kernel.org/r/20230522214051.619337-1-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lukas Wunner <lukas@wunner.de>

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 529c348084401462090b7667394d0ce0cd4bce96..17a9243d98f4573e2b8e3b2bd6766c74df8a0253 100644 (file)
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -166,11 +166,11 @@ void pciehp_handle_button_press(struct controller *ctrl)
        case ON_STATE:
                if (ctrl->state == ON_STATE) {
                        ctrl->state = BLINKINGOFF_STATE;
-                       ctrl_info(ctrl, "Slot(%s): Powering off due to button press\n",
+                       ctrl_info(ctrl, "Slot(%s): Button press: will power off in 5 sec\n",
                                  slot_name(ctrl));
                } else {
                        ctrl->state = BLINKINGON_STATE;
-                       ctrl_info(ctrl, "Slot(%s) Powering on due to button press\n",
+                       ctrl_info(ctrl, "Slot(%s): Button press: will power on in 5 sec\n",
                                  slot_name(ctrl));
                }
                /* blink power indicator and turn off attention */
@@ -185,22 +185,23 @@ 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;
                        pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_ON,
                                              PCI_EXP_SLTCTL_ATTN_IND_OFF);
+                       ctrl_info(ctrl, "Slot(%s): Button press: canceling request to power off\n",
+                                 slot_name(ctrl));
                } else {
                        ctrl->state = OFF_STATE;
                        pciehp_set_indicators(ctrl, PCI_EXP_SLTCTL_PWR_IND_OFF,
                                              PCI_EXP_SLTCTL_ATTN_IND_OFF);
+                       ctrl_info(ctrl, "Slot(%s): Button press: canceling request to power on\n",
+                                 slot_name(ctrl));
                }
-               ctrl_info(ctrl, "Slot(%s): Action canceled due to button press\n",
-                         slot_name(ctrl));
                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 f8c70115b6917265d3d9a4fc6da561c4d96ae0f8..379d2af5c51da5be97ce60629d5b7d2daf462839 100644 (file)
--- 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) {