Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Dragan Mladjenovic <Dragan.Mladjenovic@syrmia.com>
To:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc:     Paul Burton <paulburton@kernel.org>,
        Chao-ying Fu <cfu@wavecomp.com>, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 09/12] MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core
Date:   Thu, 19 May 2022 20:51:22 +0200
Message-Id: <20220519185125.11686-10-Dragan.Mladjenovic@syrmia.com>
In-Reply-To: <20220519185125.11686-1-Dragan.Mladjenovic@syrmia.com>
References: <20220519185125.11686-1-Dragan.Mladjenovic@syrmia.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?upDKHsiHeavZXxOlXIJE8C3VUq3Q7/3jBhb2tjnD2x7JI3NZb6KKTWxvOWba?=
 =?us-ascii?Q?ipN+5V3JyV3orRStqNcf9Y0Fxl5oL2mdCK8YksykSM7FP2i9w6VsKLE1/vYZ?=
 =?us-ascii?Q?m4fcuO0CMs/zJB3QaoEWOMP9+MniC6dyRwmueji1Lh38dSZxuAPl6uchCBur?=
 =?us-ascii?Q?c/XJj0DoRHgrG6raAvVxuLef0A7SyGKFs6OH7LNcv2KKWLXEzJRxN9rA3oQh?=
 =?us-ascii?Q?3s/KpHrHqgScqfGXuO3fgjaYoFKbJ05/Rb+t5FwQ5Dwxn01I2x3fNqe5ilxZ?=
 =?us-ascii?Q?6p14C78CKNkY8gv/gVlyezk5MXP2kz2204FBQhH2562RFg4/ehqyl19SINsd?=
 =?us-ascii?Q?JK54ZuwUsjERc0qzqXOVOgIMsVQGImi497+YV9MMuimjnYkb/Vlfd19mwqdq?=
 =?us-ascii?Q?/qKdUxX6LfmykPUeC+EFuSiQvPmy3SsEMSrq7UrquuBV6ZayutJts5w+Tnos?=
 =?us-ascii?Q?X2vnmvlylbu4QxpAjTn4Auc8ZdrxL+DieTPuX7YGbwuXukEFbm1WFLmUNTkw?=
 =?us-ascii?Q?67FgXp9H7tS0QXVL/hXwHWfRJRldnsFtaSWbKElATuF0jGzol5RQOqHQ4XHU?=
 =?us-ascii?Q?EiaTeamy1cq9LK2woujR6JeIf7tCDHyvjs9zeBF5BRWT1AC+zUvJDx3ydhrJ?=
 =?us-ascii?Q?MtBBMKUqBddEMSTi94MKZnYhnjhZtOAA5XqgxXJnVgd43ndESK3sRexnzfrl?=
 =?us-ascii?Q?Ehy3fWlR2MUXwW3OHgkgPmXB2Cla4MIofc38RmeYX6CMwkkxvxjo2IA5JDXA?=
 =?us-ascii?Q?h//dgGLDvaGZzFA3NmnPCOoY2ji4wrYveBqm45tc0qSPWoyvw+rTxKC0LQDN?=
 =?us-ascii?Q?2vznPMucwWOfbhqPFfl2Skq7IfDoWspa6567QbvMoiKaoRx25kC+HT4jVyu4?=
 =?us-ascii?Q?/xxw26JUoYgPRU9thFjI9XCXITgkJfnS2kBtXCwIY2hCrzUKrQXugAL8qRnU?=
 =?us-ascii?Q?gdxOt4TBF3/9/1m8kmyy6UDD7qqcJ4nPH1OWiprVZrmfxLEMRlvdOLoPpplU?=
 =?us-ascii?Q?6U187TdddlnX88xFN/TOQ9Xx3reCxypcDKZfjaMHWdBjq4GjG2rY1NcCZAke?=
 =?us-ascii?Q?OLFaolZkvlLV/BFDV9qm20lC8Z07rQFWrugtH6P9r6O4BPnssC35LhveWgpC?=
 =?us-ascii?Q?EmFL//nDqjVdwvJYt4nlM+Us31OEexJlRIvuwcFm9vdkdoe9JJ+OfA066Tw0?=
 =?us-ascii?Q?jWimK+vsFAke2Wo6e7X/PBYjOF2reuTYZubxryV9Ce1SqVR44mJqJX+jwnHI?=
 =?us-ascii?Q?1o2sFERCtS3c/HM8okBVu7XwIBwwfOAhzC/bL+XiKYEVCCGvnN+e6bKAPW5a?=
 =?us-ascii?Q?7fBiCO2fuhoCWs/gwEuABjJ3e3w6LBbADycCslTgSs/z69Cj/nHlfNwnQtD6?=
 =?us-ascii?Q?AgLqsYnRz5PYnlGag7NpLba5njtAQ7zEqEX4dl1TA8lBh+PqLYZfVTN1iK6B?=
 =?us-ascii?Q?s5eWkHSptNxPYdgNBmmwtCWi7UEzUKEuILe46j4FQjzoTdUH8lu8q4hk+0lE?=
 =?us-ascii?Q?B5Rnvpg6Ab08zDRHqk70JX08uLywswNWRjLlJ8WOxM5ILeQ2PdTlU81DueBm?=
 =?us-ascii?Q?uEhxvgSaP7JEezXhaQNFKThzxTkaGD6UGAyPit7heXE779RSrik7nWbD9zSh?=
 =?us-ascii?Q?Wh5KnRb3LdO3HfnBgksmEjKfKpFnDdzDuB0B7XRk/rbWneCpvEEhGyxmZdVd?=
 =?us-ascii?Q?OQMIPtbCMrAEAV7NE5B3igEP0GMNdwj1CqOX5lxIZMXoFZ8hwPJUpT/tI4jJ?=
 =?us-ascii?Q?J9ui7dNTjImgRFNjwr300hLiMC10h1g=3D?=
X-OriginatorOrg: syrmia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 43a7dfa9-c7df-4474-5351-08da39c8a051
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4208.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 18:51:47.3366
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 19214a73-c1ab-4e19-8f59-14bdcb09a66e
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: uzwZd/l3DsN2FI0pJD48GUML65C/sbhyOmXiTYRfIwHIGhw4oE4akoFBGBv5R5DDNGDIhzkQAGFVsqRojKWrkoXsIJnXMdHdiGJaO4YCwqg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2546
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Paul Burton <paulburton@kernel.org>

The pm-cps code has up until now used per-CPU variables indexed by core,
rather than CPU number, in order to share data amongst sibling CPUs (ie.
VPs/threads in a core). This works fine for single cluster systems, but
with multi-cluster systems a core number is no longer unique in the
system, leading to sharing between CPUs that are not actually siblings.

Avoid this issue by using per-CPU variables as they are more generally
used - ie. access them using CPU numbers rather than core numbers.
Sharing between siblings is then accomplished by:
 - Assigning the same pointer to entries for each sibling CPU for the
   nc_asm_enter & ready_count variables, which allow this by virtue of
   being per-CPU pointers.

 - Indexing by the first CPU set in a CPUs cpu_sibling_map in the case
   of pm_barrier, for which we can't use the previous approach because
   the per-CPU variable is not a pointer.

Signed-off-by: Paul Burton <paulburton@kernel.org>
Signed-off-by: Chao-ying Fu <cfu@wavecomp.com>

diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index 9bf60d7d44d3..a7bcf2b814c8 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -56,10 +56,7 @@ static DEFINE_PER_CPU_ALIGNED(u32*, ready_count);
 /* Indicates online CPUs coupled with the current CPU */
 static DEFINE_PER_CPU_ALIGNED(cpumask_t, online_coupled);
 
-/*
- * Used to synchronize entry to deep idle states. Actually per-core rather
- * than per-CPU.
- */
+/* Used to synchronize entry to deep idle states */
 static DEFINE_PER_CPU_ALIGNED(atomic_t, pm_barrier);
 
 /* Saved CPU state across the CPS_PM_POWER_GATED state */
@@ -118,9 +115,10 @@ int cps_pm_enter_state(enum cps_pm_state state)
 	cps_nc_entry_fn entry;
 	struct core_boot_config *core_cfg;
 	struct vpe_boot_config *vpe_cfg;
+	atomic_t *barrier;
 
 	/* Check that there is an entry function for this state */
-	entry = per_cpu(nc_asm_enter, core)[state];
+	entry = per_cpu(nc_asm_enter, cpu)[state];
 	if (!entry)
 		return -EINVAL;
 
@@ -156,7 +154,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
 	smp_mb__after_atomic();
 
 	/* Create a non-coherent mapping of the core ready_count */
-	core_ready_count = per_cpu(ready_count, core);
+	core_ready_count = per_cpu(ready_count, cpu);
 	nc_addr = kmap_noncoherent(virt_to_page(core_ready_count),
 				   (unsigned long)core_ready_count);
 	nc_addr += ((unsigned long)core_ready_count & ~PAGE_MASK);
@@ -164,7 +162,8 @@ int cps_pm_enter_state(enum cps_pm_state state)
 
 	/* Ensure ready_count is zero-initialised before the assembly runs */
 	WRITE_ONCE(*nc_core_ready_count, 0);
-	coupled_barrier(&per_cpu(pm_barrier, core), online);
+	barrier = &per_cpu(pm_barrier, cpumask_first(&cpu_sibling_map[cpu]));
+	coupled_barrier(barrier, online);
 
 	/* Run the generated entry code */
 	left = entry(online, nc_core_ready_count);
@@ -635,12 +634,14 @@ static void *cps_gen_entry_code(unsigned cpu, enum cps_pm_state state)
 
 static int cps_pm_online_cpu(unsigned int cpu)
 {
-	enum cps_pm_state state;
-	unsigned core = cpu_core(&cpu_data[cpu]);
+	unsigned int sibling, core;
 	void *entry_fn, *core_rc;
+	enum cps_pm_state state;
+
+	core = cpu_core(&cpu_data[cpu]);
 
 	for (state = CPS_PM_NC_WAIT; state < CPS_PM_STATE_COUNT; state++) {
-		if (per_cpu(nc_asm_enter, core)[state])
+		if (per_cpu(nc_asm_enter, cpu)[state])
 			continue;
 		if (!test_bit(state, state_support))
 			continue;
@@ -652,16 +653,19 @@ static int cps_pm_online_cpu(unsigned int cpu)
 			clear_bit(state, state_support);
 		}
 
-		per_cpu(nc_asm_enter, core)[state] = entry_fn;
+		for_each_cpu(sibling, &cpu_sibling_map[cpu])
+			per_cpu(nc_asm_enter, sibling)[state] = entry_fn;
 	}
 
-	if (!per_cpu(ready_count, core)) {
+	if (!per_cpu(ready_count, cpu)) {
 		core_rc = kmalloc(sizeof(u32), GFP_KERNEL);
 		if (!core_rc) {
 			pr_err("Failed allocate core %u ready_count\n", core);
 			return -ENOMEM;
 		}
-		per_cpu(ready_count, core) = core_rc;
+
+		for_each_cpu(sibling, &cpu_sibling_map[cpu])
+			per_cpu(ready_count, sibling) = core_rc;
 	}
 
 	return 0;
-- 
2.17.1