From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 52E0F348C56; Thu, 2 Jul 2026 16:22:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783009381; cv=none; b=f8WRo6NQJEpRn5OAxvY3SxIsjAV1cHsJLq82eMux4u1U2J135Z4iL7Vgb5lRd6V6PNmOhLJSmJroCpYE9ldlQduIkmFLGBGedKFjoYubygEHq0Lu8j12zlp6+ipg1yWQ1DC0cl/TD92p+GKGzvHZ6WoOHTT8nz/OBD8myzf/HPk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783009381; c=relaxed/simple; bh=4YgquvKd+iCkXkr9E6i67kKUW+Rk/S6dyNKUOR1nKXc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uvF4kmaJHD3JRm+SPDwnFRmqWzYa8lCe9VkGIKORYeQq0ZYZUFPe27RT9yweOgVblm1aNwxyfy69iVsYgqCle6DwUixfucd+VJeW+4ssRuI9/C8XBGxp1VFRjrt5v2Bz7wEAdM0DmWNjPnIVyZIAlp8wV8b7chQhJK+GYnHQsC0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=jKEU/AbM; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="jKEU/AbM" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C168535C8; Thu, 2 Jul 2026 09:22:51 -0700 (PDT) Received: from e142021.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 68E763F673; Thu, 2 Jul 2026 09:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009376; bh=4YgquvKd+iCkXkr9E6i67kKUW+Rk/S6dyNKUOR1nKXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jKEU/AbMfct+F+msbw2CaA8qUgu8ukUR6QdVihb7d0GSoeHrhoZ8DO890DWX7NZVz w6ZgXGdK2e1MwTYepubgnW/t0ShLMH/+3yvM+vhFZuC9scCOR9mWZsFxWgYVwX2TlY NTwhjlIrimh4qAd5sQh4swG1T3iNgYMcLUliKs4E= From: Andre Przywara To: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Catalin Marinas , Will Deacon , "Rafael J . Wysocki" , Len Brown , James Morse , Ben Horgan , Reinette Chatre , Fenghua Yu Cc: Jonathan Cameron , Srivathsa L Rao , Ganapatrao Kulkarni , Trilok Soni , Srinivas Ramana , Niyas Sait , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/15] arm_mpam: propagate MSC read errors for mpam_msc_read_mbwu_l() Date: Thu, 2 Jul 2026 18:22:18 +0200 Message-ID: <20260702162229.4008659-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260702162229.4008659-1-andre.przywara@arm.com> References: <20260702162229.4008659-1-andre.przywara@arm.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Allow the mpam_msc_read_mbwu_l() function to return an error, and propagate read errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index 011d1e3544d7..1d06902fb970 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -1106,6 +1106,7 @@ static bool mpam_ris_has_mbwu_long_counter(struct mpam_msc_ris *ris) static u64 mpam_msc_read_mbwu_l(struct mpam_msc *msc) { + int ret; int retry = 3; u32 mbwu_l_low; u32 mbwu_l_high1, mbwu_l_high2; @@ -1115,11 +1116,17 @@ static u64 mpam_msc_read_mbwu_l(struct mpam_msc *msc) WARN_ON_ONCE((MSMON_MBWU_L + sizeof(u64)) > msc->mapped_hwpage_sz); WARN_ON_ONCE(!cpumask_test_cpu(smp_processor_id(), &msc->accessibility)); - __mpam_read_reg(msc, MSMON_MBWU_L + 4, &mbwu_l_high2); + ret = __mpam_read_reg(msc, MSMON_MBWU_L + 4, &mbwu_l_high2); + if (ret) + return MSMON___L_NRDY; + do { mbwu_l_high1 = mbwu_l_high2; - __mpam_read_reg(msc, MSMON_MBWU_L, &mbwu_l_low); - __mpam_read_reg(msc, MSMON_MBWU_L + 4, &mbwu_l_high2); + ret = __mpam_read_reg(msc, MSMON_MBWU_L, &mbwu_l_low); + if (!ret) + ret = __mpam_read_reg(msc, MSMON_MBWU_L + 4, &mbwu_l_high2); + if (ret) + return MSMON___L_NRDY; retry--; } while (mbwu_l_high1 != mbwu_l_high2 && retry > 0); -- 2.43.0