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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 5EB0EC2BD0C for ; Fri, 9 Oct 2020 08:00:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D74822283 for ; Fri, 9 Oct 2020 08:00:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="AmZWcTmT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732358AbgJIIAi (ORCPT ); Fri, 9 Oct 2020 04:00:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732793AbgJIIAT (ORCPT ); Fri, 9 Oct 2020 04:00:19 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 406A9C0613D9 for ; Fri, 9 Oct 2020 01:00:18 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id n6so8949195wrm.13 for ; Fri, 09 Oct 2020 01:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=AmZWcTmTMY3aRt6Gxo6D+cFSlAKtbo7rzcAhKQblXce5J0bM+0jidwIuX1SJM78PW3 a4CzgO4OyPIunTZ40M8qjiQpRIe+CXuCN2QeQz0Nq3eitwpnmxf1tCSrmdU7BFARQUrJ TsYEd08BMm8jvttMOB5N0WbB01Om3gekKiY/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=gN/bdSP2f0NsLtyJ/47/lykgId3QlYyXpNLp9V6H+M8w7N4cQYgoWXtX4+Tlt0F9oh /jIX/0mZoKYaDlmzQa/jqdwYLO8GO/HHeubHYYwV4Lm32hhvb0tVZYnAJ7Gg5ctwN2j/ uW8pdLnA5v4j0xqmaKP56nn9pHdoHtmawhaXXAc+2LU1SBQROl4kidaCqtuuUHKziidn G+SU/7uwZfTokj64/IJRxKxgSdGEJMgUfKPlQqU4EQRj4JHCMBP8M3zu7cUZfmFVFTQT atSLm1aMpADlWxYjdQxuHWcOfBwv9Um7aVNqK+FRbQnmqFPjAGTe27H2t2bsrKC6Pw/r 8pKQ== X-Gm-Message-State: AOAM532UvjO/1ADv/OFO25ZCjNRamk0S3Utb+dNKCFGYLTiXkeYX8jWi o2U6cvUS2QrGVTg5aoQKQOrDxQ== X-Google-Smtp-Source: ABdhPJyIgZ0DKgvAk38zXma7Xw6CtJtdY0QGkVhgcnr9L1zZ08hj8no1NH+SgdXtl2+3a6urGujNzQ== X-Received: by 2002:adf:fa02:: with SMTP id m2mr13160452wrr.273.1602230416967; Fri, 09 Oct 2020 01:00:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.01.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 01:00:16 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Cc: kvm@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, linux-s390@vger.kernel.org, Daniel Vetter , Daniel Vetter , Jason Gunthorpe , Kees Cook , Dan Williams , Andrew Morton , John Hubbard , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jan Kara , Bjorn Helgaas , linux-pci@vger.kernel.org Subject: [PATCH v2 17/17] drm/i915: Properly request PCI BARs Date: Fri, 9 Oct 2020 09:59:34 +0200 Message-Id: <20201009075934.3509076-18-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When trying to test my CONFIG_IO_STRICT_DEVMEM changes I realized they do nothing for i915. Because i915 doesn't request any regions, like pretty much all drm pci drivers. I guess this is some very old remnants from the userspace modesetting days, when we wanted to co-exist with the fbdev driver. Which usually requested these resources. But makes me wonder why the pci subsystem doesn't just request resource automatically when we map a bar and a pci driver is bound? Knowledge about which pci bars we need kludged together from intel_uncore.c and intel_gtt.c from i915 and intel-gtt.c over in the fake agp driver. Signed-off-by: Daniel Vetter Cc: Jason Gunthorpe Cc: Kees Cook Cc: Dan Williams Cc: Andrew Morton Cc: John Hubbard Cc: Jérôme Glisse Cc: Jan Kara Cc: Dan Williams Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org --- drivers/gpu/drm/i915/intel_uncore.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 54e201fdeba4..ce39049d8919 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1692,10 +1692,13 @@ static int uncore_mmio_setup(struct intel_uncore *uncore) struct pci_dev *pdev = i915->drm.pdev; int mmio_bar; int mmio_size; + int bar_selection; + int ret; mmio_bar = IS_GEN(i915, 2) ? 1 : 0; + bar_selection = BIT (2) | BIT(mmio_bar); /* - * Before gen4, the registers and the GTT are behind different BARs. + * On gen3 the registers and the GTT are behind different BARs. * However, from gen4 onwards, the registers and the GTT are shared * in the same BAR, so we want to restrict this ioremap from * clobbering the GTT which we want ioremap_wc instead. Fortunately, @@ -1703,6 +1706,8 @@ static int uncore_mmio_setup(struct intel_uncore *uncore) * generations up to Ironlake. * For dgfx chips register range is expanded to 4MB. */ + if (INTEL_GEN(i915) == 3) + bar_selection |= BIT(3); if (INTEL_GEN(i915) < 5) mmio_size = 512 * 1024; else if (IS_DGFX(i915)) @@ -1710,8 +1715,15 @@ static int uncore_mmio_setup(struct intel_uncore *uncore) else mmio_size = 2 * 1024 * 1024; + ret = pci_request_selected_regions(pdev, bar_selection, "i915"); + if (ret < 0) { + drm_err(&i915->drm, "failed to request pci bars\n"); + return ret; + } + uncore->regs = pci_iomap(pdev, mmio_bar, mmio_size); if (uncore->regs == NULL) { + pci_release_selected_regions(pdev, bar_selection); drm_err(&i915->drm, "failed to map registers\n"); return -EIO; } @@ -1721,9 +1733,18 @@ static int uncore_mmio_setup(struct intel_uncore *uncore) static void uncore_mmio_cleanup(struct intel_uncore *uncore) { - struct pci_dev *pdev = uncore->i915->drm.pdev; + struct drm_i915_private *i915 = uncore->i915; + struct pci_dev *pdev = i915->drm.pdev; + int mmio_bar; + int bar_selection; + + mmio_bar = IS_GEN(i915, 2) ? 1 : 0; + bar_selection = BIT (2) | BIT(mmio_bar); + if (INTEL_GEN(i915) == 3) + bar_selection |= BIT(3); pci_iounmap(pdev, uncore->regs); + pci_release_selected_regions(pdev, bar_selection); } void intel_uncore_init_early(struct intel_uncore *uncore, -- 2.28.0 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 2EAC7C433E7 for ; Fri, 9 Oct 2020 08:05:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B567221789 for ; Fri, 9 Oct 2020 08:05:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dKBWfAqd"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="AmZWcTmT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B567221789 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=On5qVf2ucnhFSDRPNsUckZ0HnyscE+xS1Q4vzt5Ens4=; b=dKBWfAqdsENi1qck3gwOlvszK Sn6v1mr4kwJ2iAYjAW9uFMcX8xfrzfPqEVKC0wvamwWGHLZmw1B03oIRvTrf30jJXJ0CQiiDV2Ecq 0jE9GsMjq05135DWQvYI29Q4R6NFkRir/bTVx9BZYdcIhGoaRwe6DlAdNVXB43+7Mfn12fRcxQnZv q2uiy/QbFCRm6Mdlbc29xND0c/hfRLZCCCV9ZM848dTF/Pss1h+7f8EwxUeSHUEvX1w22k41LSQr3 dnBnC2LIOlbV6Vj++YbyRTiYvB4XSF7QT6xQTbMFex1ssJpvZQC3GK111Gt9//r1IOhWlmMXRDC2E dmJbviLcA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQnN0-0003zq-AN; Fri, 09 Oct 2020 08:03:18 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQnK6-0002bi-Eh for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2020 08:00:33 +0000 Received: by mail-wr1-x442.google.com with SMTP id e18so9231593wrw.9 for ; Fri, 09 Oct 2020 01:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=AmZWcTmTMY3aRt6Gxo6D+cFSlAKtbo7rzcAhKQblXce5J0bM+0jidwIuX1SJM78PW3 a4CzgO4OyPIunTZ40M8qjiQpRIe+CXuCN2QeQz0Nq3eitwpnmxf1tCSrmdU7BFARQUrJ TsYEd08BMm8jvttMOB5N0WbB01Om3gekKiY/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=uC+a0nzKltMOGHkgyopS92JwBCvfQJBvDb/dsmF4u+JSpD0e+RorhJ7KoAhnIV1VWK C+4kXJlb8seGvu0YUsr5JAgexIkOQDuQh9tl0TDP5fWLbUfHzRRpVw6hKMtNw9zaEML3 HerYY1DqnVc3N7cbBHdNyMBFw8dyGBclmUmIArAOT6/cgjnAZRO70ZZMlg7mwgktYoxC xscPYIZDr8B/n32IzsaXJLdoGrf3O/nJKav1DXgDAKCVVpDQKTFOe4OEWVIikNou2eCW mEx0vo9uxdrQqFcgHckBkze4J0lUCcHsCfYFfbIvJFEXBZOL3reduYSjZyReYdUxU4gk erAQ== X-Gm-Message-State: AOAM5317OLc47/DUEJhsME3wmJUelgdJ+DWwSU/yB7c/8rvjCMv3K1M7 mCQVCC/MKYN6rZ+NnVMOKTnBRA== X-Google-Smtp-Source: ABdhPJyIgZ0DKgvAk38zXma7Xw6CtJtdY0QGkVhgcnr9L1zZ08hj8no1NH+SgdXtl2+3a6urGujNzQ== X-Received: by 2002:adf:fa02:: with SMTP id m2mr13160452wrr.273.1602230416967; Fri, 09 Oct 2020 01:00:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.01.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 01:00:16 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v2 17/17] drm/i915: Properly request PCI BARs Date: Fri, 9 Oct 2020 09:59:34 +0200 Message-Id: <20201009075934.3509076-18-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201009_040018_609242_89DF0CE1 X-CRM114-Status: GOOD ( 21.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Jan Kara , Kees Cook , kvm@vger.kernel.org, Jason Gunthorpe , Daniel Vetter , linux-pci@vger.kernel.org, linux-mm@kvack.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , John Hubbard , Bjorn Helgaas , Daniel Vetter , Dan Williams , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org V2hlbiB0cnlpbmcgdG8gdGVzdCBteSBDT05GSUdfSU9fU1RSSUNUX0RFVk1FTSBjaGFuZ2VzIEkg cmVhbGl6ZWQgdGhleQpkbyBub3RoaW5nIGZvciBpOTE1LiBCZWNhdXNlIGk5MTUgZG9lc24ndCBy ZXF1ZXN0IGFueSByZWdpb25zLCBsaWtlCnByZXR0eSBtdWNoIGFsbCBkcm0gcGNpIGRyaXZlcnMu IEkgZ3Vlc3MgdGhpcyBpcyBzb21lIHZlcnkgb2xkCnJlbW5hbnRzIGZyb20gdGhlIHVzZXJzcGFj ZSBtb2Rlc2V0dGluZyBkYXlzLCB3aGVuIHdlIHdhbnRlZCB0bwpjby1leGlzdCB3aXRoIHRoZSBm YmRldiBkcml2ZXIuIFdoaWNoIHVzdWFsbHkgcmVxdWVzdGVkIHRoZXNlCnJlc291cmNlcy4KCkJ1 dCBtYWtlcyBtZSB3b25kZXIgd2h5IHRoZSBwY2kgc3Vic3lzdGVtIGRvZXNuJ3QganVzdCByZXF1 ZXN0CnJlc291cmNlIGF1dG9tYXRpY2FsbHkgd2hlbiB3ZSBtYXAgYSBiYXIgYW5kIGEgcGNpIGRy aXZlciBpcyBib3VuZD8KCktub3dsZWRnZSBhYm91dCB3aGljaCBwY2kgYmFycyB3ZSBuZWVkIGts dWRnZWQgdG9nZXRoZXIgZnJvbQppbnRlbF91bmNvcmUuYyBhbmQgaW50ZWxfZ3R0LmMgZnJvbSBp OTE1IGFuZCBpbnRlbC1ndHQuYyBvdmVyIGluIHRoZQpmYWtlIGFncCBkcml2ZXIuCgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IEphc29u IEd1bnRob3JwZSA8amdnQHppZXBlLmNhPgpDYzogS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1 bS5vcmc+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogQmpvcm4gSGVsZ2Fh cyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5lbC5vcmcKLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDI1ICsrKysrKysrKysrKysr KysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggNTRlMjAxZmRlYmE0Li5j ZTM5MDQ5ZDg5MTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0xNjkyLDEw ICsxNjkyLDEzIEBAIHN0YXRpYyBpbnQgdW5jb3JlX21taW9fc2V0dXAoc3RydWN0IGludGVsX3Vu Y29yZSAqdW5jb3JlKQogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gaTkxNS0+ZHJtLnBkZXY7CiAJ aW50IG1taW9fYmFyOwogCWludCBtbWlvX3NpemU7CisJaW50IGJhcl9zZWxlY3Rpb247CisJaW50 IHJldDsKIAogCW1taW9fYmFyID0gSVNfR0VOKGk5MTUsIDIpID8gMSA6IDA7CisJYmFyX3NlbGVj dGlvbiA9IEJJVCAoMikgfCBCSVQobW1pb19iYXIpOwogCS8qCi0JICogQmVmb3JlIGdlbjQsIHRo ZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBkaWZmZXJlbnQgQkFScy4KKwkgKiBP biBnZW4zIHRoZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBkaWZmZXJlbnQgQkFS cy4KIAkgKiBIb3dldmVyLCBmcm9tIGdlbjQgb253YXJkcywgdGhlIHJlZ2lzdGVycyBhbmQgdGhl IEdUVCBhcmUgc2hhcmVkCiAJICogaW4gdGhlIHNhbWUgQkFSLCBzbyB3ZSB3YW50IHRvIHJlc3Ry aWN0IHRoaXMgaW9yZW1hcCBmcm9tCiAJICogY2xvYmJlcmluZyB0aGUgR1RUIHdoaWNoIHdlIHdh bnQgaW9yZW1hcF93YyBpbnN0ZWFkLiBGb3J0dW5hdGVseSwKQEAgLTE3MDMsNiArMTcwNiw4IEBA IHN0YXRpYyBpbnQgdW5jb3JlX21taW9fc2V0dXAoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3Jl KQogCSAqIGdlbmVyYXRpb25zIHVwIHRvIElyb25sYWtlLgogCSAqIEZvciBkZ2Z4IGNoaXBzIHJl Z2lzdGVyIHJhbmdlIGlzIGV4cGFuZGVkIHRvIDRNQi4KIAkgKi8KKwlpZiAoSU5URUxfR0VOKGk5 MTUpID09IDMpCisJCWJhcl9zZWxlY3Rpb24gfD0gQklUKDMpOwogCWlmIChJTlRFTF9HRU4oaTkx NSkgPCA1KQogCQltbWlvX3NpemUgPSA1MTIgKiAxMDI0OwogCWVsc2UgaWYgKElTX0RHRlgoaTkx NSkpCkBAIC0xNzEwLDggKzE3MTUsMTUgQEAgc3RhdGljIGludCB1bmNvcmVfbW1pb19zZXR1cChz dHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCiAJZWxzZQogCQltbWlvX3NpemUgPSAyICogMTAy NCAqIDEwMjQ7CiAKKwlyZXQgPSBwY2lfcmVxdWVzdF9zZWxlY3RlZF9yZWdpb25zKHBkZXYsIGJh cl9zZWxlY3Rpb24sICJpOTE1Iik7CisJaWYgKHJldCA8IDApIHsKKwkJZHJtX2VycigmaTkxNS0+ ZHJtLCAiZmFpbGVkIHRvIHJlcXVlc3QgcGNpIGJhcnNcbiIpOworCQlyZXR1cm4gcmV0OworCX0K KwogCXVuY29yZS0+cmVncyA9IHBjaV9pb21hcChwZGV2LCBtbWlvX2JhciwgbW1pb19zaXplKTsK IAlpZiAodW5jb3JlLT5yZWdzID09IE5VTEwpIHsKKwkJcGNpX3JlbGVhc2Vfc2VsZWN0ZWRfcmVn aW9ucyhwZGV2LCBiYXJfc2VsZWN0aW9uKTsKIAkJZHJtX2VycigmaTkxNS0+ZHJtLCAiZmFpbGVk IHRvIG1hcCByZWdpc3RlcnNcbiIpOwogCQlyZXR1cm4gLUVJTzsKIAl9CkBAIC0xNzIxLDkgKzE3 MzMsMTggQEAgc3RhdGljIGludCB1bmNvcmVfbW1pb19zZXR1cChzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUpCiAKIHN0YXRpYyB2b2lkIHVuY29yZV9tbWlvX2NsZWFudXAoc3RydWN0IGludGVs X3VuY29yZSAqdW5jb3JlKQogewotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gdW5jb3JlLT5pOTE1 LT5kcm0ucGRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHVuY29yZS0+aTkx NTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGk5MTUtPmRybS5wZGV2OworCWludCBtbWlvX2Jh cjsKKwlpbnQgYmFyX3NlbGVjdGlvbjsKKworCW1taW9fYmFyID0gSVNfR0VOKGk5MTUsIDIpID8g MSA6IDA7CisJYmFyX3NlbGVjdGlvbiA9IEJJVCAoMikgfCBCSVQobW1pb19iYXIpOworCWlmIChJ TlRFTF9HRU4oaTkxNSkgPT0gMykKKwkJYmFyX3NlbGVjdGlvbiB8PSBCSVQoMyk7CiAKIAlwY2lf aW91bm1hcChwZGV2LCB1bmNvcmUtPnJlZ3MpOworCXBjaV9yZWxlYXNlX3NlbGVjdGVkX3JlZ2lv bnMocGRldiwgYmFyX3NlbGVjdGlvbik7CiB9CiAKIHZvaWQgaW50ZWxfdW5jb3JlX2luaXRfZWFy bHkoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlLAotLSAKMi4yOC4wCgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWls aW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0 cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= 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=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 74000C388D0 for ; Fri, 9 Oct 2020 08:00:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F03122269 for ; Fri, 9 Oct 2020 08:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="AmZWcTmT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F03122269 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE5E06EC7C; Fri, 9 Oct 2020 08:00:20 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D8636EC7A for ; Fri, 9 Oct 2020 08:00:18 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id g12so9221530wrp.10 for ; Fri, 09 Oct 2020 01:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=AmZWcTmTMY3aRt6Gxo6D+cFSlAKtbo7rzcAhKQblXce5J0bM+0jidwIuX1SJM78PW3 a4CzgO4OyPIunTZ40M8qjiQpRIe+CXuCN2QeQz0Nq3eitwpnmxf1tCSrmdU7BFARQUrJ TsYEd08BMm8jvttMOB5N0WbB01Om3gekKiY/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VnPfmIw9ZEJAdxqVy4AIvj5gzcDwS/bnZ7Vl10D80aI=; b=f9ezqigvpn+qXUzrLn527ABAOBApu7FxyO/U82M6CpIwXKrb+EdGGZMJkOeXrdyg+b Ejq1Q7rID7W1shvopzHInSQ7zJnH9OMa5dv+TIB7JeEHSbRX8l2+sx9VjfDP3zQPHEam 51bQ1Loqezin3boRkHcrLykkWcmb4ch/x/lApTC1qNUaa+5xNXw4NM5CQnfrOqJyNMMK +cDfResyQXhVYnYS1mf7GjlIIagc/sF0SRm37RwIk5w/KN5vThlnyLI83QJKMCbtb5sI 8/gvyNGA/IzD7Xz99TdBRdC51L4tD+GMS2PMyD5vIcgRPo6qY7NTuB1OPqUV8mz1q7LD J17w== X-Gm-Message-State: AOAM533j0joSoZI1rrYU18PJQ1AvK9OcESO8W7t3qAoMT8AwFFQSwj9b 4pPjlUVw+/fusdLMqTHHkbpx/+q5qx42hD1e X-Google-Smtp-Source: ABdhPJyIgZ0DKgvAk38zXma7Xw6CtJtdY0QGkVhgcnr9L1zZ08hj8no1NH+SgdXtl2+3a6urGujNzQ== X-Received: by 2002:adf:fa02:: with SMTP id m2mr13160452wrr.273.1602230416967; Fri, 09 Oct 2020 01:00:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u17sm11634118wri.45.2020.10.09.01.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 01:00:16 -0700 (PDT) From: Daniel Vetter To: DRI Development , LKML Subject: [PATCH v2 17/17] drm/i915: Properly request PCI BARs Date: Fri, 9 Oct 2020 09:59:34 +0200 Message-Id: <20201009075934.3509076-18-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> References: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Jan Kara , Kees Cook , kvm@vger.kernel.org, Jason Gunthorpe , Daniel Vetter , linux-pci@vger.kernel.org, linux-mm@kvack.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , John Hubbard , Bjorn Helgaas , Daniel Vetter , Dan Williams , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" V2hlbiB0cnlpbmcgdG8gdGVzdCBteSBDT05GSUdfSU9fU1RSSUNUX0RFVk1FTSBjaGFuZ2VzIEkg cmVhbGl6ZWQgdGhleQpkbyBub3RoaW5nIGZvciBpOTE1LiBCZWNhdXNlIGk5MTUgZG9lc24ndCBy ZXF1ZXN0IGFueSByZWdpb25zLCBsaWtlCnByZXR0eSBtdWNoIGFsbCBkcm0gcGNpIGRyaXZlcnMu IEkgZ3Vlc3MgdGhpcyBpcyBzb21lIHZlcnkgb2xkCnJlbW5hbnRzIGZyb20gdGhlIHVzZXJzcGFj ZSBtb2Rlc2V0dGluZyBkYXlzLCB3aGVuIHdlIHdhbnRlZCB0bwpjby1leGlzdCB3aXRoIHRoZSBm YmRldiBkcml2ZXIuIFdoaWNoIHVzdWFsbHkgcmVxdWVzdGVkIHRoZXNlCnJlc291cmNlcy4KCkJ1 dCBtYWtlcyBtZSB3b25kZXIgd2h5IHRoZSBwY2kgc3Vic3lzdGVtIGRvZXNuJ3QganVzdCByZXF1 ZXN0CnJlc291cmNlIGF1dG9tYXRpY2FsbHkgd2hlbiB3ZSBtYXAgYSBiYXIgYW5kIGEgcGNpIGRy aXZlciBpcyBib3VuZD8KCktub3dsZWRnZSBhYm91dCB3aGljaCBwY2kgYmFycyB3ZSBuZWVkIGts dWRnZWQgdG9nZXRoZXIgZnJvbQppbnRlbF91bmNvcmUuYyBhbmQgaW50ZWxfZ3R0LmMgZnJvbSBp OTE1IGFuZCBpbnRlbC1ndHQuYyBvdmVyIGluIHRoZQpmYWtlIGFncCBkcml2ZXIuCgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IEphc29u IEd1bnRob3JwZSA8amdnQHppZXBlLmNhPgpDYzogS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1 bS5vcmc+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IEFu ZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2huIEh1YmJhcmQg PGpodWJiYXJkQG52aWRpYS5jb20+CkNjOiBKw6lyw7RtZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0 LmNvbT4KQ2M6IEphbiBLYXJhIDxqYWNrQHN1c2UuY3o+CkNjOiBEYW4gV2lsbGlhbXMgPGRhbi5q LndpbGxpYW1zQGludGVsLmNvbT4KQ2M6IGxpbnV4LW1tQGt2YWNrLm9yZwpDYzogbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtl cm5lbC5vcmcKQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9yZwpDYzogQmpvcm4gSGVsZ2Fh cyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KQ2M6IGxpbnV4LXBjaUB2Z2VyLmtlcm5lbC5vcmcKLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDI1ICsrKysrKysrKysrKysr KysrKysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggNTRlMjAxZmRlYmE0Li5j ZTM5MDQ5ZDg5MTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0xNjkyLDEw ICsxNjkyLDEzIEBAIHN0YXRpYyBpbnQgdW5jb3JlX21taW9fc2V0dXAoc3RydWN0IGludGVsX3Vu Y29yZSAqdW5jb3JlKQogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gaTkxNS0+ZHJtLnBkZXY7CiAJ aW50IG1taW9fYmFyOwogCWludCBtbWlvX3NpemU7CisJaW50IGJhcl9zZWxlY3Rpb247CisJaW50 IHJldDsKIAogCW1taW9fYmFyID0gSVNfR0VOKGk5MTUsIDIpID8gMSA6IDA7CisJYmFyX3NlbGVj dGlvbiA9IEJJVCAoMikgfCBCSVQobW1pb19iYXIpOwogCS8qCi0JICogQmVmb3JlIGdlbjQsIHRo ZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBkaWZmZXJlbnQgQkFScy4KKwkgKiBP biBnZW4zIHRoZSByZWdpc3RlcnMgYW5kIHRoZSBHVFQgYXJlIGJlaGluZCBkaWZmZXJlbnQgQkFS cy4KIAkgKiBIb3dldmVyLCBmcm9tIGdlbjQgb253YXJkcywgdGhlIHJlZ2lzdGVycyBhbmQgdGhl IEdUVCBhcmUgc2hhcmVkCiAJICogaW4gdGhlIHNhbWUgQkFSLCBzbyB3ZSB3YW50IHRvIHJlc3Ry aWN0IHRoaXMgaW9yZW1hcCBmcm9tCiAJICogY2xvYmJlcmluZyB0aGUgR1RUIHdoaWNoIHdlIHdh bnQgaW9yZW1hcF93YyBpbnN0ZWFkLiBGb3J0dW5hdGVseSwKQEAgLTE3MDMsNiArMTcwNiw4IEBA IHN0YXRpYyBpbnQgdW5jb3JlX21taW9fc2V0dXAoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3Jl KQogCSAqIGdlbmVyYXRpb25zIHVwIHRvIElyb25sYWtlLgogCSAqIEZvciBkZ2Z4IGNoaXBzIHJl Z2lzdGVyIHJhbmdlIGlzIGV4cGFuZGVkIHRvIDRNQi4KIAkgKi8KKwlpZiAoSU5URUxfR0VOKGk5 MTUpID09IDMpCisJCWJhcl9zZWxlY3Rpb24gfD0gQklUKDMpOwogCWlmIChJTlRFTF9HRU4oaTkx NSkgPCA1KQogCQltbWlvX3NpemUgPSA1MTIgKiAxMDI0OwogCWVsc2UgaWYgKElTX0RHRlgoaTkx NSkpCkBAIC0xNzEwLDggKzE3MTUsMTUgQEAgc3RhdGljIGludCB1bmNvcmVfbW1pb19zZXR1cChz dHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpCiAJZWxzZQogCQltbWlvX3NpemUgPSAyICogMTAy NCAqIDEwMjQ7CiAKKwlyZXQgPSBwY2lfcmVxdWVzdF9zZWxlY3RlZF9yZWdpb25zKHBkZXYsIGJh cl9zZWxlY3Rpb24sICJpOTE1Iik7CisJaWYgKHJldCA8IDApIHsKKwkJZHJtX2VycigmaTkxNS0+ ZHJtLCAiZmFpbGVkIHRvIHJlcXVlc3QgcGNpIGJhcnNcbiIpOworCQlyZXR1cm4gcmV0OworCX0K KwogCXVuY29yZS0+cmVncyA9IHBjaV9pb21hcChwZGV2LCBtbWlvX2JhciwgbW1pb19zaXplKTsK IAlpZiAodW5jb3JlLT5yZWdzID09IE5VTEwpIHsKKwkJcGNpX3JlbGVhc2Vfc2VsZWN0ZWRfcmVn aW9ucyhwZGV2LCBiYXJfc2VsZWN0aW9uKTsKIAkJZHJtX2VycigmaTkxNS0+ZHJtLCAiZmFpbGVk IHRvIG1hcCByZWdpc3RlcnNcbiIpOwogCQlyZXR1cm4gLUVJTzsKIAl9CkBAIC0xNzIxLDkgKzE3 MzMsMTggQEAgc3RhdGljIGludCB1bmNvcmVfbW1pb19zZXR1cChzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUpCiAKIHN0YXRpYyB2b2lkIHVuY29yZV9tbWlvX2NsZWFudXAoc3RydWN0IGludGVs X3VuY29yZSAqdW5jb3JlKQogewotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gdW5jb3JlLT5pOTE1 LT5kcm0ucGRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHVuY29yZS0+aTkx NTsKKwlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGk5MTUtPmRybS5wZGV2OworCWludCBtbWlvX2Jh cjsKKwlpbnQgYmFyX3NlbGVjdGlvbjsKKworCW1taW9fYmFyID0gSVNfR0VOKGk5MTUsIDIpID8g MSA6IDA7CisJYmFyX3NlbGVjdGlvbiA9IEJJVCAoMikgfCBCSVQobW1pb19iYXIpOworCWlmIChJ TlRFTF9HRU4oaTkxNSkgPT0gMykKKwkJYmFyX3NlbGVjdGlvbiB8PSBCSVQoMyk7CiAKIAlwY2lf aW91bm1hcChwZGV2LCB1bmNvcmUtPnJlZ3MpOworCXBjaV9yZWxlYXNlX3NlbGVjdGVkX3JlZ2lv bnMocGRldiwgYmFyX3NlbGVjdGlvbik7CiB9CiAKIHZvaWQgaW50ZWxfdW5jb3JlX2luaXRfZWFy bHkoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlLAotLSAKMi4yOC4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK