From patchwork Mon Jan 6 15:47:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Johnson X-Patchwork-Id: 1218263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=outlook.com.au Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s0Hz2h0Nz9s29 for ; Tue, 7 Jan 2020 02:47:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726454AbgAFPrK convert rfc822-to-8bit (ORCPT ); Mon, 6 Jan 2020 10:47:10 -0500 Received: from mail-oln040092253066.outbound.protection.outlook.com ([40.92.253.66]:62976 "EHLO APC01-SG2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726296AbgAFPrK (ORCPT ); Mon, 6 Jan 2020 10:47:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=htoa0SWg5LQ44ux/F0j5bXOntu43ujhZ7tiQu3KF+nEuPjMAmnNyjIGSK8n+VvApiHSG0kMn16LpuYlAteY5GYz4mGL2lHyVS4Z7hCMKfcBSx8oMFGGzzYwxlsggt93wpCaHUN3Lx4r8fC2lpFZb28248TFT+HrkXCSbrFHKCTfIa5b9CyuflR1W1biVlMt19Zu3iUc358Bl/FpjKveMey0faTZcdD+oj03D9uRSJbnCGyroMdchQwfMcx/3IiDJ2yOzxeF83/FsF84x/Jf7U4Dn4WITMb2Jd8SFEeqoVG1i8sB2QzEu8yVvnvHWnlJ+fT1TwZ0xsIhYu6uto8iIOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ACbULg1bckVj/Hjp+C12t3lJhpsYpPrCgwOttmUOnZQ=; b=fywBUe0uCCuXxMK4+dFDGG+RmxaDZcODlTnWyx222nuZk1JYscNCbcJmUlI6MNo8FZ1hYk884CX/nKsK+L6vzxDOP0x0tn2wkKbxfOSPG09s7WvKmLc3WgRS51VWtijUJRy5CypNYASaxuH+LYHYAEgQsPAcDYnAoRfGvlETLz5GswS8DW4DhEluM17NsnqIfo7StejU9L1bsAJCHTup5gtWo9z2KH8UjAVR5dC4XX6N2f+jhU1ct3P7LLqySUrAQ6K8/3K02/JIV8w/wF6s8dcKgkYVXJM0tvVPtcZuLc3/laTo4/5NNzFdLt+BJT4u68GPyv+VTAxW0Z5dcyDc2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from PU1APC01FT027.eop-APC01.prod.protection.outlook.com (10.152.252.53) by PU1APC01HT215.eop-APC01.prod.protection.outlook.com (10.152.253.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11; Mon, 6 Jan 2020 15:47:05 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (10.152.252.59) by PU1APC01FT027.mail.protection.outlook.com (10.152.252.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11 via Frontend Transport; Mon, 6 Jan 2020 15:47:05 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9]) by PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9%11]) with mapi id 15.20.2602.016; Mon, 6 Jan 2020 15:47:05 +0000 Received: from nicholas-dell-linux (49.196.2.242) by ME2PR01CA0091.ausprd01.prod.outlook.com (2603:10c6:201:2d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.12 via Frontend Transport; Mon, 6 Jan 2020 15:47:03 +0000 From: Nicholas Johnson To: "linux-kernel@vger.kernel.org" CC: "linux-pci@vger.kernel.org" , Bjorn Helgaas , Mika Westerberg , Benjamin Herrenschmidt , Logan Gunthorpe , Nicholas Johnson Subject: [PATCH v1 1/4] PCI: In extend_bridge_window() change available to new_size Thread-Topic: [PATCH v1 1/4] PCI: In extend_bridge_window() change available to new_size Thread-Index: AQHVxKiLa1++WKJEpU2RFfQl7JVJSw== Date: Mon, 6 Jan 2020 15:47:05 +0000 Message-ID: Accept-Language: en-AU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: ME2PR01CA0091.ausprd01.prod.outlook.com (2603:10c6:201:2d::31) To PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (2603:1096:300:d::20) x-incomingtopheadermarker: OriginalChecksum:66F1D0BCF42455C3B74D8EA6123FD11B87D0A9CEAC0DB669B2A1CDE782D11847; UpperCasedChecksum:302C6865E10ECCFED3DEB8BB9C0CB96DBA7C36485D9CF7CD35B5C6BBE0F8F7D5; SizeAsReceived:7776; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [5/AwRT8mb+3UqtGAlAVE2r5q+sAtXIV9] x-microsoft-original-message-id: <20200106154656.GA2550@nicholas-dell-linux> x-ms-publictraffictype: Email x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: fc7e52e5-0789-4f41-d609-08d792bfae0b x-ms-exchange-slblob-mailprops: mBy7Mai7yE6pvqwJQ6Mx8ls6+U3+cSxqYFVpPuB4DUD/ERuR7JHpcMBtrf2TV/gVFzAA3THUGHIkwV/Z4bhOx9vKrGXvQQTCK22djaWQTyXCdhOR/ll+4b6wdPxnC1dMSDeic81IDQzD1JfHnCgLy+HNkI+Y7U0IEfNcUjuTBK6xkM1flrRJCAkzb08o0/utkWtMQmLiSqa4zA7b5XLoON2uG2uTTOpzfy0IsCVjH63YeHRPgPJ3tXleVFaPhLwLPvINhEe91js7/UIbYJ87JHrmK4lB2jBhwA34Y98c3qP9YGs2TxBMlZ5+1Bg6RmQuLSy5pyRv2D2pafpdRFAAkcxRXC4qBWu6IfSV7fLBtGyDVzL2m6KzgTBFTobB5pe2xMsJ3g4aQOo6aUKIqntwocdQ6iP6v1Yu78ZjdSAz7VvCHT+zYNqNzjbvSc5aW8X+idu+wNf1qomLQ2pofdQeXRlS1Ri57+Fytw989Uu6x2SSCXouJ3KHhGQsXNmN3eWM9BVgxCsaAtnnFnlgD8UwCkrG9J55Bc+03V3vOUV3+wR+mbJ8sVXxSTKSLaJe1Perw9JfBwwUaXSm2AOSn+bkl4UbOWwBztWAWRw/AWQ2icFcMp7bGsp55BOclNQvMLXmImnHf/ubdtx3NvUVZOmip6aoJlIfqE4uIFb7vY06gkccK8TEaO+d5XpUJtlzbNU51ZfxN2j9ORVt7UTl7Ug8+C79qnl/B9XC x-ms-traffictypediagnostic: PU1APC01HT215: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rQEy2dhBqwT5FVSNQIAPLrLzAn+NpAA4KYWglPEdzsvRs2GvAit65G1Y0ytXOflTvqNT321qP6qC2K/YjSQfAhayg4CGfaI/3fBCqPfYriut/d6TgUKJMwUcfQeQKdN5E4MzqVgbx9+zOMaUVbaZ7eBCuFXPJkLnX4tpYf33ozyyYPFgLU4bN10+CllJfPe6 x-ms-exchange-transport-forked: True Content-ID: <2FBF0FE68131134085982169092BE7B5@KORP216.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: fc7e52e5-0789-4f41-d609-08d792bfae0b X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 15:47:05.5903 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT215 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In extend_bridge_window() change "available" parameter name to new_size. This makes more sense as this parameter represents the new size for the window. Signed-off-by: Nicholas Johnson Reviewed-by: Mika Westerberg --- drivers/pci/setup-bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 8b39b9ebb..ed5055ef7 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1834,14 +1834,14 @@ void __init pci_assign_unassigned_resources(void) static void extend_bridge_window(struct pci_dev *bridge, struct resource *res, struct list_head *add_list, - resource_size_t available) + resource_size_t new_size) { struct pci_dev_resource *dev_res; if (res->parent) return; - if (resource_size(res) >= available) + if (resource_size(res) >= new_size) return; dev_res = res_to_dev_res(add_list, res); @@ -1849,10 +1849,10 @@ static void extend_bridge_window(struct pci_dev *bridge, struct resource *res, return; /* Is there room to extend the window? */ - if (available - resource_size(res) <= dev_res->add_size) + if (new_size - resource_size(res) <= dev_res->add_size) return; - dev_res->add_size = available - resource_size(res); + dev_res->add_size = new_size - resource_size(res); pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, &dev_res->add_size); } From patchwork Mon Jan 6 15:47:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Johnson X-Patchwork-Id: 1218265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=outlook.com.au Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s0JP2ZQXz9s29 for ; Tue, 7 Jan 2020 02:47:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726296AbgAFPrc convert rfc822-to-8bit (ORCPT ); Mon, 6 Jan 2020 10:47:32 -0500 Received: from mail-oln040092255091.outbound.protection.outlook.com ([40.92.255.91]:62528 "EHLO APC01-HK2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726463AbgAFPrb (ORCPT ); Mon, 6 Jan 2020 10:47:31 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FPsbhrnjY8esTreQr2sgZkl7J0nxKh24TqyM8VDrmhKk+X3jh326gkVhWOrf2f/hpHOxz9TvcHkGUZmOjAeC1AzQnWyOQ5fs7nKxSQMGyp3Ol24i9qAL9CUgACMGJocTG9OvgDo7vfGP8cTaZe7RXp5HAzKEGblIfbXX/53+lROIIPofTl7dL65VaAA3ZD7P3rEpv+5HeAaRt0BRBSCsOsSQ+MWNQvOSgRAy7m0gozdLvRMDMB0dwyPXUBZCTDapbe08ERzXxy7uzlJtJGwvIiZ2yeUZi+5KWvUHwluAPsD+4bXrL/4BXCt1/E10zCuFBpCLgF1+z+Rtpr1TejwYsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WC/L95QDvIDVqaEbmyCPLI25dO/7DMT10XX9IPbUKBc=; b=bsgHNDTFYB1aOgm/CS1ZOx8OW6DYexBeazHPoTQTUwQkrKXLcpeF0Uwr/ufZ2YdXeEoUd0YaPKQRqcNqftYIwL1iRX8HfJbgiy56y8izG98niOJg/QSWyjhZc0fn5SX3JQm8wEjGh4ZuWAC/bG7n7rCF6rYfvDl6cvbqkQc8S2LHb781HBP2UQ2U7uMUKVPuEto3MpcRWxjQPHNg/IAVgBLSMcTv931WGRna1EHVygI3zXKZT017WB7ogccVWlgBaRLUmtRhpsKu1M2eRTMhSh1GLBxF3M6u05ZqLacOuvGEh5cxsEntxQK0uUJtaRVNFsJtqxsEjnYuWTKefJ4Ivg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from PU1APC01FT027.eop-APC01.prod.protection.outlook.com (10.152.252.60) by PU1APC01HT122.eop-APC01.prod.protection.outlook.com (10.152.253.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11; Mon, 6 Jan 2020 15:47:26 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (10.152.252.59) by PU1APC01FT027.mail.protection.outlook.com (10.152.252.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11 via Frontend Transport; Mon, 6 Jan 2020 15:47:26 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9]) by PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9%11]) with mapi id 15.20.2602.016; Mon, 6 Jan 2020 15:47:26 +0000 Received: from nicholas-dell-linux (49.196.2.242) by ME2PR01CA0071.ausprd01.prod.outlook.com (2603:10c6:201:2b::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.12 via Frontend Transport; Mon, 6 Jan 2020 15:47:24 +0000 From: Nicholas Johnson To: "linux-kernel@vger.kernel.org" CC: "linux-pci@vger.kernel.org" , Bjorn Helgaas , Mika Westerberg , Benjamin Herrenschmidt , Logan Gunthorpe , Nicholas Johnson Subject: [PATCH v1 2/4] PCI: Rename extend_bridge_window() to adjust_bridge_window() Thread-Topic: [PATCH v1 2/4] PCI: Rename extend_bridge_window() to adjust_bridge_window() Thread-Index: AQHVxKiYVkMXiVVjV0e7nVZLFkb5Kg== Date: Mon, 6 Jan 2020 15:47:26 +0000 Message-ID: Accept-Language: en-AU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: ME2PR01CA0071.ausprd01.prod.outlook.com (2603:10c6:201:2b::35) To PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (2603:1096:300:d::20) x-incomingtopheadermarker: OriginalChecksum:7D265AF8A88138C58CA7EB271D831F71EF099B6238DA5151A513AA9B90D82BC3; UpperCasedChecksum:DC80366EFE9ADC5AD70326E1754D9B4F33872FE8B4C0150D7DAED8013FC490BA; SizeAsReceived:7793; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [UOr+758f9cB+tUoZ+Usx5XpuH1SfpJ2M] x-microsoft-original-message-id: <20200106154718.GA2555@nicholas-dell-linux> x-ms-publictraffictype: Email x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: cc53108c-1823-4a83-8c0f-08d792bfba77 x-ms-exchange-slblob-mailprops: Zv/SX2iM+5X+ova95ZZQG91BCNa2vH60F/nlaJpFtG4IdfIuDG+gPLdC8qcx3lbiQvZFcaxUSbqV0W5rBGzX6m9YG3XhOjQl8utgtKY9T7oKXapfrTe61pgnEzt/Dvm83feRDkEPJGFlO9tDjwn6E5/th/dmcVcHY490RANDLFC8vTNm6QhmXjpiwdH3nVBFlAawUZXbeYF1mYUxTvJKi9bW48hqcW99L0Ofrht5gKSfeCtYYNbDbpLvD4yQmPAPaPWJGztZzP8PUq2X+YsagdT6nNCSCiW/bZZ68NwUJEgicbfmpvpmFG6O1LVd5DHmDMm1p1Z3/cyKf5cZd+c3/PlcK+uvTjBFFQswOzo3A3x2c5Pb04XIj5i39ns3IGjBp3XtlNm/6LsSrt/Jnc5gFkVIG74f+oLgwiPNNEwPYwwIyTPJvpBKGetfGXgEwmNoA+v35lEbKlEHXJqf1MzYSNlnycOrpLoowtMSlIqZstOg3vwXS5Met2EsAO2UgXlLPTdvp/1D/M/LlwGIVn0Qfg2vj5o6YGv4Ziwck2/wCJVhBN9d0OOxe361VZwyZJHbiAd8qSAs+RIaLWSNvMbxthsj30QuTSFN2PeuNsenBnagUGIA6oXLSXPsJ5bl4nx5MxL/InbDa5Vvd9cYFSRutlzlJVxUWbC64YkFe/DDMXAZI78GDKZL7MIlLVbpYG53hS6l4Bh5RMU= x-ms-traffictypediagnostic: PU1APC01HT122: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: o8zum7yq8DqqrlUwAB6P4/eTnyapSTA9/7FJyxGtD10eBJBavHAwBOeBFYPd+jXcTDWFSQfkiZFkez1HAMIZyZuklx0lzYefUIU8WogvKTuxh9lDyPbTPAbUq+B8Yax3ZtzjAGMo2xuQyxNxCFEb2RtTxUGADcJOCeJGuLR4fSFcXr/PK0eyBVvye534PSca x-ms-exchange-transport-forked: True Content-ID: <13A01649C73514438397BCF737FECF1D@KORP216.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: cc53108c-1823-4a83-8c0f-08d792bfba77 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 15:47:26.4178 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT122 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rename extend_bridge_window() to adjust_bridge_window() to prepare for the fact that the window will be able to shrink. No functional changes. Signed-off-by: Nicholas Johnson Reviewed-by: Mika Westerberg --- drivers/pci/setup-bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index ed5055ef7..de43815be 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1832,7 +1832,7 @@ void __init pci_assign_unassigned_resources(void) } } -static void extend_bridge_window(struct pci_dev *bridge, struct resource *res, +static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res, struct list_head *add_list, resource_size_t new_size) { @@ -1895,9 +1895,9 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, * calculated in __pci_bus_size_bridges() which covers all the * devices currently connected to the port and below. */ - extend_bridge_window(bridge, io_res, add_list, resource_size(&io)); - extend_bridge_window(bridge, mmio_res, add_list, resource_size(&mmio)); - extend_bridge_window(bridge, mmio_pref_res, add_list, + adjust_bridge_window(bridge, io_res, add_list, resource_size(&io)); + adjust_bridge_window(bridge, mmio_res, add_list, resource_size(&mmio)); + adjust_bridge_window(bridge, mmio_pref_res, add_list, resource_size(&mmio_pref)); /* From patchwork Mon Jan 6 15:47:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Johnson X-Patchwork-Id: 1218266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=outlook.com.au Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s0Jl5D8hz9sQp for ; Tue, 7 Jan 2020 02:47:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726463AbgAFPrv convert rfc822-to-8bit (ORCPT ); Mon, 6 Jan 2020 10:47:51 -0500 Received: from mail-oln040092254105.outbound.protection.outlook.com ([40.92.254.105]:29408 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726446AbgAFPru (ORCPT ); Mon, 6 Jan 2020 10:47:50 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ijmtXcuEgh49Pc3DLgffwhFrbFl0C7+kWKoi2qBPDvjyCJzBsUQLaV6F3XxkuRbPZ2jHVZxuoXV07neYgXJ2EFa+AXGZ2RdY2M7KXLNh6yEnt1XPrCUB0Vrv0YmOYVi2G9CksZ1WDEy9F/QfWiHhyYnmzacB4GTPP2U/us9MgTxJI+AKQINKg8/VUKVs3O47XXjdWN4LCkXGVbVeS9THowgvLcXtPNiR51RJ2K+iiHREMySKQowv4CMLk2qO20tQ8F2cVE04B7mn4q97Is/5qF2IsiglQAyfaFZ9YOftW3eFDTNB0g8aEtbAIRP9Eo0E/kH2XLFHwtiiaawy63gtsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W1G7E/xOATCSFhCmuNY6VUB0fIguhBCNQ4FAllQUnTw=; b=M8lOtjWw0gerQhz6phlc0VwwvUvJfuTCvlyF38auWEajqvQLEbSX1k37+/0ZJnRF3EDHmQhJ5CTkY7ForPSrMWrSQbun+Tb5LopZKgPsfJ2MwdbLzW4KM9w0bOpJ1xLsHhImlSrKIeMxvByIeGH2OKZ0gPly6OwPP86J2AHPZjh3bR7CiObBAam3mebgb7tDlwhq0+lqIhvJIIRh9sp/GRHEqmb3PAKygDNKcSLxXe5y4GzdOtMNKBRJrhQC+fWV5JrB1d/ppdrhqowe0rKvHYhTcivevhrBONPPhZ43LCAqbEYVNtRwclilQSIhT9XaIBuTAjLyoEWK8G7gqYJIcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from PU1APC01FT027.eop-APC01.prod.protection.outlook.com (10.152.252.57) by PU1APC01HT217.eop-APC01.prod.protection.outlook.com (10.152.253.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11; Mon, 6 Jan 2020 15:47:46 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (10.152.252.59) by PU1APC01FT027.mail.protection.outlook.com (10.152.252.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11 via Frontend Transport; Mon, 6 Jan 2020 15:47:46 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9]) by PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9%11]) with mapi id 15.20.2602.016; Mon, 6 Jan 2020 15:47:46 +0000 Received: from nicholas-dell-linux (49.196.2.242) by ME4P282CA0001.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:90::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.12 via Frontend Transport; Mon, 6 Jan 2020 15:47:43 +0000 From: Nicholas Johnson To: "linux-kernel@vger.kernel.org" CC: "linux-pci@vger.kernel.org" , Bjorn Helgaas , Mika Westerberg , Benjamin Herrenschmidt , Logan Gunthorpe , Nicholas Johnson Subject: [PATCH v1 3/4] PCI: Change extend_bridge_window() to set resource size directly Thread-Topic: [PATCH v1 3/4] PCI: Change extend_bridge_window() to set resource size directly Thread-Index: AQHVxKijErSkuA6mHUWDAsVXSXsSfw== Date: Mon, 6 Jan 2020 15:47:46 +0000 Message-ID: Accept-Language: en-AU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: ME4P282CA0001.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:90::11) To PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (2603:1096:300:d::20) x-incomingtopheadermarker: OriginalChecksum:E5A7E51C3DEBC1EC0D60CA76C86138AEAD698E1E8B87A74D193EA7202EA46697; UpperCasedChecksum:1BE29C202C672595D324CF7E016AF2F2D38FE3BD4241A0E7EFA7E691863C4B68; SizeAsReceived:7784; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [Hk31UU2j0QgMxQqQVOmyqFdfJNXRVt/i] x-microsoft-original-message-id: <20200106154738.GA2559@nicholas-dell-linux> x-ms-publictraffictype: Email x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: a1e38f1e-4d20-41dd-3bc2-08d792bfc647 x-ms-exchange-slblob-mailprops: mBy7Mai7yE6pvqwJQ6Mx8ls6+U3+cSxqRl4Pv7axpQA1J9/IVsYCYZ9gno4nkXuyUH7Hkk6wZMV2vdKPSRNEwt4v3w2aBwiZi1PEdFaOHy14gibmb3DoVkfqQXokBhlbl1EJun/DcH66nle/NlAOWyJwgWtK98QEryIbs33mfGb39bZMMQlAeIX9caDMrhcBBkwpedk6C8MPE+jE3Gj+TdHl0bHahdI7dxpzitDEri8vbvUgajp4zg1QXyEWzqrId5XCdBzCQmgmk7sVNxzrWsupTybwIMEJNk17FIOKph6uyfoI9y+KU57ahRwv069TnseKlOpLI+H4tc7KQZLc6VNM9XgnevYFq1v4g+j+NvJtQKn3h6Aj1hjbYkmhqc8yQqCs1mmseY8pzDBa1ycAzHCkHHcG/3cjqa7y6/nv+ReyBfDwusyctgSCmvPxehip/QcNOjMXjCmlNNbGajkhnPl7V73kMJMb20TgnGVJ90LThhrNmFWbkxclZLoZUiLn0UH2WN9zh6U1JCyQiaLOdv7LEFfRq8rB9FxD+971clPyQGQdOik/pEa846ca1zhpSAShSXqEslYYlxzZ2r5WReNnp3zUtUpwaPzgR0dDF9b02nJ5q5oe5W9PdFsjEgW8UQXWeftABG07g5iN3O8w3x8hMFI9OLVNJpTyys/F694tr8I39XODsvqWZDa0D1x5Sdmhf5TjsPj1xWB4GXThj5v2ko9+u+D1 x-ms-traffictypediagnostic: PU1APC01HT217: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uQHpNNDRey/85Ce6JN5ioDBkryZv6X/A/liCWfjyno+9x1cBxu+zu+569GZ8WM4PJ3ogi6B7+5vOvgDwBQswwKnM3ut0G+I8+8DmASweQ2mVfUnkymAcYT1eklEgdSqk5vDXcZkCc5TCwJoUDmPjvlch05Y8GMdTYZ476x0HVFmthV/92Ch+x1Mvz8mHzTn5 x-ms-exchange-transport-forked: True Content-ID: <0CB312B40E6B6841BA65B9FEF4AF5E36@KORP216.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a1e38f1e-4d20-41dd-3bc2-08d792bfc647 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 15:47:46.2209 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT217 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Change extend_bridge_window() to set resource size directly instead of using additional resource lists. Because additional resource lists are optional resources, any algorithm that requires guaranteed allocation that uses them cannot be guaranteed to work. Remove the resource from add_list, as a zero-sized additional resource is redundant. Update comment in pci_bus_distribute_available_resources() to reflect the above changes. Signed-off-by: Nicholas Johnson --- drivers/pci/setup-bus.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index de43815be..0c51f4937 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1836,7 +1836,7 @@ static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res, struct list_head *add_list, resource_size_t new_size) { - struct pci_dev_resource *dev_res; + resource_size_t add_size; if (res->parent) return; @@ -1844,17 +1844,10 @@ static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res, if (resource_size(res) >= new_size) return; - dev_res = res_to_dev_res(add_list, res); - if (!dev_res) - return; - - /* Is there room to extend the window? */ - if (new_size - resource_size(res) <= dev_res->add_size) - return; - - dev_res->add_size = new_size - resource_size(res); - pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, - &dev_res->add_size); + add_size = new_size - resource_size(res); + pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, &add_size); + res->end = res->start + new_size - 1; + remove_from_list(add_list, res); } static void pci_bus_distribute_available_resources(struct pci_bus *bus, @@ -1889,11 +1882,9 @@ static void pci_bus_distribute_available_resources(struct pci_bus *bus, mmio_pref.start = min(ALIGN(mmio_pref.start, align), mmio_pref.end + 1); - /* - * Update additional resource list (add_list) to fill all the - * extra resource space available for this port except the space - * calculated in __pci_bus_size_bridges() which covers all the - * devices currently connected to the port and below. + /* + * Now that we have adjusted for alignment, update the bridge window + * resources to fill as much remaining resource space as possible. */ adjust_bridge_window(bridge, io_res, add_list, resource_size(&io)); adjust_bridge_window(bridge, mmio_res, add_list, resource_size(&mmio)); From patchwork Mon Jan 6 15:48:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Johnson X-Patchwork-Id: 1218268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=outlook.com.au Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47s0K80r9jz9sQp for ; Tue, 7 Jan 2020 02:48:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726478AbgAFPsK convert rfc822-to-8bit (ORCPT ); Mon, 6 Jan 2020 10:48:10 -0500 Received: from mail-oln040092254014.outbound.protection.outlook.com ([40.92.254.14]:15344 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726636AbgAFPsK (ORCPT ); Mon, 6 Jan 2020 10:48:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mppfyAuh0QtDTh+HMIGJYQ6R9Fp6mrv7iWjFaxvkoogtW+oRX+zgH3LYCKh6QKuXhmCo2TWLdQw1z4YuqzlNvd0Ap81GzV7UgHnESE4I/YVzaDRrtRIEIc5A1Pp5vDhOPpcHK9xQCBW0T3pJq6zhbYl8GBQ6uSU3BoQyl6ZaGByaPj9c/JzfR371RFf9VlRfUld2pQGYUjew0D7Hxzw1+uo3xyzb8gAqT6Rc7KH7EJ2fBxlSP6rOJXZBcjhdmMC312ku+5r8UQ8TdLcNcunWtec5ymL932JJ5WDvQshdw1F8sTqNBBsIHnaPhQoUiq/Pyik6FYcXvWqw5vRbbPP20w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oU0QJ+nQVpoWeffN3MeVHtTHRAdUp3onbfgKuUchiYA=; b=jtv4BoC/p+mw9YBrbmlbxFMSxbSWHiGEcM5QVr5NG5eyBVgG8SgBEM7SU+xibgZrMg5e4YnB5d0K9vKuInJuj3unYVUJOk2amPRr7ApRsvsI8JUeetmzHHYKEryuTEgGHFyz7tGKJHT064cms1SABgxJGsEERt+a+NELjD0rXJ24UY2UbWN9zOQJ7L+90AgZ2mhtHIjk5zP9DQot7rPPRBklQBLvEyTUETgtSNgnYaKjSyQObPltbjFTPhSz/gXjZezZmq4bDDP93SGEoPp0IkzSrfBPcdLl2xDDZAk61Llek2R3+LSO4KPx8IznhOuoGZwOEIfKM1KjZ4eDRQRqig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from PU1APC01FT027.eop-APC01.prod.protection.outlook.com (10.152.252.53) by PU1APC01HT146.eop-APC01.prod.protection.outlook.com (10.152.253.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11; Mon, 6 Jan 2020 15:48:06 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (10.152.252.59) by PU1APC01FT027.mail.protection.outlook.com (10.152.252.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.11 via Frontend Transport; Mon, 6 Jan 2020 15:48:06 +0000 Received: from PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9]) by PSXP216MB0438.KORP216.PROD.OUTLOOK.COM ([fe80::20ad:6646:5bcd:63c9%11]) with mapi id 15.20.2602.016; Mon, 6 Jan 2020 15:48:06 +0000 Received: from nicholas-dell-linux (49.196.2.242) by MEXPR01CA0135.ausprd01.prod.outlook.com (2603:10c6:200:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.10 via Frontend Transport; Mon, 6 Jan 2020 15:48:03 +0000 From: Nicholas Johnson To: "linux-kernel@vger.kernel.org" CC: "linux-pci@vger.kernel.org" , Bjorn Helgaas , Mika Westerberg , Benjamin Herrenschmidt , Logan Gunthorpe , Nicholas Johnson Subject: [PATCH v1 4/4] PCI: Allow extend_bridge_window() to shrink resource if necessary Thread-Topic: [PATCH v1 4/4] PCI: Allow extend_bridge_window() to shrink resource if necessary Thread-Index: AQHVxKivCsNYvp642Ua95PoPKOxpRw== Date: Mon, 6 Jan 2020 15:48:06 +0000 Message-ID: Accept-Language: en-AU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MEXPR01CA0135.ausprd01.prod.outlook.com (2603:10c6:200:2e::20) To PSXP216MB0438.KORP216.PROD.OUTLOOK.COM (2603:1096:300:d::20) x-incomingtopheadermarker: OriginalChecksum:E117D3158B37EB762019E2F9F3BC2778D0A69B659A9CFF349BBD4C2781FE19C0; UpperCasedChecksum:76DF33309F7046977D84305125BDD685200E8294B1145247B3098C0E942C4811; SizeAsReceived:7789; Count:48 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YumsE+2F3fePCaKAI0HGtJwIKlCshVHJ] x-microsoft-original-message-id: <20200106154758.GA2561@nicholas-dell-linux> x-ms-publictraffictype: Email x-incomingheadercount: 48 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: f95d2363-9788-46d3-d17b-08d792bfd222 x-ms-exchange-slblob-mailprops: mBy7Mai7yE6pvqwJQ6Mx8ls6+U3+cSxqRl4Pv7axpQA1J9/IVsYCYZkN2PCFNMW5ukL0hJQ2gikaHRQ7T/cDFTX7DjS4gvof4bH/2EghGGk3T0SwyLokeTFZc41yB4ImgR1yjQ7+CUy3y9JeMrn/9MQCEhJb5n6swPieqBWJVn6xbWxCsyq8ZKqT88lAP+zN4Wmk2JyfYmj66QWQKASYWGuoMcp/zBAO55O15cYlGyLj+iPoMKKCME1NncgR0hE2Um9Fr3OLR+DhQ4T1M7mx5+OuWmuKaqwJ0bpGjnN+PYXwvUJ8S05UYpEMYFCy4p9fXPREYweLUJwUyB8wmokd+Co8cEciyPbBRCOH8bsXmgvh0j4VHfry/AsZEhe6/5T3WTuHho4YSkfYjxN8dtKv5ZGoWiWINNF7p93MCbzrji4Lz+2znMoShlI9SvMoe/R62xE6Jwcs2Cf/teQU/yXFwtyNOg9hU04PqAJT1mhAU1xXr6kNri0WK6MOx17Jv7H92eGzGyxVeCOdl8QpOU9E6P8cJ1pC3lqRa1uscNDgAL38dyOXykpNd88m9Zi6DBWXoOSUazATjsCT+dHgAYdqZmVfV4b72cZ2eGCDLb8WSqpTyXvp9708Z6MgxLcAVmxRgxxCtyuNTdHRMFouuK4AlAHzwAVBuy4YsF002UZKO2TMQ/q05DqHh8pwjz1KYvwPdKF51OhtyD7Nc8ZqhvQ7VnqTM/q18Axa x-ms-traffictypediagnostic: PU1APC01HT146: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: f0tKylp45PIrtMC77O3fvLZf5LJsdw5hyucdMBS+/uSRVMdAOSdaIoWdYPDhL9flerAWTwBkpgHO0zpVEQEHbMKkpeKebx929Gu/02W3PK4BScMiLCgjCseyuNkV0/rRQog4Dy8o5dgASxKbvkZfpHMUL+btBPbis0k3Br6dASu6dduaxZq4NCGv33sr6psI x-ms-exchange-transport-forked: True Content-ID: MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f95d2363-9788-46d3-d17b-08d792bfd222 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 15:48:06.1429 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT146 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove checks for resource size in extend_bridge_window(). This is necessary to allow the pci_bus_distribute_available_resources() to function when the kernel parameter pci=hpmemsize=nn[KMG] is used to allocate resources. Because the kernel parameter sets the size of all hotplug bridges to be the same, there are problems when nested hotplug bridges are encountered. Fitting a downstream hotplug bridge with size X and normal bridges with non-zero size Y into parent hotplug bridge with size X is impossible, and hence the downstream hotplug bridge needs to shrink to fit into its parent. Add check for if bridge is extended or shrunken and reflect that in the call to pci_dbg(). Reset the resource if its new size is zero (if we have run out of a bridge window resource) to prevent the PCI resource assignment code from attempting to assign a zero-sized resource. Signed-off-by: Nicholas Johnson --- drivers/pci/setup-bus.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 0c51f4937..e7e57bf72 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1836,18 +1836,25 @@ static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res, struct list_head *add_list, resource_size_t new_size) { - resource_size_t add_size; + resource_size_t add_size, size = resource_size(res); if (res->parent) return; - if (resource_size(res) >= new_size) - return; + if (new_size > size) { + add_size = new_size - size; + pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, + &add_size); + } else if (new_size < size) { + add_size = size - new_size; + pci_dbg(bridge, "bridge window %pR shrunken by %pa\n", res, + &add_size); + } - add_size = new_size - resource_size(res); - pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, &add_size); res->end = res->start + new_size - 1; remove_from_list(add_list, res); + if (!new_size) + reset_resource(res); } static void pci_bus_distribute_available_resources(struct pci_bus *bus,