From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from shrimp.cherry.relay.mailchannels.net (shrimp.cherry.relay.mailchannels.net [23.83.223.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72696322768 for ; Mon, 27 Jul 2026 19:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=23.83.223.164 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785180981; cv=none; b=iTKHictaoubGvXBuJ9I0ziIqnJyjX3BpDRCaQIzf6aRHhIC8hIfdouEF0KuzQRVG0I7eewCE6IUm9UBzrG7+gm88ji08nK+ADMsuAzAMPzeYsm+sGvtfg1LveSpW8Ib77VT3Sk3DNUwVKxqooldFmGWWKKrilgG6m9TItmkicnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785180981; c=relaxed/simple; bh=Ks9RWRxwFgH+/rWUDLJVuHiPK6fWkD/7kFcJbDYGqbg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m2Jq58/4H0XSBLF5N9RfPuLBQRw6xBJQwTd0Q65AWNoIUBdZwj30cm15XVG5DPa1o63bdafCki8TIs3EBrjSoKpB14Yf7CbMoYoYEOYnTUFLyusQiqWuQOpS9bAvmZEhrmA8bvCnAnSlA1iLrLa1eqdUH885nGtNQ3l0Yv9Nr7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net; spf=fail smtp.mailfrom=stgolabs.net; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b=X34MTvSx; arc=none smtp.client-ip=23.83.223.164 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=stgolabs.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=stgolabs.net header.i=@stgolabs.net header.b="X34MTvSx" X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 926A44C261B; Mon, 27 Jul 2026 19:36:08 +0000 (UTC) Received: from pdx1-sub0-mail-a227.dreamhost.com (trex-green-0.trex.outbound.svc.cluster.local [100.104.243.140]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 646F24C259D; Mon, 27 Jul 2026 19:36:08 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|dave@stgolabs.net X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|dave@stgolabs.net X-MailChannels-Auth-Id: dreamhost X-Spot-Occur: 2d0548a2390b4d79_1785180968507_3489651346 X-MC-Loop-Signature: 1785180968507:3922412777 X-MC-Ingress-Time: 1785180968507 Received: from pdx1-sub0-mail-a227.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.104.243.140 (trex/8.0.2); Mon, 27 Jul 2026 19:36:08 +0000 Received: from offworld.lan (unknown [76.167.199.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dave@stgolabs.net) by pdx1-sub0-mail-a227.dreamhost.com (Postfix) with ESMTPSA id 4h883C5Rzxz1jL; Mon, 27 Jul 2026 12:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stgolabs.net; s=dreamhost; t=1785180968; bh=9ruYIFNfpwGcUbryBdfYm/wrTJL2dFrTDfMZt4FQj0A=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=X34MTvSxXiyyBfhoe8w2tFz600WNj5eVhz950moox0Sueg0bAq/HG2UBXATNWTCkJ mJsB6eBhi84+hOyCgwbsySVpCI5ZvWcKGGWkupEzlmr0YvX47TGXADamjsgRLq3DS0 8ouHavwyXGTEB/G72PgRrewAcYFSqxrS4M6bFfCIzAXkX2zueWWA3GPnFewtKNH/Xf 0N9qd3jcwzczCDfuHultRi5xcYKS/0UZ1bcEkaYDsRCEql2zUYMunsJuU79D2PPl75 jCSO1npq19vpVmlM3+w3kkCVQbAF5ZWdoaRUFFhANKTJu7MMCuNW07lTTXGbqd57F6 T+IqeyHnJdsiA== From: Davidlohr Bueso To: dave.jiang@intel.com Cc: jic23@kernel.org, alison.schofield@intel.com, icheng@nvidia.com, benjamin.cheatham@amd.com, alucerop@amd.com, dongjoo.seo1@samsung.com, dave@stgolabs.net, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/9] cxl/hdm: Rename decoder coherency flags Date: Mon, 27 Jul 2026 12:35:57 -0700 Message-Id: <20260727193601.651871-6-dave@stgolabs.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260727193601.651871-1-dave@stgolabs.net> References: <20260727193601.651871-1-dave@stgolabs.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Align with the ACPI CXL Window restriction naming and convert CXL_DECODER_F_TYPE2/F_TYPE3 to F_DEVMEM/F_HOSTONLY. Type2 and Type3 coherency models were named prior to Back-Invalidate. Reviewed-by: Ben Cheatham Reviewed-by: Dave Jiang Signed-off-by: Davidlohr Bueso --- drivers/cxl/acpi.c | 8 ++++---- drivers/cxl/core/port.c | 12 ++++++------ drivers/cxl/cxl.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index eceb8dd97df2..2c54f709c45d 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -143,9 +143,9 @@ static unsigned long cfmws_to_decoder_flags(int restrictions) unsigned long flags = CXL_DECODER_F_ENABLE; if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_DEVMEM) - flags |= CXL_DECODER_F_TYPE2; + flags |= CXL_DECODER_F_DEVMEM; if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM) - flags |= CXL_DECODER_F_TYPE3; + flags |= CXL_DECODER_F_HOSTONLY; if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_VOLATILE) flags |= CXL_DECODER_F_RAM; if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_PMEM) @@ -447,8 +447,8 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws, cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions); /* host-only wins if firmware sets both coherency restrictions */ cxld->target_type = CXL_DECODER_HOSTONLYMEM; - if (cxld->flags & CXL_DECODER_F_TYPE2) { - if (cxld->flags & CXL_DECODER_F_TYPE3) + if (cxld->flags & CXL_DECODER_F_DEVMEM) { + if (cxld->flags & CXL_DECODER_F_HOSTONLY) dev_dbg(dev, "CFMWS has both HDM-H and HDM-D\n"); else cxld->target_type = CXL_DECODER_DEVMEM; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 0bcb3ad7905c..4fce2188cd8c 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -128,8 +128,8 @@ static DEVICE_ATTR_RO(name) CXL_DECODER_FLAG_ATTR(cap_pmem, CXL_DECODER_F_PMEM); CXL_DECODER_FLAG_ATTR(cap_ram, CXL_DECODER_F_RAM); -CXL_DECODER_FLAG_ATTR(cap_type2, CXL_DECODER_F_TYPE2); -CXL_DECODER_FLAG_ATTR(cap_type3, CXL_DECODER_F_TYPE3); +CXL_DECODER_FLAG_ATTR(cap_type2, CXL_DECODER_F_DEVMEM); +CXL_DECODER_FLAG_ATTR(cap_type3, CXL_DECODER_F_HOSTONLY); CXL_DECODER_FLAG_ATTR(locked, CXL_DECODER_F_LOCK); CXL_DECODER_FLAG_ATTR(cap_bi, CXL_DECODER_F_BI); @@ -364,8 +364,8 @@ static bool can_create_pmem(struct cxl_root_decoder *cxlrd) unsigned long flags = cxlrd->cxlsd.cxld.flags; unsigned long hdm_h, hdm_db; - hdm_h = CXL_DECODER_F_TYPE3 | CXL_DECODER_F_PMEM; - hdm_db = CXL_DECODER_F_TYPE2 | CXL_DECODER_F_BI | CXL_DECODER_F_PMEM; + hdm_h = CXL_DECODER_F_HOSTONLY | CXL_DECODER_F_PMEM; + hdm_db = CXL_DECODER_F_DEVMEM | CXL_DECODER_F_BI | CXL_DECODER_F_PMEM; return (flags & hdm_h) == hdm_h || (flags & hdm_db) == hdm_db; } @@ -375,8 +375,8 @@ static bool can_create_ram(struct cxl_root_decoder *cxlrd) unsigned long flags = cxlrd->cxlsd.cxld.flags; unsigned long hdm_h, hdm_db; - hdm_h = CXL_DECODER_F_TYPE3 | CXL_DECODER_F_RAM; - hdm_db = CXL_DECODER_F_TYPE2 | CXL_DECODER_F_BI | CXL_DECODER_F_RAM; + hdm_h = CXL_DECODER_F_HOSTONLY | CXL_DECODER_F_RAM; + hdm_db = CXL_DECODER_F_DEVMEM | CXL_DECODER_F_BI | CXL_DECODER_F_RAM; return (flags & hdm_h) == hdm_h || (flags & hdm_db) == hdm_db; } diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 62c5bd9e295c..5f4a11538bbf 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -295,8 +295,8 @@ int cxl_dport_map_rcd_linkcap(struct pci_dev *pdev, struct cxl_dport *dport); */ #define CXL_DECODER_F_RAM BIT(0) #define CXL_DECODER_F_PMEM BIT(1) -#define CXL_DECODER_F_TYPE2 BIT(2) -#define CXL_DECODER_F_TYPE3 BIT(3) +#define CXL_DECODER_F_DEVMEM BIT(2) +#define CXL_DECODER_F_HOSTONLY BIT(3) #define CXL_DECODER_F_LOCK BIT(4) #define CXL_DECODER_F_ENABLE BIT(5) #define CXL_DECODER_F_NORMALIZED_ADDRESSING BIT(6) -- 2.39.5