From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3613C77B75 for ; Mon, 22 May 2023 21:54:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232387AbjEVVyC (ORCPT ); Mon, 22 May 2023 17:54:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjEVVyB (ORCPT ); Mon, 22 May 2023 17:54:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E5C5DB for ; Mon, 22 May 2023 14:54:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EC3B860EAB for ; Mon, 22 May 2023 21:53:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25DB1C433EF; Mon, 22 May 2023 21:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684792439; bh=Gzg0pmd7zTRUEr48dWDKv3lohKMoi8eOHur33T0H1H0=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=trWa5gtsiWh4p6JC3tXRylxMZfBiBLvJW3xgYKelR5jHdVoqkz9D743+EmSchqjav xOb1mcxQ45b+EgFauYvtqBwj2JI0n/+uM00IRPyhvGY7BElE5/uXDT4K97GpQpC8UK lb4nkS/LfMoPwFIcUYdZjGG8p0ELx28C546UFnVIW8bYpoylp4jgJxpzd+Zxa0Sebi iqV1raA8+lJhtilIB9SxukiUAhqbYQByniXRwac7W4WOmJ+G+5pIeixOp3zOErFwVG wnZXuyHa28BcCvOnPD28TIPpdldRI5Bcgwq0p55NNXT4F03AyxzFZaA5MooKnWTWxp KzbZEIAoks0Xg== Date: Mon, 22 May 2023 16:53:57 -0500 From: Bjorn Helgaas To: Rongguang Wei , Rongguang Wei , Lukas Wunner Cc: linux-pci@vger.kernel.org, Bjorn Helgaas Subject: Re: [PATCH] PCI: pciehp: Simplify Attention Button logging Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230522214051.619337-1-helgaas@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Mon, May 22, 2023 at 04:40:51PM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas > > 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 >