From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755161AbbKRAqL (ORCPT ); Tue, 17 Nov 2015 19:46:11 -0500 Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:43007 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752859AbbKRAqI (ORCPT ); Tue, 17 Nov 2015 19:46:08 -0500 X-IronPort-AV: E=Sophos;i="5.20,310,1444719600"; d="scan'208";a="80847443" Subject: Re: [PATCH 2/5] PCI: iproc: Add PAXC interface support To: Florian Fainelli , Bjorn Helgaas References: <1447806715-30043-1-git-send-email-rjui@broadcom.com> <1447806715-30043-3-git-send-email-rjui@broadcom.com> <564BC79D.9010705@gmail.com> CC: Marc Zyngier , Arnd Bergmann , Hauke Mehrtens , , , From: Ray Jui Message-ID: <564BCA4C.6030809@broadcom.com> Date: Tue, 17 Nov 2015 16:46:04 -0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <564BC79D.9010705@gmail.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/17/2015 4:34 PM, Florian Fainelli wrote: > On 17/11/15 16:31, Ray Jui wrote: >> Traditionally, all iProc PCIe root complexes use PAXB based wrapper, >> with an integrated on-chip Serdes to support external endpoint devices. >> On newer iProc platforms, a PAXC based wrapper is introduced, for >> connection with internally emulated PCIe endpoint devices in the ASIC >> >> This patch adds support for PAXC based iProc PCIe root complex in the >> iProc PCIe core driver. This change fators out common logic between >> PAXB and PAXC, and use tables to store register offsets that are >> different between PAXB and PAXC. This allows the driver to be scaled to >> support subsequent PAXC revisions in the future >> >> Signed-off-by: Ray Jui >> Reviewed-by: Scott Branden >> --- >> drivers/pci/host/pcie-iproc-platform.c | 8 ++ >> drivers/pci/host/pcie-iproc.c | 202 +++++++++++++++++++++++++++------ >> drivers/pci/host/pcie-iproc.h | 19 ++++ >> 3 files changed, 195 insertions(+), 34 deletions(-) >> >> diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c >> index c9550dc..716b56b 100644 >> --- a/drivers/pci/host/pcie-iproc-platform.c >> +++ b/drivers/pci/host/pcie-iproc-platform.c >> @@ -42,6 +42,13 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev) >> pcie->dev = &pdev->dev; >> platform_set_drvdata(pdev, pcie); >> >> + if (of_device_is_compatible(np, "brcm,iproc-pcie")) >> + pcie->type = IPROC_PCIE_PAXB; >> + else if (of_device_is_compatible(np, "brcm,iproc-pcie-paxc")) >> + pcie->type = IPROC_PCIE_PAXC; >> + else >> + return -ENODEV; > > Sorry for not noticing earlier, but typically, to avoid repeating the > same compatible string twice (once if of_device_id, and somewhere else), > you would put the type in the .data member of the of_device_id lookup > table and you could fetch this directly here. So something like this: > > static const struct of_device_id iproc_pcie_of_match_table[] = { > { .compatible = "brcm,iproc-pcie", .data = (int *)IPROC_PCIE_PAXB }, > + { .compatible = "brcm,iproc-pcie-paxc", .data = (int *)IPROC_PCIE_PAXC }, > { /* sentinel */ } > Just to confirm, if I do this, then the above code to check of_device_is_compatible becomes the following? pcie->type = (enum iproc_pcie_type)of_id->data; Thanks, Ray