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=-11.2 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_SANE_1 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 D2A74C433E7 for ; Fri, 9 Oct 2020 09:49:23 +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 5C7042225D for ; Fri, 9 Oct 2020 09:49:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZsBeVlTm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C7042225D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ovk6XdYi46VvriwC5WU6ufpu1CwQGrxJCdXrQ7PcCSU=; b=ZsBeVlTmyhk4D0DJinZj1INR8 NkTMmlOrPCGeJG1my7wNbmQGiSlaSH8zt03JLpc+dbWEcoEFS0AF8ybsmFAbcEstxJkXofS3joyzR 3aMy/l72OpjUzVegxLk4IiibY90adMdi6dbuOxpEenp1/YisLa+iFw0sPWZjSKIqnuf5re4KjuL3l pzC4U72ioxjMfs8e9mAKjNrPpHnjwST/pg8RjDQmHoIMvXzGYezwSpQf58t4/Eo2rzv2IABJTmGjo oLde3ABhVRtGFvcqXA7TswTtG5mNCKy7JcIip70+JTG629updYR2Yh3mSmoqDB9xVwitIUhSdIrUP ShVNwN3YA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQp0M-0004ze-Nj; Fri, 09 Oct 2020 09:48:02 +0000 Received: from mga07.intel.com ([134.134.136.100]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQp0J-0004ya-Uh for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2020 09:48:00 +0000 IronPort-SDR: JMHYDLOpWkAOCzAJtIKE0ZSTaQspvTEso7dsG8qYYaDZ5QRmPc+ihLo5kH88ijg0kkaYJzH9Ta SsOY8FCS/wOw== X-IronPort-AV: E=McAfee;i="6000,8403,9768"; a="229649691" X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="229649691" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2020 02:47:57 -0700 IronPort-SDR: pPywwhoQ8IZ0oqnSyAy7Si9u7fhcqFsuiRTRfdjMWfQODPzT5+PsDTX8QsBMudIyk2KOf3VcKr TS88VD5e6ZZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,354,1596524400"; d="scan'208";a="298385120" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga008.fm.intel.com with SMTP; 09 Oct 2020 02:47:51 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 09 Oct 2020 12:47:50 +0300 Date: Fri, 9 Oct 2020 12:47:50 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Daniel Vetter Subject: Re: [PATCH v2 17/17] drm/i915: Properly request PCI BARs Message-ID: <20201009094750.GQ6112@intel.com> References: <20201009075934.3509076-1-daniel.vetter@ffwll.ch> <20201009075934.3509076-18-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201009075934.3509076-18-daniel.vetter@ffwll.ch> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201009_054800_104998_C91D3E49 X-CRM114-Status: GOOD ( 32.93 ) 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, linux-mm@kvack.org, linux-pci@vger.kernel.org, LKML , DRI Development , Jason Gunthorpe , =?iso-8859-1?B?Suly9G1l?= Glisse , 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="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 09, 2020 at 09:59:34AM +0200, Daniel Vetter wrote: > 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=E9r=F4me 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/i= ntel_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 =3D i915->drm.pdev; > int mmio_bar; > int mmio_size; > + int bar_selection; Signed bitmasks always make me uneasy. But looks like that's what it is in the pci api. So meh. > + int ret; > = > mmio_bar =3D IS_GEN(i915, 2) ? 1 : 0; > + bar_selection =3D BIT (2) | BIT(mmio_bar); ^ spurious space = That's also not correct for gen2 I think. gen2: 0 =3D GMADR 1 =3D MMADR 2 =3D IOBAR gen3: 0 =3D MMADR 1 =3D IOBAR 2 =3D GMADR 3 =3D GTTADR gen4+: 0+1 =3D GTTMMADR 2+3 =3D GMADR 4 =3D IOBAR Maybe we should just have an explicit list of bars like that in a comment? I'd also suggest sucking this bitmask calculation into a small helper so you can reuse it for the release. > /* > - * 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 *u= ncore) > * generations up to Ironlake. > * For dgfx chips register range is expanded to 4MB. > */ > + if (INTEL_GEN(i915) =3D=3D 3) > + bar_selection |=3D BIT(3); > if (INTEL_GEN(i915) < 5) > mmio_size =3D 512 * 1024; > else if (IS_DGFX(i915)) > @@ -1710,8 +1715,15 @@ static int uncore_mmio_setup(struct intel_uncore *= uncore) > else > mmio_size =3D 2 * 1024 * 1024; > = > + ret =3D 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 =3D pci_iomap(pdev, mmio_bar, mmio_size); > if (uncore->regs =3D=3D 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 =3D uncore->i915->drm.pdev; > + struct drm_i915_private *i915 =3D uncore->i915; > + struct pci_dev *pdev =3D i915->drm.pdev; > + int mmio_bar; > + int bar_selection; > + > + mmio_bar =3D IS_GEN(i915, 2) ? 1 : 0; > + bar_selection =3D BIT (2) | BIT(mmio_bar); > + if (INTEL_GEN(i915) =3D=3D 3) > + bar_selection |=3D 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 > = > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel