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: 10404615 X-Patchwork-Delegate: bhelgaas@google.com 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 48800601D2 for ; Wed, 16 May 2018 18:24:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3900428526 for ; Wed, 16 May 2018 18:24:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DE3E2856D; Wed, 16 May 2018 18:24:22 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 D52A028526 for ; Wed, 16 May 2018 18:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbeEPSYE (ORCPT ); Wed, 16 May 2018 14:24:04 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56048 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbeEPSYC (ORCPT ); Wed, 16 May 2018 14:24:02 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5960D60558; Wed, 16 May 2018 18:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526495041; bh=rvEfBnKpeAymFNS8nIqQEnrYberNfh11BH2n5nAtr2A=; h=From:To:Cc:Subject:Date:From; b=fxQxG1CvJH/cpxNXnyVl6lDQGnKNgwXWRvZ8YGe3onDMRp/YtR93m12SqansycgJJ Jw9YrkgeEX7sEgjwNG5Evk/gZrQANsiK9ZPAjq51ROUX+6DNdZni7UUjSyTwSTH1qz vhXnwjahNGBi4fPW+qMSBs4i+FkqfAIAHNA3E1R8= 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Peter Jones , Bartlomiej Zolnierkiewicz , linux-fbdev@vger.kernel.org (open list:EFIFB FRAMEBUFFER DRIVER), dri-devel@lists.freedesktop.org (open list:FRAMEBUFFER LAYER), linux-kernel@vger.kernel.org (open list) 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 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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];