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 C0A1FC43458 for ; Thu, 2 Jul 2026 16:22:56 +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=czlvCWHgFxITAitOP/CbIbd0AbY2KzDlKh3fOr0rKWI=; b=WxmLJTG+JZoCh8KJ+qATDQm6+f UPT0yrF+dhzmqJHVsg9SBVEh3Zi/1ZcE8aUgBTP++fw3ZmEAoyQhkvXcQME3nTS61IfRpV0GFTKBY gPnzIr/Ob8P9KwpTIQmScbXbS/jsRgOxK6w86hijO3Yp9wifFzBRXagah394QuTjqxnsWZ//j6UNK TD/ZRdVwhvquxZ+VjLN6FeEP2juESuYSHtOYz60Gp3ljhB+4KJe9AklEnjiszX6h7j9och5u+tlYK y+7kzddn8ikm/ryLKQxT+HF5XNuxxyvNeAPd9k2PDay6irf5/h6UzbipM2AX9eGjbY+Q0AKGwEsAx dLM/REaA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfKBe-00000004zI9-1azl; Thu, 02 Jul 2026 16:22:50 +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 1wfKBc-00000004zGu-1n2k for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2026 16:22:49 +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 8135235B7; Thu, 2 Jul 2026 09:22:43 -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 290333F673; Thu, 2 Jul 2026 09:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009367; bh=7qjci2iIVbAXAhbMTcthtv0y9ebcxOyVKtQNj6luUuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lBbL6rMjFQEQyG9xrzuTJ4n8pNDUKlJt42cPO2CfJNQFnjcaXjTlNmBuB5gciAgm0 tcf5wU4i0WZr3N0/ADWNTjRdYXztg1zPeflU2dloah37I1OFDiR3ZDgkD1G4/cDoSi ma8jEoue1pVybtN1IQqoK0hCqEeupcApDcuwxJJw= 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 02/15] arm_mpam: propagate MSC read errors for wrapper functions Date: Thu, 2 Jul 2026 18:22:16 +0200 Message-ID: <20260702162229.4008659-3-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_092248_544200_95876252 X-CRM114-Status: GOOD ( 13.69 ) 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 wrapper functions for IDR and ESR accesses to return an error, and propagate read errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 51 +++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index df14b4513382..ce8738adb6ff 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -247,27 +247,34 @@ static bool mpam_msc_check_aidr(struct mpam_msc *msc) return true; } -static u64 mpam_msc_read_idr(struct mpam_msc *msc) +static int mpam_msc_read_idr(struct mpam_msc *msc, u64 *res) { u32 idr_high = 0, idr_low; + int ret; lockdep_assert_held(&msc->part_sel_lock); - mpam_read_partsel_reg(msc, IDR, &idr_low); - if (FIELD_GET(MPAMF_IDR_EXT, idr_low)) - mpam_read_partsel_reg(msc, IDR + 4, &idr_high); + ret = mpam_read_partsel_reg(msc, IDR, &idr_low); + if (!ret && FIELD_GET(MPAMF_IDR_EXT, idr_low)) + ret = mpam_read_partsel_reg(msc, IDR + 4, &idr_high); - return ((u64)idr_high << 32) | idr_low; + if (!ret) + *res = ((u64)idr_high << 32) | idr_low; + + return ret; } -static void mpam_msc_clear_esr(struct mpam_msc *msc) +static int mpam_msc_clear_esr(struct mpam_msc *msc) { u32 esr_low; + int ret; - __mpam_read_reg(msc, MPAMF_ESR, &esr_low); + ret = __mpam_read_reg(msc, MPAMF_ESR, &esr_low); + if (ret) + return ret; if (!esr_low) - return; + return 0; /* * Clearing the high/low bits of MPAMF_ESR can not be atomic. @@ -277,18 +284,30 @@ static void mpam_msc_clear_esr(struct mpam_msc *msc) */ if (msc->has_extd_esr) __mpam_write_reg(msc, MPAMF_ESR + 4, 0); + __mpam_write_reg(msc, MPAMF_ESR, 0); + + return 0; } -static u64 mpam_msc_read_esr(struct mpam_msc *msc) +static int mpam_msc_read_esr(struct mpam_msc *msc, u64 *res) { u32 esr_high = 0, esr_low; + int ret; - __mpam_read_reg(msc, MPAMF_ESR, &esr_low); - if (msc->has_extd_esr) - __mpam_read_reg(msc, MPAMF_ESR + 4, &esr_high); + ret = __mpam_read_reg(msc, MPAMF_ESR, &esr_low); + if (ret) + return ret; + + if (msc->has_extd_esr) { + ret = __mpam_read_reg(msc, MPAMF_ESR + 4, &esr_high); + if (ret) + return ret; + } - return ((u64)esr_high << 32) | esr_low; + *res = ((u64)esr_high << 32) | esr_low; + + return 0; } static void __mpam_part_sel_raw(u32 partsel, struct mpam_msc *msc) @@ -993,7 +1012,7 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) /* Grab an IDR value to find out how many RIS there are */ mutex_lock(&msc->part_sel_lock); - idr = mpam_msc_read_idr(msc); + mpam_msc_read_idr(msc, &idr); mpam_read_partsel_reg(msc, IIDR, &msc->iidr); mutex_unlock(&msc->part_sel_lock); @@ -1009,7 +1028,7 @@ 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); - idr = mpam_msc_read_idr(msc); + mpam_msc_read_idr(msc, &idr); mutex_unlock(&msc->part_sel_lock); partid_max = FIELD_GET(MPAMF_IDR_PARTID_MAX, idr); @@ -2492,7 +2511,7 @@ static irqreturn_t __mpam_irq_handler(int irq, struct mpam_msc *msc) &msc->accessibility))) return IRQ_NONE; - reg = mpam_msc_read_esr(msc); + mpam_msc_read_esr(msc, ®); errcode = FIELD_GET(MPAMF_ESR_ERRCODE, reg); if (!errcode) -- 2.43.0