From patchwork Thu Feb 25 23:06:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stuart Yoder X-Patchwork-Id: 588454 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B370E1402BC for ; Fri, 26 Feb 2016 10:27:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EC1F7A776C; Fri, 26 Feb 2016 00:27:20 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B9dJ0wV2HAsR; Fri, 26 Feb 2016 00:27:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0561BA774D; Fri, 26 Feb 2016 00:27:20 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 67726A7752 for ; Fri, 26 Feb 2016 00:27:17 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DFBhxeRqHA55 for ; Fri, 26 Feb 2016 00:27:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0086.outbound.protection.outlook.com [157.56.111.86]) by theia.denx.de (Postfix) with ESMTPS id 6AC27A775B for ; Fri, 26 Feb 2016 00:27:10 +0100 (CET) Received: from BN3PR0301CA0063.namprd03.prod.outlook.com (10.160.152.159) by BY2PR03MB316.namprd03.prod.outlook.com (10.141.139.26) with Microsoft SMTP Server (TLS) id 15.1.409.15; Thu, 25 Feb 2016 23:27:04 +0000 Received: from BY2FFO11FD028.protection.gbl (2a01:111:f400:7c0c::134) by BN3PR0301CA0063.outlook.office365.com (2a01:111:e400:401e::31) with Microsoft SMTP Server (TLS) id 15.1.415.20 via Frontend Transport; Thu, 25 Feb 2016 23:27:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD028.mail.protection.outlook.com (10.1.15.217) with Microsoft SMTP Server (TLS) id 15.1.422.5 via Frontend Transport; Thu, 25 Feb 2016 23:26:58 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u1PNQq56001286; Thu, 25 Feb 2016 16:26:53 -0700 From: Stuart Yoder To: Date: Thu, 25 Feb 2016 17:06:20 -0600 Message-ID: <1456441583-20932-5-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1456441583-20932-1-git-send-email-stuart.yoder@nxp.com> References: <1456441583-20932-1-git-send-email-stuart.yoder@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131009164197320177; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CPI:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(76176999)(50986999)(19580395003)(19580405001)(50226001)(87936001)(5003940100001)(86362001)(33646002)(189998001)(85426001)(77096005)(36756003)(5008740100001)(4326007)(104016004)(586003)(5001960100002)(105606002)(1096002)(2906002)(6806005)(50466002)(1220700001)(92566002)(106466001)(2950100001)(229853001)(2351001)(47776003)(48376002)(110136002)(7059030)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB316; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD028; 1:veXe39BaocIjJElenM02DxiNZp3VmFufL4/e/hjWTSE8Yiw4uSFeZsXMVsOpYiPR/X4ZHa+BUSNq9d7qyJwhveAPVt8BgHXzfPuXBJEYWpN1bW/YoSzJbDZKvg+V1eubBNDCXD9t4ZYeYcK7MLg9GfKHgQWjcHg82XGfkDD4zX5GM66wC1p192CJN9Kg6OKuRXUn0XQFHTnnv3PcGYznAyXPJPZV4NfTFu1/eQXAmxWWX+g9jJftsqjFRAYfrk50FAZsLs4XRzvNz/l5rTsmNVNccnPIVtbVP/Xh2I8+OuJIt2n9klYbadXAu8+1hoI7aGwGJBqqoM61TmOmrMSaa82XdNqHvouL/l+ujMijrSPW1UQzFqgVZ0whsoZGWv2pXIT7JOQjDFSBszOW5XIn2MNC884YPlc87+oppR67vykI0KT7hlxhuAHcLd5kPRXo97wrS6RXpCg1UqAZD8kd5yTWEoRE8RC0yvBXU6s406n9I6HXU/y7TJbeojSD8TYT1kTHTOUN9kqAHrIWgCveLfWJRWL23N23Q1A5bK3fREsL81PZM9s1K9fQa9PdAYIxUz5EaQcIuY/d6gBripZAjVJPkOoEDqAcrmYLy739Kuy1np8i1r1fZPE6QCXoCmby MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4b9a3470-e962-4a92-63f7-08d33e3b28a5 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB316; 2:/RJQzyBX/NRPsrIeRiKw0hATwqjIhPAXMLrEe64uTpTLnh04+bd5Y2QkGWD3/NwOY8okBe+zgKJri51DPdVO4FCLE/DQACjB6aR0QsjLW+c5Um1IDinvzbmlDuBIqAD30tF4hejPOxaXbbf7dlWsMkfDFUTH+QUCmVy3i3GkbOdSoj0tOcPSECmvF2xY1uwo; 3:RYoDJ0DdIqhqGAbZpUVWkf/rv+rci9yOF9bE8areCxB42+UAsfGqdg9Fypkpe8DD1tqwVqY5FtYuV7vPlpr2yivwuCRfhIt+fvojvxpzTD+TzaSgbBcX9NLYKKvjCKvn146MMQ32kwd2ZIU1n17WxQ+hTpIkWMjxrogO/GYStAP3TXyEmyHmErxFKvY9y3G4Zu/HDxZ4uCUMPAyFCLsfuGperhLFDqZGEKE6MEZRkIs=; 25:smEo2+dnuCVFV/y0BsJ+TBOAf1ddGDcWs+F2iG7RHB9XLvuHJOaGT55d58/laBHr2MK95xHD3hW3MvbCTUfXSavTSG6LIytHFbSDpm1XhD9pOXCsCSWUwiEsdFPgyYpgAiTWpB1qITpqFQ40kZDDUdVwk2paML/HD7QRlQMOE2HHmHVxZiqCjnKImc2ESYn0y0yExFSkJT24ON41lgiBQmRF40RrwcVgJewtq9TTssu8K2JgvKXXCgruLRb+tsKgi1Pixesf327BgsHJ35psQmOAzjXMDGar2lqWcaCfMVmy9ZWasTuX7erHT9gziTE4OpgRMll6t6WzvY4ZwAfsKg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB316; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(8121501046)(13024025)(13015025)(13017025)(13023025)(5005006)(10201501046)(3002001); SRVR:BY2PR03MB316; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB316; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB316; 4:RJ/bMCfWlF/AKz4ra2BDSyMkA6q3NSWy8lUpnFEta+xSRxZkGj2J09h9i5xFS6w6TNCmsFwCFMDJh25tivVlK/nGP1K+uGmNFF35yM4sQZspPPfm7V+oahV6DP/24geS8v+nrWnvvyGwN+QaPGXGWKAltzc9CLPJ939Y7x2jnmZjQiPg0kdLXvjKifXte3IFfniOsl+pyCHjyZqmEHImEe6v4A78IYGlqNv03sgWL3azFpucCcQNIAjInKegT6K+mhlAjuz4iB2AZfi5mN1t4XT81RA6o4PkJi8V4pB2RX3FmQAD2gbNBS8lCrktbfKrAA/hBxM4qnosfYcEEH/OH1fecXTCdC2tML9eMDCQ3wvOHEtR6BljcGCobROKuNDivY40Gzhbwaor4O0948Sli70NB2lDmxKSG0XD5hIayZSvhyJySrDpO5ausEYFE6TyJQJHqTmCJiFMlX0O45Fqs6phHONLDvUSid4fdJBI/b+wo3oOg+ZM6U0ccydYFFaX X-Forefront-PRVS: 08635C03D4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB316; 23:nUewbei/oSSSYQOBEW8qJBCz3cVJwU3x0hswnCmqVK?= =?us-ascii?Q?NuCDvh0PdvT3OEnj8vJAweTVYuQn6tSXDIhF19amBhK2uqUy79JgCMMPKtMm?= =?us-ascii?Q?W2qlG16+l1Mbvh1kiEGmFEzc6qbmizuwoBodMkvXd/K/wRinApTa7v+mEE9k?= =?us-ascii?Q?lcF6p4j1yxNuxwOmDslkmpttJMeQPD91CvFSPWZNNkSevXPH86OfOp0d1omL?= =?us-ascii?Q?lETmxCf7dAq77TEX+iMq6JUkQfGRjxxh5bC1CF2bl1/WjeUKrbOMRYRQLZwH?= =?us-ascii?Q?ivVvG1mOg1d50vucjHv/wQ+6Qmy8vSXgXaMG4YFrw8Fc7YkLCxXYXPkjfHIF?= =?us-ascii?Q?MGLfFNPTtGl0NK1Z3G7fV8MAKOekScGGKBzyABuX0YOGO0I7d+AKDxbMZPNl?= =?us-ascii?Q?ljxPTCvcDV2AEel3HgVKJqbHsPgNNherSLpgpi8AHUY8niBsDitOJp/vSecy?= =?us-ascii?Q?2dS1Ik6r8rEX+hfBwdqTepszXRzGXNw/YTAxwzRU4M2F2UfrzSpACafoQW/4?= =?us-ascii?Q?u+OaeBnVPgu0tAvObMnKBfWLRyQqUbkw/HhwSuN92YZjazNKY9j8L+E0HSrZ?= =?us-ascii?Q?+w4EL//ME/jIiEWFuS+C0tz/xFB3GjxKNWBiG0F4m+J+AmdZojTa8gWF7sus?= =?us-ascii?Q?cgF5aGEWoVOGA2dip923oodWvfjrqxYOFUANBno81lzGxIPu1e5dM8aHgJhD?= =?us-ascii?Q?gxBeh1wZZE+rNohbCc0YGOcipUTS3Fr0yQ1lHWnqcslPkcIy/8b6LjtYj8Jn?= =?us-ascii?Q?sd+jYIM74rcBUHmxId23on2x3pD/cGUDnDvMnzq7i5mSPEU3/q0XxihPoOut?= =?us-ascii?Q?pKedLPEqLVNbHJSlsJ4u7qFUXpOex+lr/fQ9ZSeyhzUyw/D7yJMX4iT9qWlC?= =?us-ascii?Q?DvVjZ1XsdLaijoNg22E8FbcljfTBccJbhoWLPtwC7SHAvAd3aTx5uIzMrVjD?= =?us-ascii?Q?v66Jde2mQDVoFGifEJHpEwF2boD4CEnRB2C/JKnBsA2/ZEFiXZBetnrfk+wd?= =?us-ascii?Q?Gavo4FF8IX0P7EPXSi6UHsnGFFsSRHh5IXRn6cscziHOjkJ+Pa1plHeQ6nf2?= =?us-ascii?Q?b0uSdH4G0WwW1mHsUzUv6BBKwl?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB316; 5:xiy+zl8yerwY385Z3V3LQ0gpuOYJ+rV3KHq9yf8c2biS555j8CwdYAcl+hsTTyd8Vs3Hu/cx4N2a7Swo26Gj+hmSH0uVL4ZsqsRKx5LOeB8/PYrLK6sB02LE3LPUT948Du6bwblTJx9wdQ7nW6JZ9nPenDLD4QwR2uo0AppuPQw=; 24:cyyS4wKAfDvLGXqoJ6zGUmOXUxW2vf7zQ3hxgXUJZWC7/sQnta7jV2rOlOlNhrLQT05L1UZjAgfKW2qO3XRF7E6XW23Ox2qcXDjVknCS9ns= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2016 23:26:58.8116 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB316 Cc: marc.zyngier@arm.com, leoyang.li@nxp.com, mingkai.hu@nxp.com Subject: [U-Boot] [PATCH 4/7 v2] pci/layerscape: add support for LUT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stuart Yoder The per-PCI controller LUT (Look-Up-Table) is a 32-entry table that maps PCI requester IDs (bus/dev/fun) to a stream ID. This patch implements infrastructure to enable LUT initialization: -define registers offsets -add an index to 'struct ls_pcie' to track next available slot in LUT -add function to allocate the next available entry index -add function to program a LUT entry Signed-off-by: Stuart Yoder --- -v2 -no changes drivers/pci/pcie_layerscape.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index bb29222..6886488 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -58,6 +58,13 @@ #define PCIE_ATU_FUNC(x) (((x) & 0x7) << 16) #define PCIE_ATU_UPPER_TARGET 0x91C +/* LUT registers */ +#define PCIE_LUT_BASE 0x80000 +#define PCIE_LUT_UDR(n) (0x800 + (n) * 8) +#define PCIE_LUT_LDR(n) (0x804 + (n) * 8) +#define PCIE_LUT_ENABLE (1 << 31) +#define PCIE_LUT_ENTRY_COUNT 32 + #define PCIE_DBI_RO_WR_EN 0x8bc #define PCIE_LINK_CAP 0x7c @@ -93,6 +100,7 @@ struct ls_pcie { void __iomem *dbi; void __iomem *va_cfg0; void __iomem *va_cfg1; + int next_lut_index; struct pci_controller hose; }; @@ -482,6 +490,33 @@ static void ls_pcie_setup_ep(struct ls_pcie *pcie, struct ls_pcie_info *info) } } + +/* + * Return next available LUT index. + */ +static u32 ls_pcie_next_lut_index(struct ls_pcie *pcie) +{ + if (pcie->next_lut_index < PCIE_LUT_ENTRY_COUNT) + return pcie->next_lut_index++; + else + return -1; /* LUT is full */ +} + +/* + * Program a single LUT entry + */ +static void ls_pcie_lut_set_mapping(struct ls_pcie *pcie, int index, u32 devid, + u32 streamid) +{ + void __iomem *lut; + + lut = pcie->dbi + PCIE_LUT_BASE; + + /* leave mask as all zeroes, want to match all bits */ + writel((devid << 16), lut + PCIE_LUT_UDR(index)); + writel(streamid | PCIE_LUT_ENABLE, lut + PCIE_LUT_LDR(index)); +} + int ls_pcie_init_ctrl(int busno, enum srds_prtcl dev, struct ls_pcie_info *info) { struct ls_pcie *pcie; @@ -513,6 +548,7 @@ int ls_pcie_init_ctrl(int busno, enum srds_prtcl dev, struct ls_pcie_info *info) pcie->va_cfg1 = map_physmem(info->cfg1_phys, info->cfg1_size, MAP_NOCACHE); + pcie->next_lut_index = 0; /* outbound memory */ pci_set_region(&hose->regions[0],