From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E492C2BA2B for ; Wed, 8 Apr 2020 13:04:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2033820753 for ; Wed, 8 Apr 2020 13:04:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=flygoat.com header.i=jiaxun.yang@flygoat.com header.b="MGi8nusr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728942AbgDHNEN (ORCPT ); Wed, 8 Apr 2020 09:04:13 -0400 Received: from sender3-op-o12.zoho.com.cn ([124.251.121.243]:17891 "EHLO sender3-op-o12.zoho.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728890AbgDHNEN (ORCPT ); Wed, 8 Apr 2020 09:04:13 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1586350933; cv=none; d=zoho.com.cn; s=zohoarc; b=TBes1nXwoj0zlkCQrPxZBJVTTZxUidOXybCr53tQQNtAp5OzWyUj9yaIHeUefNxurJczHBK5/jAHenwJfO6BXQb21uZ07BDHO9ebYft+P+/UrBXCZn2F1O9dePYnT/JA9PX4PGydkGyGuuP+VZGBw1QY1/bqdgFMAY0G9Joc8DI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com.cn; s=zohoarc; t=1586350933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=pvVcRtCqfH3vqqhS/khlj9DqWBnRf2S/d6gBy/uBo9A=; b=VMcIyzmdc6pGrzmyukLutD0E4xjg8gtmszFlaeKO+hgLK/Iar7B/e8IHxyYXI4Mk+EEPMrUZ40uQfMcOXiusAX+mXmNyItdA8DS8KJva1bV8qzHcE+ZSf3KbS+kEB3GA49XXKU3Shh/nggPz+ME5w1gEH5afZgVGlpoYivQgLbE= ARC-Authentication-Results: i=1; mx.zoho.com.cn; dkim=pass header.i=flygoat.com; spf=pass smtp.mailfrom=jiaxun.yang@flygoat.com; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1586350933; s=mail; d=flygoat.com; i=jiaxun.yang@flygoat.com; h=From:To:Cc:Message-ID:Subject:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=pvVcRtCqfH3vqqhS/khlj9DqWBnRf2S/d6gBy/uBo9A=; b=MGi8nusrZDH6aWUCxRhrByaRYgtWIrIT5t7vKeTs9jzc6F3EbD23XLosAXfoV4Eq kBIF1wyn6XiG/Qef84kVrzDLq0ajXSJZEloA2Vku5ZVoin8nvONSnH9g1G/RjrCDeTs m79PD7Kh1dQmCivoM1AszQC3r+FsK2oQ4OtuLF34= Received: from localhost.localdomain (39.155.141.144 [39.155.141.144]) by mx.zoho.com.cn with SMTPS id 1586350931576768.9659616147869; Wed, 8 Apr 2020 21:02:11 +0800 (CST) From: Jiaxun Yang To: linux-mips@vger.kernel.org Cc: Jiaxun Yang , Thomas Bogendoerfer , Huacai Chen , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Florian Fainelli , Robert Richter , Thomas Gleixner , Jason Cooper , Marc Zyngier , Paul Burton , Allison Randal , Greg Kroah-Hartman , Vladimir Kondratiev , Arnd Bergmann , Serge Semin , Matt Redfearn , Richard Fontana , Steve Winslow , Alexios Zavras , Kamal Dasu , Oleksij Rempel , Mike Rapoport , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, oprofile-list@lists.sf.net Message-ID: <20200408130024.2529220-4-jiaxun.yang@flygoat.com> Subject: [PATCH 09/12] MIPS: bmips: Switch to new topology interface Date: Wed, 8 Apr 2020 20:59:51 +0800 X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <20200408113505.2528103-1-jiaxun.yang@flygoat.com> References: <20200408113505.2528103-1-jiaxun.yang@flygoat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoCNMailClient: External Content-Type: text/plain; charset=utf8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change the parameter of cpu_set_core from cpudata to cpuid. Also set cluster id for bmips as it have different method to probe actual hwid of CPU, and smp_store_cpuinfo is using cluster id to determine if we should probe topology info again. Signed-off-by: Jiaxun Yang --- arch/mips/kernel/smp-bmips.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c index 9058e9dcf080..c40bb37eab38 100644 --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c @@ -247,7 +247,8 @@ static void bmips_init_secondary(void) =09=09break; =09case CPU_BMIPS5000: =09=09write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), 0)); -=09=09cpu_set_core(¤t_cpu_data, (read_c0_brcm_config() >> 25) & 3); +=09=09cpu_set_core(smp_processor_id(), (read_c0_brcm_config() >> 25) & 3); +=09=09cpu_set_cluster(smp_processor_id(), 0); =09=09break; =09} } --=20 2.26.0.rc2