From patchwork Wed Dec 16 15:16:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7863031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E0B229F387 for ; Wed, 16 Dec 2015 15:28:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 084B020396 for ; Wed, 16 Dec 2015 15:28:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1056B20382 for ; Wed, 16 Dec 2015 15:28:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a9DyE-0000wq-Ks; Wed, 16 Dec 2015 15:26:26 +0000 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a9DqT-0000kD-2e for linux-arm-kernel@lists.infradead.org; Wed, 16 Dec 2015 15:18:27 +0000 Received: by mail-wm0-x22d.google.com with SMTP id l126so43181730wml.0 for ; Wed, 16 Dec 2015 07:18:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+412m+6ydg9iTY9A9jDXddqhjHbIoakpLEj68IT6FSQ=; b=E2Z/Ay8+cz3y+JAawhnzR7zzZKwUtJh+oPtkbbkQnya6htUGsyAmVsTiRIv7n1v6/+ 8/+dEICquyGUYzTWF/0oz7vl45NKQjwr8bM5GnFrQBKYyutzbeqhjzYV7JJLp3h2amnF IcY5d5OqZcyKUSGYid+sdNRRQJrl3fKnqyKHApmx1mrgFN84D3HiTK4otMbK23cTiPHH r/ZAWMl02vjQ/1H69BV1Oif+H5m8Jv6GBZMtpExHCfyxy+KeyhAbgijgY8mFmD/3Z6hS 5FPj97czr7eKyjgm9/tt2hYPDdmqHER6TDm7GRx5q0XlnVfbUz8+LMLIwMBM3H7qQDdf cR4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+412m+6ydg9iTY9A9jDXddqhjHbIoakpLEj68IT6FSQ=; b=fNiqUqt6JuMahamkJSZEPuZX8eWSzNdRx2KHbGJWHYxZgmRV60OgAVaqptP6IZXl1M 0ez98PUMYZJURBKfb0BHj274Hk1zWQrX0/DGsKKpcphb8rSBLRPZRui7CV06gCmCdLnW So9/qsb0EG5m5vrXaSAYIQ8S+ZCL035ki9e2gOQvLXjpkSt9MLGovPaSZyJGsiOl1CId 9mYoyaAIoJze4BppT/+tyorBcr6SdeEPvSWlaV6VWHJI48M586hs30wYVsNSYAd+iKoz JuPiOykpsAA2Zq+QySdjJE42Zd0ya2cNUUEfQti+KM2kZBsfs6H9Eu1Zyk9U5uDOMLnQ r+Xg== X-Gm-Message-State: ALoCoQl8ztuXVSbEawBwhxNJ5OzDRfNgiMBlA0jq0jD0WtCBfZWVf1hdZAwbpeqRsU9qVbPnXEXLqdeQlviXs+Up3Ar2Sfp9gg== X-Received: by 10.28.125.201 with SMTP id y192mr12611084wmc.23.1450279084610; Wed, 16 Dec 2015 07:18:04 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.18.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:04 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Subject: [PATCH V2 14/23] pci, acpi: Provide generic way to assign bus domain number. Date: Wed, 16 Dec 2015 16:16:24 +0100 Message-Id: <1450278993-12664-15-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-1-git-send-email-tn@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151216_071825_359091_7BC29DCF X-CRM114-Status: GOOD ( 15.28 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jchandra@broadcom.com, jcm@redhat.com, linaro-acpi@lists.linaro.org, linux-pci@vger.kernel.org, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, robert.richter@caviumnetworks.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, wangyijing@huawei.com, Tomasz Nowicki , tglx@linutronix.de, mw@semihalf.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As we now have valid PCI host bridge device reference we can introduce code that is going to find its bus domain number using ACPI _SEG method. Note that _SEG method is optional, therefore _SEG absence means that all PCI buses belong to domain 0. Signed-off-by: Tomasz Nowicki Reviewed-by: Liviu Dudau Tested-by: Suravee Suthikulpanit --- drivers/pci/pci.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7274006..39a985b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -4796,14 +4797,34 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) * API and update the use_dt_domains value to keep track of method we * are using to assign domain numbers (use_dt_domains = 0). * + * IF ACPI, we expect non-DT method (use_dt_domains == -1) + * and call _SEG method for corresponding host bridge device. + * If _SEG method does not exist, following ACPI spec (6.5.6) + * all PCI buses belong to domain 0. + * * All other combinations imply we have a platform that is trying - * to mix domain numbers obtained from DT and pci_get_new_domain_nr(), - * which is a recipe for domain mishandling and it is prevented by - * invalidating the domain value (domain = -1) and printing a - * corresponding error. + * to mix domain numbers obtained from DT, ACPI and + * pci_get_new_domain_nr(), which is a recipe for domain mishandling and + * it is prevented by invalidating the domain value (domain = -1) and + * printing a corresponding error. */ + if (domain >= 0 && use_dt_domains) { use_dt_domains = 1; +#ifdef CONFIG_ACPI + } else if (!acpi_disabled && use_dt_domains == -1) { + struct acpi_device *acpi_dev = to_acpi_device(parent); + unsigned long long segment = 0; + acpi_status status; + + status = acpi_evaluate_integer(acpi_dev->handle, + METHOD_NAME__SEG, NULL, + &segment); + if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) + dev_err(&acpi_dev->dev, "can't evaluate _SEG\n"); + + domain = segment; +#endif } else if (domain < 0 && use_dt_domains != 1) { use_dt_domains = 0; domain = pci_get_new_domain_nr();