From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (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 062C7361668; Tue, 25 Aug 2026 06:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787641152; cv=pass; b=YZy9KrHO16d7metL8hQ1qjDJFtuoapQ77ZweODSe1DuFOWuK0C6WN3NiWgOjYwjdz1W+o//zUiyr58nZeBqk0SI8T8YpamdFob/OlzvnIjMlu7AcDpvHPZNdEFvt+oLNBv38LqYotP+/57BXhSwepJ4XmtZH9qkRsOMsgeegqaw= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787641152; c=relaxed/simple; bh=ZQ72fbmRFFodf95rm+P2GRV5tpLVB1h15coaRnmiIQQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=bejm4ZmprH4YNB2PN5NoB7+DXLwdSt74OrOEa5R3Vo0QwiZ49JcbeehmE7uP1VVDDSbvbzJuC4AIvD67ye0NZP2mw6IpUwrC6w16uVHkQG0paAuA150oXOlOyjlWQar7EtDLSbfGyI11qVol8iPbhYblZE/LcR2L/lwF7ytsSxs= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=N1W4nm36; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="N1W4nm36" ARC-Seal: i=1; a=rsa-sha256; t=1787641137; cv=none; d=zohomail.com; s=zohoarc; b=BWaE2/RXarkbcZc1r+pnvYHDIAPN8oGf5IWgBihFdFxMX5RSqxqsF1Yzvt/yjCeVFOVo2HEHrBRcDPYNUmWCDpZrRMCSxfqmOSvGFmkvaNoOh/9WB5Dtg7fI6FYH7uOEi4FThL8wj2XWyu/uNG0onuDNV3oT6WoM4IWKGgiPn4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787641137; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=Yaziqxb7+WKSWjLyMNfveH40kZz2XNovdSDMc21+f6U=; b=ItXsrSy6yos2lay/tpq+jYM7PBPyehp6UOw6s6pMqfFY/N3Z+DzKU01yf4HjjeGC5IAjnhDGdahcFw5mDg4jZXbRugqV4Z77nIlDCvj6mckXEXgUSlg/e5CFsAoiz0BJbiBEWI/jcjWwcfonB6SdPBGd4TQgax746F2ltQ/xsJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1787641137; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=Message-ID:Date:Date:MIME-Version:Subject:Subject:To:To:Cc:Cc:From:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID:Message-Id:Reply-To; bh=Yaziqxb7+WKSWjLyMNfveH40kZz2XNovdSDMc21+f6U=; b=N1W4nm36ndTpVPodoal1Q+e6ZBWqSypDOBBjC8boYgOoBiKMfxI/U5w/mdxqRotm yPxJj2nh5geQqLBIDBRpnSF4iLjyJkANBAg75jvE3OjPzW+8EzBM0UOuvEb8pt8SqVZ 4vhSMBATibV+FmhRfPbhB57exwFXT35kzZpbQkvE= Received: by mx.zohomail.com with SMTPS id 178764113546214.37737266110662; Mon, 24 Aug 2026 23:58:55 -0700 (PDT) Message-ID: Date: Tue, 25 Aug 2026 14:58:47 +0800 Precedence: bulk X-Mailing-List: linux-tegra@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10 05/12] cxl: Cache endpoint decoder settings during PCI enumeration To: Srirangan Madhavan , Alison Schofield , Bjorn Helgaas , Dave Jiang , Davidlohr Bueso , Ira Weiny , Jonathan Cameron , Vishal Verma , linux-cxl@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Alex Williamson , vsethi@nvidia.com, alwilliamson@nvidia.com, Sai Yashwanth Reddy Kancherla , Vishal Aslot , Manish Honap , Jiandi An , Richard Cheng , linux-tegra@vger.kernel.org References: <20260804192958.1823952-1-smadhavan@nvidia.com> <20260804192958.1823952-6-smadhavan@nvidia.com> From: Li Ming In-Reply-To: <20260804192958.1823952-6-smadhavan@nvidia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Feedback-ID: zu08011227093b6b5dbd6840018db5883a00003a322e5747628aff6a543de8aef03d6ed5c0b8c251b73981ea:ZohoMail X-Zoho-CM-AccountID: abd763e7b9fa23acf4f42a44f9876d2d993e05abdb9290f9ccb1008c977bf7f0 X-ZohoMailClient: External On 8/5/2026 3:29 AM, Srirangan Madhavan wrote: > Populate pci_dev->hdm for CXL.mem functions from pci_bus_add_device(), > after final PCI fixups and state save but before driver binding. This > gives driver-free reset paths an early HDM snapshot while avoiding the > pre-resource-assignment window in PCI capability initialization. > > Use the CXL Register Locator BAR Indicator to find the component register > BAR, reject unassigned, disabled, or zero memory BAR resources before > temporarily enabling Memory Space, and restore the original PCI_COMMAND > value before returning. > > CXL core reuses and refreshes the same cache as decoders are committed or > reset, and retries cache setup during CXL HDM enumeration if the PCI > bus-add attempt did not publish a cache. Move the register helpers into > the built-in CONFIG_CXL_HDM set so the early cache path is available > without cxl_core, and keep the cxl-test mock core from building a > duplicate regs.o. > > Signed-off-by: Srirangan Madhavan > --- > drivers/cxl/core/Makefile | 3 +- > drivers/cxl/core/hdm.c | 13 +- > drivers/cxl/core/regs.c | 4 + > drivers/cxl/core/resource.c | 313 ++++++++++++++++++++++++++++++++++++ > drivers/pci/bus.c | 2 + > drivers/pci/probe.c | 2 + > include/cxl/cxl.h | 26 +++ > tools/testing/cxl/Kbuild | 1 - > 8 files changed, 360 insertions(+), 4 deletions(-) > > diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile > index 0df4178bbbaa..e22f05d83c39 100644 > --- a/drivers/cxl/core/Makefile > +++ b/drivers/cxl/core/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > obj-$(CONFIG_CXL_BUS) += cxl_core.o > -obj-$(CONFIG_CXL_HDM) += resource.o > +obj-$(CONFIG_CXL_HDM) += regs.o resource.o > obj-$(CONFIG_CXL_SUSPEND) += suspend.o > > ccflags-y += -I$(srctree)/drivers/cxl > @@ -8,7 +8,6 @@ CFLAGS_trace.o = -DTRACE_INCLUDE_PATH=. -I$(src) > > cxl_core-y := port.o > cxl_core-y += pmem.o > -cxl_core-y += regs.o > cxl_core-y += memdev.o > cxl_core-y += mbox.o > cxl_core-y += pci.o > diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c > index ec988e7b7c0c..b47701fc5315 100644 > --- a/drivers/cxl/core/hdm.c > +++ b/drivers/cxl/core/hdm.c > @@ -112,10 +112,17 @@ static int cxl_pci_setup_hdm_info(struct cxl_hdm *cxlhdm) > struct pci_dev *pdev __free(pci_dev_put) = > cxl_port_get_uport_pci_dev(cxlhdm->port); > bool present; > + int rc; > > if (!pdev) > return 0; > > + rc = cxl_pci_hdm_info_match(pdev, cxlhdm->decoder_count, &present); > + if (rc || present) > + return rc; > + > + pci_cxl_hdm_init(pdev); > + > return cxl_pci_hdm_info_match(pdev, cxlhdm->decoder_count, &present); > } > > @@ -180,6 +187,10 @@ static void cxl_hdm_info_set_decoder(struct cxl_hdm *cxlhdm, > if (!info || cxld->id >= info->decoder_count) > return; > > + if (cxlhdm->regs.hdm_decoder) > + info->global_ctrl = readl(cxlhdm->regs.hdm_decoder + > + CXL_HDM_DECODER_CTRL_OFFSET); > + > if (cxld->flags & CXL_DECODER_F_ENABLE) > cxl_decoder_snapshot(cxld, &info->settings[cxld->id]); > else > @@ -1002,11 +1013,11 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, > { > struct cxl_endpoint_decoder *cxled = NULL; > u64 size, base, skip, dpa_size, lo, hi; > + struct cxl_decoder_settings settings; > bool committed; > u32 remainder; > int i, rc; > u32 ctrl, tl_low, tl_high; > - struct cxl_decoder_settings settings; > > if (should_emulate_decoders(info)) > return cxl_setup_hdm_decoder_from_dvsec(port, cxld, dpa_base, > diff --git a/drivers/cxl/core/regs.c b/drivers/cxl/core/regs.c > index 93710cf4f0a6..040b0304f63c 100644 > --- a/drivers/cxl/core/regs.c > +++ b/drivers/cxl/core/regs.c > @@ -199,6 +199,7 @@ void __iomem *devm_cxl_iomap_block(struct device *dev, resource_size_t addr, > > return ret_val; > } > +EXPORT_SYMBOL_NS_GPL(devm_cxl_iomap_block, "CXL"); > > int cxl_map_component_regs(const struct cxl_register_map *map, > struct cxl_component_regs *regs, > @@ -517,6 +518,7 @@ u16 cxl_rcrb_to_aer(struct device *dev, resource_size_t rcrb) > > return offset; > } > +EXPORT_SYMBOL_NS_GPL(cxl_rcrb_to_aer, "CXL"); > > static resource_size_t cxl_rcrb_to_linkcap(struct device *dev, struct cxl_dport *dport) > { > @@ -633,6 +635,7 @@ resource_size_t __rcrb_to_component(struct device *dev, struct cxl_rcrb_info *ri > > return component_reg_phys; > } > +EXPORT_SYMBOL_NS_GPL(__rcrb_to_component, "CXL"); > > resource_size_t cxl_rcd_component_reg_phys(struct device *dev, > struct cxl_dport *dport) > @@ -641,3 +644,4 @@ resource_size_t cxl_rcd_component_reg_phys(struct device *dev, > return CXL_RESOURCE_NONE; > return __rcrb_to_component(dev, &dport->rcrb, CXL_RCRB_UPSTREAM); > } > +EXPORT_SYMBOL_NS_GPL(cxl_rcd_component_reg_phys, "CXL"); > diff --git a/drivers/cxl/core/resource.c b/drivers/cxl/core/resource.c > index 97cb136cb2ae..7f5946d3f2c4 100644 > --- a/drivers/cxl/core/resource.c > +++ b/drivers/cxl/core/resource.c > @@ -2,9 +2,16 @@ > /* Copyright (c) 2026 NVIDIA Corporation & Affiliates */ > #include > #include > +#include > #include > #include > +#include > +#include > #include > +#include > +#include > + > +#include > > #include "cxl.h" > #include "core.h" > @@ -170,3 +177,309 @@ int cxl_hdm_decode_decoder(struct cxl_decoder_settings *settings, int id, > &settings->interleave_granularity); > } > EXPORT_SYMBOL_FOR_MODULES(cxl_hdm_decode_decoder, "cxl_core"); > + > +struct cxl_hdm_decoder_state { > + u32 ctrl; > + u32 base_low; > + u32 base_high; > + u32 size_low; > + u32 size_high; > + u32 target_low; > + u32 target_high; > +}; > + > +static void cxl_pci_hdm_info_free(struct cxl_hdm_info *info) > +{ > + if (!info) > + return; > + > + kfree(info->decoder_state); > + kfree(info); > +} > + > +void pci_cxl_hdm_release(struct pci_dev *pdev) > +{ > + struct cxl_hdm_info *info; > + > + scoped_guard(rwsem_write, &cxl_rwsem.dpa) { > + info = pdev->hdm; > + pdev->hdm = NULL; > + } > + > + cxl_pci_hdm_info_free(info); > +} > + > +static bool cxl_pci_bar_usable(struct pci_dev *pdev, int bar) > +{ > + struct resource *res = &pdev->resource[bar]; > + > + if (!pci_resource_len(pdev, bar)) > + return false; > + if (res->flags & (IORESOURCE_UNSET | IORESOURCE_DISABLED)) > + return false; > + if (resource_type(res) != IORESOURCE_MEM) > + return false; > + if (!res->start || !res->end) > + return false; > + > + return true; > +} > + > +static int cxl_pci_hdm_find_bar(struct pci_dev *pdev, resource_size_t hdm_start, > + resource_size_t hdm_size, int *bar, > + resource_size_t *offset) > +{ > + resource_size_t hdm_end; > + > + if (!hdm_size) > + return -EINVAL; > + > + hdm_end = hdm_start + hdm_size - 1; > + if (hdm_end < hdm_start) > + return -EINVAL; > + > + for (int i = 0; i < PCI_STD_NUM_BARS; i++) { > + struct resource *res = &pdev->resource[i]; > + > + if (!cxl_pci_bar_usable(pdev, i)) > + continue; > + if (hdm_start < res->start || hdm_end > res->end) > + continue; > + > + if (bar) > + *bar = i; > + if (offset) > + *offset = hdm_start - res->start; > + return 0; > + } > + > + return -ENODEV; > +} > + > +static void __iomem *cxl_pci_hdm_map(struct pci_dev *pdev, > + struct cxl_register_map *map, > + struct cxl_hdm_info *info) > +{ > + struct cxl_reg_map *hdm_map = &map->component_map.hdm_decoder; > + resource_size_t hdm_start; > + void __iomem *hdm; > + int rc; > + > + hdm_start = map->resource + hdm_map->offset; > + info->hdm_size = hdm_map->size; > + > + rc = cxl_pci_hdm_find_bar(pdev, hdm_start, info->hdm_size, > + &info->hdm_bar, &info->hdm_offset); > + if (rc) > + return ERR_PTR(rc); > + > + hdm = ioremap(hdm_start, info->hdm_size); > + if (!hdm) { > + pci_err(pdev, "failed to map CXL HDM decoder registers\n"); > + return ERR_PTR(-ENOMEM); > + } > + > + return hdm; > +} > + > +static void cxl_pci_hdm_read_decoder_state(struct cxl_hdm_decoder_state *state, > + void __iomem *hdm, int id) > +{ > + state->ctrl = readl(hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); > + state->base_low = readl(hdm + CXL_HDM_DECODER0_BASE_LOW_OFFSET(id)); > + state->base_high = readl(hdm + CXL_HDM_DECODER0_BASE_HIGH_OFFSET(id)); > + state->size_low = readl(hdm + CXL_HDM_DECODER0_SIZE_LOW_OFFSET(id)); > + state->size_high = readl(hdm + CXL_HDM_DECODER0_SIZE_HIGH_OFFSET(id)); > + state->target_low = readl(hdm + CXL_HDM_DECODER0_TL_LOW(id)); > + state->target_high = readl(hdm + CXL_HDM_DECODER0_TL_HIGH(id)); > +} > + > +static int cxl_pci_hdm_read_decoder(struct pci_dev *pdev, > + struct cxl_hdm_decoder_state *state, > + struct cxl_decoder_settings *settings, > + void __iomem *hdm, int id) > +{ > + u64 target_or_skip, base, size; > + int rc; > + > + cxl_pci_hdm_read_decoder_state(state, hdm, id); > + > + base = ((u64)state->base_high << 32) | state->base_low; > + size = ((u64)state->size_high << 32) | state->size_low; > + target_or_skip = ((u64)state->target_high << 32) | state->target_low; > + > + rc = cxl_hdm_decode_decoder(settings, id, state->ctrl, base, size, > + target_or_skip, NULL); > + if (rc) { > + pci_err(pdev, "CXL HDM decoder %d has invalid configuration: %d\n", > + id, rc); > + return rc; > + } > + return 0; > +} > + > +static int cxl_pci_hdm_capable(struct pci_dev *pdev) > +{ > + u16 cap; > + int dvsec; > + int rc; > + > + dvsec = pci_find_dvsec_capability(pdev, PCI_VENDOR_ID_CXL, > + PCI_DVSEC_CXL_DEVICE); > + if (!dvsec) > + return -ENOTTY; > + > + rc = pci_read_config_word(pdev, dvsec + PCI_DVSEC_CXL_CAP, &cap); > + if (rc) > + return pcibios_err_to_errno(rc); > + > + if (!(cap & PCI_DVSEC_CXL_MEM_CAPABLE)) > + return -ENOTTY; > + > + return 0; > +} > + > +static int cxl_pci_hdm_read_info(struct pci_dev *pdev, > + struct cxl_register_map *map, > + struct cxl_hdm_info *info) > +{ > + struct cxl_decoder_settings *settings; > + void __iomem *hdm; > + int decoder_count; > + int rc; > + > + rc = cxl_setup_regs(map); > + if (rc) > + return rc; > + > + if (!map->component_map.hdm_decoder.valid) > + return -ENODEV; > + > + hdm = cxl_pci_hdm_map(pdev, map, info); > + if (IS_ERR(hdm)) > + return PTR_ERR(hdm); > + > + decoder_count = cxl_hdm_decoder_count(readl(hdm + > + CXL_HDM_DECODER_CAP_OFFSET)); > + if (decoder_count < 0) { > + rc = decoder_count; > + goto out_unmap; > + } > + > + if (decoder_count > CXL_HDM_DECODER_MAX_COUNT) { > + rc = -ENXIO; > + goto out_unmap; > + } > + > + info->decoder_count = decoder_count; > + info->global_ctrl = readl(hdm + CXL_HDM_DECODER_CTRL_OFFSET); > + info->decoder_state = kcalloc(decoder_count, > + sizeof(*info->decoder_state), > + GFP_KERNEL); > + if (!info->decoder_state) { > + rc = -ENOMEM; > + goto out_unmap; > + } > + > + settings = info->settings; > + for (int i = 0; i < info->decoder_count; i++) { > + rc = cxl_pci_hdm_read_decoder(pdev, &info->decoder_state[i], > + &settings[i], hdm, i); > + if (rc) > + goto out_unmap; > + } > + > + rc = 0; > +out_unmap: > + iounmap(hdm); > + return rc; > +} > + > +static int __pci_cxl_hdm_init(struct pci_dev *pdev) > +{ > + struct cxl_register_map map = { 0 }; > + struct cxl_hdm_info *info; > + bool restore_command; > + u16 command; > + int rc; > + > + down_read(&cxl_rwsem.dpa); > + if (pdev->hdm) { > + up_read(&cxl_rwsem.dpa); > + return 0; > + } > + up_read(&cxl_rwsem.dpa); Could use a scoped_guard() here. > + > + rc = cxl_pci_hdm_capable(pdev); > + if (rc) > + return rc; > + > + rc = cxl_find_regblock(pdev, CXL_REGLOC_RBI_COMPONENT, &map); > + if (rc) > + return rc; > + > + rc = cxl_pci_hdm_find_bar(pdev, map.resource, map.max_size, NULL, NULL); > + if (rc) > + return rc; > + > + info = kzalloc_obj(*info, GFP_KERNEL); > + if (!info) > + return -ENOMEM; > + > + rc = pci_read_config_word(pdev, PCI_COMMAND, &command); > + if (rc) { > + rc = pcibios_err_to_errno(rc); > + goto out_free_info; > + } > + > + restore_command = !(command & PCI_COMMAND_MEMORY); > + if (restore_command) { > + rc = pci_write_config_word(pdev, PCI_COMMAND, > + command | PCI_COMMAND_MEMORY); > + if (rc) { > + rc = pcibios_err_to_errno(rc); > + goto out_free_info; > + } > + } > + > + rc = cxl_pci_hdm_read_info(pdev, &map, info); > + > + if (restore_command) { > + int rc2 = pci_write_config_word(pdev, PCI_COMMAND, command); > + > + if (rc2) { > + rc2 = pcibios_err_to_errno(rc2); > + pci_err(pdev, > + "failed to restore PCI_COMMAND after CXL HDM cache init: %d\n", > + rc2); > + if (!rc) > + rc = rc2; > + } > + } How about moving PCI_COMMAND programming and restoring into cxl_pci_hdm_read_info(), and rename current cxl_pci_hdm_read_info() to __cxl_pci_hdm_read_info()? > + > + if (rc) > + goto out_free_info; > + > + down_write(&cxl_rwsem.dpa); > + if (!pdev->hdm) { > + pdev->hdm = info; > + info = NULL; > + } > + up_write(&cxl_rwsem.dpa); Same as above, can be replaced by a scoped_guard(). > + > + cxl_pci_hdm_info_free(info); > + return 0; > + > +out_free_info: > + cxl_pci_hdm_info_free(info); > + return rc; > +} > + > +void pci_cxl_hdm_init(struct pci_dev *pdev) > +{ > + int rc; > + > + rc = __pci_cxl_hdm_init(pdev); > + if (rc && rc != -ENOTTY && rc != -ENODEV) > + pci_dbg(pdev, "CXL HDM cache init failed: %d\n", rc); > +} > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index 655ed53436d3..5fd7bae8e786 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > > #include "pci.h" > > @@ -359,6 +360,7 @@ void pci_bus_add_device(struct pci_dev *dev) > > /* Save config space for error recoverability */ > pci_save_state(dev); > + pci_cxl_hdm_init(dev); > > /* > * Enable runtime PM, which potentially allows the device to > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index dd0abbc63e18..0bed5638d6da 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include "pci.h" > > static struct resource busn_resource = { > @@ -2484,6 +2485,7 @@ static void pci_release_dev(struct device *dev) > struct pci_dev *pci_dev; > > pci_dev = to_pci_dev(dev); > + pci_cxl_hdm_release(pci_dev); > pci_release_capabilities(pci_dev); > pci_release_of_node(pci_dev); > pcibios_release_device(pci_dev); > diff --git a/include/cxl/cxl.h b/include/cxl/cxl.h > index 703285966946..a1fe8949f3f7 100644 > --- a/include/cxl/cxl.h > +++ b/include/cxl/cxl.h > @@ -26,6 +26,7 @@ enum cxl_devtype { > }; > > struct cxl_region; > +struct pci_dev; > > enum cxl_decoder_type { > CXL_DECODER_DEVMEM = 2, > @@ -135,16 +136,41 @@ struct cxl_regs { > > #define CXL_HDM_DECODER_MAX_COUNT 32 > > +struct cxl_hdm_decoder_state; > + > /** > * struct cxl_hdm_info - PCI device HDM decoder programming cache > * @decoder_count: number of decoder settings entries > + * @hdm_bar: BAR containing the HDM decoder registers > + * @hdm_offset: HDM decoder register offset relative to @hdm_bar > + * @hdm_size: HDM decoder register resource size > + * @global_ctrl: cached HDM decoder global control register > + * @decoder_state: cached raw per-decoder register state > * @settings: cached per-decoder programming state > */ > struct cxl_hdm_info { > int decoder_count; > + int hdm_bar; > + resource_size_t hdm_offset; > + resource_size_t hdm_size; > + u32 global_ctrl; > + struct cxl_hdm_decoder_state *decoder_state; > struct cxl_decoder_settings settings[CXL_HDM_DECODER_MAX_COUNT]; > }; > > +#ifdef CONFIG_CXL_HDM > +void pci_cxl_hdm_init(struct pci_dev *pdev); > +void pci_cxl_hdm_release(struct pci_dev *pdev); > +#else > +static inline void pci_cxl_hdm_init(struct pci_dev *pdev) > +{ > +} > + > +static inline void pci_cxl_hdm_release(struct pci_dev *pdev) > +{ > +} > +#endif > + > struct cxl_reg_map { > bool valid; > int id; > diff --git a/tools/testing/cxl/Kbuild b/tools/testing/cxl/Kbuild > index 6c09932587ce..2eb61812a8e7 100644 > --- a/tools/testing/cxl/Kbuild > +++ b/tools/testing/cxl/Kbuild > @@ -55,7 +55,6 @@ obj-m += cxl_core.o > > cxl_core-y := $(CXL_CORE_SRC)/port.o > cxl_core-y += $(CXL_CORE_SRC)/pmem.o > -cxl_core-y += $(CXL_CORE_SRC)/regs.o > cxl_core-y += $(CXL_CORE_SRC)/memdev.o > cxl_core-y += $(CXL_CORE_SRC)/mbox.o > cxl_core-y += $(CXL_CORE_SRC)/pci.o