From patchwork Wed Nov 23 07:26:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Malaterre X-Patchwork-Id: 9442675 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 1DEE260778 for ; Wed, 23 Nov 2016 07:26:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FD9B1FE95 for ; Wed, 23 Nov 2016 07:26:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04791203C0; Wed, 23 Nov 2016 07:26:58 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 20FDF1FE95 for ; Wed, 23 Nov 2016 07:26:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932708AbcKWH04 (ORCPT ); Wed, 23 Nov 2016 02:26:56 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33395 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932707AbcKWH0z (ORCPT ); Wed, 23 Nov 2016 02:26:55 -0500 Received: by mail-wm0-f68.google.com with SMTP id u144so861637wmu.0 for ; Tue, 22 Nov 2016 23:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=7qf+kU2t3qTfruzmvVDz3qaQpAzqoJ+OO7MZnVoNY5k=; b=l+n+bttJrDjOniqtzv+IBgblXa6g3pBQJEoZ0FGU/QgmRIPzHcWo3DkQwLyFam2iW7 qCyoISq/ZP1kVRuPJBQh+LzbwtB1Se8iFtPCQiLLA38jnvCYxGz9RJSju59f/ljXVvyl SYm00A2tpe3zduiSXxdE/gmRM4iR8JhFfIddVB3/w2ApjK4k574wmUdoYSke7QuPO4aA j4ArPE00ycjBR/Vt3p6w6w484Fh8875L4fqgYdf9DPcnnt5YEUwkaVpeSyT0qZFoPzib 8HCUQgoeXS/dpefGNbnk4vAIU7mIatrbrq5dsP3r3RxW7/M4NL0Q/ph1dteSMXohOIUa anfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=7qf+kU2t3qTfruzmvVDz3qaQpAzqoJ+OO7MZnVoNY5k=; b=PCK/Lu4bHf4/dsNrkKS/jl/XXCLhcFkyP9GiENpD7rUKsvsQ/oN5p8iEJH7tGgDRW3 PMz1/zNQhnPH30S6PD5ZCfxjGxITjWfchedQ1iGKM+RSStGdg+0tjVl6vFuzP/OhzsNr XTPNDMNlff5oGeQWxyDc/w+Tm3oXBvuLeEgX9oNnMVqXJaNrOuRMDj2hlEGl+RZ3gWpc 1jyKnGJ58aQsTUWbAoDBGF13nj8X7DUZs7Q7Gs59p/dxC6SHLL9dg+qPt1p7QRK/wWEN aFViiWGCV5Fs0me2e26fOQ6uQPlC6bSMxRsUrcAg/Nax1bSxzcG2OR7F/vylpUrX4+DD IsMg== X-Gm-Message-State: AKaTC03q68e6MRn9eaLgWXhJDUU4mcYgToISzElCHfBFWwmDM5+Pr1qTBl6df6hzy7YjDQ== X-Received: by 10.28.37.70 with SMTP id l67mr5669018wml.128.1479886013953; Tue, 22 Nov 2016 23:26:53 -0800 (PST) Received: from maester.malat.net (bru31-1-78-225-226-121.fbx.proxad.net. [78.225.226.121]) by smtp.gmail.com with ESMTPSA id yj10sm34857483wjb.3.2016.11.22.23.26.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 23:26:52 -0800 (PST) Received: by maester.malat.net (Postfix, from userid 1000) id 7C52C1376035; Wed, 23 Nov 2016 08:26:50 +0100 (CET) From: Mathieu Malaterre To: linux-fbdev@vger.kernel.org Cc: Lennart Sorensen , Tomi Valkeinen , Jean-Christophe Plagniol-Villard , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, Mathieu Malaterre Subject: [PATCH v3] Fix loading of module radeonfb on PowerMac Date: Wed, 23 Nov 2016 08:26:41 +0100 Message-Id: <1479886001-27801-1-git-send-email-malat@debian.org> X-Mailer: git-send-email 2.1.4 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 When the linux kernel is build with (typical kernel ship with Debian installer): CONFIG_FB_OF=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_FB_RADEON=m The offb driver takes precedence over module radeonfb. It is then impossible to load the module, error reported is: [ 96.551486] radeonfb 0000:00:10.0: enabling device (0006 -> 0007) [ 96.551526] radeonfb 0000:00:10.0: BAR 0: can't reserve [mem 0x98000000-0x9fffffff pref] [ 96.551531] radeonfb (0000:00:10.0): cannot request region 0. [ 96.551545] radeonfb: probe of 0000:00:10.0 failed with error -16 This patch reproduce the behavior of the module radeon, so as to make it possible to load radeonfb when offb is first loaded. The problem is that offb call pci_request_region first, and then radeonfb tries to do it, and since one is trying to take over from the other, it can't do that because the area is already reserved. It should be noticed that `offb_destroy` is never called which explain the need to skip error detection on the radeonfb side. Signed-off-by: Mathieu Malaterre Link: https://bugs.debian.org/826629#57 Link: https://bugzilla.kernel.org/show_bug.cgi?id=119741 Suggested-by: Lennart Sorensen --- v2: Remove compilation warning v3: Hide error messages on PPC drivers/video/fbdev/aty/radeon_base.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 218339a..837c86a 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2259,6 +2259,22 @@ static struct bin_attribute edid2_attr = { .read = radeon_show_edid2, }; +static int radeon_kick_out_firmware_fb(struct pci_dev *pdev) +{ + struct apertures_struct *ap; + + ap = alloc_apertures(1); + if (!ap) + return -ENOMEM; + + ap->ranges[0].base = pci_resource_start(pdev, 0); + ap->ranges[0].size = pci_resource_len(pdev, 0); + + remove_conflicting_framebuffers(ap, KBUILD_MODNAME, false); + kfree(ap); + + return 0; +} static int radeonfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -2314,20 +2330,29 @@ static int radeonfb_pci_register(struct pci_dev *pdev, rinfo->fb_base_phys = pci_resource_start (pdev, 0); rinfo->mmio_base_phys = pci_resource_start (pdev, 2); + ret = radeon_kick_out_firmware_fb(pdev); + if (ret) + return ret; + /* request the mem regions */ ret = pci_request_region(pdev, 0, "radeonfb framebuffer"); + /* this is not an error on PowerMac where offb already requested mem regions */ +#ifndef CONFIG_PPC if (ret < 0) { printk( KERN_ERR "radeonfb (%s): cannot request region 0.\n", pci_name(rinfo->pdev)); goto err_release_fb; } +#endif ret = pci_request_region(pdev, 2, "radeonfb mmio"); +#ifndef CONFIG_PPC if (ret < 0) { printk( KERN_ERR "radeonfb (%s): cannot request region 2.\n", pci_name(rinfo->pdev)); goto err_release_pci0; } +#endif /* map the regions */ rinfo->mmio_base = ioremap(rinfo->mmio_base_phys, RADEON_REGSIZE); @@ -2511,10 +2536,12 @@ static int radeonfb_pci_register(struct pci_dev *pdev, iounmap(rinfo->mmio_base); err_release_pci2: pci_release_region(pdev, 2); +#ifndef CONFIG_PPC err_release_pci0: pci_release_region(pdev, 0); err_release_fb: framebuffer_release(info); +#endif err_disable: err_out: return ret;