From patchwork Tue Jan 7 00:56:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3445061 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C29FFC02DC for ; Tue, 7 Jan 2014 00:58:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 003402017A for ; Tue, 7 Jan 2014 00:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38C482016D for ; Tue, 7 Jan 2014 00:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757798AbaAGA4J (ORCPT ); Mon, 6 Jan 2014 19:56:09 -0500 Received: from mail-ig0-f170.google.com ([209.85.213.170]:53835 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757779AbaAGA4F (ORCPT ); Mon, 6 Jan 2014 19:56:05 -0500 Received: by mail-ig0-f170.google.com with SMTP id k19so8811958igc.1 for ; Mon, 06 Jan 2014 16:56:04 -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=sCNzaHqmTx3XIyZxfMveD8G18RO98bQUNL0M7CnIN7M=; b=mR/BgDB0GKuPgGSu0ieF8dqC63bM28P/GBUTtcEWwBBlr72PV7xc0XVetsncjzoEst np9s20SToHXzDDsKdG6GHCOzLCHpkcYz7R+M/F0jWODG5Q6KHyY8zLm2B0N1tj4poHpn MNOfGMiOtSpNi+S53gQ5YWJVLTrCiz7UjwYNsNp3t7kySIkrijcui4n/VF5kfBQltod8 hhyh/yyxdNmgNJx+mZXec41lOVJ7AUscx7qCwFDEDk44NclCYE+X65Mm9FalVZjFM0ge bXw0sf1XK7nHiuGb9377IZuAwwn1rDY7vOhs7xlgZu+loyn4puSKlyLBnh0ADW4UHqCH CTAQ== 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=sCNzaHqmTx3XIyZxfMveD8G18RO98bQUNL0M7CnIN7M=; b=ahAswLRbkAVzmqtcZPXHTtAjb8fsSNRCtTealdt8/Fvpd69DypKcIa+ZwmLQjh5+BU BQP1+e5aYtI7rDc4AgdFW+c6Zka8G01Zg2JzVw2m4OVCeHGjVt5WYKHeH3uXjwY6xrnI loRfU+9GWLIZ+bYSm4XGCl1Jucfb+OP5w7UZU354I59E5tmMp8rg7Ck6+0JSWhX4oFLG WCrn5EQQtBrds0lh7tOmdApcUFUDyTmB3OOtmiSejolwQLZFyl90/IrYDmWPEqp1yC+z qTWbT34spozCWthpVrRdKnGH8TwrPojBEfLLBCoaufC6deCZ0RMTaWO8beFlZZ8me/Rr mm3A== X-Gm-Message-State: ALoCoQlm4rQcgAtrTnGcFYwao9IR2WOsgAI5DrlDzNFgpg6fvWaflZIOXEDNrMEFVmycMGmSZQnDGs0q0DvtNsuIsQfklDMz+QCwkUJrQVhvivIeau0Hbs/SJE1B4dUb/26vKJFnMUHLgK4BgufdCLR2rUKt1IMjfT6NSPp1MQyrSQWVFoODwdtvCdxRsCkcRY1ijcr0pPSsxchmZDXbafl0Btu3qgEXzZcuVI7lu+A/uBAGRbzpf48= X-Received: by 10.43.153.138 with SMTP id la10mr16152389icc.10.1389056164778; Mon, 06 Jan 2014 16:56:04 -0800 (PST) Received: from localhost ([172.29.127.26]) by mx.google.com with ESMTPSA id ni7sm896808igb.7.2014.01.06.16.56.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 06 Jan 2014 16:56:04 -0800 (PST) Subject: [PATCH v7 07/15] agp/intel: Rename gtt_bus_addr to gtt_phys_addr 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:02 -0700 Message-ID: <20140107005602.10786.2964.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 The only use of gtt_bus_addr is as an argument to ioremap(), so it is a CPU physical address, not a bus address. Rename it to gtt_phys_addr to reflect this. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/char/agp/intel-gtt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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-gtt.c b/drivers/char/agp/intel-gtt.c index b8e2014cb9cb..54202ffcf467 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -64,7 +64,7 @@ static struct _intel_private { struct pci_dev *pcidev; /* device one */ struct pci_dev *bridge_dev; u8 __iomem *registers; - phys_addr_t gtt_bus_addr; + phys_addr_t gtt_phys_addr; u32 PGETBL_save; u32 __iomem *gtt; /* I915G */ bool clear_fake_agp; /* on first access via agp, fill with scratch */ @@ -191,7 +191,7 @@ static int i810_setup(void) writel(virt_to_phys(gtt_table) | I810_PGETBL_ENABLED, intel_private.registers+I810_PGETBL_CTL); - intel_private.gtt_bus_addr = reg_addr + I810_PTE_BASE; + intel_private.gtt_phys_addr = reg_addr + I810_PTE_BASE; if ((readl(intel_private.registers+I810_DRAM_CTL) & I810_DRAM_ROW_0) == I810_DRAM_ROW_0_SDRAM) { @@ -636,10 +636,10 @@ static int intel_gtt_init(void) intel_private.gtt = NULL; if (intel_gtt_can_wc()) - intel_private.gtt = ioremap_wc(intel_private.gtt_bus_addr, + intel_private.gtt = ioremap_wc(intel_private.gtt_phys_addr, gtt_map_size); if (intel_private.gtt == NULL) - intel_private.gtt = ioremap(intel_private.gtt_bus_addr, + intel_private.gtt = ioremap(intel_private.gtt_phys_addr, gtt_map_size); if (intel_private.gtt == NULL) { intel_private.driver->cleanup(); @@ -796,7 +796,7 @@ static int i830_setup(void) if (!intel_private.registers) return -ENOMEM; - intel_private.gtt_bus_addr = reg_addr + I810_PTE_BASE; + intel_private.gtt_phys_addr = reg_addr + I810_PTE_BASE; return 0; } @@ -1123,13 +1123,13 @@ static int i9xx_setup(void) case 3: pci_read_config_dword(intel_private.pcidev, I915_PTEADDR, >t_addr); - intel_private.gtt_bus_addr = gtt_addr; + intel_private.gtt_phys_addr = gtt_addr; break; case 5: - intel_private.gtt_bus_addr = reg_addr + MB(2); + intel_private.gtt_phys_addr = reg_addr + MB(2); break; default: - intel_private.gtt_bus_addr = reg_addr + KB(512); + intel_private.gtt_phys_addr = reg_addr + KB(512); break; }