From patchwork Thu Oct 4 08:54:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 978723 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l/GLxfPr"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="nn5G/BP/"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dT5sgIyv"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QnbF1HWQz9s7T for ; Thu, 4 Oct 2018 19:27:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tpH5nDLcHyKwID6vkpeHJD+ItgeYHaZ213phCEm6ut8=; b=l/GLxfPrfmT9F4 0oef248VFOADVQXxVT/dKjL49sjlW4JoZ1iOrivNRab7pQB31amBtJVwBWCMm1MLa37QvUgOw/th2 N61hr83y/xHRlE4ffEh0pJHpq+FDBqsnC4H/HWSrtRPHCPH8iY6pr/WnTs2YAlQF696O2JROOW6qm bqLanakAnuxoRJBal1gc29Prg2p8t06HN5ADSKxlIkLruYHOH87HMrnNFNpSCFQ7s0Ft+rOYwlqoO jZPKXZPcjfZb7Sn10tLyTC80kn1RHVkp/Xx/8IZU2kBkNG0gRdHFV2Xpzuc2moVYV0cgMVL2B6ESM +SwFtVs4Za8MR/hdcDVg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zuH-00048r-5R; Thu, 04 Oct 2018 09:26:53 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zsj-0002jv-Rp for linux-arm-kernel@bombadil.infradead.org; Thu, 04 Oct 2018 09:25:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oal2Sxh3eKSVbX8dI6XStpPyPYZTzwiOSIntq3DfXv0=; b=nn5G/BP/O6JYgMQmYrvD3FNS/r EQ/Bd4l3nazrpIp1BZnhVpiZjpB6csKBINCD2CUp/6vSy5vC8lC+c55dP0TAZY7RXbDDaccq96x07 1PgzwcyxgnzRIzhVSNtOgF865jCzX4dA0pENiO7XjyhN56kF2qPq/crxaZiSkwZi+/PYnocRhsgxC DdLJQBW3U9bK18MYnmU6oAHtSmoFVLQQXQldP6y0YCfx0tuFjXZkohHfkibcBzhnfaAYgVhyygci+ UXBOqXhTnCGdR+fYDgZnqL+h9zyxXQXYXvxRdP8uC4HtLLFXodrmsA4IG4uawm3mxZO5J5jg9HUoP 2MQ0ZTQg==; Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zPH-0007VP-FK for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2018 08:54:52 +0000 Received: by mail-wm1-x344.google.com with SMTP id z204-v6so7341922wmc.5 for ; Thu, 04 Oct 2018 01:54:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oal2Sxh3eKSVbX8dI6XStpPyPYZTzwiOSIntq3DfXv0=; b=dT5sgIyvnwhdXHQNv4Rc5C8G6LVXjSGFrF/ZnRKwlC0SX0iRP6iS5Tbo1bE3gj/A5V EdB/wxWmQdEcfh+jCNIB7tvyiGOJcXOgSw39pJTqoNbY7+TS2ZbZaCf+OZFQC3CHUTiU 27fHFh8IUC20VLaYm1B/hLhdQVH9gaew1XRtlRJJXAif4Mp4xvDPMJHj5azHuVv0WmbA qNkUEGQzDVoah0zPYnIgYeK/oDQfYBlySF3Cp5YEMVFZkkXP4v0sxVHYGZqkwJPgYfqs WN/D1/YhvgieTMDfMMQS2lmGB4zctbe0/B8BzgbZvARI3nwW+F/kvcH2WzOLqcOsC1hZ coWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oal2Sxh3eKSVbX8dI6XStpPyPYZTzwiOSIntq3DfXv0=; b=Dmmx/IfPdIb24Bn3qiB3nF7lb6BFeGH9q75VYTsmGDWJsJrJlmlx0Y3irPLYjESVi5 FT/jPr6ZjUhhGv0eRyAL2vyxlqj2OirxATQLquhOMVCKQexcQyJ2jFZJJ0srO+7zHCQw apuzPgPf7kd5tMZdM87c+eGujpXo6qpxyOhmdbhfjYddF4iBXxU0ad2ikCPs2gBsSYKN X7Xhk2GGYrxXuBis3NKZDSUUx8caRWU94CafWd+7VaeCkr5gIUjskeuzvzqZeWMTkyUE Etuq5XxWYvDunzI0J3HL844cJtRopkgdflj9PM6vcrg2vZDh3gSf39AA5qgrdYC+5krk 36xg== X-Gm-Message-State: ABuFfojzVrZGVo0xCXjLqi8fx6VcPPnfkB0PpnHGV/kMUrORw85UtdrK jNWWrAWSK65FOuKlHV8iZZYMaGve/hIUXg== X-Google-Smtp-Source: ACcGV63CRi4UXM8mkEXCOVPqg17EE1pywkCH4HbqumAq958mbNu+iW5GiJHFu0dx9cXUtII0l3Jxig== X-Received: by 2002:a1c:a683:: with SMTP id p125-v6mr4134869wme.24.1538643277075; Thu, 04 Oct 2018 01:54:37 -0700 (PDT) Received: from cperon-Latitude-7490.devialet.com (static-css-csd-151233.business.bouyguestelecom.com. [176.162.151.233]) by smtp.gmail.com with ESMTPSA id b139-v6sm8715013wmd.36.2018.10.04.01.54.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 01:54:36 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Dinh Nguyen , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/3] ARM: socfpga: Clean unused functions Date: Thu, 4 Oct 2018 10:54:13 +0200 Message-Id: <20181004085415.12925-1-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181004_045451_529160_83D964DD X-CRM114-Status: GOOD ( 12.47 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (peron.clem[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org These functions are unused externally, removed them and declare the one used locally as static. Signed-off-by: Clément Péron --- arch/arm/mach-socfpga/core.h | 2 -- arch/arm/mach-socfpga/socfpga.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h index 65e1817d8afe..92cae0a9213f 100644 --- a/arch/arm/mach-socfpga/core.h +++ b/arch/arm/mach-socfpga/core.h @@ -34,8 +34,6 @@ #define RSTMGR_MPUMODRST_CPU1 0x2 /* CPU1 Reset */ -extern void socfpga_init_clocks(void); -extern void socfpga_sysmgr_init(void); void socfpga_init_l2_ecc(void); void socfpga_init_ocram_ecc(void); void socfpga_init_arria10_l2_ecc(void); diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index dde14f7bf2c3..5fb6f79059a8 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -32,7 +32,7 @@ void __iomem *rst_manager_base_addr; void __iomem *sdr_ctl_base_addr; unsigned long socfpga_cpu1start_addr; -void __init socfpga_sysmgr_init(void) +static void __init socfpga_sysmgr_init(void) { struct device_node *np; From patchwork Thu Oct 4 08:54:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 978717 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CMJDTDP7"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="HiQ/8y9p"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mMWvqcCp"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QnBD0lRZz9s7W for ; Thu, 4 Oct 2018 19:08:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0ocQI3xP6ncQmN2kow0Q16+Hi7rjh5MenOliGgb8GhY=; b=CMJDTDP7+EHVbz Th+/9iGJX1vtri2PdAYZaOe6ttXEA7LskufePvgA2S3T10F4lXYsF/lrRCVZx44ZjkwlnyO083Crw VtnJ6MmCEj7o03OSyZZVbltdWSV+VCy3AuJwBlPIFPjb3zJK82Ct6N9Y2Rz1l81OMy6HuxQXX3iOM WSjU4aBNHK7lx6ItLQTMCJnBa0nByS59YmtSuUrDQ9G0vnGK4kEbaSps258C5ea6dxMRCd1wxLi0E yl9MR9e8pFG4uxbHw1FowmFwYwHSYYnpWSZOAp8gzLirskPP0tbeHWchfILMXKmvDTMShjcuWxHL/ WhT57eQAKpCuTJ8UUYZQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zcg-0002Jy-SJ; Thu, 04 Oct 2018 09:08:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zcW-0002BN-0d for linux-arm-kernel@bombadil.infradead.org; Thu, 04 Oct 2018 09:08:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VgEeMcMlv6eq1LWwPB2RsqWLX+9E5hcAuRXmO2ns/Nw=; b=HiQ/8y9pMus+fsS4bh2pUD3Chc Z8h/X4RAxchoTatLpwKXJgezsZEwcRwBFigAdty2vx9PpwEZIy9RojuofVO0oYPNiaz2nLtjhG4Iz jkeh11bKX+cjPocsV7ztzgUWiKWAh2GMPfRwNndppjrgdDvMN8rJVpgRI8+jVXd7tGwpNpozUvTbk nS3vxfRp1uUmUo+OPIpEydxC43Y1mn071Gfj38/6uPywVSP0HVlh3Ve4ahHuEzaH6VUzAFxLRdgYG ziauecemzVJs2nFLMQLI6lJWez7pAxurSRkFCBz8lpps5odSrbgUBI5AJZ1e8mnoWynpVJy3dMNJx b5tGpb7A==; Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zPI-00059A-Fg for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2018 08:54:54 +0000 Received: by mail-wr1-x444.google.com with SMTP id y16so8995565wrw.3 for ; Thu, 04 Oct 2018 01:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VgEeMcMlv6eq1LWwPB2RsqWLX+9E5hcAuRXmO2ns/Nw=; b=mMWvqcCpd72Wdd6pp5e6Wj+H5S6QfpLXVWU5HYDPvgREyCK05v3p+8iIDyZfLYx9F3 ozBB1lSTlwpautLEzbnCShiU7BC7SVc5VtPTRR3DZVtLHITv3CVNh6LNvw4riMrxYmF5 ASesBkhCK+GP6y0xRuWMkgJEmiLZh+5joaUWVBHBkO4lHo+3kNm9okxgp9RlYi62sStw zzkzypyH8hZmzGnSCJxmMlEu0uKOFiAZbeGLjwCwjSNykrDS0BlWLDB088sq4lDwJOOV 6EwiLQ06frLHJwJbrqhO0KAnT4h4JtB90TjtW1Z1/AZ4yUq9AVPuymZ08oU6eSMsahRO 8Akw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VgEeMcMlv6eq1LWwPB2RsqWLX+9E5hcAuRXmO2ns/Nw=; b=g+ktN/nUvl6cmODpR+5szI/MuqGvXYSLKtb1d2uva14kAfJBuoNZ4tgBqNw+eLXfEW /l4KOkPjQxkUwDPPx1l9xFMPCS783j1O+Dg/lSgZ8N5i00TenmLRbiTM2hXgjFzC2d3o kV6Y+iwDg4LpzODFbPe72niMemRoaYzMYqv59Q3eqmgr4GqwDSsHNNd9PjWzufWkuBqD tnbYa//bh9O7K33aD/L2YjxhHnBzY5xgprs3F+TopU3cTDyBJo8s4g+ckZdYoiAswK84 3JknSTeWKWVLtkW7c8+4wDMvE55DgLE3yUMeGj0p2+Wcac+3vGT3sGgB3kg7jfm8XB3L mdGA== X-Gm-Message-State: ABuFfoincg/AoqK4nUKXZyaZ6IS6VS7ImXnz1RUDjuq9MFEPGCcktxvs SIEteMBe6brjL9WhK35v52o= X-Google-Smtp-Source: ACcGV62jzhNs9W0bECQ8cK7hwB3fcYLhup0a0k/5Z8DDz/iwG+GxUEVhS2aBoepkSi362AlW/wA/MQ== X-Received: by 2002:adf:9e09:: with SMTP id u9-v6mr3909303wre.51.1538643280605; Thu, 04 Oct 2018 01:54:40 -0700 (PDT) Received: from cperon-Latitude-7490.devialet.com (static-css-csd-151233.business.bouyguestelecom.com. [176.162.151.233]) by smtp.gmail.com with ESMTPSA id b139-v6sm8715013wmd.36.2018.10.04.01.54.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 01:54:39 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Dinh Nguyen , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/3] ARM: socfpga: Turn on all peripheral clocks for a system reboot Date: Thu, 4 Oct 2018 10:54:14 +0200 Message-Id: <20181004085415.12925-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181004085415.12925-1-peron.clem@gmail.com> References: <20181004085415.12925-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181004_095452_544006_B6427D95 X-CRM114-Status: GOOD ( 17.34 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (-0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (peron.clem[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= , Dinh Nguyen Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Dinh Nguyen When doing a software reboot, all peripheral clocks must get turned on for the L3 interconnect to work. This code is needed when doing a "reboot" from user-space and a peripheral clock as been gated off. Why would a peripheral clock get gated? An example use case would be a .ko that gets insmod and rmmod during runtime. The insmod would turn on the IP's clock, and the rmmod would turn off the IP's clock. Doing a "reboot" would cause the system to hang. 5c04b57fe33c ("ARM: socfpga: Enable soft reset") Signed-off-by: Dinh Nguyen Signed-off-by: Clément Péron --- arch/arm/mach-socfpga/core.h | 3 +++ arch/arm/mach-socfpga/socfpga.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/arm/mach-socfpga/core.h b/arch/arm/mach-socfpga/core.h index 92cae0a9213f..17c8a97c04d9 100644 --- a/arch/arm/mach-socfpga/core.h +++ b/arch/arm/mach-socfpga/core.h @@ -52,4 +52,7 @@ extern unsigned long socfpga_cpu1start_addr; #define SOCFPGA_SCU_VIRT_BASE 0xfee00000 +/* Clock manager defines */ +#define SOCFPGA_ENABLE_PLL_REG 0xA0 + #endif diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index 5fb6f79059a8..c9c881f7c67c 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -31,6 +31,7 @@ void __iomem *sys_manager_base_addr; void __iomem *rst_manager_base_addr; void __iomem *sdr_ctl_base_addr; unsigned long socfpga_cpu1start_addr; +void __iomem *clkmgr_base_addr; static void __init socfpga_sysmgr_init(void) { @@ -51,6 +52,10 @@ static void __init socfpga_sysmgr_init(void) np = of_find_compatible_node(NULL, NULL, "altr,rst-mgr"); rst_manager_base_addr = of_iomap(np, 0); + np = of_find_compatible_node(NULL, NULL, "altr,clk-mgr"); + clkmgr_base_addr = of_iomap(np, 0); + WARN_ON(!clkmgr_base_addr); + np = of_find_compatible_node(NULL, NULL, "altr,sdr-ctl"); sdr_ctl_base_addr = of_iomap(np, 0); } @@ -80,6 +85,9 @@ static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd) { u32 temp; + /* Turn on all periph PLL clocks */ + writel(0xffff, clkmgr_base_addr + SOCFPGA_ENABLE_PLL_REG); + temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL); if (mode == REBOOT_HARD) From patchwork Thu Oct 4 08:54:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 978722 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Pi+2J8Kl"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="CwW0yAoF"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YcUerniO"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QnZS0BbNz9s7W for ; Thu, 4 Oct 2018 19:26:24 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bdp7GWxGscH8y5s0I7o/Xca0NtUlVpsWpgVDYQ/cn+I=; b=Pi+2J8Klc7VOE8 6c54rEvqsX8zI0IyN3cxYhD3uG6jV7b4hyutTXM9Rfw6OoC6p6UTy2AERo/XU08SJjaEjGzxTH3FO P0M2NM/pvhkPA1JQmJmxyL6x/YiTndtKnKdcUscYKNldYu2HmhoYCIQ9nvstk10RbaytLZedxwfst /+P+hK9RpLlUEFqoZCE7XAt90LZEJrCXtIBSnlVJZCCjty3OcYyDyX2+iF6C/SxP3tr5ey+yBbE5c DlljILiIG5OoX7OurSwexPNlvCqQBHVh6x7BzmxINjL71F4eNfrF1O0UaTSTYBtqynb8MdXYM4Qoo EAyLChKD2bk59ramFG7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7ztd-0003r7-Tj; Thu, 04 Oct 2018 09:26:14 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zsi-0002jv-Cd for linux-arm-kernel@bombadil.infradead.org; Thu, 04 Oct 2018 09:25:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WAY6asfu2dthVrWoRaMrySY99FspVqJhbvZ+puVcCpQ=; b=CwW0yAoFkAoszYvbd6Wnn4j0H7 2Izk/8e0Ztvao7opiXLB+MllOKDVV0o6QBSfwLerss3dEEMIWafZFtWsF2G6NDJUSELe1jkuwRAO0 nNsuNvrUzvFnc57ZEyHSuwDHEZSdUhPamlOumq5Z10IF0yNfS/nFxwJOQEL/kvDLgL2VXFn9d3mX0 Hdq+y2B/PvAjYy9ZNNcdrKurbaYCp/UHpJxiPCC/wCdrKgkvd7GgwZhIWocVOSIP9EEV+H9+EvysW F/nAZ+rbk6uJdI1RRqsECGQlQkktdqRlhrYKUKtbtRBwPonCdOMnEzjZDPdcrBxRI91tQyK+TQoNl Mh/IzUkQ==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g7zPN-0007Vc-20 for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2018 08:54:57 +0000 Received: by mail-wr1-x443.google.com with SMTP id e4-v6so9017627wrs.0 for ; Thu, 04 Oct 2018 01:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WAY6asfu2dthVrWoRaMrySY99FspVqJhbvZ+puVcCpQ=; b=YcUerniOc5ukL58Rog+5iCx6keflrN9HJpLYHahZDeAj98+kmfluHPoG9kOxruekqn 7sJzVLrN0maoh1ucd3x6LQ+vQqSMRWHputukEqbdjXgE9p4HnX/6ghN01uvnDh5l1zg+ Pv3oG3cVDsn0A6TO2DJ3DTGUPVW52+4RH2i4CnN2a+CeII57x10o2TpbEB0ITfJdX1Xr zcLlyROLuGHi66CPCce+sHUsv76QxBKMUxmj40RcBxvHIO+Aju+6iuaTDyOZx0otgaoD eCbcE3QsWZGTJKfv/af8QwevhMhloQHRO/a78nhVjuHKIwTvlUlKNPqkxD/EhkgLkZUK 7h2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WAY6asfu2dthVrWoRaMrySY99FspVqJhbvZ+puVcCpQ=; b=gREM6D4iW+UGKBDPQgiYWIQsu7M+dGZRqMtHI4/dUn5+zRy40wmkNswPMDvZYfjhh/ NQeWLQxDEf7PraT9oipc82gaH8n8gp42xdo52aI4zTlJNXYWSZeR5G7FK6Fn3e/GA3vn pSIRLVj9sfPfATjJY0ctCJQVMD0Z9MoZelsmLcBg7OC/4hHwTLuB1q4QLEJU19buWktk bR8DkD6WYDNjScWlBtmfcTGZmlDBMPTqgNUGAEcTLdPwrR4BeuQtomT9WEseRv8weq+W r9HHHARlzCS6OwbW4Rfo6VCdlwBMJy6wHLB0eMaWdljeLM3YVNSERmhH6Cpz0Zwo+ZkY gP7A== X-Gm-Message-State: ABuFfogmoZa41JSAkCy28x/Vh9HANHsZ0wrmye6s93nvggIa+J4gch3q Tbt1NCL8bJBl7yPUZAHaBdw= X-Google-Smtp-Source: ACcGV61j4SWI3d82/0nOgoUJIsSCp4IDwgIGMBqr2fVZKs1dnLHbtpV5X/0qmp8hWNSWAxBe6LF5mg== X-Received: by 2002:adf:f3c7:: with SMTP id g7-v6mr3788424wrp.229.1538643283484; Thu, 04 Oct 2018 01:54:43 -0700 (PDT) Received: from cperon-Latitude-7490.devialet.com (static-css-csd-151233.business.bouyguestelecom.com. [176.162.151.233]) by smtp.gmail.com with ESMTPSA id b139-v6sm8715013wmd.36.2018.10.04.01.54.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 01:54:42 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Dinh Nguyen , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 3/3] ARM: socfpga: Turn on ARM errata for L2 cache Date: Thu, 4 Oct 2018 10:54:15 +0200 Message-Id: <20181004085415.12925-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181004085415.12925-1-peron.clem@gmail.com> References: <20181004085415.12925-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181004_045457_132292_B8137DF2 X-CRM114-Status: GOOD ( 11.05 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (peron.clem[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Dinh Nguyen Turn on these ARM and PL310 errata for SoCFPGA: ARM_ERRATA_754322 ARM_ERRATA_764369 ARM_ERRATA_775420 PL310_ERRATA_588369 PL310_ERRATA_727915 PL310_ERRATA_753970 PL310_ERRATA_769419 Fixes: 387798b37c8d ("ARM: initial multiplatform support") Signed-off-by: Dinh Nguyen Signed-off-by: Clément Péron --- arch/arm/mach-socfpga/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 4adb901dd5eb..a04660918d71 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -11,6 +11,13 @@ menuconfig ARCH_SOCFPGA select HAVE_ARM_TWD if SMP select MFD_SYSCON select PCI_DOMAINS if PCI + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 if SMP + select ARM_ERRATA_775420 + select PL310_ERRATA_588369 + select PL310_ERRATA_727915 + select PL310_ERRATA_753970 if PL310 + select PL310_ERRATA_769419 if ARCH_SOCFPGA config SOCFPGA_SUSPEND