From patchwork Mon Nov 27 15:24:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioanna Alifieraki X-Patchwork-Id: 1868837 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=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sf8X25jslz1ySP for ; Tue, 28 Nov 2023 02:24:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r7dTA-0004Pe-Dj; Mon, 27 Nov 2023 15:24:20 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r7dT7-0004PX-FK for kernel-team@lists.ubuntu.com; Mon, 27 Nov 2023 15:24:17 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DB5E63F546 for ; Mon, 27 Nov 2023 15:24:16 +0000 (UTC) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40b346a11cdso29550305e9.3 for ; Mon, 27 Nov 2023 07:24:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701098656; x=1701703456; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QElYyXRvG+LMRaeHb9Vsy5iv/bnbzrhpqvqhReCL91E=; b=kbO7ErHT+9qVrExjx4uiH+RgSkzCqndEF54dCUaR0Kgui0mN3CKqWCH3upffY0H4X6 0Da5xJlqyPFzVjoVSA3qpArBFaybueY93Feum57ANQxlhxHYTEPxAgoRCqKeCkxvuAz9 ajaeDa56aamvBdQObkdAfH1qfLJPC8T0utCMEOTiBM1sMnoe7RNYXrIoFFx3eBCgWn8r uBS2ltxZsdAN2G7hF+nzu/XNbvUMCsWXaI6dtgrqxVSxFOsV3f5Tt46ePG408TQsd0pc RI05EBZ01XkuHji9VqIAIcn6cV+ZwNowGeQ/XiEUo2Rz3ySiL3yKbxldbRto7yfsaBLi TdeQ== X-Gm-Message-State: AOJu0YyhcoZqnXiADRZkRYppYwF/dZyYC46T0qTh9aWP9+UtvQHoi3dJ TgiW/t/FFMkTkiB7da9Em3xe9hOLaH/7+b4353MB6E77QremO6ae1SqThhkpfMSKhnXYcp0RRiZ A58poMx8xtJzYGJ8Wg3aJ7b/StG6/LcAz93F8/NSBkvJ/OnwPUA== X-Received: by 2002:a05:600c:198b:b0:40b:47cb:5f90 with SMTP id t11-20020a05600c198b00b0040b47cb5f90mr1744229wmq.27.1701098656332; Mon, 27 Nov 2023 07:24:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEZYwytCUtfYLxCmuO6YzXdhCce0nkafy4L4AiFS6t6Njq8UoS5d9LZ+XgASIeMfsDAv4GshA== X-Received: by 2002:a05:600c:198b:b0:40b:47cb:5f90 with SMTP id t11-20020a05600c198b00b0040b47cb5f90mr1744207wmq.27.1701098655927; Mon, 27 Nov 2023 07:24:15 -0800 (PST) Received: from localhost.localdomain ([2a02:587:280d:2a76:100e:9ae3:978d:d35e]) by smtp.gmail.com with ESMTPSA id h4-20020adfa4c4000000b0032d8eecf901sm12417019wrb.3.2023.11.27.07.24.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 07:24:14 -0800 (PST) From: Ioanna Alifieraki To: kernel-team@lists.ubuntu.com Subject: [lunar/linux-azure][SRU][PATCH] Revert "PCI: hv: Use async probing to reduce boot time" Date: Mon, 27 Nov 2023 17:24:13 +0200 Message-Id: <20231127152413.27620-1-ioanna-maria.alifieraki@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2042568 This reverts commit 8bb7b605405db1cd47811ad65d2e737904a6f9ac. Signed-off-by: Ioanna Alifieraki --- drivers/pci/controller/pci-hyperv.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index e74d0a5430b7..9ab332d02a63 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -2405,16 +2405,12 @@ static int create_root_hv_pci_bus(struct hv_pcibus_device *hbus) if (error) return error; - /* - * pci_lock_rescan_remove() and pci_unlock_rescan_remove() are - * unnecessary here, because we hold the hbus->state_lock, meaning - * hv_eject_device_work() and pci_devices_present_work() can't race - * with create_root_hv_pci_bus(). - */ + pci_lock_rescan_remove(); hv_pci_assign_numa_node(hbus); pci_bus_assign_resources(bridge->bus); hv_pci_assign_slots(hbus); pci_bus_add_devices(bridge->bus); + pci_unlock_rescan_remove(); hbus->state = hv_pcibus_installed; return 0; } @@ -4086,9 +4082,6 @@ static struct hv_driver hv_pci_drv = { .remove = hv_pci_remove, .suspend = hv_pci_suspend, .resume = hv_pci_resume, - .driver = { - .probe_type = PROBE_PREFER_ASYNCHRONOUS, - }, }; static void __exit exit_hv_pci_drv(void)