From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9354CC43387 for ; Tue, 15 Jan 2019 16:56:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6178220651 for ; Tue, 15 Jan 2019 16:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547571366; bh=ba9eQMaL4xcoW4WwK6AUf74HVaFGJt6K8avoSMnhq5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hB9ambehbL/DrjBTIGRxo0BEPAunKW5O94rnitMSANNyirCXPL74tyv258FzfAL4L dxvd57GhC6yYYjvPiv2oxa7kGGeZZiCjR60M0P+vFl5BSoBao2zj2yJ3zdAwwe6VcW SNg10/ViFFNR0NDtBh3MgQkob6V3v7dBOsPFMofo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728802AbfAOQz7 (ORCPT ); Tue, 15 Jan 2019 11:55:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:58776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732903AbfAOQl5 (ORCPT ); Tue, 15 Jan 2019 11:41:57 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74E632054F; Tue, 15 Jan 2019 16:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547570517; bh=ba9eQMaL4xcoW4WwK6AUf74HVaFGJt6K8avoSMnhq5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sW5UvJXa1Izh9JEpRkLWMvVYSkwG7YFMmcTr4kd8QuXypULaN36Iq/JEnWW+GMX6V sZm9TMA4vn8JIJt7rZ2fjl5Un48p1j4e8644lky1Ok2+o30uPIsALpJoypibvla0+Y ZQQJxnwHoAfgmlCqvII79EflS/NTp9sLygklEyh4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Auger , Jean-Philippe Brucker , Lorenzo Pieralisi , Robin Murphy , Will Deacon , Hanjun Guo , Sudeep Holla , Catalin Marinas , "Rafael J. Wysocki" Subject: [PATCH 4.19 23/50] ACPI/IORT: Fix rc_dma_get_range() Date: Tue, 15 Jan 2019 17:35:59 +0100 Message-Id: <20190115154911.292348420@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190115154909.933241945@linuxfoundation.org> References: <20190115154909.933241945@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jean-Philippe Brucker commit c7777236dd8f587f6a8d6800c03df318fd4d2627 upstream. When executed for a PCI_ROOT_COMPLEX type, iort_match_node_callback() expects the opaque pointer argument to be a PCI bus device. At the moment rc_dma_get_range() passes the PCI endpoint instead of the bus, and we've been lucky to have pci_domain_nr(ptr) return 0 instead of crashing. Pass the bus device to iort_scan_node(). Fixes: 5ac65e8c8941 ("ACPI/IORT: Support address size limit for root complexes") Reported-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Signed-off-by: Lorenzo Pieralisi Reviewed-by: Eric Auger Acked-by: Robin Murphy Cc: stable@vger.kernel.org Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: "Rafael J. Wysocki" Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/arm64/iort.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -951,9 +951,10 @@ static int rc_dma_get_range(struct devic { struct acpi_iort_node *node; struct acpi_iort_root_complex *rc; + struct pci_bus *pbus = to_pci_dev(dev)->bus; node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX, - iort_match_node_callback, dev); + iort_match_node_callback, &pbus->dev); if (!node || node->revision < 1) return -ENODEV;