From patchwork Wed Oct 4 16:29:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 821393 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3y6hHD0qJSz9sxR for ; Thu, 5 Oct 2017 03:31:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C6FF4C21E79; Wed, 4 Oct 2017 16:30:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 304C2C21E42; Wed, 4 Oct 2017 16:30:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C7405C21D90; Wed, 4 Oct 2017 16:30:13 +0000 (UTC) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0057.outbound.protection.outlook.com [104.47.40.57]) by lists.denx.de (Postfix) with ESMTPS id 07F9EC21C93 for ; Wed, 4 Oct 2017 16:30:13 +0000 (UTC) Received: from CY4PR03CA0108.namprd03.prod.outlook.com (10.171.242.177) by MWHPR03MB2701.namprd03.prod.outlook.com (10.168.207.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 4 Oct 2017 16:30:10 +0000 Received: from BN1AFFO11FD021.protection.gbl (2a01:111:f400:7c10::150) by CY4PR03CA0108.outlook.office365.com (2603:10b6:910:4d::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Wed, 4 Oct 2017 16:30:10 +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=fail 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 BN1AFFO11FD021.mail.protection.outlook.com (10.58.52.81) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Wed, 4 Oct 2017 16:30:10 +0000 Received: from r49496.am.freescale.net (r49496.am.freescale.net [10.29.244.114]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v94GU7e6018873; Wed, 4 Oct 2017 09:30:08 -0700 From: Fabio Estevam To: Date: Wed, 4 Oct 2017 13:29:57 -0300 Message-ID: <1507134597-6831-1-git-send-email-fabio.estevam@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131516082105242749; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7966004)(336005)(39860400002)(39380400002)(346002)(376002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(316002)(50986999)(5003940100001)(33646002)(189998001)(53936002)(54906003)(47776003)(106466001)(85426001)(2351001)(105606002)(104016004)(39060400002)(4326008)(5660300001)(498600001)(6666003)(50226002)(48376002)(97736004)(6916009)(77096006)(68736007)(2906002)(356003)(81156014)(81166006)(16586007)(575784001)(86362001)(8656003)(36756003)(8676002)(50466002)(305945005)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2701; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD021; 1:NXe5opM2QZwRL9ydZBFWM8TazySgGFQ2Vph2G+9t30Mordv7GZtgDdQVbezjXyoGf1dxJ9Oc5+AI58y9kPubtX9p3KXdIiHhS0KKQgsqcbv/bc+i5Mo4RJDjxL+gzzMB MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b1ae0e41-ab5c-4cea-30b1-08d50b452e92 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:MWHPR03MB2701; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2701; 3:z7wEwQAemNuWJ28ZEjxbRzosG5wBZZdaMb8TJ2uAYP6AIUT61u6szHmVsMu0Ub8UHs9ghtJEJOuDNjp6JcltB9PCI0iDh0BL1GM7Yp9GquGW+9Li2nuBD/ErDGDDLJjGGYimeytw5JpX9l0wWzvQfuXwAjxPLu55JvPlewpbYRAr+UqIeNLykXwdFYVIf4ENTkj3efOvQFdgiweO1+xnevjygBpIApCgMSiaxkC/qPohMeezIQMS3RpfcmdPEUh2W5OczYx0du/lmcf7oQECWUMnWo1QfArqTWQi9Td5tA8luRYpbZeTuXeFM7IpkSOBlt2H/Z3OdCtPjp3jC/2sHWSfX67VRgCNBqNNYe4WweA=; 25:oFAQXrvqllDPmC2W7F192Ji1sPstLF/nlQhLhKwLQpmXbqjLhtktJ4QNEZl8mdC/HVyQhjo5PjcsTKqjKqq+4ejkEYPSvNN+1T6qXLMnoxBWEEs6t2flJ55QNmEHc6lyya8vxRUsQ4R7yTSkJs3SHflUZvn7WBJ4svuG3Zgg0IjMt1TLXX8PomgVtYfMhF5ZY8x24PjgcZFl3owVbUUatM4WdCnE9n3jgzWDY/+lXhTi8yBuOwoGD7IoRQObUnD+s+IRE0ryFOgAFUWQ4xu8C09oMhsr0UE49ObUuWCSV4qcFYAikO+Yw5cQZBuMiq6zcLg3yuLENVV0b/GCY4AyqA== X-MS-TrafficTypeDiagnostic: MWHPR03MB2701: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2701; 31:4e0QfXGK6TCkqHVlvofjR7nrJopE6Tfer/Zu7DxqT70emFF2gyaaa7zE/55izHleODoW9h/+i5/gVHy5gSqljEtnQKGxFk12EtImWou0WjGU1rSL961GdDa8IHiOXEu5XtJSKq/eqq576BNlSvmLpkz/iB9TobSy/tlAmIFPWi2uJsdqgAzkJW/HSVJcg/76CfyKYFp/x0WghoLLq/h1yMFKGD1N3+YrhT5z6RaBWzk=; 4:1ltpQcyq4PYth2ZuSHQjOTn0aoRC0ZgrHIcqb+Kmre9OSnl2/VI+q4MY16LTAsRrsg9Rj4ayASWPDL8fEgbpHGb8RcuN+g6n0QgeWx9zWENuIlJGfRAcYNEUwSpkbe9zqf7odpn+T5LQalvKYBmXwYUwKD7th03UJRGjf4p2kyg+oZ5mrigTmqN7vevh8w1hfAAH5QLCrrhqhD8FNcQMJSNxjqQW09G8nzHHcgLi09TFg0jS0iCjBoFizRR1zEBz1lk5ncoJPc5hjaMnv+k4OVdbstsi5BYJla/9oKK1k/U= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123561025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2701; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2701; X-Forefront-PRVS: 0450A714CB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2701; 23:t7zEJ8YVU7y0S5c0dGedyQ+xXPMX+clgJGKbxdkVJ?= PlmKACZssuav8RAH36t/kiMVhWMWJXwFTvoqz1BQIhIXYfdz9veGO8f4JhF40go5E8R7NIDoGrwAc9fDOH0xAJnRa3bFiAZemHITUMMU5mWqUo8pNyrMvGvfObghL6D7WsxYnttNG+yepmRCs2kLXZlHYq8E6vO7Rp3PsCW0fQG73nSZ2TurEGos2+9phFSC28BIgGH16kxzaPo4Q1wbPS6UJX0Av/bE7XVCkrSN1rgxw2lBtNYjrLkevfhAxfgtOSwQ6lpHFSKUTls06fRJaAtiNLtok4eJ9Wd0ky8Y0WofdOpNDlKcXLkjt/HJWqxFQsCO9ayyl5zgUUyn88pRmCJ+yYXLQ1aOYpQATBGbDMz7aOk1YwTysvS+2Shu69huHcrG3my+9SZbBTLpOuxqj+5c0cW/FjRnanSoZZv+nwT99GK34lcMHtFVadWu8HM+oc2JuCoYBU2Nz2vJLy8GEBtdLkJdOmaPwgCtb77yxb2zUs0Gv18tk7BKmAPHxeFSnZnIjnnyawnGrtDCKhFqjWtFbjeOmExKUIj0SB2tGuHBn4E/XeRIHXjrl+5C9SzzShs9+aZSL9vp4+H/wsluW5MDnynuf60Mdeyp+9bYA7Y3E3/ON+h9NywijnSGdGHeRkyOuZ2UM6qsjJ4IAgQWX9o1qgHddKeznp7p19UutJbJBS+L83gsSNHAqeDzesRFlTfTuElOg6nKf+yyxYA3qPFXaGvafq13m8MPd8gaxnYtdsSSc3jhhxxuCe7ewed1hTHXrrgMeipMh2DD7zfUfe7t9HPW9O4Gfu2Pzr4+xvCXUFuDEviAVMp8AHmVieQF0nZRf4AqaH2ax0kQGAz4y5/iSgMQYImWdMuDG8XxXzqH1EPk8JMaTyZm5yV0qQoPuxIUykkB/alnpCRml/zOjO8gxA5umoBJjF75P2oFnjF1HOvwGiFcarirmoly26RvsLdHoFFY9z39LvQLnVhw2YzMK//B3hJgd2vxOQXkYkhz33uN660CfD+mWKtECSlG4RbwImksT5r9VvRd+gjXMz4Ez54KNQQ0uS6fSg77mFqwmFciu60n4vgrD3OLZ5x/4mM/d0tvuJI5hTKvRSPEkz9XI8zcSv8HNnuXgi70bZ4RT48ygcLbPAT1A1IFw5AeA4= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2701; 6:HVbQNCUoZp4xU3ibY62EBIY5vvNlEiKJDxDWcG4sUKnLinnATF/r1cteIee+YgHQg2JkAgPwEzKhhni0dmxZ+FWGq4btTuwGFL1jPxyXnbXrVmp47Jzv9rOIJiJUl2aIY1kuZZAjbjrzyyM74nXydmdRFQs5M6af1Vx9ZyhJ2pepUMiamZUUf1SwJoP5Y19rnZ/25xU612WMN51de03KtgNiFzenV/joMKfrJLrgxwpG6cp556oK/SjW0YBLRDVyvz31uuuZpM3Pu2mrefhfZva2MXORoUvVdYze8jsj49YB9+QDRbCJ0q9/1WxuWAL/cELtFHWjqrJuwsXQlrUX1Q==; 5:9P2tUoILnEpUEO3w+SVa3p2y3+eOJYgJjYszkxUSWY6sYZxDnpg+FPkRZzOCtzP4KQ1BEclcmiIGxhyjl82wy46NS8/+U3gg7ZcR29jxLt7UBy429wf+ECz6EIw0BFuMTWlkZbWDZyZqMtJFdgQM+Q==; 24:UDfGOJqLMCYwb0n54xtkfI5FAzY5/nG82t0z6j+xtHYy6C3litGz3ZFn1guixIyIqfVsnLK5rYrSVdmL+icLK4LV2tChxPzctsY0+PcxpjA=; 7:BjTfd4q7UNgSC9IlWmv/VjFDrtEllXMvk8wGZ2OxFtDonWV2oADTZPdiLiLNyKUnfieF8N1mQYCUNfHD9IUWP+r4ajMeQbtWI5VD4FcwKHBFR7rB54rml9TOmleoeN4F9lN2fJLTjRWaedJiHHgCyig2lCa97Oa9djt3PELIHkmB99TvmWjRWkBwsR0vy8giIFHedwV/OHLzCdJQXZXfoP0cMvGcW/MxPxEDvPRwNVI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2017 16:30:10.3059 (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: MWHPR03MB2701 Cc: u-boot@lists.denx.de, pjones@redhat.com, Fabio Estevam Subject: [U-Boot] [PATCH] disk: part_dos: Use the original allocation scheme for the SPL case X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Since commit ff98cb90514d ("part: extract MBR signature from partitions") SPL boot on i.MX6 starts to fail: U-Boot SPL 2017.09-00221-g0d6ab32 (Oct 02 2017 - 15:13:19) Trying to boot from MMC1 (keep in loop) Use the original allocation scheme for the SPL case, so that MX6 boards can boot again. This is a temporary solution to avoid the boot regression. Signed-off-by: Fabio Estevam Acked-by: Rob Clark Tested-by: Peter Robinson --- Hi Tom, I do not have time this week to further investigate and narrow down this problem. Using the old allocation scheme fixes the mx6 SPL boot problem. disk/part_dos.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/disk/part_dos.c b/disk/part_dos.c index 1a36be0..6dd2c2d 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -89,6 +89,7 @@ static int test_block_type(unsigned char *buffer) static int part_test_dos(struct blk_desc *dev_desc) { +#ifndef CONFIG_SPL_BUILD ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz); if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) @@ -102,6 +103,15 @@ static int part_test_dos(struct blk_desc *dev_desc) dev_desc->sig_type = SIG_TYPE_MBR; dev_desc->mbr_sig = mbr->unique_mbr_signature; } +#else + ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz); + + if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1) + return -1; + + if (test_block_type(buffer) != DOS_MBR) + return -1; +#endif return 0; }