From patchwork Wed Jan 17 14:14:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Singh Tomar X-Patchwork-Id: 13521788 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 DC5E3C47DA2 for ; Wed, 17 Jan 2024 14:16:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PScKghiZdHw/PlnIVRTFsXLenh+FBHvmqHdQSl2FReU=; b=jURaPBnkj7heOK B19wBv+L1hflKEujKlM6Jx6FOXkItnFCgG3Hj7ByK/1+K1dfKKjrOjNU9nIDmWXxoZ5xf7yE0WYV+ +Ej3gq1L5hiFLDUgvZsanx6c4ue4jylRpSQWlS2GILiJzvIpK8fa00v+ZkQxmJSnyAkY8mn9RllGk KpZBiiCoxEpB3/5p24Yas4GbnaWmolp3d5G9OpxFtOklhINQ6wWRwk4ENmj7u/R7mqj2wgThY9BTW i0+UIgzmsRCRfBtu2dHRUsKU/7M0czFZGSMnKCFIg0Umv6omlinTemdsxnLk6wxUGBd7/A/UdOkxM UR1wt1zeXfn6lN6PPHbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQ6hz-00Gyus-1c; Wed, 17 Jan 2024 14:15:59 +0000 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQ6hJ-00GyDi-35 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jan 2024 14:15:23 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40H8Ydfc012684; Wed, 17 Jan 2024 06:15:00 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= pfpt0220; bh=AyLoq4qCvNRklZsb/iMNJS5tPScAkgwgIIVRtypuMfA=; b=kdH Sy9Px9R7Tvl0q0/LYGJ+MZyus/ZDTBeBOZy34UQ9y2H9pwUcWnTzOS7W3NwtO/sM y8eVeyPel4oTGTL0sIugJbEAbmjOE73fmhn62MPlfZR7mqnN/LrI9CyaqJMyCgtb +PrqOmXTw0FUTqXeHlmXsFO9sS1VuIQZGohS8AYJXa0Srvi6bke3M8czpke7q/q1 oa+QtSyI6pvH0UsI6lfC/v9rcw2Ggp2PdRlGBoQeFPckXoi8uGsZLS0I9a8FRI8k wiqHsjKFL8kGXDbabTOG0ZjMhmlolBwO4WM4HBgFmvrYh8ds2yponi2/E3uay9UJ u6Z2Sc138bK8bCvMTRA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3vp0ge393y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 17 Jan 2024 06:15:00 -0800 (PST) Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Wed, 17 Jan 2024 06:14:58 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Wed, 17 Jan 2024 06:14:58 -0800 Received: from localhost.localdomain (unknown [10.28.36.167]) by maili.marvell.com (Postfix) with ESMTP id D7A7D5B6931; Wed, 17 Jan 2024 06:14:54 -0800 (PST) From: Amit Singh Tomar To: , CC: , , , , , , , , Amit Singh Tomar Subject: [PATCH v1 12/14] arm_mpam: Program Downstream priority value Date: Wed, 17 Jan 2024 19:44:03 +0530 Message-ID: <20240117141405.3063506-13-amitsinght@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240117141405.3063506-1-amitsinght@marvell.com> References: <20240117141405.3063506-1-amitsinght@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: zpp2hqTM8jJAkQKnD65_Nno9V8gilWRY X-Proofpoint-ORIG-GUID: zpp2hqTM8jJAkQKnD65_Nno9V8gilWRY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-17_08,2024-01-17_01,2023-05-22_02 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240117_061518_196334_E3B8FE68 X-CRM114-Status: GOOD ( 11.22 ) 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 Now that Downstream priorities values can be passed from resource control schemata file, let's program it into memory mapped Priority Partition Configuration Register. Signed-off-by: Amit Singh Tomar --- Changes since RFC: * Priority value is inverted based on DSPRI_0_IS_LOW value. --- drivers/platform/mpam/mpam_devices.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index 9953f2050d35..388d57281fd8 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -1101,6 +1101,7 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid, struct mpam_props *rprops = &ris->props; u16 dspri = GENMASK((rprops->dspri_wd - 1), 0); u16 intpri = GENMASK((rprops->intpri_wd - 1), 0); + u8 dspri_part_0_low, dspri_rprops, dspri_cfg; lockdep_assert_held(&msc->lock); @@ -1143,18 +1144,33 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid, if (mpam_has_feature(mpam_feat_ccap_part, rprops)) mpam_write_partsel_reg(msc, CMAX, cmax); - if (mpam_has_feature(mpam_feat_intpri_part, rprops) || - mpam_has_feature(mpam_feat_dspri_part, rprops)) { + if (mpam_has_feature(mpam_feat_intpri_part, rprops)) { /* aces high? */ if (!mpam_has_feature(mpam_feat_intpri_part_0_low, rprops)) intpri = 0; - if (!mpam_has_feature(mpam_feat_dspri_part_0_low, rprops)) - dspri = 0; if (mpam_has_feature(mpam_feat_intpri_part, rprops)) pri_val |= FIELD_PREP(MPAMCFG_PRI_INTPRI, intpri); - if (mpam_has_feature(mpam_feat_dspri_part, rprops)) - pri_val |= FIELD_PREP(MPAMCFG_PRI_DSPRI, dspri); + + mpam_write_partsel_reg(msc, PRI, pri_val); + } + + dspri_rprops = mpam_has_feature(mpam_feat_dspri_part, + rprops); + dspri_part_0_low = mpam_has_feature(mpam_feat_dspri_part_0_low, + rprops); + if (dspri_rprops) { + dspri_cfg = mpam_has_feature(mpam_feat_dspri_part, + cfg); + if (dspri_cfg) { + pri_val |= (!dspri_part_0_low) + ? FIELD_PREP(MPAMCFG_PRI_DSPRI, cfg->dspri ^ dspri) + : FIELD_PREP(MPAMCFG_PRI_DSPRI, cfg->dspri & dspri); + } else { + pri_val |= (!dspri_part_0_low) + ? FIELD_PREP(MPAMCFG_PRI_DSPRI, 0) + : FIELD_PREP(MPAMCFG_PRI_DSPRI, dspri); + } mpam_write_partsel_reg(msc, PRI, pri_val); }