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 4AA6CC43458 for ; Thu, 2 Jul 2026 16:23:10 +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=2dIdQb8dJcyowk3goxpdxWl40cw0E2sc0GS21GQa1PM=; b=Rf+Pe341eaMdCQHpxFjFvMyEC+ BT6sIFy6N+cuGTUsue0wRqEkSa5zX4Civ9VCnGDg/zRTahyi2oe4xWH7dOKwtze/4HBKS4gjTjNie 6iqutn4w5N5gZqqzrwaDXuEeffyLkZI5jAHC5gAZREmur5uQ7hEbckNJ+7jC8JEYN1wvpqHj0Ljrz T7SufK7LW61TfjVTA7Xlp4B8zmdQu6ybzjzfeQPtJaaxs0sOqF2Yqy29JgM23fecc1m5wO4E8OdCf 6W840ED5KoCLsksSPtzm1+D69Fmyql5WC/r6qe4xUZ7Ja0drHWXG//6Fq5ScTNfI/e5bqhGwMNd6r PZ8VrEuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wfKBr-00000004zQx-45ez; Thu, 02 Jul 2026 16:23:03 +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 1wfKBp-00000004zPO-1zpd for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2026 16:23:02 +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 E2EE935CB; Thu, 2 Jul 2026 09:22:55 -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 8B11A3F673; Thu, 2 Jul 2026 09:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1783009380; bh=Yj/qiqCuDrztdPO9H7QAPgd9Fj2LM4WqBGpJ969IKzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FGbnlpNzENa9BMHtOpMyNULrmIZ6/StiiucbAhWkYoaUkANrLX5r+Lk0I7KU/ZVwH luJIAILEZ/klpOWZeecoLvF1AMfp2QsMSE/lPgGOeeJAU3DDzLt12HXH/+er8Vcyv+ 6zT0mxGDegfetS2jJmpodxWEYucSD6/PEnE+Exgw= 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 05/15] arm_mpam: propagate MSC read errors for msmon helpers Date: Thu, 2 Jul 2026 18:22:19 +0200 Message-ID: <20260702162229.4008659-6-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_092301_555001_F04AEB03 X-CRM114-Status: GOOD ( 11.72 ) 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 helper functions for msmon accesses to return an error, and propagate read errors from the lower level up. Signed-off-by: Andre Przywara --- drivers/resctrl/mpam_devices.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c index 1d06902fb970..b259fe20a614 100644 --- a/drivers/resctrl/mpam_devices.c +++ b/drivers/resctrl/mpam_devices.c @@ -1189,25 +1189,31 @@ static void gen_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val, } } -static void read_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val, - u32 *flt_val) +static int read_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val, + u32 *flt_val) { struct mpam_msc *msc = m->ris->vmsc->msc; + int ret; switch (m->type) { case mpam_feat_msmon_csu: - mpam_read_monsel_reg(msc, CFG_CSU_CTL, ctl_val); - mpam_read_monsel_reg(msc, CFG_CSU_FLT, flt_val); + ret = mpam_read_monsel_reg(msc, CFG_CSU_CTL, ctl_val); + if (!ret) + ret = mpam_read_monsel_reg(msc, CFG_CSU_FLT, flt_val); break; case mpam_feat_msmon_mbwu_31counter: case mpam_feat_msmon_mbwu_44counter: case mpam_feat_msmon_mbwu_63counter: - mpam_read_monsel_reg(msc, CFG_MBWU_CTL, ctl_val); - mpam_read_monsel_reg(msc, CFG_MBWU_FLT, flt_val); + ret = mpam_read_monsel_reg(msc, CFG_MBWU_CTL, ctl_val); + if (!ret) + ret = mpam_read_monsel_reg(msc, CFG_MBWU_FLT, flt_val); break; default: pr_warn("Unexpected monitor type %d\n", m->type); + return -EINVAL; } + + return ret; } /* Remove values set by the hardware to prevent apparent mismatches. */ -- 2.43.0