From patchwork Sat Jan 10 02:34:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 427314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 90370140187 for ; Sat, 10 Jan 2015 13:36:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758423AbbAJCgl (ORCPT ); Fri, 9 Jan 2015 21:36:41 -0500 Received: from mail-oi0-f46.google.com ([209.85.218.46]:58054 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756348AbbAJCfy (ORCPT ); Fri, 9 Jan 2015 21:35:54 -0500 Received: by mail-oi0-f46.google.com with SMTP id a3so14472509oib.5; Fri, 09 Jan 2015 18:35:53 -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:in-reply-to:references; bh=292+WvvGKehGojq/I2ev16GJh9GMunYLVHkKV37ZXQ8=; b=AQVpjlTQFugGMEuROpoDU506zPjsbF+C27csredEuGS8vGS/zZek+kXynj3/+7Zi6Q v7UDhNGFhOcM9Garb68+2lmmr8x6EYv7r68ZR6t4qWFJ8L4UX4Meld7rl1YSBqoAag7D zKspN3rZpcb1F3BW4NiOr8HTrhruilgWTPOOX4CAQIyAi1jIjtzJ/P/iEjkXmLTNDeXl ChJxj0znh0GSo0b+e1jihLiIHPpq/VgSkpp/1w7+qGaEwZyxItzLSTGzs4qkCCTSOEjj Y6xilcFNDpiuX2yX6gbdZZSY/iHbXturso+WByJGzBNSJYYzBs87zUNVbgaTUaPE/q3a hc8w== X-Received: by 10.202.208.201 with SMTP id h192mr10574402oig.25.1420857353427; Fri, 09 Jan 2015 18:35:53 -0800 (PST) Received: from rob-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id b192sm5326257oih.4.2015.01.09.18.35.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Jan 2015 18:35:52 -0800 (PST) From: Rob Herring To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-pci@vger.kernel.org, Bjorn Helgaas , Rob Herring , Thierry Reding , Stephen Warren , Alexandre Courbot , linux-tegra@vger.kernel.org Subject: [PATCH 14/16] pci/host: tegra: convert to use generic config accesses Date: Fri, 9 Jan 2015 20:34:48 -0600 Message-Id: <1420857290-8373-15-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420857290-8373-1-git-send-email-robh@kernel.org> References: <1420857290-8373-1-git-send-email-robh@kernel.org> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Convert the tegra host PCI driver to use the generic config access functions. Signed-off-by: Rob Herring Cc: Thierry Reding Cc: Bjorn Helgaas Cc: Stephen Warren Cc: Alexandre Courbot Cc: linux-tegra@vger.kernel.org Cc: linux-pci@vger.kernel.org Tested-by: Thierry Reding Acked-by: Thierry Reding --- drivers/pci/host/pci-tegra.c | 55 +++----------------------------------------- 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index a800ae9..44fd31b 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -480,59 +480,10 @@ static void __iomem *tegra_pcie_conf_address(struct pci_bus *bus, return addr; } -static int tegra_pcie_read_conf(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 *value) -{ - void __iomem *addr; - - addr = tegra_pcie_conf_address(bus, devfn, where); - if (!addr) { - *value = 0xffffffff; - return PCIBIOS_DEVICE_NOT_FOUND; - } - - *value = readl(addr); - - if (size == 1) - *value = (*value >> (8 * (where & 3))) & 0xff; - else if (size == 2) - *value = (*value >> (8 * (where & 3))) & 0xffff; - - return PCIBIOS_SUCCESSFUL; -} - -static int tegra_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 value) -{ - void __iomem *addr; - u32 mask, tmp; - - addr = tegra_pcie_conf_address(bus, devfn, where); - if (!addr) - return PCIBIOS_DEVICE_NOT_FOUND; - - if (size == 4) { - writel(value, addr); - return PCIBIOS_SUCCESSFUL; - } - - if (size == 2) - mask = ~(0xffff << ((where & 0x3) * 8)); - else if (size == 1) - mask = ~(0xff << ((where & 0x3) * 8)); - else - return PCIBIOS_BAD_REGISTER_NUMBER; - - tmp = readl(addr) & mask; - tmp |= value << ((where & 0x3) * 8); - writel(tmp, addr); - - return PCIBIOS_SUCCESSFUL; -} - static struct pci_ops tegra_pcie_ops = { - .read = tegra_pcie_read_conf, - .write = tegra_pcie_write_conf, + .map_bus = tegra_pcie_conf_address, + .read = pci_generic_config_read32, + .write = pci_generic_config_write32, }; static unsigned long tegra_pcie_port_get_pex_ctrl(struct tegra_pcie_port *port)