From patchwork Mon Oct 19 11:59:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 532272 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 CFB331401AF for ; Mon, 19 Oct 2015 23:23:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 79BF54B819; Mon, 19 Oct 2015 14:22:37 +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 VJlD_IwBfdSn; Mon, 19 Oct 2015 14:22:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E46D94B81A; Mon, 19 Oct 2015 14:21:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 281624B6EF for ; Mon, 19 Oct 2015 14:14:37 +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 NJHm85l5mmea for ; Mon, 19 Oct 2015 14:14:37 +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-bn1bon0064.outbound.protection.outlook.com [157.56.111.64]) by theia.denx.de (Postfix) with ESMTPS id 74E6F4B6ED for ; Mon, 19 Oct 2015 14:14:32 +0200 (CEST) Received: from BY2PR03CA039.namprd03.prod.outlook.com (10.141.249.12) by BY2PR03MB331.namprd03.prod.outlook.com (10.141.139.20) with Microsoft SMTP Server (TLS) id 15.1.300.14; Mon, 19 Oct 2015 11:59:12 +0000 Received: from BY2FFO11FD041.protection.gbl (2a01:111:f400:7c0c::195) by BY2PR03CA039.outlook.office365.com (2a01:111:e400:2c5d::12) with Microsoft SMTP Server (TLS) id 15.1.300.14 via Frontend Transport; Mon, 19 Oct 2015 11:59:12 +0000 Authentication-Results: spf=none (sender IP is 192.88.168.50) smtp.mailfrom=rhuath.am.freescale.net; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=rhuath.am.freescale.net; Received-SPF: None (protection.outlook.com: rhuath.am.freescale.net does not designate permitted sender hosts) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD041.mail.protection.outlook.com (10.1.14.226) with Microsoft SMTP Server (TLS) id 15.1.300.4 via Frontend Transport; Mon, 19 Oct 2015 11:59:11 +0000 Received: from rhuath.am.freescale.net (rhuath.am.freescale.net [10.81.117.101]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t9JBxAF4020993; Mon, 19 Oct 2015 04:59:11 -0700 Received: by rhuath.am.freescale.net (Postfix, from userid 65020136) id E53922DEBB; Mon, 19 Oct 2015 06:59:10 -0500 (CDT) From: Gong Qianyu To: Date: Mon, 19 Oct 2015 06:59:01 -0500 Message-ID: <1445255949-25021-11-git-send-email-b52263@rhuath.am.freescale.net> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1445255949-25021-10-git-send-email-b52263@rhuath.am.freescale.net> References: <1445255949-25021-1-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-2-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-3-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-4-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-5-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-6-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-7-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-8-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-9-git-send-email-b52263@rhuath.am.freescale.net> <1445255949-25021-10-git-send-email-b52263@rhuath.am.freescale.net> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130897295518456099; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD041; 1:Ox2yYlclul8BMjFQHQljl1WMDMgdUrn/+Sru0mKGgBresNttvhyv4rCLOTyKRDUIqA34eadtTGGTwWHCDsL5CRMzqvTnFlpB6nlV6kRT+oPI9ZckgbGCSe/70RM+mat18VqOkkoE8bbYp6y35lBxThXeHzqkKYaRZsf/hzaTylhPgal3EycINt3SfABfZRUG7KVJ/KFGHGeVweO7mdwoAa9HZUQrb5AVHsxCvyPHE5wcG6KixlxmbfQp2oa8BfzgR7sQsqKN1tyyk6KDBJlbldWVayk/hqmZojwe3LRjp5myDdojMjGKljsKHhu5oj634+CkmVZ53q/g54EqncoZoGuOU7T82sqMgphiNNXqt1VcUQaDwUedlMLFlrhyVlgmIVbfEVJaZ29hOV4aAJ0lZg== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(2980300002)(428002)(189002)(199003)(64706001)(42186005)(33646002)(47776003)(87936001)(103686003)(101416001)(50466002)(105586002)(106466001)(90966002)(76176999)(5007970100001)(50986999)(5003940100001)(19580395003)(92566002)(6806005)(81156007)(16796002)(11100500001)(19580405001)(46386002)(45336002)(86362001)(46102003)(93886004)(5008740100001)(97736004)(5001920100001)(50226001)(48376002)(229853001)(2950100001)(52956003)(2351001)(107886002)(189998001)(5001960100002)(110136002)(4001430100001)(42262002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB331; H:tx30smr01.am.freescale.net; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:0; LANG:; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB331; 2:18En3WRs11TGbYfvInrHXmVwHEx1/m75cE92Nd11bk1X2JvUS+pxNoqc7Iu8OgJVYHOlZm7T0LSmsKtcEch7oV40+EErq9antTp3x1hHL/ljsKBQ+6X4vSu0Dc+SZ97RcYt6yhgXgH2NmYypeBguSXYR/Td3ce20qBf4VLDLe5g=; 3:2AwbnQ2K5VIDkOLXiCsoa3pZvcZMmfGilIvh7eh4z/3hifqGPzoRJGcH0mvhGrvaXe/DQLOUWoAgREdXqUMEs2YGeEIdJwnA1hgGsqNINQnxmFI5YRJEwugpXTTLvGznTaxjwjE9/FsfA4HdEGUYC72Jx0ktuD56WK2bflXprXhUfSddFm4jh0jDovhgGPq88Ot+RTNp09pwBaSbTph18h/JF7oGf4wkouBzDl47R2M=; 25:+ZQEi04q3usTZUmITIEdCcDvRFUN/hMHvkd//GhxWecdvdMA89t7FqRGJq+VTa6Hl1D0ipR+OOeXJcqY8ginM3yPr9b695wn64ZsuPc2/NLYUsmz6deK7Byb+0qP/j02suT7lhYw1KW/HVsLCNN8WdWwbFSs+/c42N43ZntVqOeo0XIqxgalvobhuUqD3ekzPe6YmirqAcMdXP97yKSgoRmefd8ORMSFFKPktOwBs7DEI9KXBM1gpDzPv8qWIS+nQlAXEpDaq2hkxcKHex2Blw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB331; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:BY2PR03MB331; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB331; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB331; 4:heTCx0b/J0KsyZjMhO5amBiMmidfQ4JTcsZ81NQBSEK66OQ3vWkVw2YjPllLUDVkI7PvvOjVBzbCaosJkLhLPBk2pr+YaAXqZ+3r/Nc97K3qeYz5E2cXO22W7lJWneR4CtNg9gRhX+IZMd9VEdi2HGVgBVPJZu/sFm0WuzuZlSi3u6fqosdqGBFQz2J0m6I5lJ60byS6iAbYd0nFmIXbyJp+E7psut4yrH5Am7IDzpKjt0Va3byvGvBvZLZExiCuwF85d031miN7YEdHpa9DBjX7Gx92pL1oaSfAUPz2FOyX0r+4Ya0jWMyYy8l3KAD4F3a6CeDEQJad5TEwt040SD9T5pJQjIv9AQsfTu2p8p4= X-Forefront-PRVS: 07349BFAD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB331; 23:LWkaCT+aDxCWjdCInOEb2lQ6ngW4iOsV2PrR0YrL3B?= =?us-ascii?Q?J+JPhBY0uP4SrsDZ4y5n37AYhu5dF7dOaywFUL+PuboifppOX5pdh4VdYLfG?= =?us-ascii?Q?b7UmQ+jhbXXMH02AacvSFCOGiJm/1vW0HZlf6IEnHCB72xqV8+Si0FkDKonm?= =?us-ascii?Q?YQzrGTR7JfGtM9RuGmjNRfpdK+bAvISPCsLHKYduPmflrrwz6X30M3M/vDnm?= =?us-ascii?Q?4fj5PYONj2rwSJbdjjnFPzcm5tuEAUpVtRz7c/zlNgrvdn0fqfsCEbZdYwPA?= =?us-ascii?Q?PYMMkBVAm4zL1J6LSK4DjdFOvfsj64NwujHS4ANqxIiLpnV6cRFkNav7FhOG?= =?us-ascii?Q?+VIo1iFABoV/IlFU60fMThd3eGetb0jyNKFzkPv7B0nrLWPukS0mLmFQzKfO?= =?us-ascii?Q?OVcBh3CGE83D93Zael5cBw/CGJ6blgJCh/D6/tIfGcT1pL6yGYrek9CFEz0v?= =?us-ascii?Q?02MwgwgfClXp5Rk5esf7LjK9/VLVFkl1muJjvrePnlFwzNBkGbkGQJqaguPX?= =?us-ascii?Q?HRgqVe6/0Stl0anMWq/VZ3TxNcprpNMIh6zx7iEIyG3qYwnUpNx8jhDJLEW+?= =?us-ascii?Q?pcDSBjYOWyiQSBcnFeRlZfpdPUh16Fqh/J/6sfV+dWiztOC2VrYxexUfq8//?= =?us-ascii?Q?r95NuayPcDC4H0ST3rRjtETKdSVPfkpE6Sj6CBStNRQmcI6pxRaH2zTo8Yeb?= =?us-ascii?Q?nkTzZw9KkC3JuqhidAJzW2dQ0P1w1mDx+sY3WUoW+8bvP26BaFDQWI2Ty4Jv?= =?us-ascii?Q?4s6E8EWpP9uJHxTcg6ugtAUbcN6d937wWQsr6apBdCvy+5MP2NhKLEilKxa5?= =?us-ascii?Q?VymqLyvB1pdx5U8eKRbyTygHX/toHZG4e54IkrQgm8wlh0nsfwIKfPA5XXQc?= =?us-ascii?Q?+k80vLhc0DYOkG0TnWL07VMZUyjxQAA9nuucKicXJ9wL0yG6Ykrr4i+qE2rr?= =?us-ascii?Q?hXPOwddgGlpaBYHlLdnTxZdf12txp7WORrsKKiMMIlyQ0a9j863XDMr9p6vU?= =?us-ascii?Q?1oCUSUcL77m3Gb6jeI0NWWxoY1naS/4q8cCLdofPsl8e2SzPBdDuwWshtwyK?= =?us-ascii?Q?9/SH4m4X5GQeTO3nPdHWEGOUl49lKYXS8KlbZoS+hg7d9mWx0OhJ+3VQgQPz?= =?us-ascii?Q?HH5OQHQo4FSO9jAJqZjD2jkI7oVbPuuMR9XEG9hzQurLiWlh4tSHLRORzQ0d?= =?us-ascii?Q?VPCf+dXAZkEnyC956eflgiFj4hPSpdOkFIj/E6vfDKy03iAR72sb1IIzJJQN?= =?us-ascii?Q?ZzQ9AUB2CZTnOMXRPh4CBXsINHe2410XIpQgx6rER7MB4rglFBMk8mka6CU/?= =?us-ascii?Q?DM+OQTti+3G0mB4AI61k330xd0Z+KwsLUhBw1iMCpd?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB331; 5:tiZWxXDa3FPUXWFtT2YFuy7jtu6BO2l+31a2TdjULy0PhZxKCjt1CmucyTSxn21HDvXcZ+8q/Ts04/KFKVHhMWkLRiwmvEUgxn+qkWjxhVaeGpCNhcA0IweyeNlQ4oFEPdvBUfx8S0e2eBaV9A1D2gWffJm2iv2nGnM/f6mxm+M=; 24:EBT48Y7X0+oEmPwK/VKM/vVre3HcJaceMiaIXPm/7wDKW9zJb9NOMhyeuEPT5uZNL/Lnw/gQ4R0w30V7iMNBRqfs/uAOoCuNRg5ZXattC6k= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2015 11:59:11.5960 (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: BY2PR03MB331 X-Mailman-Approved-At: Mon, 19 Oct 2015 14:21:14 +0200 Cc: B07421@freescale.com, Gong Qianyu , alison.wang@freescale.com, B48286@freescale.com, Wenbin.Song@freescale.com Subject: [U-Boot] [Patch V6 10/18] net/fm: fix MDIO controller base on FMAN2 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: Shaohui Xie MDIO controller base on FMAN2 was defined as CONFIG_SYS_FSL_FM2_ADDR plus offset, but CONFIG_SYS_FSL_FM2_ADDR only defined when there are two FMANs, so we should only define MDIO controller base on FMAN2 when there is FMAN2. Signed-off-by: Shaohui Xie Signed-off-by: Mingkai Hu Signed-off-by: Gong Qianyu --- V6: - No change. V5: - No change. V4: - No change. V3: - No change. V2: - No change. include/fm_eth.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/fm_eth.h b/include/fm_eth.h index 3e1b9f4..d43f801 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -45,8 +45,10 @@ enum fm_eth_type { #ifdef CONFIG_SYS_FMAN_V3 #define CONFIG_SYS_FM1_DTSEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xfc000) #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xfd000) +#if (CONFIG_SYS_NUM_FMAN == 2) #define CONFIG_SYS_FM2_DTSEC_MDIO_ADDR (CONFIG_SYS_FSL_FM2_ADDR + 0xfc000) #define CONFIG_SYS_FM2_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM2_ADDR + 0xfd000) +#endif #else #define CONFIG_SYS_FM1_DTSEC1_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xe1120) #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xf1000) @@ -89,6 +91,7 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ } #else +#if (CONFIG_SYS_NUM_FMAN == 2) #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM2_TGEC_MDIO_ADDR) \ @@ -101,6 +104,20 @@ enum fm_eth_type { .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ offsetof(struct ccsr_fman, memac[n-1+8]),\ } +#else +#define FM_TGEC_INFO_INITIALIZER(idx, n) \ +{ \ + FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ + .index = idx, \ + .num = n - 1, \ + .type = FM_ETH_10G_E, \ + .port = FM##idx##_10GEC##n, \ + .rx_port_id = RX_PORT_10G_BASE + n - 1, \ + .tx_port_id = TX_PORT_10G_BASE + n - 1, \ + .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ + offsetof(struct ccsr_fman, memac[n-1+8]),\ +} +#endif #endif #if (CONFIG_SYS_NUM_FM1_10GEC >= 3)