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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25CDCC43458 for ; Thu, 2 Jul 2026 16:23:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S6U9PquI1bl4gsO0c+zdVJG09xA+3oRstq88VvzWudc=; b=EU9TSofHUlWwuS1TTlYR/FlC8P sT0HrqsiSLeS4w/IXb6h7WFltSipbWIrMkKu+DqqK0pOZiZY4HvGNpsxceuWzrR60bu5u3nC7zpYo q+mkPNzA6Nr96/vxjnANyYtsK6MU+jskeGjT8OTWLMPC0TA/LYGkEaDpGnCMG8azIXCL94WiZ+CE4 d+GmAuu/w2Al616cgaoXEm+bZwH7aXKFUR4HKYQrb2rA8n6m1WYyZSPiNluyM67IQoT8FnzVCw8XQ IbiAoT2tu5mTSaxgkMSObDogvxwqC4dYzaNEOMS7w2UZD+k7tQ3Rsm4c2uyG5qpFLKM0PVd2iENEV dco8BPdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfKBz-00000004zWt-1a7s; Thu, 02 Jul 2026 16:23:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfKBx-00000004zUj-0DjE for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2026 16:23:10 +0000 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 2FD3935C8; Thu, 2 Jul 2026 09:23:04 -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 C91DA3F673; Thu, 2 Jul 2026 09:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009388; bh=kEvUNv9TDnlTrcE5k7Pm1MvIytY9hUUE7m5Rs28ExKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QdIYOnme/DnUjEmWzeUNK6ASpHR6SGo/287x9A4/W1uA3GWMH7mEfCDRVseFNcVoU Hvf3RU2VCrLdV//421ADRgtJrKzb95kGpY7tdGLrJwaXqtdp0+/RgFQ+0XJURiIZoU QguGGcyupZWoiOmAImNVrknU0r8yCq/tN+XcpPAw= 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 07/15] arm_mpam: propagate MSC read errors for state saving functions Date: Thu, 2 Jul 2026 18:22:21 +0200 Message-ID: <20260702162229.4008659-8-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260702_092309_167971_0D689CBF X-CRM114-Status: GOOD ( 12.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allow the mpam_save_mbwu_state() function to return an error, and propagate read errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 47 +++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index d18c7be86aaa..c50ca0e4f426 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -1773,6 +1773,7 @@ static int mpam_save_mbwu_state(void *arg) { int i; u64 val; + int ret; struct mon_cfg *cfg; u32 cur_flt, cur_ctl, mon_sel; struct mpam_msc_ris *ris = arg; @@ -1789,31 +1790,41 @@ static int mpam_save_mbwu_state(void *arg) mon_sel = FIELD_PREP(MSMON_CFG_MON_SEL_MON_SEL, i) | FIELD_PREP(MSMON_CFG_MON_SEL_RIS, ris->ris_idx); mpam_write_monsel_reg(msc, CFG_MON_SEL, mon_sel); - mpam_read_monsel_reg(msc, CFG_MBWU_FLT, &cur_flt); - mpam_read_monsel_reg(msc, CFG_MBWU_CTL, &cur_ctl); - mpam_write_monsel_reg(msc, CFG_MBWU_CTL, 0); + ret = mpam_read_monsel_reg(msc, CFG_MBWU_FLT, &cur_flt); + if (!ret) + ret = mpam_read_monsel_reg(msc, CFG_MBWU_CTL, &cur_ctl); + if (!ret) + mpam_write_monsel_reg(msc, CFG_MBWU_CTL, 0); - if (mpam_ris_has_mbwu_long_counter(ris)) { - val = mpam_msc_read_mbwu_l(msc); - mpam_msc_zero_mbwu_l(msc); - } else { - u32 val32; + if (!ret) { + if (mpam_ris_has_mbwu_long_counter(ris)) { + val = mpam_msc_read_mbwu_l(msc); + mpam_msc_zero_mbwu_l(msc); + } else { + u32 val32; - mpam_read_monsel_reg(msc, MBWU, &val32); - val = val32; - mpam_write_monsel_reg(msc, MBWU, 0); + ret = mpam_read_monsel_reg(msc, MBWU, &val32); + if (!ret) { + val = val32; + mpam_write_monsel_reg(msc, MBWU, 0); + } + } } - cfg->mon = i; - cfg->pmg = FIELD_GET(MSMON_CFG_x_FLT_PMG, cur_flt); - cfg->match_pmg = FIELD_GET(MSMON_CFG_x_CTL_MATCH_PMG, cur_ctl); - cfg->partid = FIELD_GET(MSMON_CFG_x_FLT_PARTID, cur_flt); - mbwu_state->correction += val; - mbwu_state->enabled = FIELD_GET(MSMON_CFG_x_CTL_EN, cur_ctl); + if (!ret && val != MSMON___L_NRDY) { + cfg->mon = i; + cfg->pmg = FIELD_GET(MSMON_CFG_x_FLT_PMG, cur_flt); + cfg->match_pmg = FIELD_GET(MSMON_CFG_x_CTL_MATCH_PMG, cur_ctl); + cfg->partid = FIELD_GET(MSMON_CFG_x_FLT_PARTID, cur_flt); + mbwu_state->correction += val; + mbwu_state->enabled = FIELD_GET(MSMON_CFG_x_CTL_EN, cur_ctl); + } mpam_mon_sel_unlock(msc); + if (ret) + break; } - return 0; + return ret; } /* -- 2.43.0