From patchwork Mon Jul 21 16:58:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 34001 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F1BE20492 for ; Mon, 21 Jul 2014 17:00:18 +0000 (UTC) Received: by mail-oi0-f69.google.com with SMTP id h136sf15747024oig.8 for ; Mon, 21 Jul 2014 10:00:17 -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=tBJJjhqfgqiEGyjNjUCbOT4E5w9eFgD2QjWuzWMyhCk=; b=EckMIXvqIJq7S2IK5oVD5vmuk2FADJDXoQrt446BBOXhZvROdbIesS8hRgfSFQlzfa PtnTWcJYFgoi9xARoRBppiHSqfe0+w1osJ9yDBN0C4DnUfqhThT/qE98d99Y5EzYjz0g TOX4atbdG9c9aPFbtkipLLPWycY4kNCLuZTW4hTeFcAA8jMO+I1gKfQkGQYImFHyj+h2 oPlC2aQUNAH5sQ/V3kUtJHDmCrftqeqAqrnSGsRYbPhBaUkJyMk6neocFrC7l36681Ey 8NRcDXBiLVix2oZxcvFhwQ2hmKzyi7GaMpboZ5GkE3cTfHwhrYhth2IKavkPQAYVBGaW C0NA== X-Gm-Message-State: ALoCoQlgyw8S9NKo9cqzbSenMlONMuj4SxnvlLd8nFgm0c/uSaVx8QyzJGUureAij1hTZQIgcCGA X-Received: by 10.42.123.148 with SMTP id s20mr8853210icr.8.1405962016980; Mon, 21 Jul 2014 10:00:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.38 with SMTP id g35ls2023389qgg.1.gmail; Mon, 21 Jul 2014 10:00:16 -0700 (PDT) X-Received: by 10.220.196.207 with SMTP id eh15mr3896782vcb.78.1405962016842; Mon, 21 Jul 2014 10:00:16 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id su5si11874365vec.27.2014.07.21.10.00.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jul 2014 10:00:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hu12so12507033vcb.20 for ; Mon, 21 Jul 2014 10:00:16 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr3859650vcf.71.1405962016316; Mon, 21 Jul 2014 10:00:16 -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 tc5csp128561vcb; Mon, 21 Jul 2014 10:00:15 -0700 (PDT) X-Received: by 10.70.127.230 with SMTP id nj6mr3644052pdb.164.1405962014362; Mon, 21 Jul 2014 10:00:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ds16si7405417pdb.477.2014.07.21.10.00.09 for ; Mon, 21 Jul 2014 10:00:09 -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 S933114AbaGURAH (ORCPT + 14 others); Mon, 21 Jul 2014 13:00:07 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:57850 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932679AbaGURAE (ORCPT ); Mon, 21 Jul 2014 13:00:04 -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 s6LGwmSY027795; Mon, 21 Jul 2014 11:58:48 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s6LGwlSC003647; Mon, 21 Jul 2014 11:58:47 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Mon, 21 Jul 2014 11:58:47 -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 s6LGwik1008817; Mon, 21 Jul 2014 11:58:46 -0500 From: Murali Karicheri To: , , CC: Murali Karicheri , Russell King , Grant Likely , Rob Herring , Bjorn Helgaas , Richard Zhu , Kishon Vijay Abraham I , Marek Vasut , Arnd Bergmann , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Randy Dunlap Subject: [PATCH v7 1/5] PCI: designware: add rd[wr]_other_conf API Date: Mon, 21 Jul 2014 12:58:41 -0400 Message-ID: <1405961925-27248-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405961925-27248-1-git-send-email-m-karicheri2@ti.com> References: <1405961925-27248-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.175 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 Reviewed-by: Pratyush Anand Acked-by: Mohit Kumar Acked-by: Jingoo Han Acked-by: Santosh Shilimkar CC: Russell King CC: Grant Likely CC: Rob Herring CC: Bjorn Helgaas 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 --- 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); };