From patchwork Fri Apr 21 01:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rongguang Wei X-Patchwork-Id: 1771662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=f5aQDkV2; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4Q2cch2ntfz23td for ; Fri, 21 Apr 2023 11:38:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232426AbjDUBik (ORCPT ); Thu, 20 Apr 2023 21:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjDUBij (ORCPT ); Thu, 20 Apr 2023 21:38:39 -0400 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.215]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3E74040F0 for ; Thu, 20 Apr 2023 18:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=YpOx2 0ZPOX0eC9hjyNQoJWH8V4PPD2EvIXeC9tUZfCE=; b=f5aQDkV2H18F6Zg+MamxP NaR68bN727VHXGU4LQwXFmrvv1mvFiOaCD2I3cpHD1MG7XOyd7wkf+qXha2iXd6g u3JBspOHU+0oQ7dmMiFBlt1a5SQstWogLFPNN7WCZV5DQDiMB3gUnyvlmpTJsGAr +2FOHNxqolMHmlelLz/xvo= Received: from localhost.localdomain (unknown [116.128.244.169]) by zwqz-smtp-mta-g4-3 (Coremail) with SMTP id _____wBXBjv56EFkD64KCA--.28035S2; Fri, 21 Apr 2023 09:38:01 +0800 (CST) From: Rongguang Wei To: lukas@wunner.de Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, Rongguang Wei Subject: [PATCH v2] PCI: pciehp: Fix the slot in BLINKINGON_STATE when Presence Detect Changed event occurred Date: Fri, 21 Apr 2023 09:37:49 +0800 Message-Id: <20230421013749.646304-1-clementwei90@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wBXBjv56EFkD64KCA--.28035S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WFWfWrW8Jr4UKFW5Gr1Dtrb_yoW8tw15pa yDGayagry0ga1UXws3XF48Ww1Yk3s3ZrWUCF1DCw17ua1fCr48JasY9ryYqrW3uFWkXaya 93WDKFyDW3WUJFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UNvttUUUUU= X-Originating-IP: [116.128.244.169] X-CM-SenderInfo: 5fohzv5qwzvxizq6il2tof0z/xtbBzhxYa2I0Y6rQSAAAsm X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rongguang Wei pciehp's behavior is incorrect if the Attention Button is pressed on an unoccupied slot. When a Presence Detect Changed event has occurred, the slot status in either BLINKINGOFF_STATE or OFF_STATE, turn it off unconditionally. But if the slot status is in BLINKINGON_STATE and the slot is currently empty, the slot status was staying in BLINKINGON_STATE. The message print like this: pcieport 0000:00:01.5: pciehp: Slot(0-5): Attention button pressed pcieport 0000:00:01.5: pciehp: Slot(0-5) Powering on due to button press pcieport 0000:00:01.5: pciehp: Slot(0-5): Attention button pressed pcieport 0000:00:01.5: pciehp: Slot(0-5): Button cancel pcieport 0000:00:01.5: pciehp: Slot(0-5): Action canceled due to button press It cause the next Attention Button Pressed event become Button cancel and missing the Presence Detect Changed event with this button press though this button presses event is occurred after 5s. According to the Commit d331710ea78f ("PCI: pciehp: Become resilient to missed events"), if the slot is currently occupied, turn it on and if the slot is empty, it need to set in OFF_STATE rather than stay in current status when pciehp_handle_presence_or_link_change() bails out. V2: Update to simple code and avoid gratuitous message. Fixes: d331710ea78f ("PCI: pciehp: Become resilient to missed events") Link: https://lore.kernel.org/linux-pci/20230403054619.19163-1-clementwei90@163.com/ Signed-off-by: Rongguang Wei --- drivers/pci/hotplug/pciehp_ctrl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 529c34808440..1f78e401e9b6 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -256,6 +256,7 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) present = pciehp_card_present(ctrl); link_active = pciehp_check_link_active(ctrl); if (present <= 0 && link_active <= 0) { + ctrl->state = OFF_STATE; mutex_unlock(&ctrl->state_lock); return; }