From patchwork Thu Jun 4 09:30:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1303415 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=mZ9Ny+up; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49d0rd5Xlhz9sRK for ; Thu, 4 Jun 2020 19:30:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DB9981E3D; Thu, 4 Jun 2020 11:30:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="mZ9Ny+up"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0F0E81E43; Thu, 4 Jun 2020 11:30:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on0715.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe07::715]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6903F81E38 for ; Thu, 4 Jun 2020 11:30:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SrI0Ezs+mVofnvyB5ZXbgIg8MpRExcGNu7GE1mEgS3SnHsyq7MLKC/nKNPbf8v5ilkokmKi8v4brJ9DKPmQWOMAOIAOEpeUFyAv/7WGs+9EEpPAC+X/TQVAV69eA61FfSzi6zm3OTEpFntgNIks/SE8MRnDluGjPanDV9OgLOo/uR2nhtDlca2xfK71PYRVZyR3dvdXOAcgWQy8S61e05ZL3V16vwJMHHohcMehsuoNvKZYPKLB2q6T4/rG6pJ3HYus111YTAzKxubd18Rqxmmet8JxbE/xHdEn0GLL9JrO42ioVzjaQ2aQY9fH8Y/xhwIbVt6RRoxdnC0fl7KuK3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wUQtybWWXXkBf9xmRjAwFEQWM2VHY0AenbYJ8k14Bgs=; b=Ldn7ADPwDVVlTXtPgpr03h+biysFa9sxf/z2Tu+c11HPAH7Y28mQH1Pry0xe4dItzsSZiE95Gwn/hHYFHBQ1Jn4mkgU2yRGBcXK8NStz3K4gwsknJWChBwAFM/n9Cm+dDPpymK8bhhfgobH6/VaLCQ2rt97hYabayeEoQ4Ia2T8ty5a3N7nZDST+NcaKq6yvRZrLFORDnYNSUwZQVR7auIxWCwSXu1RX7nfcWEl+b9XTPC9ElcLdpUBNUFr1xnq5cBp8Vj0R0JPFxbBqaC0LG/7CJXtD6s7hRqhXLm0mCeuylvJiywY+XQ7EEsIBMCdhyogq3lyOih05+rbPraMJAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wUQtybWWXXkBf9xmRjAwFEQWM2VHY0AenbYJ8k14Bgs=; b=mZ9Ny+upj3FM6D3yFz6SYduOZFcGNjcAFEaTU3ozHhej2sYpdCKxZvjNK9V3jIbGvC8rHYOdHSwqhJZx2rWD1de1f2j78897+X1xFJAL0sKrsRX9rcQGQKVbgqQOZ/jODtRO+oVzFpJY9BkF59Hxwe5j0yNU1autcX2O+u3lv6A= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=prevas.dk; Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) by VI1PR10MB3679.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:134::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18; Thu, 4 Jun 2020 09:30:47 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::f0ac:4e97:2536:faa]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::f0ac:4e97:2536:faa%7]) with mapi id 15.20.3066.018; Thu, 4 Jun 2020 09:30:47 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Christophe Leroy , Wolfgang Denk , Simon Glass , Rasmus Villemoes Subject: [PATCH] powerpc: reduce number of WATCHDOG_RESET calls from flush_cache Date: Thu, 4 Jun 2020 11:30:39 +0200 Message-Id: <20200604093039.26781-1-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.23.0 X-ClientProxiedBy: AM6P193CA0045.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::22) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prevas-ravi.prevas.se (5.186.116.45) by AM6P193CA0045.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18 via Frontend Transport; Thu, 4 Jun 2020 09:30:46 +0000 X-Mailer: git-send-email 2.23.0 X-Originating-IP: [5.186.116.45] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35e047cb-969c-48cb-c76d-08d80869f672 X-MS-TrafficTypeDiagnostic: VI1PR10MB3679: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 04244E0DC5 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6ram2RjLaSPp+QZUnyo4nZ47fYhPi/X3wx+XXO5rIYT3xCDIj59HxH0ccfuF3/FCadeFyctpd7HpwC00zrioxkw6EOi6vCBIrib8pzWBBIzY4RkzN2mciOBqe4CySfCjaKUQMvjWLgKZyNGl3Obg8VBk+78F0AsoLG5WLVt7aDug/qMYoRGYS52W1T7hWXnu5BUsqQg/PbycJNj44f3yZ/nnWUey+xZ6+18rz2Mp/Zl0nQu/0xYXgBkZ57ymA589otFMW0xb5/vc7pth+wDpRt6gYxg9wtvnpgrJlUe1O8THPV9AsW+sxtbJmgjArHyZNfRKCHAfYZAvyK4eMGiJ7w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFTY:; SFS:(39840400004)(366004)(396003)(136003)(346002)(376002)(5660300002)(8936002)(2616005)(6506007)(83380400001)(956004)(44832011)(6666004)(8676002)(86362001)(316002)(107886003)(54906003)(8976002)(52116002)(36756003)(4326008)(6486002)(478600001)(1076003)(66946007)(6916009)(186003)(2906002)(6512007)(26005)(66476007)(66556008)(16526019); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: fVs4bvQPmNTBLVEK7aBEYtAkTivHJJJGSLMYx06NIoBgnnnub6aozBP5LXqWqobXLij/xFzTHnw+KyH/V3mygFuq7ugREn3LnaNqCT950uVAwaj7I4vnTRnTcox1h03nhFGavJ4TfdiZs+04rJDLe2s5u6PN6K4AT3gZLSk2EnYd6gWzKYCpoDoJZfjTFEnic4oHDT/l/QUHdEXsn3eQE6SONRWYY0mOKWUkYXe6oGz/uAveMXcjSZ8zEYC2AeC+I5GFDaKh/+xK+t04oDDDvGgs2Ru0Jy+25NbgEejxEkr4M6gaXeS4XaIpTYINCTpRAIhDnq2KQ0tXIAuGn3Gprc6cwQQYHZgmGyQGKndWXHlzSpY+K36jJcj8XwfCuPuhYiNkCsj1aolRxL1DO9QxLnyXXMPYUzrYAd42bDusxW3jFepCU+pxsfAp2qmcJQHBLdHbMMjzF3YbuLn9uTmP5vm3eImVJNfESLkdt2MM+gQ= X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 35e047cb-969c-48cb-c76d-08d80869f672 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2020 09:30:47.4199 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nHrnp/U/9z84yemAHp/+HxVhgFgrWQfDUpa04dEobuQ4XbIAGZaeuGMq8W+75Z4Hc7mS6yGMRfOrKEdq3mlxnkNMGgTQBOd421VXYjcSPTo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3679 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Calling WATCHDOG_RESET for each and every cache line is overkill. In our case, the kernel image is a little over 7MB, and the almost 500000 calls of WATCHDOG_RESET() adds about one second to the boottime. I very highly doubt there's any real hardware where flushing 64K from cache to memory takes more than a few milliseconds, so this should be completely safe. Since it reduces the number of WATCHDOG_RESET() calls by roughly a factor of 1000, the overhead from those is practically eliminated. (Just in case the range flushed is so small that it doesn't cross a 64K boundary, add a single WATCHDOG_RESET() between the loops). 64K is chosen because that's also the default chunk size used by the hashing algorithms, and when, say, a sha256 digest of a kernel image of a few MB is being verified, that's almost guaranteed to be cache-cold, so apart from the computations being done, the hashing is also bounded by memory speed - so if 64K works for those cases, it should certainly also work when memory access is the only thing being done. Signed-off-by: Rasmus Villemoes Reviewed-by: Stefan Roese --- arch/powerpc/lib/cache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/lib/cache.c b/arch/powerpc/lib/cache.c index 528361e972..df2310f4e2 100644 --- a/arch/powerpc/lib/cache.c +++ b/arch/powerpc/lib/cache.c @@ -8,6 +8,7 @@ #include #include #include +#include void flush_cache(ulong start_addr, ulong size) { @@ -21,15 +22,18 @@ void flush_cache(ulong start_addr, ulong size) for (addr = start; (addr <= end) && (addr >= start); addr += CONFIG_SYS_CACHELINE_SIZE) { asm volatile("dcbst 0,%0" : : "r" (addr) : "memory"); - WATCHDOG_RESET(); + if ((addr & (SZ_64K - 1)) == 0) + WATCHDOG_RESET(); } /* wait for all dcbst to complete on bus */ asm volatile("sync" : : : "memory"); + WATCHDOG_RESET(); for (addr = start; (addr <= end) && (addr >= start); addr += CONFIG_SYS_CACHELINE_SIZE) { asm volatile("icbi 0,%0" : : "r" (addr) : "memory"); - WATCHDOG_RESET(); + if ((addr & (SZ_64K - 1)) == 0) + WATCHDOG_RESET(); } asm volatile("sync" : : : "memory"); /* flush prefetch queue */