From patchwork Wed Nov 29 20:18:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10083519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C6D360234 for ; Wed, 29 Nov 2017 20:23:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F4AD29BE7 for ; Wed, 29 Nov 2017 20:23:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 741EA29BE8; Wed, 29 Nov 2017 20:23:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0311929BEA for ; Wed, 29 Nov 2017 20:23:28 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=y+jAlV6WF6L2lxkwEh9aK9iAEbtKJD24DrC+njQUv5g=; b=QwVVYTgK1L5WSSGfTDUjnHArJN Q1ETlYDWD8mF+ue7ySLT1r4zC84BFVOGwaG0TBIqaGOL9X/uUnL5+pELzAOzik+VSBaiiIIkSe20b idekJH1QK4ewHoywrV2rPoYaQYoDOVGtnrFdA9Vb3JSyImYQnAQZoIkwdgs9zwBli/D+uK0JxWMyt PCk/0mItix2fqyMjX9yr9A8R6Q08a8Zk7mGFSo46IbBHg9mS3BXXzxs4mTZdArCzN+sUZa6I70Ba2 5F8cGgSynOhYANqmbx5PHmK2pYugN8jJKagFnkWCQXz9Jhz5GNoalLqVm6lry/8vkNbxjYWJvws2l VXDSsV3g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eK8tE-0000il-6C; Wed, 29 Nov 2017 20:23:28 +0000 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eK8rm-0007gs-1X for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2017 20:22:05 +0000 Received: by mail-qt0-x244.google.com with SMTP id j5so5983626qth.11 for ; Wed, 29 Nov 2017 12:21:37 -0800 (PST) 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; bh=MN0SFb4mVU6YHcmm+veEH4KcyIvq5DiJ1iWgSrcgxi8=; b=kmMymwDr+bjyUB5cWXCi/UEem+gBkEG+6VoxhKtfb+t3i0PqYK8GGCpW4doH/YWW0A 7I1jOy3OJTl3Sj4sVOMV9bWW9vxT67ZgEvZ6YlitLAr6TRjS1EujB0H4dYRdaliR2fVL DH97bnkTkqsc49ZsD+kJ1tL15kXqvux8pmHY8ngYCVAAuPPDOr+mHwGakQbosw4hm+Rx KRNAv+CK9hL9M90Vyc5t9u8YOdTNkka9sa9xO2ACnBgjFNC2m7Tkhh+MNKLXSndwbCM1 WswvZph72TPjNAuN8n819H/27o3pGJscpqtb8ueBsNHuZmPr07Zc1o+PSlTinaPzgrOD GQkQ== 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; bh=MN0SFb4mVU6YHcmm+veEH4KcyIvq5DiJ1iWgSrcgxi8=; b=Jfh2P+qMJSTBrv5ZWPqTCrWJ3ASe6guWs10wDTsNjf61Ojkes8kEJPJZs476YtzK3P PRqnvZ4E5ViySILOgkViKZwls3Cp4S9TStcrncbm59p85+KETWSAJQpuHPHz9e7FtZKH zC8Vv3FQ0E7R5Wb80rdxZNb1IWAN/FoclSpW9cw7t2lYJkmJOt/UmvU1xo14pJ5HeGxo gnMakA3v1i9bfUYf+gm5lxgLtCXOwEGxOhiLOq+UftsWfzMCDZw/95wxEI/L0VCPAHh2 lZpKYHe1MOMnAarXfKBzliPcZsmFYkgwXeR0jNU8u5JZmRBPAFYrVaStWR1hfKxlFjjq jY5Q== X-Gm-Message-State: AKGB3mLaqqHn/JDqWfSS1r8I7G1gjGCwNk/Q9wo0kjbn/YO7ZAwjx5GP 6WPI3WF4DWRwXbg2UD0Krso= X-Google-Smtp-Source: AGs4zMYsxSgoLZBk5jxPtBXQxp0m9BqDnpOo9HHlXkv8G5aU7krA+Tzdy8xPbtipjL0lhSm3qDbFFw== X-Received: by 10.200.16.3 with SMTP id z3mr154588qti.61.1511986896779; Wed, 29 Nov 2017 12:21:36 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id z128sm1736337qke.92.2017.11.29.12.21.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 12:21:35 -0800 (PST) From: Florian Fainelli To: bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 5/9] soc: brcmstb: biuctrl: Prepare for saving/restoring other registers Date: Wed, 29 Nov 2017 12:18:45 -0800 Message-Id: <20171129201849.17522-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171129201849.17522-1-f.fainelli@gmail.com> References: <20171129201849.17522-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171129_122158_779731_C6F25111 X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Florian Fainelli , open list , Rob Herring , Gregory Fong , Brian Norris , "moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE" MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for saving/restoring additional registers required on some newer platforms (7268, 7271, 7278), migrate the code to use enums and helper functions to access registers. Signed-off-by: Florian Fainelli --- drivers/soc/bcm/brcmstb/biuctrl.c | 75 ++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c index e8322e663831..16cbfc2e953a 100644 --- a/drivers/soc/bcm/brcmstb/biuctrl.c +++ b/drivers/soc/bcm/brcmstb/biuctrl.c @@ -21,13 +21,45 @@ #include #include -#define B15_CPU_CREDIT_REG_OFFSET 0x184 -#define B53_CPU_CREDIT_REG_OFFSET 0x0b0 #define CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK 0x70000000 static void __iomem *cpubiuctrl_base; static bool mcp_wr_pairing_en; -static unsigned int cpu_credit_reg_offset; +static const int *cpubiuctrl_regs; + +static inline u32 cbc_readl(int reg) +{ + int offset = cpubiuctrl_regs[reg]; + + if (offset == -1) + return (u32)-1; + + return readl_relaxed(cpubiuctrl_base + offset); +} + +static inline void cbc_writel(u32 val, int reg) +{ + int offset = cpubiuctrl_regs[reg]; + + if (offset == -1) + return; + + writel_relaxed(val, cpubiuctrl_base + offset); +} + +enum cpubiuctrl_regs { + CPU_CREDIT_REG = 0, +}; + +static const int b15_cpubiuctrl_regs[] = { + [CPU_CREDIT_REG] = 0x184, +}; + +static const int b53_cpubiuctrl_regs[] = { + [CPU_CREDIT_REG] = 0x0b0, +}; + +#define NUM_CPU_BIUCTRL_REGS 1 static int __init mcp_write_pairing_set(void) { @@ -36,15 +68,15 @@ static int __init mcp_write_pairing_set(void) if (!cpubiuctrl_base) return -1; - creds = readl_relaxed(cpubiuctrl_base + cpu_credit_reg_offset); + creds = cbc_readl(CPU_CREDIT_REG); if (mcp_wr_pairing_en) { pr_info("MCP: Enabling write pairing\n"); - writel_relaxed(creds | CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK, - cpubiuctrl_base + cpu_credit_reg_offset); + cbc_writel(creds | CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK, + CPU_CREDIT_REG); } else if (creds & CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK) { pr_info("MCP: Disabling write pairing\n"); - writel_relaxed(creds & ~CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK, - cpubiuctrl_base + cpu_credit_reg_offset); + cbc_writel(creds & ~CPU_CREDIT_REG_MCPx_WR_PAIRING_EN_MASK, + CPU_CREDIT_REG); } else { pr_info("MCP: Write pairing already disabled\n"); } @@ -80,9 +112,9 @@ static int __init setup_hifcpubiuctrl_regs(void) } if (of_device_is_compatible(cpu_dn, "brcm,brahma-b15")) - cpu_credit_reg_offset = B15_CPU_CREDIT_REG_OFFSET; + cpubiuctrl_regs = b15_cpubiuctrl_regs; else if (of_device_is_compatible(cpu_dn, "brcm,brahma-b53")) - cpu_credit_reg_offset = B53_CPU_CREDIT_REG_OFFSET; + cpubiuctrl_regs = b53_cpubiuctrl_regs; else { pr_err("unsupported CPU\n"); ret = -EINVAL; @@ -94,21 +126,30 @@ static int __init setup_hifcpubiuctrl_regs(void) } #ifdef CONFIG_PM_SLEEP -static u32 cpu_credit_reg_dump; /* for save/restore */ +static u32 cpubiuctrl_reg_save[NUM_CPU_BIUCTRL_REGS]; static int brcmstb_cpu_credit_reg_suspend(void) { - if (cpubiuctrl_base) - cpu_credit_reg_dump = - readl_relaxed(cpubiuctrl_base + cpu_credit_reg_offset); + unsigned int i; + + if (!cpubiuctrl_base) + return 0; + + for (i = 0; i < NUM_CPU_BIUCTRL_REGS; i++) + cpubiuctrl_reg_save[i] = cbc_readl(i); + return 0; } static void brcmstb_cpu_credit_reg_resume(void) { - if (cpubiuctrl_base) - writel_relaxed(cpu_credit_reg_dump, - cpubiuctrl_base + cpu_credit_reg_offset); + unsigned int i; + + if (!cpubiuctrl_base) + return; + + for (i = 0; i < NUM_CPU_BIUCTRL_REGS; i++) + cbc_writel(cpubiuctrl_reg_save[i], i); } static struct syscore_ops brcmstb_cpu_credit_syscore_ops = {