From patchwork Mon Jun 30 21:45:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 32795 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E7B3203C0 for ; Mon, 30 Jun 2014 21:46:44 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id tr6sf55893326ieb.11 for ; Mon, 30 Jun 2014 14:46:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=gzg0AU7lN5Q4KmjYf+ShAAW2rpH36cBR4B37plCBIcY=; b=DjYhtw9xyBybAPv7ExisRtDIMe/Ysqvwi1a4x6Nyee5eNu5b/nvrPQnRsMvfmj8BYV jjI3mAwxy5BDhtmgnAc9yKpJPmgFBmGhaocyRzyQeB0mh97kJWPrl4WiCYfpAjQZiH9C TQ+vgOQxK5AfoTMiIPN6wi3v+69gmT0CrzK7KWEj1CMOqh1Bzh8wteRvuTuort7rjoc9 UiamrxtYLyxDnoJOsHgNAEUL0YPzqYzNLmC4KsaPoCINYw4OfDSRKlB0Ud7kVL2JYRF3 iuQUxeZF5YAHefWyeFKArhNgzfCndm+q6wUCNafaLVm9UAyObZl4o00j6GC3dqldEPmd I7Jg== X-Gm-Message-State: ALoCoQnPyGZGFeDbSfGxxkt69kuwh694U2+B7MYshVyQzcTi+ET1aquaTPoEuFMUKvzRAJJrhmgc X-Received: by 10.182.112.202 with SMTP id is10mr24134147obb.47.1404164804097; Mon, 30 Jun 2014 14:46:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.100 with SMTP id y91ls1672653qgy.60.gmail; Mon, 30 Jun 2014 14:46:43 -0700 (PDT) X-Received: by 10.52.101.168 with SMTP id fh8mr33787552vdb.34.1404164803914; Mon, 30 Jun 2014 14:46:43 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id s19si10651930vcp.1.2014.06.30.14.46.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 14:46:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy10so8184134vcb.29 for ; Mon, 30 Jun 2014 14:46:43 -0700 (PDT) X-Received: by 10.221.40.193 with SMTP id tr1mr5727974vcb.31.1404164803784; Mon, 30 Jun 2014 14:46:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp170807vcb; Mon, 30 Jun 2014 14:46:43 -0700 (PDT) X-Received: by 10.66.254.4 with SMTP id ae4mr54826964pad.99.1404164802973; Mon, 30 Jun 2014 14:46:42 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ei3si24555714pbb.219.2014.06.30.14.46.42; Mon, 30 Jun 2014 14:46:42 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754846AbaF3Vqf (ORCPT + 27 others); Mon, 30 Jun 2014 17:46:35 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:47201 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbaF3Vq2 (ORCPT ); Mon, 30 Jun 2014 17:46:28 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5ULjOqi012180; Mon, 30 Jun 2014 16:45:24 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5ULjNuv029385; Mon, 30 Jun 2014 16:45:23 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Mon, 30 Jun 2014 16:45:23 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5ULjKaV001990; Mon, 30 Jun 2014 16:45:22 -0500 From: Murali Karicheri To: , , CC: Murali Karicheri , Santosh Shilimkar , Russell King , Grant Likely , Rob Herring , Mohit Kumar , Jingoo Han , Bjorn Helgaas , Pratyush Anand , Richard Zhu , Kishon Vijay Abraham I , Marek Vasut , Arnd Bergmann , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap Subject: [PATCH v3 1/5] PCI: designware: add rd[wr]_other_conf API Date: Mon, 30 Jun 2014 17:45:16 -0400 Message-ID: <1404164720-11066-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404164720-11066-1-git-send-email-m-karicheri2@ti.com> References: <1404164720-11066-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m-karicheri2@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , v3.65 version of the designware h/w, requires application space registers to be configured to access the remote EP config space. To support this, add rd[wr]_other_conf API in the pcie_host_opts Signed-off-by: Murali Karicheri CC: Santosh Shilimkar CC: Russell King CC: Grant Likely CC: Rob Herring CC: Mohit Kumar CC: Jingoo Han CC: Bjorn Helgaas CC: Pratyush Anand CC: Richard Zhu CC: Kishon Vijay Abraham I CC: Marek Vasut CC: Arnd Bergmann CC: Pawel Moll CC: Mark Rutland CC: Ian Campbell CC: Kumar Gala CC: Randy Dunlap CC: Grant Likely Acked-by: Jingoo Han --- drivers/pci/host/pcie-designware.c | 12 ++++++++++-- drivers/pci/host/pcie-designware.h | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 1eaf4df..d8f3af7 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -656,7 +656,11 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, } if (bus->number != pp->root_bus_nr) - ret = dw_pcie_rd_other_conf(pp, bus, devfn, + if (pp->ops->rd_other_conf) + ret = pp->ops->rd_other_conf(pp, bus, devfn, + where, size, val); + else + ret = dw_pcie_rd_other_conf(pp, bus, devfn, where, size, val); else ret = dw_pcie_rd_own_conf(pp, where, size, val); @@ -679,7 +683,11 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn, return PCIBIOS_DEVICE_NOT_FOUND; if (bus->number != pp->root_bus_nr) - ret = dw_pcie_wr_other_conf(pp, bus, devfn, + if (pp->ops->wr_other_conf) + ret = pp->ops->wr_other_conf(pp, bus, devfn, + where, size, val); + else + ret = dw_pcie_wr_other_conf(pp, bus, devfn, where, size, val); else ret = dw_pcie_wr_own_conf(pp, where, size, val); diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h index 77f592f..8121901 100644 --- a/drivers/pci/host/pcie-designware.h +++ b/drivers/pci/host/pcie-designware.h @@ -61,6 +61,10 @@ struct pcie_host_ops { u32 val, void __iomem *dbi_base); int (*rd_own_conf)(struct pcie_port *pp, int where, int size, u32 *val); int (*wr_own_conf)(struct pcie_port *pp, int where, int size, u32 val); + int (*rd_other_conf)(struct pcie_port *pp, struct pci_bus *bus, + unsigned int devfn, int where, int size, u32 *val); + int (*wr_other_conf)(struct pcie_port *pp, struct pci_bus *bus, + unsigned int devfn, int where, int size, u32 val); int (*link_up)(struct pcie_port *pp); void (*host_init)(struct pcie_port *pp); };