From patchwork Tue Jan 7 00:56:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3445051 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 87A8B9F2E9 for ; Tue, 7 Jan 2014 00:58:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B64BD2017B for ; Tue, 7 Jan 2014 00:58:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E24B22016D for ; Tue, 7 Jan 2014 00:58:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757824AbaAGA4Q (ORCPT ); Mon, 6 Jan 2014 19:56:16 -0500 Received: from mail-ig0-f180.google.com ([209.85.213.180]:43839 "EHLO mail-ig0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757817AbaAGA4M (ORCPT ); Mon, 6 Jan 2014 19:56:12 -0500 Received: by mail-ig0-f180.google.com with SMTP id m12so277312iga.1 for ; Mon, 06 Jan 2014 16:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=9T7Y/UR4bKmxQrv8myohDpGymW0yiTAku2MI/57Xk9Q=; b=bNs4uSus8YiTg92lZpVGnKEFESltE7+tTBpNuOyQwnJ6+q+ENRnd/fKRtNT6Fcq/+J NUW30CIlq1mIsRdnGZwaV3LaZv/TktQ+T6l9Bw14bfUQPgPRi16i1lGrVVRAMfIDgxx8 xTntfF+/0JG1p2/eLv13GCBPYZdsQFMzxy/TL4VcxS6PYzol/5EMO019CQk0rFPMyRqF LSxd4vkEuIwYvKNOEn4FOv+L57LlamlA9YvBg2oQRGz/dXs8x3HK75Yy6oHt7gdXXHe/ /OJX5gfYAXMfPcFLP3Jo41lxjVqGTsCbwNhN3U06Ze4qq0BVO+O+BG0mgeTdsCbGfa8P DLeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=9T7Y/UR4bKmxQrv8myohDpGymW0yiTAku2MI/57Xk9Q=; b=hNjf4gZpbsVhvcyoe/+b6bpNld/HiZ2HADNCqWYS+PkHbOynsf93xyPm5xYTgbwm/l Vr3HwiW4to8rxFe1Vn1xxicDRvYgIhPsNPlGQfrtVKiUNs2qQ4puPx4ps0cDYsgH1OYZ c0IB4eU0WJIWdFt1fnj1aUB+Xz1BeWF54cYeMBhZ9FIUzA8huAx8LJKZxx6Czmf9bZxH /v9VMnKoouDU36oYcb6h289dbTTDUtdpKsTqfm+LtM+3BKzQAOycNZuM4K3oNNV2Flxi TPpmMLF4PyTuwPzdGPeTw81LSMghHl+dSN700aDbi6dlZVBfpxO9k+ojfuCJcK3+tDR8 u6yQ== X-Gm-Message-State: ALoCoQlx3UC9Hiwik1GEaSIPh+rkH/I0NntGwczhG7FC1ngt/Gcq1GXtczRcn/EiSngH/k2SWPnVnp4YaGNo6hd6xtTPURRpUwO2nkIT5tYccweHqX2K2rMnjv1aD8Gs85vKcZYqrDtBHP9w5blnAHY/KVSJBo8PVcmrvAKitPHg+1M6/pyPtsMSfsPXlu6RHJeM0Ex9vy/I7bgJv44BsUPJCWOK9r8czkqlcwdlcta7/ViiCpys6a4= X-Received: by 10.50.78.200 with SMTP id d8mr22472908igx.38.1389056172291; Mon, 06 Jan 2014 16:56:12 -0800 (PST) Received: from localhost ([172.29.127.26]) by mx.google.com with ESMTPSA id u1sm917409ige.1.2014.01.06.16.56.10 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 06 Jan 2014 16:56:11 -0800 (PST) Subject: [PATCH v7 08/15] agp/intel: Support 64-bit GMADR To: linux-pci@vger.kernel.org, Daniel Vetter From: Bjorn Helgaas Cc: David Airlie , Yinghai Lu , Guo Chao , linux-kernel@vger.kernel.org Date: Mon, 06 Jan 2014 17:56:09 -0700 Message-ID: <20140107005609.10786.29922.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140107005003.10786.85164.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140107005003.10786.85164.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Yinghai Lu Per the Intel 915G/915GV/... Chipset spec (document number 301467-005), GMADR is a standard PCI BAR. The PCI core reads GMADR at enumeration-time. Use pci_bus_address() instead of reading it again in the driver. This works correctly for both 32-bit and 64-bit BARs. The spec above only mentions 32-bit GMADR, but Yinghai's patch (link below) indicates some devices have a 64-bit GMADR. [bhelgaas: reworked starting from http://lkml.kernel.org/r/1385851238-21085-13-git-send-email-yinghai@kernel.org] Signed-off-by: Yinghai Lu Signed-off-by: Bjorn Helgaas --- drivers/char/agp/intel-agp.h | 4 ++-- drivers/char/agp/intel-gtt.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h index 1042c1b90376..0bf5590fd0f9 100644 --- a/drivers/char/agp/intel-agp.h +++ b/drivers/char/agp/intel-agp.h @@ -55,7 +55,7 @@ #define INTEL_I860_ERRSTS 0xc8 /* Intel i810 registers */ -#define I810_GMADDR 0x10 +#define I810_GMADR_BAR 0 #define I810_MMADDR 0x14 #define I810_PTE_BASE 0x10000 #define I810_PTE_MAIN_UNCACHED 0x00000000 @@ -113,7 +113,7 @@ #define INTEL_I850_ERRSTS 0xc8 /* intel 915G registers */ -#define I915_GMADDR 0x18 +#define I915_GMADR_BAR 2 #define I915_MMADDR 0x10 #define I915_PTEADDR 0x1C #define I915_GMCH_GMS_STOLEN_48M (0x6 << 4) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 54202ffcf467..560f66bffebb 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -608,9 +608,8 @@ static bool intel_gtt_can_wc(void) static int intel_gtt_init(void) { - u32 gma_addr; u32 gtt_map_size; - int ret; + int ret, bar; ret = intel_private.driver->setup(); if (ret != 0) @@ -660,14 +659,11 @@ static int intel_gtt_init(void) } if (INTEL_GTT_GEN <= 2) - pci_read_config_dword(intel_private.pcidev, I810_GMADDR, - &gma_addr); + bar = I810_GMADR_BAR; else - pci_read_config_dword(intel_private.pcidev, I915_GMADDR, - &gma_addr); - - intel_private.gma_bus_addr = (gma_addr & PCI_BASE_ADDRESS_MEM_MASK); + bar = I915_GMADR_BAR; + intel_private.gma_bus_addr = pci_bus_address(intel_private.pcidev, bar); return 0; }