From patchwork Thu May 19 14:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenliang Wang X-Patchwork-Id: 12855805 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0AC49C433F5 for ; Thu, 19 May 2022 16:59:53 +0000 (UTC) Received: from localhost ([::1]:49920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrjVB-0000kj-0q for qemu-devel@archiver.kernel.org; Thu, 19 May 2022 12:59:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrhQz-0005UI-7q for qemu-devel@nongnu.org; Thu, 19 May 2022 10:47:30 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:38840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrhQl-0000ls-Ib for qemu-devel@nongnu.org; Thu, 19 May 2022 10:47:21 -0400 Received: by mail-pg1-x536.google.com with SMTP id 137so5285460pgb.5 for ; Thu, 19 May 2022 07:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=KGbT4fdqWnE3RW5+3tkusAJuvGtDSgAm254BmJ5v9G8=; b=G9EOUo3ujWw4PTec68tuX3LSQULQ5XE3nB4JftCq5Xj4yfoJQzh/82ghT9/XkfFayC Eqb4QvhDDu4cffH9GaGmnFJ/wIY9HozKwpEPK0v8geD1Tj2dPjv7zQmquf/iv88ErFCh q0oD/36e+4ZX6f0FlksM06Zodm63wb1Z3LKOAEqQu6Jp0mtj0ialwsH1TA0OIFVbSVrZ HH7IIAg9aj4EnZ0xWPZ4wHRqg4erXlUOnlyjJ1PPxupfl965mieWWG0czGd8zUlAMI3n AQ6aWx5cSzBgIdNHTgk83rrCiTs/4x+N57mkZfFbwi0S6UTsA8mi81XC30O3H/23jTyX BAZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KGbT4fdqWnE3RW5+3tkusAJuvGtDSgAm254BmJ5v9G8=; b=iIR51xVNWa4WFd7dP8S0TPW4/afuBmIjxIACErPuHQnG7F/Q9LIdZSrZp+khvXGjqZ TvBFomrJehBY7LV05UpzQroH+4Th5ZG7EX97sQH6Z+18Xqhveq5AFB3uK5+WYdYj8II+ etdX1z8Maz9UnKvrYfB7JBrDDrY4uzicavtnE4xNwJtIZkIgIO3GjxjkluFPFCzBweeP pmo02aVcKAGTb8pg7/QVD33RX3HC0NyJE2WT+WQ1iUbOtQ8TPidbMyzhOKX6d8s8nkmP nXsThrXLTkjj8IVq7U7ON0+Qs5pfLgZyxNUvUIWZPFgMr1RCyVnztkn6ECkkZeKeWS0I CmNA== X-Gm-Message-State: AOAM531xrUQxodXjB/xzs8vFs5had2zUp308KFJv9K2EPGtslpcDg9Zu K86TOrILc3krCfffKz7dZ5UbmdXmjJSMSw== X-Google-Smtp-Source: ABdhPJyLMdbafamzO/FlTgFEWcaGDzTYEDFv/IRfZZJTi/Lrd8JtuA3Gh9chOoVUsXLiO7gAoE0yQw== X-Received: by 2002:a05:6a00:16c7:b0:4f7:e497:69b8 with SMTP id l7-20020a056a0016c700b004f7e49769b8mr5037405pfc.6.1652971628889; Thu, 19 May 2022 07:47:08 -0700 (PDT) Received: from localhost.localdomain ([2408:8207:2434:25c0:32b7:d302:7710:9f78]) by smtp.gmail.com with ESMTPSA id jj17-20020a170903049100b0016170bb6528sm3844429plb.113.2022.05.19.07.47.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2022 07:47:08 -0700 (PDT) From: Wenliang Wang To: qemu-devel@nongnu.org Cc: marcel.apfelbaum@gmail.com, mst@redhat.com, Wenliang Wang Subject: [PATCH] hw/pci/pcie.c: Fix invalid PCI_EXP_LNKCAP setting Date: Thu, 19 May 2022 22:45:59 +0800 Message-Id: <1652971559-22126-1-git-send-email-wangwenliang.1995@bytedance.com> X-Mailer: git-send-email 2.7.4 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=wangwenliang.1995@bytedance.com; helo=mail-pg1-x536.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 19 May 2022 12:58:04 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" pcie_cap_fill_slot_lnk() wrongly set PCI_EXP_LNKCAP when slot speed and width is not set, causing strange downstream port link cap (Speed unknown, Width x0) and pcie devices native hotplug error on Linux: [ 3.545654] pcieport 0000:02:00.0: pciehp: link training error: status 0x2000 [ 3.547143] pcieport 0000:02:00.0: pciehp: Failed to check link status We do not touch PCI_EXP_LNKCAP when speed=0 or width=0, as pcie_cap_v1_fill() already do the default setting for us. Signed-off-by: Wenliang Wang --- hw/pci/pcie.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 68a62da..c82e7fc 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -92,6 +92,11 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev) return; } + /* Use default LNKCAP setting */ + if (s->speed == 0 || s->width == 0) { + return; + } + /* Clear and fill LNKCAP from what was configured above */ pci_long_test_and_clear_mask(exp_cap + PCI_EXP_LNKCAP, PCI_EXP_LNKCAP_MLW | PCI_EXP_LNKCAP_SLS);