From patchwork Fri May 18 14:17:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10410899 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 908E7602C2 for ; Fri, 18 May 2018 14:18:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F18682896D for ; Fri, 18 May 2018 14:18:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5FCF28984; Fri, 18 May 2018 14:18:39 +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=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 8199F2896D for ; Fri, 18 May 2018 14:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752175AbeEROSX (ORCPT ); Fri, 18 May 2018 10:18:23 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45988 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbeEROSA (ORCPT ); Fri, 18 May 2018 10:18:00 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B6D7460C67; Fri, 18 May 2018 14:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526653079; bh=3wVRqVZ3Etg5XL8E0GmBKUy3ejFaTF80FoqilqPgIpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoyPWvai/bShDa5ZPyQhYKeANgV/JWgLUlerHglhD9Vf9b7y+qyPyE5suI7ERm0wm kLet5XFsKfr8+XFbGQeGxHKhFzTROks+akt07g7Mz4nfL4BM2AG2Jhmcjt2NUPL66Q 2/VuMe19oHB8X8BIRANjSbFaJ+aBI5ZHPMSLSENs= 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 408EE601D7; Fri, 18 May 2018 14:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1526653079; bh=3wVRqVZ3Etg5XL8E0GmBKUy3ejFaTF80FoqilqPgIpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZoyPWvai/bShDa5ZPyQhYKeANgV/JWgLUlerHglhD9Vf9b7y+qyPyE5suI7ERm0wm kLet5XFsKfr8+XFbGQeGxHKhFzTROks+akt07g7Mz4nfL4BM2AG2Jhmcjt2NUPL66Q 2/VuMe19oHB8X8BIRANjSbFaJ+aBI5ZHPMSLSENs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 408EE601D7 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-fbdev@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 , dri-devel@lists.freedesktop.org (open list:FRAMEBUFFER LAYER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 2/2] efi/fb: Convert PCI bus address to resource if translated by the bridge Date: Fri, 18 May 2018 10:17:51 -0400 Message-Id: <1526653072-7153-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526653072-7153-1-git-send-email-okaya@codeaurora.org> References: <1526653072-7153-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@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: 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 Reviewed-by: Ard Biesheuvel Reviewed-by: Bjorn Helgaas Acked-by: Bartlomiej Zolnierkiewicz --- drivers/video/fbdev/efifb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 6daac8d..429cc85 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -431,6 +431,7 @@ static void efifb_fixup_resources(struct pci_dev *dev) .end = screen_info.lfb_base + screen_info.lfb_size - 1, .flags = IORESOURCE_MEM, }; + struct pci_bus_region region; int i; if (efifb_pci_dev || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI) @@ -442,6 +443,10 @@ static void efifb_fixup_resources(struct pci_dev *dev) if (!screen_res.start) return; + region.start = screen_res.start; + region.end = screen_res.end; + pcibios_bus_to_resource(dev->bus, &screen_res, ®ion); + for (i = 0; i <= PCI_STD_RESOURCE_END; i++) { struct resource *res = &dev->resource[i];