From patchwork Fri Oct 11 13:31:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Wilczek X-Patchwork-Id: 282753 X-Patchwork-Delegate: trini@ti.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 7AEFB2C00E3 for ; Sat, 12 Oct 2013 00:32:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D01DB4A088; Fri, 11 Oct 2013 15:32:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 0mT1jnG-21gr; Fri, 11 Oct 2013 15:32:17 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C65D74A090; Fri, 11 Oct 2013 15:32:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 850174A090 for ; Fri, 11 Oct 2013 15:32:03 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 RK6WZ6BFyos7 for ; Fri, 11 Oct 2013 15:31:57 +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 mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by theia.denx.de (Postfix) with ESMTP id 2213B4A088 for ; Fri, 11 Oct 2013 15:31:50 +0200 (CEST) Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUI00G1CAX0PMD0@mailout3.samsung.com> for u-boot@lists.denx.de; Fri, 11 Oct 2013 22:31:48 +0900 (KST) X-AuditID: cbfee61b-b7f776d0000016c8-3c-5257fdc328a7 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8C.70.05832.3CDF7525; Fri, 11 Oct 2013 22:31:47 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MUI005ELAWQF300@mmp2.samsung.com>; Fri, 11 Oct 2013 22:31:47 +0900 (KST) From: Piotr Wilczek To: u-boot@lists.denx.de Date: Fri, 11 Oct 2013 15:31:10 +0200 Message-id: <1381498270-24342-1-git-send-email-p.wilczek@samsung.com> X-Mailer: git-send-email 1.7.10 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJJMWRmVeSWpSXmKPExsVy+t9jQd3Df8ODDCafsLY42/SG3eLNw82M FuuerGW1mLx4PrPF272d7A6sHmfv7GD06NuyitHj+I3tTAHMUVw2Kak5mWWpRfp2CVwZd74v Zi9o4q7YuOkaawPjXM4uRk4OCQETiftXrjJD2GISF+6tZ+ti5OIQEpjOKPHq3j0WkISQQBeT xLZTBiA2m4C2xPI3bxhBbBEBCYlf/VcZQRqYBWYzSmzae5wdJCEs4CRx5uNisKksAqoSn7+/ BxvEK+Aq0dG+nAlim7zE0/t9bBMYuRcwMqxiFE0tSC4oTkrPNdIrTswtLs1L10vOz93ECA6A Z9I7GFc1WBxiFOBgVOLhtWAIDxJiTSwrrsw9xCjBwawkwrvgE1CINyWxsiq1KD++qDQntfgQ ozQHi5I478FW60AhgfTEktTs1NSC1CKYLBMHp1QDI1NofaadqEiv13qTo5ZX5tr+vTfbIump vOHt1aIdF6UXyUqJqqyYucD4vWHtioNRcoFGjbsPHF9wM2CS+P4bwfre59RmcZZ9a80+Xm8f ndZyfEOYRfCvJZszDM+f0zyt8VWHtf/8iQkFF3mWO++/+4L51rr84Nnzn24UmF8aoFM3dU3+ XaU1F5VYijMSDbWYi4oTASTqCzL8AQAA Cc: Tom Rini , Piotr Wilczek , Kyungmin Park Subject: [U-Boot] [PATCH] disk:efi: avoid unaligned access on efi partition X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de In this patch static variable and memcpy instead of an assignment are used to avoid unaligned access exception on some ARM platforms. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park CC: Tom Rini --- disk/part_efi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index b7524d6..303b8af 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -224,7 +224,8 @@ static int set_protective_mbr(block_dev_desc_t *dev_desc) p_mbr->signature = MSDOS_MBR_SIGNATURE; p_mbr->partition_record[0].sys_ind = EFI_PMBR_OSTYPE_EFI_GPT; p_mbr->partition_record[0].start_sect = 1; - p_mbr->partition_record[0].nr_sects = (u32) dev_desc->lba; + memcpy(&p_mbr->partition_record[0].nr_sects, &dev_desc->lba, + sizeof(dev_desc->lba)); /* Write MBR sector to the MMC device */ if (dev_desc->block_write(dev_desc->dev, 0, 1, p_mbr) != 1) { @@ -387,8 +388,9 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, gpt_e[i].ending_lba = cpu_to_le64(offset - 1); /* partition type GUID */ + static efi_guid_t basic_guid = PARTITION_BASIC_DATA_GUID; memcpy(gpt_e[i].partition_type_guid.b, - &PARTITION_BASIC_DATA_GUID, 16); + &basic_guid, 16); #ifdef CONFIG_PARTITION_UUIDS str_uuid = partitions[i].uuid;