From patchwork Wed Jun 10 10:39:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar Kushwaha X-Patchwork-Id: 482597 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 1A3751401CB for ; Wed, 10 Jun 2015 20:41:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E9EFC4B698; Wed, 10 Jun 2015 12:41:26 +0200 (CEST) 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 BtDt1hyT0zx9; Wed, 10 Jun 2015 12:41:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6AC424B689; Wed, 10 Jun 2015 12:41:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5E78A4B69C for ; Wed, 10 Jun 2015 12:40:58 +0200 (CEST) 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 MEdIqbrSfR6v for ; Wed, 10 Jun 2015 12:40:58 +0200 (CEST) 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-bn1on0141.outbound.protection.outlook.com [157.56.110.141]) by theia.denx.de (Postfix) with ESMTPS id 102854B66A for ; Wed, 10 Jun 2015 12:40:49 +0200 (CEST) Received: from DM2PR03CA0006.namprd03.prod.outlook.com (10.141.96.16) by DM2PR0301MB0749.namprd03.prod.outlook.com (10.160.97.145) with Microsoft SMTP Server (TLS) id 15.1.190.14; Wed, 10 Jun 2015 10:40:48 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::139) by DM2PR03CA0006.outlook.office365.com (2a01:111:e400:2428::16) with Microsoft SMTP Server (TLS) id 15.1.190.14 via Frontend Transport; Wed, 10 Jun 2015 10:40:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.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 BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Wed, 10 Jun 2015 10:40:47 +0000 Received: from b32579-VirtualBox.ap.freescale.net ([10.232.14.94]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t5AAdoKS000659; Wed, 10 Jun 2015 03:40:45 -0700 From: Prabhakar Kushwaha To: Date: Wed, 10 Jun 2015 16:09:41 +0530 Message-ID: <1433932787-31640-7-git-send-email-prabhakar@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433932787-31640-1-git-send-email-prabhakar@freescale.com> References: <1433932787-31640-1-git-send-email-prabhakar@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD056; 1:tAWZZ6SEKevCD4tnVMtq3h7fcXW7eBujR0BzKGme01IgTBXfuEH05kvdehXy08hlINuhN+9ORdgjKnPZB9lzYna6HhqSO649T2TDRUiay4QlYq2Bk5gZfxsa6HLWyOLIV7JqQElGC66F5gHZ5RW2ljjDQcIDYU73cn1eiMIDTWj2PjJW3p/PJqOj63yASqFAbVlFI6l4EiepZFSJPrM4qPCb7zjT2zigKwWeBl2sk0bGCSdiVdfvMzq3x8023+n6ryi/GpyIDPTcel/6DxH0+ngrEHofqejNioVsQQ7sPFf6SYJDE3437W8B3wrQK0A8CuBYbr+ZngKchZZ4Qat3/w== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(199003)(189002)(36756003)(92566002)(19580395003)(77156002)(450100001)(62966003)(105606002)(189998001)(107886002)(77096005)(2950100001)(110136002)(5001960100002)(87936001)(33646002)(47776003)(86362001)(104016003)(76176999)(50986999)(46102003)(48376002)(106466001)(19580405001)(6806004)(50226001)(229853001)(50466002)(2351001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0749; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 2:H61Hf73MGkBpFeLYGqq1MatHCJhUQhd6Z/4Bp/BbNnuoXwSBD95NjkASVZYGYhGn; 2:7SNyPJ4hc2UaKtjkpwp8OjgnUFFGoOwgla0SUFwfUYUZ5wG2Djlft/+PfrXUoukJ6PczW/d44A7jfam/DziQBFl7k0UQPl1+S+Fc453IvgUEL8SBF5nQ+NeKjciWtNN1FK3DNIPnmtBQ1X5Nw/CNNNe77egTcHlMeM1fUowKgttFs3DPQXjuzpEuV1IQycmHmop+QJbItxQMhujr2wV37x998D6iEyOCpyR32Ylxuss=; 6:GLNnZodUlIOlMLjhgUflDf6tziJucQp+/3fG0ObcnPcNWFqcXPe7S0M8UTHOcnl5kG7Rcrb7r8iHJozzWacpjH65v6Q3P4U3i1BT5V7LFS/Zj7ZDNGbsP/Jqu/++wl5Q0lD5wut4soWuikU67ZvT5lOyB2JvTbGvog5tis39Am135+NJElmqpLLi3z6E6wzegAXJjmFnGiNomgdolIK6xj07+zWh+Qr0AXroZfWl+vUIidpQkVZI4ilLyBaCJD7OJJ7ZyXCdDh5ARqboI5pFSe6TqV6DN1XmSra17r1cRq3ntX7gNhw7VS5Euxw4RqAjRO3Ld13Jgdxnmsm1N9U4Pw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0749; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:DM2PR0301MB0749; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 3:Ic6lKBISh0M80Gj9ieHKTHH9c4/esnOb+1brLqG1rQkrh902DeJ2DXr+GwnHVe5SiKiAYViSWnuppI3GIrmSrw2U/tsgbOhrO4i3yoVlAUp51UuaqhDeI6q5W++GnB6hYEdDiHYbepvN55EDHxpcUTPhRvR89AtObgQ7G318qJOW5in/i730VGOsO2qwjFzXJVksDD9ALyb/A+q4MlF47KkO/Gn0N4D9s9okqAb6rCxf9x7EghjHC9CLhFp7vvLZfRqJxzcxX6aboUTZd8/ZTgNag4TwDB6wTxB1ESEayCSYZbUJucgXRlX0HVAIpMmu X-Forefront-PRVS: 06036BD506 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 9:8yIIY0DcmWBJ5JUPEHh2B8nMAa4L86uXG1rM/L2qcOkFUgJgjxyyj1yzdGRGNxzYZvvYJKwFF38/2uT3NsqR35574cYlija2wOAGlCTlMlpTqw7aJy9u7mTjt8N6Z0651YQ4q9OCAob+Uz9gp+x/kHBvLSRdAiTrmm3SyGmlWPDIi9KYQuVpx4mx3rXTXepifPnFXkdIVhjAJAqneFIi26F5GKxu5TPHDJOT2Q91j2/xldNXKukzUz5cZLAOIAcPIz9cvhgWf2ZYnyq1x2MFndPBurX2tM/Bry91t2fVF3j5AF9xJbSuGcvV3FQwe2wtaNd3SNJU1HpT3Doy+0YLKxiOAbsZdEJMpEz2YdAIfbIv9s7U+M5LhwNLSr/NXB9NQi5PgCVIzzbZNOdGY0d5O7U30jo8CA74TzZSJqlg+wOr0h5wSxae9WG6g3VkXvkT1X6ttGhaWp0xA9Voql/zsZeVZKOVh9E5uVjjzBS8o6slyPIMeFAdL3AhU/YGeax30qAgvUxBRnLCS1nCdAOEfEge1AcaWLm8659UaVBCo0LmAZhf4AnU9L6/zNBKw2yNZRnRpiETD0HY/TLUNrnUL4SXB+hvEya/XUu9RSTkls9AYsvsRsGmjV7sirYKIZdTI2fce6Kt4uaH2ya8EA7mF23BMI9b/03EWCfWbSkSCXsiMfTWkrlvEcqkCGQ5msgkZCKEdeHLYL1TF7FDlAUx2u57gaiPxZ0UpF7IrEVzo0e/K8gXrJlRHOTLQ+0Msiq1EFZuWVN6XHBVhntcw7oR6bhzDaz7id7AR4upgPikDjXdLQtr+Is+CfRC6Kf9RU/5Uc7KggrgfyRcMLX6CkLU90hV307WvI5n6+vTJMH274PGbqTo2evCPZGMF39aYqxmEfjUqI/ddgvNjC0UNpBKew== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 3:NgYI+59416a1FgNrSa6vEMnzMYusSjNFnL0UsDIwqLI91lAt8+h1btsCXvOHEZN3t/UUOjsNm1LNjgvlJDOyvcpEvUCecq673GAt8vIAIaeAuozB/0ftuqc1lC6kIoiRzqDXMbvk67Z1TBjL4qY4gw==; 10:W9B6TcPMHOdNtvreTuMSVS3kBCCDWvtGwfD2h5oDkjQH/eGL77rwQiwjx41loWQkbs+8v6mlQTnWU1YIOSjWxe+uhJxM0bVIlde036MZgsU=; 6:Lt3vBdWAhjj4EUEbJbxqGWDaYdsD8xBQV+PGuE4n1MrqiFUxQXWgF55BB+Cb87i2 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2015 10:40:47.6544 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0749 Cc: yorksun@freescale.com, Stuart Yoder Subject: [U-Boot] [PATCH 07/13] armv8/fsl-lsch3: partition stream IDs 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 Stream IDs on ls2085a devices are not hardwired and are programmed by sw. There are a limited number of stream IDs available, and the partitioning of them is scenario dependent. This header defines the partitioning between legacy, PCI, and DPAA2 devices. Signed-off-by: Stuart Yoder Signed-off-by: Prabhakar Kushwaha --- .../include/asm/arch-fsl-lsch3/ls2085a_stream_id.h | 64 ++++++++++++++++++++++ drivers/net/fsl-mc/mc.c | 2 +- include/configs/ls2085a_common.h | 1 + include/fsl-mc/fsl_mc.h | 4 -- 4 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 arch/arm/include/asm/arch-fsl-lsch3/ls2085a_stream_id.h diff --git a/arch/arm/include/asm/arch-fsl-lsch3/ls2085a_stream_id.h b/arch/arm/include/asm/arch-fsl-lsch3/ls2085a_stream_id.h new file mode 100644 index 0000000..5c94530 --- /dev/null +++ b/arch/arm/include/asm/arch-fsl-lsch3/ls2085a_stream_id.h @@ -0,0 +1,64 @@ +/* + * Copyright 2014 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ +#ifndef __FSL_STREAM_ID_H +#define __FSL_STREAM_ID_H + +/* Stream IDs on ls2085a devices are not hardwired and are + * programmed by sw. There are a limited number of stream IDs + * available, and the partitioning of them is scenario dependent. + * This header defines the partitioning between legacy, PCI, + * and DPAA2 devices. + * + * This partitiong can be customized in this file depending + * on the specific hardware config-- e.g. perhaps not all + * PEX controllers are in use. + * + * On LS2085 stream IDs are programmed in AMQ registers (32-bits) for + * each of the different bus masters. The relationship between + * the AMQ registers and stream IDs is defined in the table below: + * AMQ bit streamID bit + * --------------------------- + * PL[18] 9 + * BMT[17] 8 + * VA[16] 7 + * [15] - + * ICID[14:7] - + * ICID[6:0] 6-0 + * ---------------------------- + */ + +#define AMQ_PL_MASK (0x1 << 18) /* priviledge bit */ +#define AMQ_BMT_MASK (0x1 << 17) /* bypass bit */ + +#define FSL_INVALID_STREAM_ID 0 + +#define FSL_BYPASS_AMQ (AMQ_PL_MASK | AMQ_BMT_MASK) + +/* legacy devices */ +#define FSL_USB1_STREAM_ID 1 +#define FSL_USB2_STREAM_ID 2 +#define FSL_SDMMC_STREAM_ID 3 +#define FSL_SATA1_STREAM_ID 4 +#define FSL_SATA2_STREAM_ID 5 +#define FSL_DMA_STREAM_ID 6 + +/* PCI - programmed in PEXn_LUT by OS */ +/* 4 IDs per controller */ +#define FSL_PEX1_STREAM_ID_START 7 +#define FSL_PEX1_STREAM_ID_END 10 +#define FSL_PEX2_STREAM_ID_START 11 +#define FSL_PEX2_STREAM_ID_END 14 +#define FSL_PEX3_STREAM_ID_START 15 +#define FSL_PEX3_STREAM_ID_END 18 +#define FSL_PEX4_STREAM_ID_START 19 +#define FSL_PEX4_STREAM_ID_END 22 + +/* DPAA2 - set in MC DPC and alloced by MC */ +#define FSL_DPAA2_STREAM_ID_START 23 +#define FSL_DPAA2_STREAM_ID_END 63 + +#endif diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index c4406c6..8bb8f7b 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -474,7 +474,7 @@ int mc_init(void) out_le32(&mc_ccsr_regs->reg_mcfbalr, reg_mcfbalr); out_le32(&mc_ccsr_regs->reg_mcfbahr, (u32)(mc_ram_aligned_base_addr >> 32)); - out_le32(&mc_ccsr_regs->reg_mcfapr, MCFAPR_BYPASS_ICID_MASK); + out_le32(&mc_ccsr_regs->reg_mcfapr, FSL_BYPASS_AMQ); /* * Tell the MC that we want delayed DPL deployment. diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index d095151..5248e2a 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -19,6 +19,7 @@ #define CONFIG_ARM_ERRATA_828024 #define CONFIG_ARM_ERRATA_826974 +#include #include #if (defined(CONFIG_SYS_FSL_SRDS_1) || defined(CONFIG_SYS_FSL_SRDS_2)) #define CONFIG_SYS_HAS_SERDES diff --git a/include/fsl-mc/fsl_mc.h b/include/fsl-mc/fsl_mc.h index 0e799f5..9106f25 100644 --- a/include/fsl-mc/fsl_mc.h +++ b/include/fsl-mc/fsl_mc.h @@ -21,10 +21,6 @@ #define GCR1_M2_DE_RST BIT(14) #define GCR1_M_ALL_DE_RST (GCR1_M1_DE_RST | GCR1_M2_DE_RST) #define GSR_FS_MASK 0x3fffffff -#define MCFAPR_PL_MASK (0x1 << 18) -#define MCFAPR_BMT_MASK (0x1 << 17) -#define MCFAPR_BYPASS_ICID_MASK \ - (MCFAPR_PL_MASK | MCFAPR_BMT_MASK) #define SOC_MC_PORTALS_BASE_ADDR ((void __iomem *)0x00080C000000) #define SOC_QBMAN_PORTALS_BASE_ADDR ((void __iomem *)0x000818000000)