From patchwork Tue Apr 14 09:08:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Borleis X-Patchwork-Id: 6214311 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F006BF4A6 for ; Tue, 14 Apr 2015 09:12:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EAF8201F5 for ; Tue, 14 Apr 2015 09:12:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1CE9C201EC for ; Tue, 14 Apr 2015 09:12:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yhwr0-0007XW-TI; Tue, 14 Apr 2015 09:09:58 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YhwqF-00077h-C1 for linux-arm-kernel@lists.infradead.org; Tue, 14 Apr 2015 09:09:16 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1Yhwpp-0004Me-1k; Tue, 14 Apr 2015 11:08:45 +0200 Received: from jbe by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1Yhwpn-0007Je-VH; Tue, 14 Apr 2015 11:08:43 +0200 From: Juergen Borleis To: linux-kernel@vger.kernel.org Subject: [PATCH 5/5] RTC/i.MX/DryIce: prepare to force a security violation Date: Tue, 14 Apr 2015 11:08:38 +0200 Message-Id: <1429002518-5015-6-git-send-email-jbe@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429002518-5015-2-git-send-email-jbe@pengutronix.de> References: <1429002518-5015-2-git-send-email-jbe@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: jbe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150414_020911_719262_FF474106 X-CRM114-Status: GOOD ( 16.48 ) X-Spam-Score: -0.0 (/) Cc: Robert Schwebel , Alessandro Zummo , linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 In order to test the new driver we need some mechanism to force a transition into the security violation state. Two DryIce internal timers can be used for this purpose. Both have an overflow feature which forces this transition and can be triggered automatically (timer) or manually (monotonic via reading the RTC time). Note: this change is intended for development only to test the driver's recovery capabilities. It is useless for regular use of the DryIce unit. Signed-off-by: Juergen Borleis Signed-off-by: Robert Schwebel [rsc: got NDA clearance from Freescale] --- drivers/rtc/rtc-imxdi.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c index de1a2e4..cbc1ebe 100644 --- a/drivers/rtc/rtc-imxdi.c +++ b/drivers/rtc/rtc-imxdi.c @@ -29,6 +29,9 @@ * not supported by the hardware. */ +#undef FORCE_VIOLATION +# define USE_TIMER_VIOLATION + #include #include #include @@ -288,6 +291,69 @@ static int di_handle_failure_state(struct imxdi_dev *imxdi, u32 dsr) return -ENODEV; } +/* + * Two types of security violations we can force: + * + * - regular timer counter overflow: + * - set it up to 0xfffffff0 + * - enable its counting + * - set TCSL bit to prevent any further change + * - let the overflow happen which forces a security violation + * + * - monotonic counter overflow: + * - set it up to 0xfffffffc + * - enable its counting (MCE = 1) + * - set MCSL bit to prevent any further change + * - write 4 times to the monotonic counter register + */ +static void di_prepare_security_violation(struct imxdi_dev *imxdi) +{ + u32 dcr = __raw_readl(imxdi->ioaddr + DCR); + u32 dtcr = __raw_readl(imxdi->ioaddr + DTCR); + +#ifndef USE_TIMER_VIOLATION /* monotonic counter variant */ + + /* clear the MCO flag, otherwhise it cannot be programmed again */ + di_write_busy_wait(imxdi, DSR_MCO, DSR); + + /* stop monotonic-counter to be able to set its absolute value */ + dcr &= ~DCR_MCE; + di_write_busy_wait(imxdi, dcr, DCR); + + /* set a new value close to its overflow */ + di_write_busy_wait(imxdi, 0xfffffff8, DMCR); + + /* enable monotonic-counter to increment on each write */ + dcr |= DCR_MCE; + di_write_busy_wait(imxdi, dcr, DCR); + + /* lock this setting */ + dcr |= DCR_MCSL; + di_write_busy_wait(imxdi, dcr, DCR); + + /* let this overflow force the transition into the failure state */ + di_write_busy_wait(imxdi, dtcr | DTCR_MOE, DTCR); +#else /* timer counter variant */ + /* clear the TCO flag, otherwhise it cannot be programmed again */ + di_write_busy_wait(imxdi, DSR_TCO, DSR); + + /* set a new value close to its overflow (16 seconds) */ + di_write_busy_wait(imxdi, 0x00000000, DTCLR); + di_write_busy_wait(imxdi, 0xfffffff0, DTCMR); + + /* enable timer-counter to increment on each write */ + dcr |= DCR_TCE; + di_write_busy_wait(imxdi, dcr, DCR); + + /* lock this setting */ + dcr |= DCR_TCSL; + di_write_busy_wait(imxdi, dcr, DCR); + + /* let this overflow force the transition into the failure state */ + di_write_busy_wait(imxdi, dtcr | DTCR_TOE, DTCR); +#endif +} + static int di_handle_valid_state(struct imxdi_dev *imxdi, u32 dsr) { /* initialize alarm */ @@ -305,6 +371,7 @@ static int di_handle_invalid_state(struct imxdi_dev *imxdi, u32 dsr) { u32 dcr, sec; +#ifndef FORCE_VIOLATION /* * lets disable all sources which can force the DryIce unit into * the "FAILURE STATE" for now @@ -312,7 +379,7 @@ static int di_handle_invalid_state(struct imxdi_dev *imxdi, u32 dsr) di_write_busy_wait(imxdi, 0x00000000, DTCR); /* and lets protect them at runtime from any change */ di_write_busy_wait(imxdi, DCR_TDCSL, DCR); - +#endif sec = __raw_readl(imxdi->ioaddr + DTCMR); if (sec != 0) dev_warn(&imxdi->pdev->dev, @@ -571,6 +638,10 @@ static int dryice_rtc_read_time(struct device *dev, struct rtc_time *tm) now = __raw_readl(imxdi->ioaddr + DTCMR); rtc_time_to_tm(now, tm); +#if defined(FORCE_VIOLATION) && !defined(USE_TIMER_VIOLATION) + /* don't use interrupts here */ + di_write_busy_wait(imxdi, 0, DMCR); +#endif return 0; } @@ -840,6 +911,9 @@ static int __init dryice_rtc_probe(struct platform_device *pdev) goto err; } +#ifdef FORCE_VIOLATION + di_prepare_security_violation(imxdi); +#endif return 0; err: