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 695C1402BBE for ; Fri, 8 May 2026 16:35:26 +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=1778258129; cv=none; b=CtwjXwpVYc4jFGrblWlT4Go9TOGPEIjEuMrErQ+ENnPCt9JLI0UI5CfGNohqbK/wuqxb68aIYbqDk4itdO/E9CmOhZbZlzf54iKPkDSMn9gwAlZOqGiiDorh89T5K2gc/F/dTjAn9BM0XVr5vUOKg+i8dwnEpNrufcFvzCQjxuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778258129; c=relaxed/simple; bh=Sa0HSPB7packjRjTbpZvjR/BW5toCOHXBvvnXq14Pm8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=DDXJpg/TJx/M9VGmfwIIJPvaFELxLtVakXYRcAQwHEEpsRp1hinrkrmII0yplrCiC8dm/F9QiX2leNuF90FpdtxZhBiBhQGNL8YyptrmMEuOfxsUtlrmOwv48NfHvRfVmMJcbTHmyAKELFoWhBywrt4LniKf1dbp4mTpXx7+/T4= 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=o/3fy7C5; 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="o/3fy7C5" 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 34E3F1F37; Fri, 8 May 2026 09:35:20 -0700 (PDT) Received: from [10.1.196.46] (e134344.arm.com [10.1.196.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 96A0E3F763; Fri, 8 May 2026 09:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778258125; bh=Sa0HSPB7packjRjTbpZvjR/BW5toCOHXBvvnXq14Pm8=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=o/3fy7C543k7tKQyBD7EzBO50ldMuXO/KeQQ5jPwwFSIJNyqc2RkoxXSbIwo8ryHX IP6mrOuB77lhS1NqgUd/MMsIq7MlH0JXwuT+PQyS5kKZWAzGN9pcrGidHvLxsJO9Ou Kqx7d8cQ9NTkJScecsHiHefnzEYYxihfreYDP54c= Message-ID: Date: Fri, 8 May 2026 17:35:21 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Thunderbird Daily Subject: Re: [PATCH v3 4/4] arm_mpam: Update architecture version check for MPAM MSC To: James Morse , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, zengheng4@huawei.com Cc: wangkefeng.wang@huawei.com, xry111@xry111.site, catalin.marinas@arm.com, yang@os.amperecomputing.com, reinette.chatre@intel.com, will@kernel.org, thuth@redhat.com, mrigendra.chaubey@gmail.com, fenghuay@nvidia.com, ahmed.genidi@arm.com References: <20260508162341.3762549-1-james.morse@arm.com> <20260508162341.3762549-5-james.morse@arm.com> Content-Language: en-US From: Ben Horgan In-Reply-To: <20260508162341.3762549-5-james.morse@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi James, On 5/8/26 17:23, James Morse wrote: > From: Zeng Heng > > In addition to updating the CPU MPAM version check, the MPAM MSC version > check also need to be updated. mpam_msc_check_aidr() is added to check > the MSC AIDR register, ensuring that both the major and minor version > numbers fall within the supported range of the MPAM architecture version. > > Signed-off-by: Zeng Heng > [ morse: changed mpam_msc_check_aidr() to accept versions like v1.2 ] > Signed-off-by: James Morse > --- > drivers/resctrl/mpam_devices.c | 23 ++++++++++++++++++++--- > 1 file changed, 20 insertions(+), 3 deletions(-) > > diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c > index 916d8fd45ed5..1771e9712ca2 100644 > --- a/drivers/resctrl/mpam_devices.c > +++ b/drivers/resctrl/mpam_devices.c > @@ -224,6 +224,24 @@ static inline void _mpam_write_monsel_reg(struct mpam_msc *msc, u16 reg, u32 val > > #define mpam_write_monsel_reg(msc, reg, val) _mpam_write_monsel_reg(msc, MSMON_##reg, val) > > +static bool mpam_msc_check_aidr(struct mpam_msc *msc) > +{ > + u32 aidr = __mpam_read_reg(msc, MPAMF_AIDR); > + u32 major = FIELD_GET(MPAMF_AIDR_ARCH_MAJOR_REV, aidr); > + u32 minor = FIELD_GET(MPAMF_AIDR_ARCH_MINOR_REV, aidr); > + > + /* > + * v0.0 and >v2.x aren't supported, but anything else should be backward > + * compatible to v0.1 or v1.0. > + */ > + if (!major && !minor) > + return false; > + if (major > 1) > + return false; > + > + return true; > +} > + > static u64 mpam_msc_read_idr(struct mpam_msc *msc) > { > u64 idr_high = 0, idr_low; > @@ -951,9 +969,8 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc) > > lockdep_assert_held(&msc->probe_lock); > > - idr = __mpam_read_reg(msc, MPAMF_AIDR); > - if ((idr & MPAMF_AIDR_ARCH_MAJOR_REV) != MPAM_ARCHITECTURE_V1) { nit: MPAM_ARCHITECTURE_V1 is now unused. Reviewed-by: Ben Horgan Thanks, Ben > - dev_err_once(dev, "MSC does not match MPAM architecture v1.x\n"); > + if (!mpam_msc_check_aidr(msc)) { > + dev_err_once(dev, "MSC does not match architecture v1.x\n"); > return -EIO; > } >