From patchwork Tue Sep 19 17:05:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 9959663 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4556560208 for ; Tue, 19 Sep 2017 17:03:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 342F228E93 for ; Tue, 19 Sep 2017 17:03:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28F5C28EAA; Tue, 19 Sep 2017 17:03:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82A4228E93 for ; Tue, 19 Sep 2017 17:03:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751378AbdISRDN (ORCPT ); Tue, 19 Sep 2017 13:03:13 -0400 Received: from foss.arm.com ([217.140.101.70]:53206 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbdISRDL (ORCPT ); Tue, 19 Sep 2017 13:03:11 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 418721435; Tue, 19 Sep 2017 10:03:11 -0700 (PDT) Received: from red-moon.cambridge.arm.com (red-moon.cambridge.arm.com [10.1.206.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B780E3F58C; Tue, 19 Sep 2017 10:03:09 -0700 (PDT) From: Lorenzo Pieralisi To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, Lorenzo Pieralisi , Will Deacon , Robin Murphy , Zhou Wang , Alex Williamson Subject: [PATCH] ACPI/IORT: Fix PCI ACS enablement Date: Tue, 19 Sep 2017 18:05:39 +0100 Message-Id: <20170919170539.6265-1-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.10.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit f6810c15cf97 ("iommu/arm-smmu: Clean up early-probing workarounds") removed kernel code that was allowing to initialize and probe the SMMU devices early (ie earlier than PCI devices through linker script callback entries) in the boot process because it was not needed any longer in that the SMMU devices/drivers now support deferred probing. Since the SMMUs probe routines are also in charge of requesting global PCI ACS kernel enablement, commit f6810c15cf97 ("iommu/arm-smmu: Clean up early-probing workarounds") also postponed PCI ACS enablement to SMMUs devices probe time, which may be too late given that PCI devices needs to detect if PCI ACS is enabled to init the respective capability through the following call path: pci_device_add() -> pci_init_capabilities() -> pci_enable_acs() Add code in the ACPI IORT SMMU platform devices initialization path (that is called before ACPI PCI enumeration) to detect if an SMMU is present in HW and enable PCI ACS if it actually is, restoring the correct PCI ACS enablement sequencing. Fixes: f6810c15cf97 ("iommu/arm-smmu: Clean up early-probing Signed-workarounds") Signed-off-by: Lorenzo Pieralisi Cc: Will Deacon Cc: Robin Murphy Cc: Zhou Wang Cc: Alex Williamson Tested-by: Zhou Wang --- drivers/acpi/arm64/iort.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 9565d57..71a7694 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1184,6 +1184,7 @@ static void __init iort_init_platform_devices(void) struct acpi_table_iort *iort; struct fwnode_handle *fwnode; int i, ret; + bool smmu_detected = false; /* * iort_table and iort both point to the start of IORT table, but @@ -1218,11 +1219,21 @@ static void __init iort_init_platform_devices(void) acpi_free_fwnode_static(fwnode); return; } + + smmu_detected = true; } iort_node = ACPI_ADD_PTR(struct acpi_iort_node, iort_node, iort_node->length); } + + /* + * If IORT reports an SMMU component make sure PCI ACS is + * requested so that PCI devices can enable it in their + * capabilities. + */ + if (smmu_detected) + pci_request_acs(); } void __init acpi_iort_init(void)