From patchwork Wed May 16 18:23:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10405679 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 78C11602C2 for ; Thu, 17 May 2018 07:17:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6302D28731 for ; Thu, 17 May 2018 07:17:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57B5B28807; Thu, 17 May 2018 07:17:47 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A2E228731 for ; Thu, 17 May 2018 07:17:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B4026E62D; Thu, 17 May 2018 07:16:15 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 303036E2BE for ; Wed, 16 May 2018 18:24:02 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id AA22B605FD; Wed, 16 May 2018 18:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526495040; bh=rvEfBnKpeAymFNS8nIqQEnrYberNfh11BH2n5nAtr2A=; h=From:To:Cc:Subject:Date:From; b=MBmKoAUNDyuMR8haPVEV0aQ/aqCxniPONOigaDOTZBbWai0jxMv53fe1ZD/TuH4st CJZX7MHcImwvKxUTmOkHREnsAOwSCWKjO5ZPnOqXpju7q0MuxBxWlEG8u5jDGcNr+1 jkqIOR/ZVnay6dYrs3z0BiS4RiWE9UqKJAGNvxp4= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5BE8360558; Wed, 16 May 2018 18:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526495040; bh=rvEfBnKpeAymFNS8nIqQEnrYberNfh11BH2n5nAtr2A=; h=From:To:Cc:Subject:Date:From; b=MBmKoAUNDyuMR8haPVEV0aQ/aqCxniPONOigaDOTZBbWai0jxMv53fe1ZD/TuH4st CJZX7MHcImwvKxUTmOkHREnsAOwSCWKjO5ZPnOqXpju7q0MuxBxWlEG8u5jDGcNr+1 jkqIOR/ZVnay6dYrs3z0BiS4RiWE9UqKJAGNvxp4= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 5BE8360558 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Subject: [RFC PATCH] efi/fb: Convert PCI bus address to resource if translated by the bridge Date: Wed, 16 May 2018 14:23:49 -0400 Message-Id: <1526495029-25783-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 17 May 2018 07:15:35 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:EFIFB FRAMEBUFFER DRIVER" , Bartlomiej Zolnierkiewicz , linux-arm-msm@vger.kernel.org, open list , "open list:FRAMEBUFFER LAYER" , Sinan Kaya , Peter Jones , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP A host bridge is allowed to remap BAR addresses using _TRA attribute in _CRS windows. pci_bus 0000:00: root bus resource [mem 0x80100100000-0x8011fffffff window] (bus address [0x00100000-0x1fffffff]) pci 0000:02:00.0: reg 0x10: [mem 0x8011e000000-0x8011effffff] When a VGA device is behind such a host bridge and the resource is translated efifb driver is trying to do ioremap against bus address rather than the resource address and is failing to probe. efifb driver is having difficulty locating the base address from BAR address when efifb: probing for efifb efifb: cannot reserve video memory at 0x1e000000 efifb: framebuffer at 0x1e000000, using 1920k, total 1875k efifb: mode is 800x600x32, linelength=3200, pages=1 efifb: scrolling: redraw efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0 Use the host bridge offset information to convert bus address to resource address in the fixup. Signed-off-by: Sinan Kaya --- drivers/video/fbdev/efifb.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 46a4484..feef02b 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -428,6 +428,8 @@ static void efifb_fixup_resources(struct pci_dev *dev) { u64 base = screen_info.lfb_base; u64 size = screen_info.lfb_size; + struct pci_host_bridge *bridge; + struct resource_entry *window; int i; if (efifb_pci_dev || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) @@ -439,6 +441,27 @@ static void efifb_fixup_resources(struct pci_dev *dev) if (!base) return; + bridge = pci_find_host_bridge(dev->bus); + if (!bridge) + return; + + resource_list_for_each_entry(window, &bridge->windows) { + phys_addr_t win_start; + phys_addr_t win_end; + size_t win_size; + + if (resource_type(window->res) != IORESOURCE_MEM) + continue; + + win_start = window->res->start - window->offset; + win_end = window->res->end - window->offset; + win_size = window->res->end - window->res->start + 1; + if (win_start <= base && win_end >= base + win_size - 1) { + base += window->offset; + break; + } + } + for (i = 0; i <= PCI_STD_RESOURCE_END; i++) { struct resource *res = &dev->resource[i];