From patchwork Sun Aug 4 08:45:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 2838545 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 68152BF535 for ; Mon, 5 Aug 2013 06:46:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B8E02017A for ; Mon, 5 Aug 2013 06:46:29 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 467F920165 for ; Mon, 5 Aug 2013 06:46:28 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6EYj-0001qt-PW; Mon, 05 Aug 2013 06:46:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6EYh-0003JU-Nv; Mon, 05 Aug 2013 06:46:23 +0000 Received: from mail-bk0-x22a.google.com ([2a00:1450:4008:c01::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6EYe-0003Ii-AH for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2013 06:46:21 +0000 Received: by mail-bk0-f42.google.com with SMTP id jk14so831044bkc.15 for ; Sun, 04 Aug 2013 23:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; bh=jH5P2lrO+7ehhwgNFKwLcf6mHZEFyiKYQ5G6CV5x2vg=; b=KlJ6F00lFvlVUYg/ZSgYAqCD4x8jS/cZW0chNi77xfssV8zLC+bE2wiuR6tTzet5K6 Lr/tfXNwj8lCIEf9OBimKHCYjK9jls2Zq7AACsxSHZFHwcx80rUOu5gnnSHHn7A+z+cf nBYOgAgrvjJYm6mB0HChzLL3pEWKhm/liyY93yt0Vb0fptoUzs8YSfUYvy7tJs0C/ZRj MWcXJGtrirMtsq6AnOSCMN93fK1XjDDpONGLOeaDa42VyzdkVo3gAcAmqguAaMHXxsFP qfEGxVDFd1TDfKvSUpFj0eQRqMbJtB6rOEsrsheiNrf1ZlhxomxmfDQ7VZpu9DHYGX2r dYUQ== X-Received: by 10.205.115.80 with SMTP id fd16mr2416709bkc.70.1375685155374; Sun, 04 Aug 2013 23:45:55 -0700 (PDT) Received: from pali-elitebook.localnet ([2a02:130:500:1560:88ac:8062:1eb7:21b7]) by mx.google.com with ESMTPSA id oe7sm4316214bkb.5.2013.08.04.23.45.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 04 Aug 2013 23:45:54 -0700 (PDT) From: Pali =?utf-8?q?Roh=C3=A1r?= To: tony@atomide.com Subject: [PATCH v3 1/2] ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1 Date: Sun, 4 Aug 2013 10:45:00 +0200 User-Agent: KMail/1.13.7 (Linux/3.10.0-rc7+radeon+synaptics-generic; KDE/4.10.5; x86_64; ; ) References: <531356997.66774.1373571839852.JavaMail.apache@mail81.abv.bg> <51DF0D7A.4090008@ti.com> <20130712102430.GA3249@localhost.localdomain> In-Reply-To: <20130712102430.GA3249@localhost.localdomain> MIME-Version: 1.0 Message-Id: <201308041045.00698@pali> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130805_024620_495255_78B2F817 X-CRM114-Status: GOOD ( 13.31 ) X-Spam-Score: 0.7 (/) Cc: nm@ti.com, linux@arm.linux.org.uk, aaro.koskinen@iki.fi, pdeschrijver@nvidia.com, linux-kernel@vger.kernel.org, =?utf-8?q?=D0=98=D0=B2=D0=B0=D0=B9=D0=BB=D0=BE?= =?utf-8?q?_=D0=94=D0=B8=D0=BC=D0=B8=D1=82=D1=80=D0=BE=D0=B2?= , Santosh Shilimkar , pavel@ucw.cz, linux-omap@vger.kernel.org, Dave Martin , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00, DATE_IN_PAST_12_24, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Here is new version (v3) of omap secure part patch: Other secure functions omap_smc1() and omap_smc2() calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access. Signed-off-by: Ivaylo Dimitrov Signed-off-by: Pali Rohár diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h index 0e72917..c4586f4 100644 --- a/arch/arm/mach-omap2/omap-secure.h +++ b/arch/arm/mach-omap2/omap-secure.h @@ -51,6 +51,7 @@ extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2, u32 arg3, u32 arg4); extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); +extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs); extern phys_addr_t omap_secure_ram_mempool_base(void); extern int omap_secure_ram_reserve_memblock(void); diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S index f6441c1..7bbc043 100644 --- a/arch/arm/mach-omap2/omap-smc.S +++ b/arch/arm/mach-omap2/omap-smc.S @@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar * + * Copyright (C) 2012 Ivaylo Dimitrov + * Copyright (C) 2013 Pali Rohár * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -54,6 +56,23 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2) +/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1 + * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r11, lr} + mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb @ Memory Barrier + smc #1 @ Call PPA service + ldmfd sp!, {r4-r11, pc} +ENDPROC(omap_smc3) + ENTRY(omap_modify_auxcoreboot0) stmfd sp!, {r1-r12, lr} ldr r12, =0x104