From patchwork Tue Oct 29 20:34:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 13855415 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 9A19420B201 for ; Tue, 29 Oct 2024 20:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730234147; cv=none; b=YEGU/CEXWCYSMC84RaieyIS0xvPUjzM9Y8ugQJdmjSZb9FHDfKoqE+UJv0XKjY+ShZqGdZlKjDrUgKK6RBBowAntfb2tOUHltQSPk4Xy1pc2fs3TYUuHMpQnwADXlYdjx//bH01d8blEZQpuZQsdqEQvECOtNH2YWIcwky9AsdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730234147; c=relaxed/simple; bh=CYwRoUDKYuiHtI74hcjgmD3QstdlBLdXXftrJLGB3R0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BduDeMe+9i8c3PjPnVjGyr9u+0CghHbXTSENEpUCVwCfvaiOdA+XJDH2NQJybs4zkVcLKm7h4msh3L12VFPoin5TSc39C8n1SO8GUoJdZ4al04B3RRg0CM2gpNFeFhlcCH9vilAW2VopsdWC8u1hqKXDaDl+rvJqdO0iz0dh4uI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=buQQBovR; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="buQQBovR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730234146; x=1761770146; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=CYwRoUDKYuiHtI74hcjgmD3QstdlBLdXXftrJLGB3R0=; b=buQQBovReGvvWFQ5cYnBgYsl0SbHLjW+fDovMcJ+v29Lx96JhgJ14Eur YelJpPSm2obunsiB/aGpxhRoBH23rVGODaWgbkO3yy2oUwV1JTiFYxxd8 COaXZIbj3089Vw14ADVK3CGB5J0hOL6RN+/74QRUmJM++4952oHvONnqC +XMAeLw/O/Dw9laF0nChFFYxA46C39oEp2/uIfkBDk0FjKYI7fAw+5cL9 d3tVdH5OASsCL0hlr07zgJaLTWM1HR3mOraVA0c1Q0UcOL6/3C6QAP5kJ X1M7Y63sFJG8n0YtjaUYqx4HBSZaNDKnMg/aEEH9sT20wX8w3pvAtXE+D w==; X-CSE-ConnectionGUID: USCZtmcsTUOoA0dF4lXYxQ== X-CSE-MsgGUID: hQiEYy5eROiSN3MTNi8/NQ== X-IronPort-AV: E=McAfee;i="6700,10204,11240"; a="40485474" X-IronPort-AV: E=Sophos;i="6.11,243,1725346800"; d="scan'208";a="40485474" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2024 13:35:45 -0700 X-CSE-ConnectionGUID: aAZPV5cRQ/KueSg2kSFgoQ== X-CSE-MsgGUID: MGH53Mf/RR2Hr29X/92oOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,243,1725346800"; d="scan'208";a="82185321" Received: from ldmartin-desk2.corp.intel.com (HELO localhost) ([10.125.108.77]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2024 13:35:43 -0700 From: Ira Weiny Date: Tue, 29 Oct 2024 15:34:47 -0500 Subject: [PATCH v5 12/27] cxl/cdat: Gather DSMAS data for DCD regions Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241029-dcd-type2-upstream-v5-12-8739cb67c374@intel.com> References: <20241029-dcd-type2-upstream-v5-0-8739cb67c374@intel.com> In-Reply-To: <20241029-dcd-type2-upstream-v5-0-8739cb67c374@intel.com> To: Dave Jiang , Fan Ni , Jonathan Cameron , Navneet Singh , Jonathan Corbet , Andrew Morton Cc: Dan Williams , Davidlohr Bueso , Alison Schofield , Vishal Verma , Ira Weiny , linux-cxl@vger.kernel.org, linux-doc@vger.kernel.org, nvdimm@lists.linux.dev, linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730234086; l=4704; i=ira.weiny@intel.com; s=20221211; h=from:subject:message-id; bh=CYwRoUDKYuiHtI74hcjgmD3QstdlBLdXXftrJLGB3R0=; b=JvnpRW4RUqrQhBWJnN4p+Y6j3rGgsRB3FzwOXXzegP+DVVX7jGKZMgRS0JFMOdhbueVzpWF0j 4/qzWinwiYqC2Tb62k8+V53RqrMOSstIdiB9JaRL3XKTicipyIrCen4 X-Developer-Key: i=ira.weiny@intel.com; a=ed25519; pk=noldbkG+Wp1qXRrrkfY1QJpDf7QsOEthbOT7vm0PqsE= Additional DCD region (partition) information is contained in the DSMAS CDAT tables, including performance, read only, and shareable attributes. Match DCD partitions with DSMAS tables and store the meta data. Reviewed-by: Jonathan Cameron Signed-off-by: Ira Weiny --- Changes: [Fan: remove unwanted blank line] [Rafael: Split out acpi change] [iweiny: remove %pra use] [Jonathan: s/cdat/CDAT/] --- drivers/cxl/core/cdat.c | 39 +++++++++++++++++++++++++++++++++++++++ drivers/cxl/core/mbox.c | 2 ++ drivers/cxl/cxlmem.h | 3 +++ 3 files changed, 44 insertions(+) diff --git a/drivers/cxl/core/cdat.c b/drivers/cxl/core/cdat.c index b5d30c5bf1e20725d13b4397a7ba90662bcd8766..7cd7734a3b0f0b742ee6e63973d12fb3e83ac332 100644 --- a/drivers/cxl/core/cdat.c +++ b/drivers/cxl/core/cdat.c @@ -17,6 +17,8 @@ struct dsmas_entry { struct access_coordinate cdat_coord[ACCESS_COORDINATE_MAX]; int entries; int qos_class; + bool shareable; + bool read_only; }; static u32 cdat_normalize(u16 entry, u64 base, u8 type) @@ -74,6 +76,8 @@ static int cdat_dsmas_handler(union acpi_subtable_headers *header, void *arg, return -ENOMEM; dent->handle = dsmas->dsmad_handle; + dent->shareable = dsmas->flags & ACPI_CDAT_DSMAS_SHAREABLE; + dent->read_only = dsmas->flags & ACPI_CDAT_DSMAS_READ_ONLY; dent->dpa_range.start = le64_to_cpu((__force __le64)dsmas->dpa_base_address); dent->dpa_range.end = le64_to_cpu((__force __le64)dsmas->dpa_base_address) + le64_to_cpu((__force __le64)dsmas->dpa_length) - 1; @@ -255,6 +259,39 @@ static void update_perf_entry(struct device *dev, struct dsmas_entry *dent, dent->coord[ACCESS_COORDINATE_CPU].write_latency); } +static void update_dcd_perf(struct cxl_dev_state *cxlds, + struct dsmas_entry *dent) +{ + struct cxl_memdev_state *mds = to_cxl_memdev_state(cxlds); + struct device *dev = cxlds->dev; + + for (int i = 0; i < mds->nr_dc_region; i++) { + /* CXL defines a u32 handle while CDAT defines u8, ignore upper bits */ + u8 dc_handle = mds->dc_region[i].dsmad_handle & 0xff; + + if (resource_size(&cxlds->dc_res[i])) { + struct range dc_range = { + .start = cxlds->dc_res[i].start, + .end = cxlds->dc_res[i].end, + }; + + if (range_contains(&dent->dpa_range, &dc_range)) { + if (dent->handle != dc_handle) + dev_warn(dev, "DC Region/DSMAS mis-matched handle/range; region [range 0x%016llx-0x%016llx] (%u); dsmas [range 0x%016llx-0x%016llx] (%u)\n" + " setting DC region attributes regardless\n", + dent->dpa_range.start, dent->dpa_range.end, + dent->handle, + dc_range.start, dc_range.end, + dc_handle); + + mds->dc_region[i].shareable = dent->shareable; + mds->dc_region[i].read_only = dent->read_only; + update_perf_entry(dev, dent, &mds->dc_perf[i]); + } + } + } +} + static void cxl_memdev_set_qos_class(struct cxl_dev_state *cxlds, struct xarray *dsmas_xa) { @@ -278,6 +315,8 @@ static void cxl_memdev_set_qos_class(struct cxl_dev_state *cxlds, else if (resource_size(&cxlds->pmem_res) && range_contains(&pmem_range, &dent->dpa_range)) update_perf_entry(dev, dent, &mds->pmem_perf); + else if (cxl_dcd_supported(mds)) + update_dcd_perf(cxlds, dent); else dev_dbg(dev, "no partition for dsmas dpa: %#llx\n", dent->dpa_range.start); diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 2c9a9af3dde3a294cde628880066b514b870029f..a4b5cb61b4e6f9b17e3e3e0cce356b0ac9f960d0 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -1649,6 +1649,8 @@ struct cxl_memdev_state *cxl_memdev_state_create(struct device *dev) mds->cxlds.type = CXL_DEVTYPE_CLASSMEM; mds->ram_perf.qos_class = CXL_QOS_CLASS_INVALID; mds->pmem_perf.qos_class = CXL_QOS_CLASS_INVALID; + for (int i = 0; i < CXL_MAX_DC_REGION; i++) + mds->dc_perf[i].qos_class = CXL_QOS_CLASS_INVALID; return mds; } diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 2fb93269ab4359dd12dfb912ded30654e2340be0..204f7bd9197bd1a02de44ef56a345811d2107ab4 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -466,6 +466,8 @@ struct cxl_dc_region_info { u64 blk_size; u32 dsmad_handle; u8 flags; + bool shareable; + bool read_only; u8 name[CXL_DC_REGION_STRLEN]; }; @@ -533,6 +535,7 @@ struct cxl_memdev_state { u8 nr_dc_region; struct cxl_dc_region_info dc_region[CXL_MAX_DC_REGION]; + struct cxl_dpa_perf dc_perf[CXL_MAX_DC_REGION]; struct cxl_event_state event; struct cxl_poison_state poison;