From patchwork Wed Dec 11 03:42:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 13902898 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (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 6B95F22C360; Wed, 11 Dec 2024 03:42:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733888567; cv=none; b=qX6TDCP3MWM82YW4LdQRIhe7fvrIVbSdHRiOJ2IQfFcpOtcx79WnjjTvSdJBFwnzsDSLbp8AzsgJtqhD9GdZTncPQj+L00PI8gO8vmWFroqcDY2xhz8SxAU55bgl1HJBaNLnyRIFy1pYJt4vACGGxkLBYgOWevojai2nWOwofss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733888567; c=relaxed/simple; bh=ddZkqpCh2syz4nwZfzVcqCI+/63UR8w/6p15BrOj3aU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jgnDAZLQS4enMY28JoSbIrVwnIi0Ql4b3mA5HpBnBxdG9RbZB3lJ/r2Bk46Uu34UFsxIG/5Yx25A+QGo48fYwbbTxBmyfGjqGTjhYud4Qud8OwNJ94l8vTAz4aBnPDOrPlfAaR4JpNm72aZG9sPk4u4VfAYDHEMs7gmRlKU1ipo= 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=IPLB6XNL; arc=none smtp.client-ip=198.175.65.16 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="IPLB6XNL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1733888566; x=1765424566; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=ddZkqpCh2syz4nwZfzVcqCI+/63UR8w/6p15BrOj3aU=; b=IPLB6XNL0VwUYHJfP7CtBaJ8VPOl1dqlZTRIyTsvydy0ucJ8SejS5P3s Osco/Skly+a5zMeKUolWfDAQ8O58XBkNPU2HHdY0BK9ST6vb82D9pKeb7 3zcoeN13Nr9p2X+cykrPY4t5ZHki8Gh/GxX2S1om5ilXbS55ickh5Hywr y6QViiaM2xrdUDasxR6jW3ifCSy8Vel7dsWwiXaQxXP0BZZHss558Qr1d 9OEBq/295FWtSCMxeez1FIxa6VgFoV0XOJupT6FCssZLAC+Y5lvx6l6tN VGkd18wzTRCFGBbF9Uam2ioqadiiQjnmNtigviNzLARr4kQSaURAQ75pB A==; X-CSE-ConnectionGUID: 1BFXl+7PTU+tvFkxuZsJmA== X-CSE-MsgGUID: jpOXtOzHQIK71gSOGlvEsQ== X-IronPort-AV: E=McAfee;i="6700,10204,11282"; a="34395727" X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="34395727" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2024 19:42:45 -0800 X-CSE-ConnectionGUID: Fl+IRs35QDCHGO4Kv3OJfw== X-CSE-MsgGUID: RYkuMFzpRDqYp9NN5as4qw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="95696871" Received: from lstrano-mobl6.amr.corp.intel.com (HELO localhost) ([10.125.109.231]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Dec 2024 19:42:43 -0800 From: Ira Weiny Date: Tue, 10 Dec 2024 21:42:25 -0600 Subject: [PATCH v8 10/21] cxl/events: Split event msgnum configuration from irq setup Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241210-dcd-type2-upstream-v8-10-812852504400@intel.com> References: <20241210-dcd-type2-upstream-v8-0-812852504400@intel.com> In-Reply-To: <20241210-dcd-type2-upstream-v8-0-812852504400@intel.com> To: Dave Jiang , Fan Ni , Jonathan Cameron , Jonathan Corbet , Andrew Morton , Kees Cook , "Gustavo A. R. Silva" 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, linux-hardening@vger.kernel.org, Li Ming X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733888537; l=2687; i=ira.weiny@intel.com; s=20221211; h=from:subject:message-id; bh=ddZkqpCh2syz4nwZfzVcqCI+/63UR8w/6p15BrOj3aU=; b=Dg+1ORntWKkEXskjARKEcNDeiUEHfO+ywrXMxq6MtI46hoOmxdrmK7S0gsA4gkViN7/o8V+/y kRdB/EzUQ80ANsjG1n+jk7RqcKhgcaEMUltEre6R1MYbcCAnCo4O7V9 X-Developer-Key: i=ira.weiny@intel.com; a=ed25519; pk=noldbkG+Wp1qXRrrkfY1QJpDf7QsOEthbOT7vm0PqsE= Dynamic Capacity Devices (DCD) require event interrupts to process memory addition or removal. BIOS may have control over non-DCD event processing. DCD interrupt configuration needs to be separate from memory event interrupt configuration. Split cxl_event_config_msgnums() from irq setup in preparation for separate DCD interrupts configuration. Reviewed-by: Jonathan Cameron Reviewed-by: Fan Ni Reviewed-by: Dave Jiang Reviewed-by: Li Ming Signed-off-by: Ira Weiny --- drivers/cxl/pci.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 5082625a7b3f51a84f894a3265e922e51b794b68..650724e6896eb4e39468cfded11e6909f8e207a6 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -715,35 +715,31 @@ static int cxl_event_config_msgnums(struct cxl_memdev_state *mds, return cxl_event_get_int_policy(mds, policy); } -static int cxl_event_irqsetup(struct cxl_memdev_state *mds) +static int cxl_event_irqsetup(struct cxl_memdev_state *mds, + struct cxl_event_interrupt_policy *policy) { struct cxl_dev_state *cxlds = &mds->cxlds; - struct cxl_event_interrupt_policy policy; int rc; - rc = cxl_event_config_msgnums(mds, &policy); - if (rc) - return rc; - - rc = cxl_event_req_irq(cxlds, policy.info_settings); + rc = cxl_event_req_irq(cxlds, policy->info_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Info log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.warn_settings); + rc = cxl_event_req_irq(cxlds, policy->warn_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Warn log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.failure_settings); + rc = cxl_event_req_irq(cxlds, policy->failure_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Failure log\n"); return rc; } - rc = cxl_event_req_irq(cxlds, policy.fatal_settings); + rc = cxl_event_req_irq(cxlds, policy->fatal_settings); if (rc) { dev_err(cxlds->dev, "Failed to get interrupt for event Fatal log\n"); return rc; @@ -790,11 +786,15 @@ static int cxl_event_config(struct pci_host_bridge *host_bridge, return -EBUSY; } + rc = cxl_event_config_msgnums(mds, &policy); + if (rc) + return rc; + rc = cxl_mem_alloc_event_buf(mds); if (rc) return rc; - rc = cxl_event_irqsetup(mds); + rc = cxl_event_irqsetup(mds, &policy); if (rc) return rc;