From patchwork Sun Aug 23 07:25:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7056911 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F34009F305 for ; Sun, 23 Aug 2015 07:21:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05FA9206FA for ; Sun, 23 Aug 2015 07:21:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02C28206F6 for ; Sun, 23 Aug 2015 07:21:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbbHWHVT (ORCPT ); Sun, 23 Aug 2015 03:21:19 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33805 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbbHWHVT (ORCPT ); Sun, 23 Aug 2015 03:21:19 -0400 Received: by padfa11 with SMTP id fa11so1574927pad.1; Sun, 23 Aug 2015 00:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=74mwfMPELCOp8NJUqTKm+NXpWXUjFo27YWYRB5BdiCY=; b=iB3AURzpIPVEbvXrkawxfPf8HdfELzsJ45LTWOsHfW4rjDOb+xHj4/qNLYsAWxvPnn 9kVoBipYto5JpphDytSJXPz4LZQiQ+8Vyr/hneMQpsO2fynmTknJQ5MZz2BD2KvO5KXM CJqSxiKumldF+5DVGGZMudnq5pQthFyyDZlte47mOa2LA4V9f6t41G1qazr8yQv3rBD1 l47ykjkr77QrhLD1zK2e4ET0Mfku4ait4dyac7DZH/hw9StZevOkzRG83MNPMHcelCP+ NhZDI6qViX+DiJFKN+zXZkGkcuJ0B1OL9r3I/sOQUJ2k7fGwu2gUZ3+kJOQc8zCyzG0c gWLQ== X-Received: by 10.68.68.166 with SMTP id x6mr33442156pbt.101.1440314478581; Sun, 23 Aug 2015 00:21:18 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id y8sm13143113pbt.7.2015.08.23.00.21.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Aug 2015 00:21:17 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, lorenzo.pieralisi@arm.com, keita.kobayashi.ym@renesas.com, horms@verge.net.au, geert@linux-m68k.org, laurent.pinchart@ideasonboard.com, Magnus Damm Date: Sun, 23 Aug 2015 16:25:21 +0900 Message-Id: <20150823072521.14156.35151.sendpatchset@little-apple> In-Reply-To: <20150823072427.14156.1960.sendpatchset@little-apple> References: <20150823072427.14156.1960.sendpatchset@little-apple> Subject: [PATCH v2 05/07] ARM: shmobile: Add function to prioritize DT SMP Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Magnus Damm Add a function to check if other DT based method is available, and if so return false to not hook up smp_ops from the machine vector. This results in that DT-based SMP support has priority over older C-based smp_ops code, and in case DT-based SMP support code does not exist in the DTB then the old smp_ops code will still work as-is. Signed-off-by: Magnus Damm --- Changes since V1: - Reworked r8a7791-specific version to become reusable function. arch/arm/mach-shmobile/common.h | 1 + arch/arm/mach-shmobile/platsmp.c | 7 +++++++ 2 files changed, 8 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/common.h +++ work/arch/arm/mach-shmobile/common.h 2015-08-23 15:26:18.722366518 +0900 @@ -11,6 +11,7 @@ extern void shmobile_smp_sleep(void); extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg); extern bool shmobile_smp_cpu_can_disable(unsigned int cpu); +extern bool shmobile_smp_init_fallback_ops(void); extern void shmobile_boot_scu(void); extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus); extern void shmobile_smp_scu_cpu_die(unsigned int cpu); --- 0001/arch/arm/mach-shmobile/platsmp.c +++ work/arch/arm/mach-shmobile/platsmp.c 2015-08-23 15:26:13.692366518 +0900 @@ -36,3 +36,10 @@ bool shmobile_smp_cpu_can_disable(unsign return true; /* Hotplug of any CPU is supported */ } #endif + +bool __init shmobile_smp_init_fallback_ops(void) +{ + /* fallback on PSCI/smp_ops if no other DT based method is detected */ + return platform_can_secondary_boot() ? true : false; +} +