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 6EFF1C43458 for ; Thu, 2 Jul 2026 16:23:31 +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=x07B0idIU7jI5nP5tX4uczkmje7aMyjOsJ/tHTLkCME=; b=QCnFo2BT3am1PI11KgJ+F7Uqiz 3EwTp0oAmCbnu99Ya8GPJam+FWx3Y/HFH+C9yBhm9kwLyId86+7eLt3KrAtvv8Ff4KFcycz2wRNol lPEcczcwShp/B64bknSf/tr33Yj+4vZf8NIPysKAC9HVzb+zetpljUmcLmEQdcf7JMR15dccjZpGC PigpbwKhk0RyjmuWQ5NOdAXGC03REvkCAN7ANLiz/3eHSIIHRT5PdqfmSuunTrgsddRqBu6XBlq1U 9X3flm9VHnsM9UBWPHoBxsx71qsAhQkihRRwa/49DA0/KQpekcDHsQWkSBCBaANw+15rnIEtd803/ GFku0Yhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfKCD-00000004zlk-08e0; Thu, 02 Jul 2026 16:23:25 +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 1wfKC9-00000004zhU-33Dr for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2026 16:23:22 +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 BD8EF35C7; Thu, 2 Jul 2026 09:23:16 -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 37CCA3F673; Thu, 2 Jul 2026 09:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009401; bh=9Q8M4dh01UPtpyHvFv79Im34gbIlo71L2ciEJRwb+I4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HtMNRiG/AN7/8Mqdtj3jorULBOaRDB0FhpTr4gIP6seVYOpExsUSX1DQHOP8RM2ya 2U9ZMMG6i65E9yPrlwiZS0cZqkMCEkPzkTOecdmzLpRWmLMF0C1Hn5K0NowsvZTBzi w2ktbj3JSxI/CbWFMkubr13GyIXUhv2qXCzB4Vcg= 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 10/15] arm_mpam: propagate MSC write errors for hardware probe functions Date: Thu, 2 Jul 2026 18:22:24 +0200 Message-ID: <20260702162229.4008659-11-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_092321_896155_BE896B46 X-CRM114-Status: GOOD ( 12.29 ) 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 MSC write accesses in the hardware probe functions to return an error, and propagate write errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index 23a5deb290b3..f3558d248c38 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -792,24 +792,30 @@ static bool mpam_ris_hw_probe_csu_nrdy(struct mpam_msc_ris *ris) mon_sel = FIELD_PREP(MSMON_CFG_MON_SEL_MON_SEL, 0) | FIELD_PREP(MSMON_CFG_MON_SEL_RIS, ris->ris_idx); - mpam_write_monsel_reg(msc, CFG_MON_SEL, mon_sel); + if (mpam_write_monsel_reg(msc, CFG_MON_SEL, mon_sel)) + return false; /* Hardware might ignore nrdy if it's not enabled */ ctl_val = MSMON_CFG_CSU_CTL_TYPE_CSU; ctl_val |= MSMON_CFG_x_CTL_MATCH_PARTID; ctl_val |= MSMON_CFG_x_CTL_MATCH_PMG; ctl_val |= MSMON_CFG_x_CTL_EN; - mpam_write_monsel_reg(msc, CFG_CSU_FLT, 0); - mpam_write_monsel_reg(msc, CFG_CSU_CTL, ctl_val); + if (mpam_write_monsel_reg(msc, CFG_CSU_FLT, 0)) + return false; + if (mpam_write_monsel_reg(msc, CFG_CSU_CTL, ctl_val)) + return false; - _mpam_write_monsel_reg(msc, MSMON_CSU, MSMON___NRDY); + if (_mpam_write_monsel_reg(msc, MSMON_CSU, MSMON___NRDY)) + return false; if (_mpam_read_monsel_reg(msc, MSMON_CSU, &now)) return false; can_set = now & MSMON___NRDY; - _mpam_write_monsel_reg(msc, MSMON_CSU, 0); + if (_mpam_write_monsel_reg(msc, MSMON_CSU, 0)) + return false; /* Configuration change to try and coax hardware into setting nrdy */ - mpam_write_monsel_reg(msc, CFG_CSU_FLT, 0x1); + if (mpam_write_monsel_reg(msc, CFG_CSU_FLT, 0x1)) + return false; if (_mpam_read_monsel_reg(msc, MSMON_CSU, &now)) return false; can_clear = !(now & MSMON___NRDY); @@ -1052,8 +1058,9 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) for (ris_idx = 0; ris_idx <= msc->ris_max; ris_idx++) { mutex_lock(&msc->part_sel_lock); - __mpam_part_sel(ris_idx, 0, msc); - ret = mpam_msc_read_idr(msc, &idr); + ret = __mpam_part_sel(ris_idx, 0, msc); + if (!ret) + ret = mpam_msc_read_idr(msc, &idr); mutex_unlock(&msc->part_sel_lock); if (ret) return ret; @@ -1072,9 +1079,11 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) ris->idr = idr; mutex_lock(&msc->part_sel_lock); - __mpam_part_sel(ris_idx, 0, msc); - ret = mpam_ris_hw_probe(ris); + ret = __mpam_part_sel(ris_idx, 0, msc); + if (!ret) + ret = mpam_ris_hw_probe(ris); mutex_unlock(&msc->part_sel_lock); + if (ret) return ret; } -- 2.43.0